Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions graphics/graphviz-devel/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ PortGroup xcodeversion 1.0

name graphviz-devel
set my_name graphviz
version 12.2.1
checksums rmd160 75d7edc5d7fc12f75eb17d4ab85855d334bf78f5 \
sha256 242bc18942eebda6db4039f108f387ec97856fc91ba47f21e89341c34b554df8 \
size 26813453
version 14.0.4
checksums rmd160 4874bc696500e1f74125fcc6a40ab4f022f74649 \
sha256 a005977de2fec13753f5bde767cf97fdc28ac54bfd6a2737c563748bc4f32317 \
size 20957384
use_xz yes

set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} eq {} ? {-devel} : {}}]
Expand Down Expand Up @@ -78,8 +79,6 @@ depends_lib \
depends_run \
port:urw-fonts

patchfiles-append smyrna.patch

configure.args \
ac_cv_prog_AWK=/usr/bin/awk \
--disable-guile \
Expand Down Expand Up @@ -369,7 +368,7 @@ subport gvedit${thisbranch} {
PortGroup app 1.0
PortGroup qt5 1.0

revision 1
revision 0

conflicts gvedit${otherbranch}

Expand Down
54 changes: 46 additions & 8 deletions graphics/graphviz-devel/files/patch-cmd-gvedit-Makefile.in.diff
Original file line number Diff line number Diff line change
@@ -1,26 +1,64 @@
--- cmd/gvedit/Makefile.in.orig 2023-07-07 02:42:43.000000000 -0500
+++ cmd/gvedit/Makefile.in 2023-07-10 04:52:31.000000000 -0500
@@ -123,9 +123,7 @@
gvedit-mdichild.$(OBJEXT) $(am__objects_1)
gvedit_OBJECTS = $(am_gvedit_OBJECTS)
--- cmd/gvedit/Makefile.in.orig 2025-10-19 11:08:31
+++ cmd/gvedit/Makefile.in 2025-11-05 22:18:00
@@ -115,7 +115,7 @@
PROGRAMS = $(bin_PROGRAMS)
am_gvedit_OBJECTS = gvedit-main.$(OBJEXT) gvedit-csettings.$(OBJEXT) \
gvedit-imageviewer.$(OBJEXT) gvedit-mainwindow.$(OBJEXT) \
- gvedit-mdichild.$(OBJEXT)
+ gvedit-mdichild.$(OBJEXT) gv_find_me.$(OBJEXT)
am__objects_1 = gvedit-moc_csettings.$(OBJEXT) \
gvedit-moc_imageviewer.$(OBJEXT) \
gvedit-moc_mainwindow.$(OBJEXT) gvedit-moc_mdichild.$(OBJEXT) \
@@ -123,10 +123,7 @@
nodist_gvedit_OBJECTS = $(am__objects_1)
gvedit_OBJECTS = $(am_gvedit_OBJECTS) $(nodist_gvedit_OBJECTS)
am__DEPENDENCIES_1 =
-gvedit_DEPENDENCIES = $(top_builddir)/lib/gvc/libgvc.la \
- $(top_builddir)/lib/cgraph/libcgraph.la \
- $(top_builddir)/lib/cdt/libcdt.la $(am__DEPENDENCIES_1) \
- $(top_builddir)/lib/cdt/libcdt.la \
- $(top_builddir)/lib/util/libutil_C.la $(am__DEPENDENCIES_1) \
+gvedit_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -620,9 +618,9 @@
-DDEMAND_LOADING=1
@@ -587,7 +584,8 @@
-I$(top_srcdir)/lib/gvc \
-I$(top_srcdir)/lib/pathplan \
-I$(top_srcdir)/lib/cgraph \
- -I$(top_srcdir)/lib/cdt
+ -I$(top_srcdir)/lib/cdt \
+ -I$(top_srcdir)/lib/util

gvedit_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@ -603,10 +601,9 @@
-DQT_USE_FAST_OPERATOR_PLUS

gvedit_LDADD = \
- $(top_builddir)/lib/gvc/libgvc.la \
- $(top_builddir)/lib/cgraph/libcgraph.la \
- $(top_builddir)/lib/cdt/libcdt.la \
- $(top_builddir)/lib/util/libutil_C.la \
+ -lgvc \
+ -lcgraph \
+ -lcdt \
$(QTGUI_LIBS) \
$(QTCORE_LIBS) \
$(EXPAT_LIBS) $(Z_LIBS)
@@ -897,6 +894,16 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gvedit_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gvedit-qrc_mdi.obj `if test -f 'qrc_mdi.cpp'; then $(CYGPATH_W) 'qrc_mdi.cpp'; else $(CYGPATH_W) '$(srcdir)/qrc_mdi.cpp'; fi`

+# libutil_C.a is a temporary internal library, therefore not available
+# for standalone build of gvedit. Substitute by directly compiling
+# the single necessary source file.
+
+CC_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+gv_find_me.o:
+ $(CC_COMPILE) -c -o $@ ../../lib/util/gv_find_me.c
+
mostlyclean-libtool:
-rm -f *.lo

17 changes: 0 additions & 17 deletions graphics/graphviz-devel/files/smyrna.patch

This file was deleted.