Date: Sun, 15 Mar 2020 14:49:10 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528486 - in head/cad/tkgate: . files Message-ID: <202003151449.02FEnA7Z083872@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Mar 15 14:49:10 2020 New Revision: 528486 URL: https://svnweb.freebsd.org/changeset/ports/528486 Log: cad/tkgate: remove unnecessary REINPLACE_CMD While here, fix a patch, add some missing deps and clean up Modified: head/cad/tkgate/Makefile (contents, props changed) head/cad/tkgate/files/patch-configure.ac (contents, props changed) head/cad/tkgate/pkg-plist (contents, props changed) Modified: head/cad/tkgate/Makefile ============================================================================== --- head/cad/tkgate/Makefile Sun Mar 15 13:26:22 2020 (r528485) +++ head/cad/tkgate/Makefile Sun Mar 15 14:49:10 2020 (r528486) @@ -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> Modified: head/cad/tkgate/files/patch-configure.ac ============================================================================== --- head/cad/tkgate/files/patch-configure.ac Sun Mar 15 13:26:22 2020 (r528485) +++ head/cad/tkgate/files/patch-configure.ac Sun Mar 15 14:49:10 2020 (r528486) @@ -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. Modified: head/cad/tkgate/pkg-plist ============================================================================== --- head/cad/tkgate/pkg-plist Sun Mar 15 13:26:22 2020 (r528485) +++ head/cad/tkgate/pkg-plist Sun Mar 15 14:49:10 2020 (r528486) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003151449.02FEnA7Z083872>