diff options
| -rw-r--r-- | japanese/texfamily/Makefile | 4 | ||||
| -rw-r--r-- | lang/tcl-itcl/Makefile | 10 | ||||
| -rw-r--r-- | lang/tcl-tclX/Makefile | 6 | ||||
| -rw-r--r-- | lang/tk-tclX/Makefile | 10 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | net/ppp-mppe/Makefile | 4 |
6 files changed, 18 insertions, 20 deletions
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile index 9a669c7d6b7..1383fb4514f 100644 --- a/japanese/texfamily/Makefile +++ b/japanese/texfamily/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:15 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/10/17 23:23:15 hubertf Exp $ DISTNAME= TeXfamily-1.2.1 CATEGORIES= japanese @@ -26,7 +26,7 @@ DEPENDS+= TeXfamily-share-1.2.1:../../japanese/texfamily-share DEPENDS+= ja-vflib-lib-[0-9]*:../../japanese/vflib-lib DIST_SUBDIR= TeXfamily -TETEX_DIR= ${BUILD_ROOT}/print/teTeX-bin/${WRKDIR:T}/teTeX-1.0 +TETEX_DIR= ${PKGSRCDIR}/print/teTeX-bin/${WRKDIR:T}/teTeX-1.0 WRKSRC= ${TETEX_DIR} EXTRACT_ONLY= # none diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile index b4fb17a7d63..e988eb4167b 100644 --- a/lang/tcl-itcl/Makefile +++ b/lang/tcl-itcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/05/01 01:57:29 jtb Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/17 23:23:15 hubertf Exp $ DISTNAME= itcl3.2 PKGNAME= tcl-itcl-3.2 @@ -16,8 +16,8 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-shared -CONFIGURE_ENV+= TCL_SRC_DIR="${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2" -CONFIGURE_ENV+= TK_SRC_DIR="${BUILD_ROOT}/x11/tk/${WRKDIR:T}/tk8.3.2" +CONFIGURE_ENV+= TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" +CONFIGURE_ENV+= TK_SRC_DIR="${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2" post-extract: @${MV} -f ${WRKSRC}/iwidgets3.0.0/doc/dialog.n \ @@ -28,10 +28,10 @@ post-extract: ${WRKSRC}/iwidgets2.2.0/doc/itcldialog.n @${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/menubar.n \ ${WRKSRC}/iwidgets2.2.0/doc/itclmenubar.n - @if [ ! -e ${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ + @if [ ! -e ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ cd ../../lang/tcl && ${MAKE} extract; \ fi - @if [ ! -e ${BUILD_ROOT}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ + @if [ ! -e ${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ cd ../../x11/tk && ${MAKE} extract; \ fi diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index 72f0529cf14..b5c964719c1 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:19 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/17 23:23:15 hubertf Exp $ # DISTNAME= tclX8.2.0 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared --with-tcl=${PREFIX}/lib --enable-tk=NO CONFIGURE_ENV+= \ - PKGSRC_TCL_SRC_DIR="${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2" + PKGSRC_TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ @@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/tclX8.2.0/unix post-extract: @${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n - @if [ ! -e ${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ + @if [ ! -e ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ cd ../../lang/tcl && ${MAKE} extract; \ fi diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile index 230c9b0379a..e9dbd60a8ca 100644 --- a/lang/tk-tclX/Makefile +++ b/lang/tk-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:20 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/10/17 23:23:15 hubertf Exp $ # DISTNAME= tclX8.2.0 @@ -21,8 +21,8 @@ CONFIGURE_ARGS+= --enable-shared --with-tcl=${PREFIX}/lib \ --with-tk=${PREFIX}/lib CONFIGURE_ENV+= \ - PKGSRC_TCL_SRC_DIR="${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2" \ - PKGSRC_TK_SRC_DIR="${BUILD_ROOT}/x11/tk/${WRKDIR:T}/tk8.3.2" + PKGSRC_TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" \ + PKGSRC_TK_SRC_DIR="${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2" MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ @@ -35,10 +35,10 @@ PATCHDIR= ${.CURDIR}/../../lang/tcl-tclX/patches post-extract: ${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n - @if [ ! -e ${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ + @if [ ! -e ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then \ cd ../../lang/tcl && ${MAKE} extract; \ fi - @if [ ! -e ${BUILD_ROOT}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ + @if [ ! -e ${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then \ cd ../../x11/tk && ${MAKE} extract; \ fi diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 90b8b3d7fc5..d3aaa6ea141 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.826 2001/10/12 15:40:56 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.827 2001/10/17 23:23:16 hubertf Exp $ # # This file is in the public domain. # @@ -449,10 +449,8 @@ _PKG_DEBUG= set -x; # If WRKOBJDIR is set, use that tree to build .ifdef WRKOBJDIR -BUILD_ROOT= ${WRKOBJDIR} BUILD_DIR?= ${WRKOBJDIR}/${PKGPATH} .else -BUILD_ROOT= ${PKGSRCDIR} BUILD_DIR?= ${.CURDIR} .endif # WRKOBJDIR diff --git a/net/ppp-mppe/Makefile b/net/ppp-mppe/Makefile index bde119f48e9..6bd42615bf1 100644 --- a/net/ppp-mppe/Makefile +++ b/net/ppp-mppe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/04/22 19:48:52 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/17 23:23:16 hubertf Exp $ DISTNAME= ppp-2.3.9 PKGNAME= ppp-mppe-2.3.9 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.moretonbay.com/vpn/releases/ COMMENT= PPP daemon and LKM with MPPE - Microsoft Point-to-Point Encryption OPENSSL_VERS= 0.9.6 -OPENSSL_SRC= ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VERS} +OPENSSL_SRC= ${PKGSRCDIR}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VERS} HAS_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes |