summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Packages.txt10
-rw-r--r--audio/krio/Makefile4
-rw-r--r--cross/COMMON/cross.mk4
-rw-r--r--cross/i386-netbsdpe/files/cross.mk2
-rw-r--r--games/angband-x11/Makefile4
-rw-r--r--games/nethack-qt/Makefile4
-rw-r--r--games/nethack-x11/Makefile4
-rw-r--r--graphics/p5-PerlMagick/Makefile4
-rw-r--r--japanese/texfamily/Makefile4
-rw-r--r--lang/tcl-itcl/Makefile10
-rw-r--r--lang/tcl-tclX/Makefile6
-rw-r--r--lang/tk-tclX/Makefile10
-rw-r--r--math/p5-Math-Pari/Makefile10
-rw-r--r--mk/bsd.pkg.defaults.mk6
-rw-r--r--mk/bsd.pkg.mk24
-rw-r--r--mk/bulk/bsd.bulk-pkg.mk44
-rw-r--r--mk/bulk/upload2
-rw-r--r--net/ppp-mppe/Makefile4
-rw-r--r--pkgtools/pkgdep/Makefile4
-rw-r--r--pkgtools/pkgdiff/Makefile5
-rw-r--r--pkgtools/pkglint/Makefile9
-rw-r--r--x11/9term/Makefile10
22 files changed, 91 insertions, 93 deletions
diff --git a/Packages.txt b/Packages.txt
index 76a6e6b7890..9636ae92616 100644
--- a/Packages.txt
+++ b/Packages.txt
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.220 2001/12/12 16:30:04 wiz Exp $
+# $NetBSD: Packages.txt,v 1.221 2001/12/15 20:25:34 agc Exp $
###########################################################################
==========================
@@ -364,7 +364,7 @@ policy:
BATCH= yes # required for bulk builds
DEPENDS_TARGET?= bulk-install
- PACKAGES?= ${PKGSRCDIR}/packages/${MACHINE_ARCH}
+ PACKAGES?= ${_PKGSRCDIR}/packages/${MACHINE_ARCH}
OBJMACHINE?= 1 # use work.${MACHINE_ARCH}
WRKOBJDIR?= /usr/tmp/pkgsrc # build here instead of in pkgsrc
FAILOVER_FETCH= yes # insist on the correct checksum
@@ -1895,8 +1895,8 @@ first part of the "do-configure" target pkgsrc/print/ghostscript5 package
(it relies on the jpeg sources being present in source form during the
build):
- if [ ! -e ${PKGSRCDIR}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ]; then \
- cd ${PKGSRCDIR}/../../graphics/jpeg && ${MAKE} extract; \
+ if [ ! -e ${_PKGSRCDIR}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ]; then \
+ cd ${_PKGSRCDIR}/../../graphics/jpeg && ${MAKE} extract; \
fi
If you build any other packages that way, please make sure the working
@@ -1904,7 +1904,7 @@ files are deleted too when this package's working files are cleaned up.
The easiest way to do so is by adding a pre-clean target:
pre-clean:
- cd ${PKGSRCDIR}/../../graphics/jpeg && ${MAKE} clean
+ cd ${_PKGSRCDIR}/../../graphics/jpeg && ${MAKE} clean
Please also note the BUILD_USES_MSGFMT and BUILD_USES_GETTEXT_M4 definitions,
which are provided as convenience definitions. The former works out whether
diff --git a/audio/krio/Makefile b/audio/krio/Makefile
index 5ce979b1476..1b40806b314 100644
--- a/audio/krio/Makefile
+++ b/audio/krio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/27 23:17:44 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/15 20:25:35 agc Exp $
DISTNAME= Krio-19990721
PKGNAME= krio-19990721
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386
USE_X11BASE= yes
-RIODIR= ${PKGSRCDIR}/audio/rio/${WRKDIR:T}/rio107
+RIODIR= ${_PKGSRCDIR}/audio/rio/${WRKDIR:T}/rio107
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs
diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index 35229ad408a..87258eb5dae 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.22 2001/03/28 06:28:16 toshii Exp $
+# $NetBSD: cross.mk,v 1.23 2001/12/15 20:25:35 agc Exp $
# Shared definitions for building a cross-compile environment.
@@ -10,7 +10,7 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
HOMEPAGE?= http://egcs.cygnus.com/
TARGET_DIR= ${PREFIX}/${TARGET_ARCH}
-COMMON_DIR= ${PKGSRCDIR}/cross/COMMON
+COMMON_DIR= ${_PKGSRCDIR}/cross/COMMON
PLIST_PRE?= ${PKGDIR}/PLIST
MESSAGE_SUBST+= CROSSBASE=${CROSSBASE}
diff --git a/cross/i386-netbsdpe/files/cross.mk b/cross/i386-netbsdpe/files/cross.mk
index 684e3b3f9f1..2583ac115d8 100644
--- a/cross/i386-netbsdpe/files/cross.mk
+++ b/cross/i386-netbsdpe/files/cross.mk
@@ -14,7 +14,7 @@ MESSAGE_SUBST+= CROSSBASE=${CROSSBASE}
HOMEPAGE?= http://gcc.gnu.org/
TARGET_DIR= ${PREFIX}/${TARGET_ARCH}
-COMMON_DIR= ${PKGSRCDIR}/cross/COMMON
+COMMON_DIR= ${_PKGSRCDIR}/cross/COMMON
GCC_PLIST_DIR= files
PLIST_PRE?= ${PKGDIR}/PLIST
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 5f73fb335af..d75cdd55c44 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:04 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/15 20:25:36 agc Exp $
#
DISTNAME= angband-283
@@ -20,7 +20,7 @@ MAKEFILE= Makefile.std
ALL_TARGET= angband
USE_X11= yes
-PATCHFILES+= ${PKGSRCDIR}/games/angband-tty/patches/patch-*
+PATCHFILES+= ${_PKGSRCDIR}/games/angband-tty/patches/patch-*
ALLFILES= ${DISTFILES} # don't checksum shared patches
SPOILERFILE= angband-spoilers.tar.gz
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 68e0f05e0ef..a88e357cbd8 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/10/24 22:10:57 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/12/15 20:25:36 agc Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -16,7 +16,7 @@ ALL_TARGET= x11tiles nethack
INSTALL_TARGET= binfiles
MAKE_ENV+= GTYPE=-qt
-PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-*
+PATCHFILES+= ${_PKGSRCDIR}/games/nethack-lib/patches/patch-*
ALLFILES= ${DISTFILES} # don't checksum shared patches
post-install:
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 4934cbb0ce1..d49ac2abb5d 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:57 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/12/15 20:25:36 agc Exp $
#
.include "../nethack-lib/Makefile.common"
@@ -16,7 +16,7 @@ ALL_TARGET= x11tiles nethack
INSTALL_TARGET= binfiles
MAKE_ENV+= GTYPE=-x11
-PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-*
+PATCHFILES+= ${_PKGSRCDIR}/games/nethack-lib/patches/patch-*
ALLFILES= ${DISTFILES} # don't checksum shared patches
post-install:
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index b21b458f947..eec4c1589a3 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/11/26 06:09:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/12/15 20:25:36 agc Exp $
DISTNAME= ImageMagick-5.3.9
PKGNAME= p5-PerlMagick-5.3.9
@@ -16,7 +16,7 @@ DEPENDS+= ${DISTNAME}:../../${MAGICK}
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
MAGICK= graphics/ImageMagick
-MAGICKDIR= ${PKGSRCDIR}/${MAGICK}
+MAGICKDIR= ${_PKGSRCDIR}/${MAGICK}
DISTINFO_FILE= ${MAGICKDIR}/distinfo
FILESDIR= ${MAGICKDIR}/files
PATCHDIR= ${MAGICKDIR}/patches
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index cb9fe4e48bd..aaa7fc8d1a2 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/08 01:02:48 kei Exp $
+# $NetBSD: Makefile,v 1.7 2001/12/15 20:25:36 agc Exp $
DISTNAME= TeXfamily-1.2.1nb1
CATEGORIES= japanese
@@ -30,7 +30,7 @@ DEPENDS+= TeXfamily-share>=1.2.1nb1:../../japanese/texfamily-share
DEPENDS+= ja-vflib-lib-[0-9]*:../../japanese/vflib-lib
DIST_SUBDIR= TeXfamily
-TETEX_DIR= ${PKGSRCDIR}/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 e988eb4167b..3741b36b102 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/17 23:23:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/15 20:25:37 agc 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="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2"
-CONFIGURE_ENV+= TK_SRC_DIR="${PKGSRCDIR}/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 ${PKGSRCDIR}/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 ${PKGSRCDIR}/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 b5c964719c1..da5c822f430 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/17 23:23:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/15 20:25:37 agc 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="${PKGSRCDIR}/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 ${PKGSRCDIR}/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 e9dbd60a8ca..d1cc3f103e4 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/17 23:23:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/15 20:25:37 agc 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="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.2" \
- PKGSRC_TK_SRC_DIR="${PKGSRCDIR}/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 ${PKGSRCDIR}/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 ${PKGSRCDIR}/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/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index d06504ddefe..9cdf0fe2478 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:28 veego Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/15 20:25:37 agc Exp $
#
DISTNAME= Math-Pari-2.001804
@@ -20,16 +20,16 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Math/Pari/.packlist
# XXX: could be improved...
post-extract:
- if [ ! -d ${PKGSRCDIR}/math/pari/${WRKDIR_BASENAME} ]; then \
- cd ${PKGSRCDIR}/math/pari && ${MAKE}; \
+ if [ ! -d ${_PKGSRCDIR}/math/pari/${WRKDIR_BASENAME} ]; then \
+ cd ${_PKGSRCDIR}/math/pari && ${MAKE}; \
fi
${RM} -f ${WRKSRC}/pari-*
- ${LN} -sf ${PKGSRCDIR}/math/pari/${WRKDIR_BASENAME}/pari-* ${WRKSRC}/
+ ${LN} -sf ${_PKGSRCDIR}/math/pari/${WRKDIR_BASENAME}/pari-* ${WRKSRC}/
do-configure:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
pre-clean:
- cd ${PKGSRCDIR}/math/pari && ${MAKE} clean
+ cd ${_PKGSRCDIR}/math/pari && ${MAKE} clean
.include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index b0c943a05f3..a49d7873ad2 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.24 2001/12/10 12:43:58 martti Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.25 2001/12/15 20:25:37 agc Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -75,7 +75,7 @@ X11BASE?= /usr/X11R6
# Possible: any path
# Default: ${X11PREFIX} or where lesstif12 is installed
-DISTDIR?= ${PKGSRCDIR}/distfiles
+DISTDIR?= ${_PKGSRCDIR}/distfiles
# Directory where original distribution
# files are stored.
# Possible: any path you like
@@ -93,7 +93,7 @@ DISTDIR?= ${PKGSRCDIR}/distfiles
# Possible: any directories
# Default: none
-PACKAGES?= ${PKGSRCDIR}/packages
+PACKAGES?= ${_PKGSRCDIR}/packages
# Store generated packages on a per-architecture base
# Possible: any path you like
# Default: /usr/pkgsrc/packages
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ad07902ee01..692392296cd 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.880 2001/12/12 12:31:14 abs Exp $
+# $NetBSD: bsd.pkg.mk,v 1.881 2001/12/15 20:25:38 agc Exp $
#
# This file is in the public domain.
#
@@ -35,16 +35,16 @@ CHECK_SHLIBS?= YES # run check-shlibs after install
SHLIB_HANDLING?= YES # do automatic shared lib handling
NOCLEAN?= NO # don't clean up after update
-PKGSRCDIR?= ${.CURDIR:C|/[^/]*/[^/]*$||}
+_PKGSRCDIR?= ${.CURDIR:C|/[^/]*/[^/]*$||}
PKGPATH?= ${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
PKGBASE?= ${PKGNAME:C/-[^-]*$//}
PKGVERSION?= ${PKGNAME:C/^.*-//}
PKGWILDCARD?= ${PKGBASE}-[0-9]*
-DISTDIR?= ${PKGSRCDIR}/distfiles
+DISTDIR?= ${_PKGSRCDIR}/distfiles
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
-PACKAGES?= ${PKGSRCDIR}/packages
-TEMPLATES?= ${PKGSRCDIR}/templates
+PACKAGES?= ${_PKGSRCDIR}/packages
+TEMPLATES?= ${_PKGSRCDIR}/templates
PATCHDIR?= ${.CURDIR}/patches
SCRIPTDIR?= ${.CURDIR}/scripts
@@ -414,9 +414,9 @@ EXTRACT_CMD?= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | ${GTAR} -xf - ${EXTRAC
# Figure out where the local mtree file is
.if !defined(MTREE_FILE)
. if defined(USE_IMAKE) || defined(USE_X11BASE)
-MTREE_FILE= ${PKGSRCDIR}/mk/${OPSYS}.x11.dist
+MTREE_FILE= ${_PKGSRCDIR}/mk/${OPSYS}.x11.dist
. else
-MTREE_FILE= ${PKGSRCDIR}/mk/${OPSYS}.pkg.dist
+MTREE_FILE= ${_PKGSRCDIR}/mk/${OPSYS}.pkg.dist
. endif
.endif # ! MTREE_FILE
@@ -595,7 +595,7 @@ uptodate-digest:
digest-*) \
;; \
*) \
- { cd ${PKGSRCDIR}/pkgtools/digest; \
+ { cd ${_PKGSRCDIR}/pkgtools/digest; \
${MAKE} clean; \
if [ -f ${DIGEST} ]; then \
${MAKE} ${MAKEFLAGS} deinstall; \
@@ -988,7 +988,7 @@ SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \
PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin \
WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
- PKGSRCDIR=${PKGSRCDIR} DEPENDS="${DEPENDS}" \
+ _PKGSRCDIR=${_PKGSRCDIR} DEPENDS="${DEPENDS}" \
PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
.if defined(BATCH)
@@ -3103,8 +3103,8 @@ print-run-depends-list:
.if !target(show-license)
show-license show-licence:
@if [ "${LICENSE}" != "" ]; then \
- if [ -e ${PKGSRCDIR}/licenses/${LICENSE} ]; then \
- ${CAT} ${PKGSRCDIR}/licenses/${LICENSE}; \
+ if [ -e ${_PKGSRCDIR}/licenses/${LICENSE} ]; then \
+ ${CAT} ${_PKGSRCDIR}/licenses/${LICENSE}; \
else \
${ECHO} "Generic ${LICENSE} information not available"; \
${ECHO} "See the package description (pkg_info -d ${PKGNAME}) for more information."; \
@@ -3317,7 +3317,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE}
esac; \
done; \
fi; \
- ${GREP} '\$$NetBSD' $$files | ${SED} -e 's|^${PKGSRCDIR}/||' > ${BUILD_VERSION_FILE};
+ ${GREP} '\$$NetBSD' $$files | ${SED} -e 's|^${_PKGSRCDIR}/||' > ${BUILD_VERSION_FILE};
. for def in ${BUILD_DEFS}
@${ECHO} ${def}= ${${def}:Q} | ${SED} -e 's|^PATH=[^ ]*|PATH=...|' >> ${BUILD_INFO_FILE}
. endfor
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index e65c8e7a8cd..7a8f3e9e12b 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.bulk-pkg.mk,v 1.31 2001/11/28 10:21:47 abs Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.32 2001/12/15 20:25:38 agc Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -68,37 +68,37 @@ BUILDLOG?= .make.${MACHINE}
# foo/bar devel/libfoo
# meaning 'foo/bar' is requied to build 'devel/libfoo'
# this is in the format needed by tsort(1)
-DEPENDSTREEFILE?= ${PKGSRCDIR}/.dependstree.${MACHINE}
+DEPENDSTREEFILE?= ${_PKGSRCDIR}/.dependstree.${MACHINE}
# This is a top level file which lists the entire pkgsrc depends tree in the format:
# foo/bar depends on: devel/libfoo devel/libbar devel/baz .....
# ie, to build foo/bar we need devel/libfoo devel/libbar devel/baz ... installed
-DEPENDSFILE?= ${PKGSRCDIR}/.depends.${MACHINE}
+DEPENDSFILE?= ${_PKGSRCDIR}/.depends.${MACHINE}
# This is a top level file which lists the entire pkgsrc depends tree in the format:
# devel/libfoo is depended upon by: foo/bar graphics/gtkfoo ...
# ie, to build foo/bar we need devel/libfoo to be installed.
# to build graphics/gtkfoo we need devel/libfoo to be installed
-SUPPORTSFILE?= ${PKGSRCDIR}/.supports.${MACHINE}
+SUPPORTSFILE?= ${_PKGSRCDIR}/.supports.${MACHINE}
# This is a top level file which cross-references each package name and pkg directory
# in the format:
# devel/libfoo libfoo-1.3
-INDEXFILE?= ${PKGSRCDIR}/.index.${MACHINE}
+INDEXFILE?= ${_PKGSRCDIR}/.index.${MACHINE}
# file containing a list of all the packages in the correct order for a bulk build.
# the correct order is one where packages that are required by others are built
# before the packages which require them.
-ORDERFILE?= ${PKGSRCDIR}/.order.${MACHINE}
+ORDERFILE?= ${_PKGSRCDIR}/.order.${MACHINE}
.else
BROKENFILE?= .broken
BUILDLOG?= .make
-DEPENDSTREEFILE?= ${PKGSRCDIR}/.dependstree
-DEPENDSFILE?= ${PKGSRCDIR}/.depends
-SUPPORTSFILE?= ${PKGSRCDIR}/.supports
-INDEXFILE?= ${PKGSRCDIR}/.index
-ORDERFILE?= ${PKGSRCDIR}/.order
+DEPENDSTREEFILE?= ${_PKGSRCDIR}/.dependstree
+DEPENDSFILE?= ${_PKGSRCDIR}/.depends
+SUPPORTSFILE?= ${_PKGSRCDIR}/.supports
+INDEXFILE?= ${_PKGSRCDIR}/.index
+ORDERFILE?= ${_PKGSRCDIR}/.order
.endif
# a list of pkgs which we should _never_ delete during a build. The primary use is for digest
@@ -201,7 +201,7 @@ bulk-package:
${ECHO_MSG} "BULK> Cleaning package and its depends" ;\
if [ "${USE_BULK_CACHE}" = "yes" ]; then \
for pkgdir in ${PKGPATH} `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'`; do \
- ${DO} (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
+ ${DO} (cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
done ;\
else \
${ECHO_MSG} ${MAKE} clean CLEANDEPENDS=YES;\
@@ -282,32 +282,32 @@ bulk-package:
pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ;\
${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\
pkgerr="-1"; \
- pkgignore=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=IGNORE)`; \
- if [ ! -z "$$pkgignore" -a ! -f ${PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \
- ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
- ${ECHO_MSG} "BULK> $$pkgignore" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
- if [ -z "`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \
+ pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=IGNORE)`; \
+ if [ ! -z "$$pkgignore" -a ! -f ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \
+ ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ ${ECHO_MSG} "BULK> $$pkgignore" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ if [ -z "`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \
pkgerr="0"; \
else \
pkgerr="1"; \
fi; \
fi; \
${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) is broken because it depends upon ${PKGNAME} (${PKGPATH}) which is broken." \
- >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+ >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
nbrokenby=`expr $$nbrokenby + 1`;\
- if ! ${GREP} -q " $$pkgdir/${BROKENFILE}" ${PKGSRCDIR}/${BROKENFILE} ; then \
- ${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${PKGSRCDIR}/${BROKENFILE} ;\
+ if ! ${GREP} -q " $$pkgdir/${BROKENFILE}" ${_PKGSRCDIR}/${BROKENFILE} ; then \
+ ${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${_PKGSRCDIR}/${BROKENFILE} ;\
fi ;\
done ;\
fi ;\
nerrors=`${GREP} -c '^\*\*\* Error code' ${BROKENFILE} || true`; \
- ${ECHO_MSG} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${PKGSRCDIR}/${BROKENFILE} \
+ ${ECHO_MSG} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${_PKGSRCDIR}/${BROKENFILE} \
) 2>&1 | tee -a ${BROKENFILE}; \
fi ; \
${ECHO_MSG} "BULK> Cleaning packages and its depends" ;\
if [ "${USE_BULK_CACHE}" = "yes" ]; then \
for pkgdir in ${PKGPATH} `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'`; do \
- ${DO} (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
+ ${DO} (cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
done ;\
else \
${ECHO_MSG} ${MAKE} clean CLEANDEPENDS=YES;\
diff --git a/mk/bulk/upload b/mk/bulk/upload
index 26774257dd6..7141a8d9d9e 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -44,7 +44,7 @@ upload_specific=$TMP/upload_specific
upload_others=$TMP/upload_others
# May be different than $USR_PKGSRC:
-pkgsrcdir=`cd pkgtools/pkglint ; make show-var VARNAME=PKGSRCDIR`
+pkgsrcdir=`cd pkgtools/pkglint ; make show-var VARNAME=_PKGSRCDIR`
packages=`cd pkgtools/pkglint ; make show-var VARNAME=PACKAGES`
# Pull in some pkgs needed
diff --git a/net/ppp-mppe/Makefile b/net/ppp-mppe/Makefile
index 6bd42615bf1..16979fa7f60 100644
--- a/net/ppp-mppe/Makefile
+++ b/net/ppp-mppe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/17 23:23:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/12/15 20:25:38 agc 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= ${PKGSRCDIR}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VERS}
+OPENSSL_SRC= ${_PKGSRCDIR}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VERS}
HAS_CONFIGURE= yes
MANCOMPRESSED_IF_MANZ= yes
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index dec6e19833d..b00de4ae4bd 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:42 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/15 20:25:39 agc Exp $
#
DISTNAME= pkgdep-1.0
@@ -19,7 +19,7 @@ NO_CONFIGURE= yes
do-build:
${CP} ${FILESDIR}/pkgdep.pl ${WRKDIR}/pkgdep
-# ${SED} -e 's|/usr/pkgsrc|${PKGSRCDIR}|' \
+# ${SED} -e 's|/usr/pkgsrc|${_PKGSRCDIR}|' \
# ${FILESDIR}/pkgdep.pl > ${WRKDIR}/pkgdep
do-install:
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index cb46208a3ea..c20a4b3bcda 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/12/03 14:30:16 seb Exp $
+# $NetBSD: Makefile,v 1.22 2001/12/15 20:25:39 agc Exp $
#
DISTNAME= pkgdiff-0.103
@@ -19,8 +19,7 @@ NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
-PKGSRCDIR?= ${.CURDIR}/../..
-MAKE_ENV= PKGSRCDIR=${PKGSRCDIR}
+MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index ed29169296d..09c9325270f 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2001/12/03 21:55:48 wiz Exp $
+# $NetBSD: Makefile,v 1.120 2001/12/15 20:25:39 agc Exp $
#
DISTNAME= pkglint-3.16
@@ -20,8 +20,7 @@ NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
-PKGSRCDIR?= ${.CURDIR}/../..
-MAKE_ENV= PKGSRCDIR=${PKGSRCDIR}
+MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR}
DISTVER= ${DISTNAME:S/pkglint-//}
@@ -38,14 +37,14 @@ NROFF= nroff -mandoc
do-build:
.for FILE in pkglint lintpkgsrc plist-clash
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
- -e 's|@PORTSDIR@|${PKGSRCDIR}|g' \
+ -e 's|@PORTSDIR@|${_PKGSRCDIR}|g' \
-e 's|@DISTVER@|${DISTVER}|g' \
< ${FILESDIR}/${FILE}.pl \
> ${WRKSRC}/${FILE}
.endfor
.for FILE in pkglint lintpkgsrc
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
- -e 's|@PORTSDIR@|${PKGSRCDIR}|g' \
+ -e 's|@PORTSDIR@|${_PKGSRCDIR}|g' \
< ${FILESDIR}/${FILE}.1 \
> ${WRKSRC}/${FILE}.1
${NROFF} ${WRKSRC}/${FILE}.1 >${WRKSRC}/${FILE}.0
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index e5ec2fa38d6..67447d39f1b 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:54 agc Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/15 20:25:39 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
#
@@ -13,13 +13,13 @@ COMMENT= X11 program which emulates a plan9 window
DEPENDS+= sam-4.3nb1:../../editors/sam
-USE_X11= yes
-
NOT_FOR_PLATFORM= *-*-alpha #LP64 Problems
+USE_BUILDLINK_ONLY= yes
+
MANCOMPRESSED= yes
WRKSRC= ${WRKDIR}
-MAKE_ENV+= WRKDIR=${WRKDIR} PKGSRCDIR=${PKGSRCDIR} \
- X11PREFIX=${X11PREFIX}
+MAKE_ENV+= WRKDIR=${WRKDIR} X11PREFIX=${X11PREFIX}
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 12:25:28 +0000