diff options
author | hoek <hoek@FreeBSD.org> | 2000-06-02 15:29:19 +0800 |
---|---|---|
committer | hoek <hoek@FreeBSD.org> | 2000-06-02 15:29:19 +0800 |
commit | 073a50e09924924dd87b668acb231ce78fa15ace (patch) | |
tree | e7cfc01542a2cb3b0bffe494037d06116d556777 /x11-toolkits | |
parent | c64a76d21985db89875ac07f1b316585ff0493c6 (diff) | |
download | freebsd-ports-graphics-073a50e09924924dd87b668acb231ce78fa15ace.tar.gz freebsd-ports-graphics-073a50e09924924dd87b668acb231ce78fa15ace.tar.zst freebsd-ports-graphics-073a50e09924924dd87b668acb231ce78fa15ace.zip |
Call DEINSTALL.wish to snuff-out extraneous wishes. Remove an archaicism
in non-ja tkstep80.
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/tk80/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/tk82/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/tk83/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/tk84/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/tkstep80/Makefile | 8 |
5 files changed, 8 insertions, 4 deletions
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile index 88ea0cdfda6..acdddfeecac 100644 --- a/x11-toolkits/tk80/Makefile +++ b/x11-toolkits/tk80/Makefile @@ -22,6 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=${TK_LIB_FILE} PKGINSTALL= ${PKGDIR}/INSTALL.wish +PKGDEINSTALL= ${PKGDIR}/DEINSTALL.wish SHLIB_MAJOR= 1 SHLIB_MINOR= 4 diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile index 7344789d182..1ff09a44a06 100644 --- a/x11-toolkits/tk82/Makefile +++ b/x11-toolkits/tk82/Makefile @@ -21,6 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1 PKGINSTALL= ${PKGDIR}/INSTALL.wish +PKGDEINSTALL= ${PKGDIR}/DEINSTALL.wish PLIST_SUB= TK_VER=8.2 SHORT_TK_VER=82 diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile index 2e572e15cc9..08f7b077c1b 100644 --- a/x11-toolkits/tk83/Makefile +++ b/x11-toolkits/tk83/Makefile @@ -23,6 +23,7 @@ CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3 CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 MAKE_ENV= SHORT_TK_VER=83 PKGINSTALL= ${PKGDIR}/INSTALL.wish +PKGDEINSTALL= ${PKGDIR}/DEINSTALL.wish PLIST_SUB= TK_VER=8.3 SHORT_TK_VER=83 diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 2e572e15cc9..08f7b077c1b 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -23,6 +23,7 @@ CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3 CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 MAKE_ENV= SHORT_TK_VER=83 PKGINSTALL= ${PKGDIR}/INSTALL.wish +PKGDEINSTALL= ${PKGDIR}/DEINSTALL.wish PLIST_SUB= TK_VER=8.3 SHORT_TK_VER=83 diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile index 3148b73da8d..e6c2c9feedb 100644 --- a/x11-toolkits/tkstep80/Makefile +++ b/x11-toolkits/tkstep80/Makefile @@ -29,6 +29,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-xpm --enable-step --enable-dnd \ --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include" CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk82/pkg/INSTALL.wish +PKGDEINSTALL= ${PORTSDIR}/x11-toolkits/tk82/pkg/DEINSTALL.wish post-install: @${RM} ${PREFIX}/lib/tkstep8.0/demos/*.orig @@ -40,13 +42,11 @@ post-install: .endif ${LN} -sf ${PREFIX}/lib/libtkstep80.so.1 ${PREFIX}/lib/libtkstep80.so ${LDCONFIG} -m ${PREFIX}/lib -.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish) - ${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish +.if exists(${PKGINSTALL}) + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: cd ${WRKSRC}; make test .include <bsd.port.mk> - -PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish |