diff options
| author | Steve Wills <swills@FreeBSD.org> | 2020-03-15 14:49:10 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2020-03-15 14:49:10 +0000 |
| commit | c021e20ce5c36c9b35bd15704b335b9d9017f1aa (patch) | |
| tree | 5ccd6899166165e461786451d3660ff27155cb75 | |
| parent | 0f47a4b77b79a1c2ed87865db9e25ea4c64c7fae (diff) | |
| download | freebsd-ports-c021e20ce5c36c9b35bd15704b335b9d9017f1aa.zip | |
cad/tkgate: remove unnecessary REINPLACE_CMD
While here, fix a patch, add some missing deps and clean up
| -rw-r--r-- | cad/tkgate/Makefile | 14 | ||||
| -rw-r--r-- | cad/tkgate/files/patch-configure.ac | 6 | ||||
| -rw-r--r-- | cad/tkgate/pkg-plist | 1 |
3 files changed, 10 insertions, 11 deletions
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index 3b781bde2beb..34b16b5c1c36 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -11,21 +11,21 @@ COMMENT= Event driven digital circuit simulator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes -USES+= autoreconf gnome iconv:translit libtool pkgconfig tk:build,run +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +USES= autoreconf gnome iconv:translit libtool pkgconfig tk + +USE_XORG= x11 xft USE_GNOME= pango OPTIONS_DEFINE= DOCS +GNU_CONFIGURE= yes post-patch: - @${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/scripts/tree.tcl @${REINPLACE_CMD} -e \ 's|%%TCL_VER%%|${TCL_VER}|g; \ s|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/configure.ac -# Remove backup files somehow installed to the stagedir -post-install: - ${FIND} ${STAGEDIR}/${DATADIR} -name '*~' -delete -or -name '*~?' -delete - .include <bsd.port.mk> diff --git a/cad/tkgate/files/patch-configure.ac b/cad/tkgate/files/patch-configure.ac index 0e38cf9f9cb1..66f333a73892 100644 --- a/cad/tkgate/files/patch-configure.ac +++ b/cad/tkgate/files/patch-configure.ac @@ -9,19 +9,19 @@ # Tcl/Tk version we will try to use (from most favored to least favored) # -TKGATE_TCLTK_VERSIONS="8.6 8.5 8.4 8.3" -+TKGATE_TCLTK_VERSIONS="8.6" ++TKGATE_TCLTK_VERSIONS="%%TCL_VER%%" # # Directories to search for include files # -TKGATE_INCDIRS="/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include /sw/include /opt/local/include" -+TKGATE_INCDIRS="/usr/local/include /usr/local/include/tcl8.6" ++TKGATE_INCDIRS="%%LOCALBASE%%/include %%TCL_INCLUDEDIR%%" # # Directories to search for library files # -TKGATE_LIBDIRS="/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib /sw/lib /opt/local/lib /usr/local/lib/tcl /usr/lib64" -+TKGATE_LIBDIRS="/usr/local/lib" ++TKGATE_LIBDIRS="%%LOCALBASE%%/lib" # # Libraries we may need if available. diff --git a/cad/tkgate/pkg-plist b/cad/tkgate/pkg-plist index b4a1370bcfad..2051533011bb 100644 --- a/cad/tkgate/pkg-plist +++ b/cad/tkgate/pkg-plist @@ -1403,7 +1403,6 @@ share/pixmaps/tkgate.xpm %%DATADIR%%/scripts/tkgate.tcl %%DATADIR%%/scripts/toolbar.tcl %%DATADIR%%/scripts/tree.tcl -%%DATADIR%%/scripts/tree.tcl.bak %%DATADIR%%/scripts/undo.tcl %%DATADIR%%/scripts/vpd.tcl %%DATADIR%%/scripts/wizard.tcl |