diff options
-rw-r--r-- | lang/tcl80/Makefile | 8 | ||||
-rw-r--r-- | lang/tcl82/Makefile | 13 | ||||
-rw-r--r-- | lang/tcl83/Makefile | 13 | ||||
-rw-r--r-- | lang/tcl84/Makefile | 13 | ||||
-rw-r--r-- | lang/tclX/Makefile | 12 | ||||
-rw-r--r-- | lang/tclX80/Makefile | 12 | ||||
-rw-r--r-- | lang/tclX82/Makefile | 12 | ||||
-rw-r--r-- | x11-toolkits/tk80/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/tk82/Makefile | 13 | ||||
-rw-r--r-- | x11-toolkits/tk83/Makefile | 13 | ||||
-rw-r--r-- | x11-toolkits/tk84/Makefile | 13 |
11 files changed, 68 insertions, 62 deletions
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile index 44a06426e998..778334b40cb3 100644 --- a/lang/tcl80/Makefile +++ b/lang/tcl80/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.8 1998/09/17 22:30:01 steve Exp $ +# $Id: Makefile,v 1.9 1998/11/14 09:43:19 asami Exp $ # DISTNAME= tcl8.0p2 @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/tcl8.0/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} -EXTRA_PKG_ARGS= -i ${PKGDIR}/INSTALL.tclsh +PKGINSTALL= ${PKGDIR}/INSTALL.tclsh SHLIB_MAJOR= 1 SHLIB_MINOR= 2 @@ -43,8 +43,8 @@ pre-build: post-install: ${LN} -sf ${TCL_LIB_FILE} ${PREFIX}/lib/${TCL_LIB} ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib -.if exists(${PKGDIR}/INSTALL.tclsh) - ${SH} ${PKGDIR}/INSTALL.tclsh +.if exists(${PKGINSTALL}) + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile index c1aa4152a1e8..78c18e6e7915 100644 --- a/lang/tcl82/Makefile +++ b/lang/tcl82/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.11 1998/10/03 21:35:20 steve Exp $ +# $Id: Makefile,v 1.12 1998/12/01 03:06:29 asami Exp $ # DISTNAME= tcl8.1a2 @@ -20,6 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh MAN1= tclsh.1 MAN3= AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \ @@ -49,15 +50,15 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ variable.n vwait.n while.n MANCOMPRESSED= yes +.include <bsd.port.pre.mk> + post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib -.if exists(${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh) - ${SH} ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +.if exists(${PKGINSTALL}) + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: cd ${WRKSRC} && ${MAKE} test -.include <bsd.port.mk> - -PKG_ARGS+= -i ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +.include <bsd.port.post.mk> diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index c1aa4152a1e8..78c18e6e7915 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.11 1998/10/03 21:35:20 steve Exp $ +# $Id: Makefile,v 1.12 1998/12/01 03:06:29 asami Exp $ # DISTNAME= tcl8.1a2 @@ -20,6 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh MAN1= tclsh.1 MAN3= AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \ @@ -49,15 +50,15 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ variable.n vwait.n while.n MANCOMPRESSED= yes +.include <bsd.port.pre.mk> + post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib -.if exists(${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh) - ${SH} ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +.if exists(${PKGINSTALL}) + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: cd ${WRKSRC} && ${MAKE} test -.include <bsd.port.mk> - -PKG_ARGS+= -i ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +.include <bsd.port.post.mk> diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index c1aa4152a1e8..78c18e6e7915 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.11 1998/10/03 21:35:20 steve Exp $ +# $Id: Makefile,v 1.12 1998/12/01 03:06:29 asami Exp $ # DISTNAME= tcl8.1a2 @@ -20,6 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh MAN1= tclsh.1 MAN3= AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \ @@ -49,15 +50,15 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ variable.n vwait.n while.n MANCOMPRESSED= yes +.include <bsd.port.pre.mk> + post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib -.if exists(${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh) - ${SH} ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +.if exists(${PKGINSTALL}) + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: cd ${WRKSRC} && ${MAKE} test -.include <bsd.port.mk> - -PKG_ARGS+= -i ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +.include <bsd.port.post.mk> diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile index e487a958c228..d7f28eea706b 100644 --- a/lang/tclX/Makefile +++ b/lang/tclX/Makefile @@ -3,7 +3,7 @@ # Date created: 6 February 1996 # Whom: jkh # -# $Id: Makefile,v 1.25 1998/10/11 19:51:36 smace Exp $ +# $Id: Makefile,v 1.26 1998/12/01 03:06:30 asami Exp $ # DISTNAME= tclX8.0.2 @@ -20,6 +20,7 @@ FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80 WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --with-tk +PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish MAN3= CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \ TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \ TclX_KeyedListSet.3 TclX_Main.3 TclX_NewKeyedListObj.3 \ @@ -30,6 +31,7 @@ MAN3= CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \ MANN= Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \ Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n +.include <bsd.port.pre.mk> post-install: $(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3 $(INSTALL_MAN) $(WRKSRC)/../doc/Handles.3 $(PREFIX)/man/man3 @@ -38,10 +40,8 @@ post-install: $(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann $(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${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 -.include <bsd.port.mk> - -PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish +.include <bsd.port.post.mk> diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile index e487a958c228..d7f28eea706b 100644 --- a/lang/tclX80/Makefile +++ b/lang/tclX80/Makefile @@ -3,7 +3,7 @@ # Date created: 6 February 1996 # Whom: jkh # -# $Id: Makefile,v 1.25 1998/10/11 19:51:36 smace Exp $ +# $Id: Makefile,v 1.26 1998/12/01 03:06:30 asami Exp $ # DISTNAME= tclX8.0.2 @@ -20,6 +20,7 @@ FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80 WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --with-tk +PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish MAN3= CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \ TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \ TclX_KeyedListSet.3 TclX_Main.3 TclX_NewKeyedListObj.3 \ @@ -30,6 +31,7 @@ MAN3= CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \ MANN= Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \ Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n +.include <bsd.port.pre.mk> post-install: $(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3 $(INSTALL_MAN) $(WRKSRC)/../doc/Handles.3 $(PREFIX)/man/man3 @@ -38,10 +40,8 @@ post-install: $(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann $(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${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 -.include <bsd.port.mk> - -PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish +.include <bsd.port.post.mk> diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile index e487a958c228..d7f28eea706b 100644 --- a/lang/tclX82/Makefile +++ b/lang/tclX82/Makefile @@ -3,7 +3,7 @@ # Date created: 6 February 1996 # Whom: jkh # -# $Id: Makefile,v 1.25 1998/10/11 19:51:36 smace Exp $ +# $Id: Makefile,v 1.26 1998/12/01 03:06:30 asami Exp $ # DISTNAME= tclX8.0.2 @@ -20,6 +20,7 @@ FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80 WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --with-tk +PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish MAN3= CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \ TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \ TclX_KeyedListSet.3 TclX_Main.3 TclX_NewKeyedListObj.3 \ @@ -30,6 +31,7 @@ MAN3= CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \ MANN= Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \ Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n +.include <bsd.port.pre.mk> post-install: $(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3 $(INSTALL_MAN) $(WRKSRC)/../doc/Handles.3 $(PREFIX)/man/man3 @@ -38,10 +40,8 @@ post-install: $(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann $(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${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 -.include <bsd.port.mk> - -PKG_ARGS+= -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish +.include <bsd.port.post.mk> diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile index 9dfc1185fb28..584e7e1cde14 100644 --- a/x11-toolkits/tk80/Makefile +++ b/x11-toolkits/tk80/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.13 1998/11/11 02:02:14 asami Exp $ +# $Id: Makefile,v 1.14 1998/11/14 09:43:32 asami Exp $ # DISTNAME= tk8.0p2 @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/tk8.0/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} -EXTRA_PKG_ARGS= -i ${PKGDIR}/INSTALL.wish +PKGINSTALL= ${PKGDIR}/INSTALL.wish SHLIB_MAJOR= 1 SHLIB_MINOR= 2 @@ -46,8 +46,8 @@ pre-build: post-install: ${LN} -sf ${TK_LIB_FILE} ${PREFIX}/lib/${TK_LIB} ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib -.if exists(${PKGDIR}/INSTALL.wish) - ${SH} ${PKGDIR}/INSTALL.wish +.if exists(${PKGINSTALL}) + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile index 53c47fdab23e..459a9f9f1509 100644 --- a/x11-toolkits/tk82/Makefile +++ b/x11-toolkits/tk82/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.18 1998/11/11 02:02:14 asami Exp $ +# $Id: Makefile,v 1.19 1998/12/01 03:06:48 asami Exp $ # DISTNAME= tk8.1a2 @@ -22,6 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ @@ -48,15 +49,15 @@ MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \ tkvars.n tkwait.n toplevel.n winfo.n wm.n MANCOMPRESSED= yes +.include <bsd.port.pre.mk> + post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${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 +.include <bsd.port.post.mk> diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile index 53c47fdab23e..459a9f9f1509 100644 --- a/x11-toolkits/tk83/Makefile +++ b/x11-toolkits/tk83/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.18 1998/11/11 02:02:14 asami Exp $ +# $Id: Makefile,v 1.19 1998/12/01 03:06:48 asami Exp $ # DISTNAME= tk8.1a2 @@ -22,6 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ @@ -48,15 +49,15 @@ MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \ tkvars.n tkwait.n toplevel.n winfo.n wm.n MANCOMPRESSED= yes +.include <bsd.port.pre.mk> + post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${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 +.include <bsd.port.post.mk> diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 53c47fdab23e..459a9f9f1509 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -3,7 +3,7 @@ # Date created: 19 August 1997 # Whom: jkh # -# $Id: Makefile,v 1.18 1998/11/11 02:02:14 asami Exp $ +# $Id: Makefile,v 1.19 1998/12/01 03:06:48 asami Exp $ # DISTNAME= tk8.1a2 @@ -22,6 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ @@ -48,15 +49,15 @@ MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \ tkvars.n tkwait.n toplevel.n winfo.n wm.n MANCOMPRESSED= yes +.include <bsd.port.pre.mk> + post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${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 +.include <bsd.port.post.mk> |