summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2001-09-09 20:36:07 +0000
committeragc <agc>2001-09-09 20:36:07 +0000
commit439f7ef8b30b4d3a4a7a7b2567b92b85dec1cb80 (patch)
tree3fd1a2f535365e26fdc0e751d53fad480118cea2
parentd7e0cbaca9b70f01fcca76240b3fcc9b9b95082e (diff)
downloadpkgsrc-439f7ef8b30b4d3a4a7a7b2567b92b85dec1cb80.tar.gz
Deprecate NO_WRKSUBDIR, replacing it with an explicit assignment of:
WRKSRC= ${WRKDIR} This is much cleaner, much more indicative of what happens, and removes another of the negative definitions (NO_.* = value).
-rw-r--r--Packages.txt8
-rw-r--r--archivers/arc/Makefile4
-rw-r--r--archivers/bicom/Makefile4
-rw-r--r--archivers/bunzip/Makefile4
-rw-r--r--archivers/ha/Makefile4
-rw-r--r--archivers/hpack/Makefile4
-rw-r--r--archivers/rar/Makefile4
-rw-r--r--archivers/stuffit/Makefile4
-rw-r--r--archivers/szdd/Makefile4
-rw-r--r--archivers/unace/Makefile4
-rw-r--r--archivers/undms/Makefile4
-rw-r--r--archivers/xbin/Makefile4
-rw-r--r--archivers/zip1/Makefile4
-rw-r--r--archivers/zoo/Makefile4
-rw-r--r--audio/csound-bath/Makefile4
-rw-r--r--audio/maplay/Makefile4
-rw-r--r--audio/mbrola/Makefile4
-rw-r--r--audio/snd/Makefile4
-rw-r--r--benchmarks/dhrystone/Makefile4
-rw-r--r--benchmarks/fib/Makefile4
-rw-r--r--benchmarks/flops/Makefile4
-rw-r--r--benchmarks/heapsort/Makefile4
-rw-r--r--benchmarks/linpack-bench/Makefile4
-rw-r--r--benchmarks/nsieve/Makefile4
-rw-r--r--benchmarks/paranoia/Makefile4
-rw-r--r--benchmarks/postmark/Makefile4
-rw-r--r--benchmarks/whetstone/Makefile4
-rw-r--r--benchmarks/xengine/Makefile4
-rw-r--r--biology/phylip/Makefile5
-rw-r--r--cad/simian-docs/Makefile4
-rw-r--r--cad/spice/Makefile4
-rw-r--r--comms/gkermit/Makefile4
-rw-r--r--comms/kermit/Makefile4
-rw-r--r--converters/rpm2cpio/Makefile4
-rw-r--r--converters/unix2dos/Makefile4
-rw-r--r--cross/bfd-crunchide/Makefile4
-rw-r--r--cross/bfd-mdsetimage/Makefile4
-rw-r--r--databases/sdbm/Makefile5
-rw-r--r--devel/as31/Makefile4
-rw-r--r--devel/cpuflags/Makefile4
-rw-r--r--devel/cweb/Makefile3
-rw-r--r--devel/gobo-eiffel/Makefile4
-rw-r--r--devel/haskell-mode/Makefile4
-rw-r--r--devel/p5-perl-headers/Makefile4
-rw-r--r--devel/pedisassem/Makefile5
-rw-r--r--devel/sfio/Makefile4
-rw-r--r--devel/sgi-stl/Makefile4
-rw-r--r--editors/sam/Makefile4
-rw-r--r--editors/wordperfect/Makefile4
-rw-r--r--emulators/freebsd_lib/Makefile4
-rw-r--r--emulators/mmix/Makefile4
-rw-r--r--emulators/simh/Makefile4
-rw-r--r--emulators/spim/Makefile4
-rw-r--r--emulators/vmware-module/Makefile4
-rw-r--r--fonts/Xg/Makefile4
-rw-r--r--fonts/arphicttf/Makefile4
-rw-r--r--fonts/jisx0212fonts/Makefile4
-rw-r--r--games/colchess-book-large/Makefile4
-rw-r--r--games/crafty-book-enormous/Makefile4
-rw-r--r--games/crafty-book-large/Makefile4
-rw-r--r--games/crafty-book-medium/Makefile4
-rw-r--r--games/crafty-book-small/Makefile4
-rw-r--r--games/crafty/Makefile4
-rw-r--r--games/exchess-book-medium/Makefile4
-rw-r--r--games/exchess-book-small/Makefile4
-rw-r--r--games/exchess/Makefile4
-rw-r--r--games/gnuchess-book-medium/Makefile4
-rw-r--r--games/gnuchess-book-small/Makefile4
-rw-r--r--games/heretic2-demo/Makefile4
-rw-r--r--games/knightcap-brain/Makefile4
-rw-r--r--games/quake/Makefile4
-rw-r--r--games/quake3arena-demo/Makefile4
-rw-r--r--games/quake3arena/Makefile4
-rw-r--r--games/quakedata/Makefile4
-rw-r--r--games/svb/Makefile4
-rw-r--r--games/ularn/Makefile4
-rw-r--r--games/xevil/Makefile4
-rw-r--r--graphics/fbm/Makefile4
-rw-r--r--graphics/fujiplay/Makefile4
-rw-r--r--graphics/jhead/Makefile4
-rw-r--r--graphics/py-gd/Makefile4
-rw-r--r--graphics/urt/Makefile4
-rw-r--r--graphics/xli/Makefile4
-rw-r--r--japanese/a2ps/Makefile4
-rw-r--r--japanese/p5-jcode/Makefile4
-rw-r--r--lang/cint/Makefile5
-rw-r--r--lang/cu-prolog/Makefile3
-rw-r--r--lang/java-lang-spec/Makefile4
-rw-r--r--lang/nawk/Makefile4
-rw-r--r--lang/py-html-docs/Makefile4
-rw-r--r--lang/siod/Makefile4
-rw-r--r--lang/sml-nj/Makefile4
-rw-r--r--mail/drac/Makefile5
-rw-r--r--mail/fromto/Makefile4
-rw-r--r--mail/imap-uw-utils/Makefile4
-rw-r--r--mail/mailserv/Makefile4
-rw-r--r--mail/mush/Makefile4
-rw-r--r--math/blas/Makefile3
-rw-r--r--math/ruby-bigfloat/Makefile4
-rw-r--r--math/sc/Makefile4
-rw-r--r--mbone/nte/Makefile4
-rw-r--r--misc/9menu/Makefile4
-rw-r--r--misc/astrolog/Makefile4
-rw-r--r--misc/fep/Makefile4
-rw-r--r--misc/ibutton-pdkit/Makefile4
-rw-r--r--misc/root/Makefile5
-rw-r--r--mk/bsd.pkg.mk9
-rw-r--r--net/6to4/Makefile4
-rw-r--r--net/bind4/Makefile4
-rw-r--r--net/fping/Makefile4
-rw-r--r--net/host/Makefile4
-rw-r--r--net/mirror/Makefile4
-rw-r--r--net/mouse-pppoe/Makefile4
-rw-r--r--net/netsaint-plugin-cluster/Makefile4
-rw-r--r--net/py-soaplib/Makefile4
-rw-r--r--net/py-xmlrpclib/Makefile4
-rw-r--r--net/smb2www/Makefile4
-rw-r--r--net/yale-tftpd/Makefile4
-rw-r--r--news/xrn/Makefile4
-rw-r--r--parallel/glunix/Makefile4
-rw-r--r--pkgtools/buildlink-x11/Makefile4
-rw-r--r--pkgtools/pkgconflict/Makefile4
-rw-r--r--pkgtools/pkgdep/Makefile4
-rw-r--r--pkgtools/pkgdiff/Makefile4
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkgmanpages/Makefile4
-rw-r--r--pkgtools/port2pkg/Makefile4
-rw-r--r--pkgtools/url2pkg/Makefile4
-rw-r--r--pkgtools/x11-links/Makefile4
-rw-r--r--pkgtools/xpkgwedge/Makefile4
-rw-r--r--print/cupsomatic/Makefile4
-rw-r--r--print/foomatic-gswrapper/Makefile4
-rw-r--r--print/hugelatex/Makefile4
-rw-r--r--print/if-psprint/Makefile4
-rw-r--r--print/jadetex/Makefile4
-rw-r--r--print/papersize/Makefile4
-rw-r--r--print/pcps/Makefile4
-rw-r--r--print/psify/Makefile4
-rw-r--r--security/uvscan-dat/Makefile4
-rw-r--r--security/uvscan/Makefile4
-rw-r--r--sysutils/aperture/Makefile4
-rw-r--r--sysutils/crashme/Makefile4
-rw-r--r--sysutils/fix4SA110rev2/Makefile5
-rw-r--r--sysutils/rtty/Makefile4
-rw-r--r--sysutils/sysgen/Makefile4
-rw-r--r--sysutils/tkcron/Makefile4
-rw-r--r--textproc/cdif/Makefile4
-rw-r--r--textproc/detex/Makefile4
-rw-r--r--textproc/docbook/Makefile4
-rw-r--r--textproc/fop/Makefile4
-rw-r--r--textproc/helpdeco/Makefile4
-rw-r--r--textproc/html/Makefile4
-rw-r--r--textproc/iso12083/Makefile4
-rw-r--r--textproc/iso8879/Makefile4
-rw-r--r--textproc/saxon/Makefile4
-rw-r--r--textproc/untex/Makefile4
-rw-r--r--textproc/xalan-j/Makefile4
-rw-r--r--wm/9wm/Makefile4
-rw-r--r--wm/olvwm/Makefile4
-rw-r--r--wm/wmthemes/Makefile4
-rw-r--r--www/ap-auth-cookie/Makefile4
-rw-r--r--www/hiawatha/Makefile4
-rw-r--r--www/htmllint/Makefile4
-rw-r--r--www/navigator3/Makefile4
-rw-r--r--www/netscape/Makefile4
-rw-r--r--www/w3c-httpd/Makefile4
-rw-r--r--x11/9term/Makefile4
-rw-r--r--x11/xmeter/Makefile4
-rw-r--r--x11/xmountains/Makefile4
-rw-r--r--x11/xpns/Makefile4
170 files changed, 352 insertions, 341 deletions
diff --git a/Packages.txt b/Packages.txt
index 4b3e11d9509..bd6286b2eb0 100644
--- a/Packages.txt
+++ b/Packages.txt
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.186 2001/09/08 20:09:46 jlam Exp $
+# $NetBSD: Packages.txt,v 1.187 2001/09/09 20:36:08 agc Exp $
###########################################################################
==========================
@@ -1789,8 +1789,14 @@ Your package doesn't create a subdirectory for itself (like GNU software
does, for instance), but extracts itself in the current directory: see
pkgsrc/editors/sam again, but the quick answer is:
+ WRKSRC= ${WRKDIR}
+
+Please note that the old
+
NO_WRKSUBDIR= yes
+has been deprecated and should not be used.
+
10.4 Custom configuration process
=================================
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index bb193b72116..2f4301db6cc 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/15 11:51:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:09 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp
#
@@ -15,7 +15,7 @@ RESTRICTED= "Do not modify. Do not charge for redistribution"
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
USE_BUILDLINK_ONLY= yes
do-install:
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 201024b0dc4..1f8be07f61a 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/13 20:34:08 nra Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:09 agc Exp $
#
DISTNAME= bicom101
@@ -13,7 +13,7 @@ COMMENT= data compressor in the PPM family
LICENSE= no-commercial-use
USE_BUILDLINK_ONLY= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-build:
for i in bialib bicom; do \
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index 893bb8f3fb3..1bb80b88b01 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/15 11:51:28 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:10 agc Exp $
DISTNAME= bunzip021.c
PKGNAME= bunzip-0.21
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.muraroa.demon.co.uk/
COMMENT= Decompressor for bzip .bz files
USE_BUILDLINK_ONLY= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} >${DISTNAME}
do-build:
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index fc6dad5d81b..d9ceef0f831 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/15 11:49:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/09 20:36:10 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp
#
@@ -13,7 +13,7 @@ COMMENT= The HA archiver using the HSC compression method
USE_BUILDLINK_ONLY= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile.nix
MAKE_FLAGS= CC="${CC}"
ALL_TARGET= ha
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 531bc6ef525..7d1c65ec726 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:15:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:10 agc Exp $
DISTNAME= hpack79${USE_RSAREF2:S/YES/u/:C/[^u]*//g}src
PKGNAME= hpack-0.79
@@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org
COMMENT= Multi-System Archiver with open keys PGP-based security
CRYPTO= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
PATCHDIR= ${WRKDIR}/.patches
USE_RSAREF2= NO
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index fd2517cd2ba..1cb468ef763 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/02/16 13:15:36 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2001/09/09 20:36:10 agc Exp $
# FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp
#
@@ -19,7 +19,7 @@ RESTRICTED= Only unmodified original package can be distributed
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${DOWNLOADED_DISTFILE} >/dev/null
pre-extract:
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index 0e27e19201c..2f8a2c3af6f 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/09 08:17:44 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:10 agc Exp $
DISTNAME= stuffit-5.2.0.603-linux
PKGNAME= stuffit-5.2.0.603
-NO_WRKSUBDIR= YES
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.aladdinsys.com/pub/linux/StuffIt_for_Linux/ \
ftp://ftp2.aladdinsys.com/pub/linux/StuffIt_for_Linux/
@@ -13,6 +12,7 @@ COMMENT= Stuffit Archive Creator and Expander
DEPENDS+= suse_base>=6:../../emulators/suse_base
+WRKSRC= ${WRKDIR}
RESTRICTED= "Redistribution not permitted"
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
diff --git a/archivers/szdd/Makefile b/archivers/szdd/Makefile
index 61b1038ca4a..a6c3daa150b 100644
--- a/archivers/szdd/Makefile
+++ b/archivers/szdd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/07/16 10:17:00 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:11 agc Exp $
#
DISTNAME= xfd_SZDD
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.kyz.uklinux.net/packers.php3#SZDD
COMMENT= extracts Microsoft SZDD files
USE_BUILDLINK_ONLY= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
pre-build:
cd ${WRKSRC} && ${MAKE_PROGRAM} clean
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 69459623213..5930822e307 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/16 10:21:15 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:11 agc Exp $
#
DISTNAME= unacepub
@@ -16,7 +16,7 @@ USE_BUILDLINK_ONLY= yes
USE_GMAKE= yes
DIST_SUBDIR= unace-1.2
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= unix/makefile
do-install:
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index 334a9d818d4..c556f10386f 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/16 10:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:11 agc Exp $
DISTNAME= undms-1.3.c
PKGNAME= undms-1.3
@@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org
COMMENT= Converts .dms Amiga disk images to uncompressed .adf images
USE_BUILDLINK_ONLY= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} >${DISTNAME}
do-build:
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index 9277396f43f..e7b670cd912 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/07/16 10:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:11 agc Exp $
#
DISTNAME= ${PRGNAME}unix
PKGNAME= ${PRGNAME}-2.3
-NO_WRKSUBDIR= YES
CATEGORIES= archivers
MASTER_SITES= ftp://sunsite.unc.edu/pub/packages/TeX/tools/xbin/
DISTFILES= ${DISTNAME}.c ${PRGNAME}.man
@@ -16,6 +15,7 @@ NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
USE_BUILDLINK_ONLY= # defined
+WRKSRC= ${WRKDIR}
PRGNAME= xbin
EXTRACT_ONLY= # blank
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 5dfee9a6279..38369d20067 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/16 10:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:12 agc Exp $
#
DISTNAME= zip1-1.1
@@ -24,7 +24,7 @@ MAKE_FLAGS= CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
ALL_TARGET= zip
USE_BUILDLINK_ONLY= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
PLIST_SRC= ${WRKSRC}/PLIST
BUILD_DEFS+= ZIP_ENCRYPTION
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index f53e57dff11..e54a0a29a92 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/16 10:29:52 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:12 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp
#
@@ -13,7 +13,7 @@ COMMENT= Manipulate archives of files in compressed form
LICENSE= zoo-license
USE_BUILDLINK_ONLY= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
ALL_TARGET= bsdansi
MAKEFILE= makefile
MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile
index 8e169dd6919..184c1a750a3 100644
--- a/audio/csound-bath/Makefile
+++ b/audio/csound-bath/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:17 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:12 agc Exp $
#
DISTNAME= Csound4.12
PKGNAME= csound-bath-4.12
-NO_WRKSUBDIR= yes
CATEGORIES= audio
MASTER_SITES= ftp://ftp.maths.bath.ac.uk/pub/dream/newest/
@@ -15,6 +14,7 @@ LICENSE= csound-license
NO_SRC_ON_CDROM= "no for-fee-redistribution"
NO_BIN_ON_CDROM= ${NO_SRC_ON_CDROM}
+WRKSRC= ${WRKDIR}
DIST_SUBDIR= csound
CONFLICTS= csound-4*
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index 8bafc62d71f..acce35aa5fd 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/16 22:10:28 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:12 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1997/01/07 14:58:04 torstenb Exp
#
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= packages@netbsd.org
COMMENT= MPEG audio player/decoder for layer I and II MPEG audio streams
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
PATCH_STRIP= -p2
pre-configure:
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index e7d851119eb..bc094086253 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/18 15:19:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:13 agc Exp $
DISTNAME= mbr301h
PKGNAME= mbrola-301h
@@ -13,7 +13,7 @@ COMMENT= MBROLA diphone synthesizer executable
LICENSE= no-commercial-use
DIST_SUBDIR= mbrola-20010717
-NO_WRKSUBDIR=
+WRKSRC= ${WRKDIR}
NO_BUILD=
ONLY_FOR_PLATFORM= NetBSD-*-i386
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 0e0570d778e..d97711e735c 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2001/09/08 19:55:39 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/09/09 20:36:13 agc Exp $
#
DISTNAME= snd
PKGNAME= snd-19980212
-NO_WRKSUBDIR= YES
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -14,6 +13,7 @@ COMMENT= X based sound editor
NO_SRC_ON_FTP= Already on MASTER_SITE_LOCAL
USE_BUILDLINK_ONLY= YES
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile.netbsd
ALL_TARGET= snd
HTMLDIR= ${PREFIX}/share/doc/html/snd
diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile
index cd5f1947d02..c0ba0e205e8 100644
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:13 agc Exp $
DISTNAME= dhry2.1
PKGNAME= dhrystone-2.1
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= root@garbled.net
COMMENT= Reinhold Weicker's DHRYSTONE 2.1 integer benchmark
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dry2 ${PREFIX}/bin/dry2
diff --git a/benchmarks/fib/Makefile b/benchmarks/fib/Makefile
index 5b453884a81..036936b4004 100644
--- a/benchmarks/fib/Makefile
+++ b/benchmarks/fib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:13 agc Exp $
DISTNAME= fib.c
PKGNAME= fib-980203
@@ -9,7 +9,7 @@ EXTRACT_SUFX= #empty
MAINTAINER= root@garbled.net
COMMENT= Mathematical benchmark
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-extract:
${MKDIR} ${WRKSRC}
diff --git a/benchmarks/flops/Makefile b/benchmarks/flops/Makefile
index 8537c8c9614..7c4b1d64146 100644
--- a/benchmarks/flops/Makefile
+++ b/benchmarks/flops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:14 agc Exp $
DISTNAME= flops
PKGNAME= flops-2.0
@@ -10,7 +10,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://performance.netlib.org/performance/html/flops.html
COMMENT= Floating point benchmark to give your MFLOPS rating
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-extract:
${MKDIR} ${WRKSRC}
diff --git a/benchmarks/heapsort/Makefile b/benchmarks/heapsort/Makefile
index 668d4b5dc31..7416e03262e 100644
--- a/benchmarks/heapsort/Makefile
+++ b/benchmarks/heapsort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:37 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:14 agc Exp $
DISTNAME= heapsort.c
PKGNAME= heapsort-1.0
@@ -9,7 +9,7 @@ EXTRACT_SUFX= #empty
MAINTAINER= root@garbled.net
COMMENT= benchmark program for variable sized arrays
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-extract:
${MKDIR} ${WRKSRC}
diff --git a/benchmarks/linpack-bench/Makefile b/benchmarks/linpack-bench/Makefile
index e5242915b4c..562471662fa 100644
--- a/benchmarks/linpack-bench/Makefile
+++ b/benchmarks/linpack-bench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 22:29:38 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:14 agc Exp $
DISTNAME= linpackc
PKGNAME= linpack-bench-940225
@@ -9,7 +9,7 @@ EXTRACT_SUFX= # empty
MAINTAINER= root@garbled.net
COMMENT= Collection of benchmarks for floating point
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-extract:
${MKDIR} ${WRKSRC}
diff --git a/benchmarks/nsieve/Makefile b/benchmarks/nsieve/Makefile
index 44c7ec0882e..e4d83aadfc4 100644
--- a/benchmarks/nsieve/Makefile
+++ b/benchmarks/nsieve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/09 11:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:14 agc Exp $
DISTNAME= nsieve.c
PKGNAME= nsieve-1.2b
@@ -9,7 +9,7 @@ EXTRACT_SUFX= #empty
MAINTAINER= root@garbled.net
COMMENT= Sieve of Eratosthenes benchmark
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-extract:
${MKDIR} ${WRKSRC}
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index 033acd4aeea..a44aab97a53 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/04/09 11:45:38 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:15 agc Exp $
DISTNAME= paranoia
PKGNAME= paranoia-960101
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .c
MAINTAINER= root@garbled.net
COMMENT= Highly paranoid test of IEEE 754 conformancy
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
do-build:
diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index a17671e5994..8ed3019e39e 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/07/17 07:02:15 garbled Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:15 agc Exp $
# FreeBSD ID: ports/benchmarks/postmark/Makefile,v 1.2 1999/09/19 05:13:20 obrien Exp
#
@@ -16,7 +16,7 @@ EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} postmark.c
NO_PATCH= yes
NO_CONFIGURE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-build:
(cd ${WRKSRC} && ${CC} ${CFLAGS} -o postmark postmark.c)
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index 3b6b3af623b..6edd5580a8a 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/04/09 11:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:15 agc Exp $
DISTNAME= whetstone
PKGNAME= whetstone-1.2
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .c
MAINTAINER= root@garbled.net
COMMENT= Benchmark for processors that gives you a MIPS rating
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
do-build:
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 7230fcdd0a8..8847a5ae251 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:15 agc Exp $
# FreeBSD Id: ports/benchmarks/xengine/Makefile,v 1.9 2000/02/02 22:31:24 mharo Exp
DISTNAME= xengine-1.0.1
@@ -14,7 +14,7 @@ COMMENT= Reciprocating engine for X
BUILD_DEPENDS= gsharutils-4.2.1:../../archivers/gsharutils
DIST_SUBDIR= xengine
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
USE_IMAKE= yes
EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | gunshar
diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile
index bc96818ed8e..275178faf95 100644
--- a/biology/phylip/Makefile
+++ b/biology/phylip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:41:30 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:16 agc Exp $
DISTNAME= phylip
PKGNAME= phylip-3.573c
-NO_WRKSUBDIR= yes
CATEGORIES= biology
MASTER_SITES= ftp://evolution.genetics.washington.edu/pub/phylip/ \
ftp://ftp.bioss.sari.ac.uk/pub/phylogeny/phylip/
@@ -16,6 +15,8 @@ RESTRICTED= "No commercial distribution without a royalty agreement with the au
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+WRKSRC= ${WRKDIR}
+
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phylip
.for DOC in main.doc \
diff --git a/cad/simian-docs/Makefile b/cad/simian-docs/Makefile
index 485f5aceda3..4977c2055d3 100644
--- a/cad/simian-docs/Makefile
+++ b/cad/simian-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/28 02:37:22 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:16 agc Exp $
#
DISTNAME= simian_man_12_98
@@ -18,7 +18,7 @@ NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_PATCH= yes
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index e23ab084de2..569cb7d2670 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/16 13:46:28 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/09/09 20:36:16 agc Exp $
# FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
#
@@ -21,7 +21,7 @@ DEPENDS+= readline>=4.0:../../devel/readline
#PATCHFILES= grid.patch newcoms.patch spsmp.patch
USE_X11= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
CONFLICTS= ng-spice-*
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 7523237d139..b7a186b7d45 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/19 03:53:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:16 agc Exp $
#
DISTNAME= gkermit
@@ -14,7 +14,7 @@ USE_BUILDLINK_ONLY= yes
ALL_TARGET= posix
MAKEFILE= makefile
MAKE_FLAGS+= CC="${CC}" KFLAGS="${CFLAGS}"
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${PREFIX}/bin/gkermit; \
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 8196ea25505..482e3dd67fe 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/02/16 13:56:16 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2001/09/09 20:36:17 agc Exp $
# $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp
#
@@ -17,7 +17,7 @@ ALL_TARGET= netbsd
BUILD_DEFS+= KFLAGS LIBS KERMIT_SUID_UUCP
MAKE_ENV+= KFLAGS="${KFLAGS}" LIBS="${LIBS}"
MAKEFILE= makefile
-NO_WRKSUBDIR= YES
+WRKSRC= ${WRKDIR}
PLIST_SRC= ${WRKDIR}/PLIST
#KFLAGS+= -DNODEBUG -DNOOLDMODEMS
diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile
index 4e48841346d..157c5ba9f5f 100644
--- a/converters/rpm2cpio/Makefile
+++ b/converters/rpm2cpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/20 02:28:26 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:17 agc Exp $
# FreeBSD Id: ports/misc/rpm2cpio/Makefile,v 1.2 1999/08/25 07:22:29 obrien Exp
DISTNAME= rpm2cpio
@@ -17,7 +17,7 @@ USE_PERL5= # defined
REPLACE_PERL= rpm2cpio
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_BUILD= # defined
do-install:
diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile
index 56ae6b4dcd6..1cd2568a8c9 100644
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/20 02:20:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:17 agc Exp $
# FreeBSD Id: ports/converters/unix2dos/Makefile,v 1.5 2000/07/04 10:31:42 sobomax Exp
DISTNAME= unix2dos-1.2
@@ -10,7 +10,7 @@ MAINTAINER= zuntum@netbsd.org
COMMENT= Translate ASCII files to/from DOS (cr/lf) and UNIX (lf)
USE_BUILDLINK_ONLY= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${PREFIX}/bin/unix2dos
diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile
index de83f6707b8..131d9ea8637 100644
--- a/cross/bfd-crunchide/Makefile
+++ b/cross/bfd-crunchide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:23 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:17 agc Exp $
DISTNAME= bfd-crunchide-1.1
CATEGORIES= cross
@@ -11,7 +11,7 @@ COMMENT= crunchide using libbfd. Used for cross-building distributions
DEPENDS= cross-binutils>=2.9.1.1:../binutils
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index 79f2923a1a1..54c13b3fd0f 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:23 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:18 agc Exp $
DISTNAME= bfd-mdsetimage-1.15.1
CATEGORIES= cross
@@ -11,7 +11,7 @@ COMMENT= mdsetimage using libbfd. Used for cross-building distributions
DEPENDS= cross-binutils>=2.9.1.1:../binutils
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile
index 67f956edc4f..542a60e62e3 100644
--- a/databases/sdbm/Makefile
+++ b/databases/sdbm/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:17:40 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:18 agc Exp $
#
DISTNAME= sdbm
# this is the Dec. 1990 release with some race condition fixes from an
# unknown outside source:
PKGNAME= sdbm-90.12.1
-NO_WRKSUBDIR= yes
CATEGORIES= databases
MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/libs/
EXTRACT_SUFX= .tar.Z
@@ -15,6 +14,8 @@ COMMENT= Substitute DBM, an implementation of the `real' ndbm library
MAKE_ENV+= LIBDIR=${PREFIX}/lib NOLINT=1
+WRKSRC= ${WRKDIR}
+
post-extract:
@cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null
diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index 09b54243cda..d4472acc5df 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 14:38:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:19 agc Exp $
DISTNAME= asm.8051
PKGNAME= as31-19900126
@@ -12,7 +12,7 @@ COMMENT= 8031/8051 assembler
EXTRACT_CMD= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | \
${SED} '1,/^.! \/bin\/sh/d' | ${SH}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile
ALL_TARGET= as31 man
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 68b016a62b2..379a06f0f70 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/08/27 20:58:38 abs Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/09 20:36:19 agc Exp $
#
DISTNAME= cpuflags-0.9
@@ -12,7 +12,7 @@ COMMENT= Determine compiler flags to best target current cpu
ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-*
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 3633aa1e506..a74a22a848b 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/17 08:38:43 abs Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:19 agc Exp $
#
# XXX This package needs to be installed with the same PREFIX as teTeX
#
@@ -13,7 +13,6 @@ COMMENT= CWEB System of Structured Documentation
DEPENDS+= teTeX-[0-9]*:../../print/teTeX
-NO_WRKSUBDIR= # defined
WRKSRC= ${WRKDIR}
post-patch:
diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile
index 949a8f4a77d..168a251853d 100644
--- a/devel/gobo-eiffel/Makefile
+++ b/devel/gobo-eiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:19 agc Exp $
#
DISTNAME= gobo15
@@ -15,7 +15,7 @@ COMMENT= portable Eiffel structure libraries and tools
BUILD_DEPENDS+= smalleiffel-0.77:../../lang/smalleiffel
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${LOCALBASE}/bin/unzip -uLa \
${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile
index 28388139fdc..51599c660e3 100644
--- a/devel/haskell-mode/Makefile
+++ b/devel/haskell-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/06 00:08:29 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:20 agc Exp $
DISTNAME= haskell-mode
PKGNAME= haskell-mode-20001129
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.haskell.org/haskell-mode/
COMMENT= Haskell mode for Emacs
DIST_SUBDIR= ${PKGNAME}
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index d9176794381..b2bc0e0f3f2 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/13 07:13:37 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:20 agc Exp $
DISTNAME= p5-perl-headers
PKGNAME= ${DISTNAME}-${OS_VERSION}
@@ -14,7 +14,7 @@ USE_PERL5= # defined
PERL5_PACKLIST= ${PERL5_SITEARCH}/.packlist.h2ph
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= # defined
NO_PATCH= # defined
NO_CONFIGURE= # defined
diff --git a/devel/pedisassem/Makefile b/devel/pedisassem/Makefile
index 96a01230f9a..fdf4b839445 100644
--- a/devel/pedisassem/Makefile
+++ b/devel/pedisassem/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/04/18 20:38:21 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:20 agc Exp $
DISTNAME= dsasmsrc
PKGNAME= pedisassem-0.22
-NO_WRKSUBDIR= yes
CATEGORIES= devel
MASTER_SITES= http://www.geocities.com/SiliconValley/Foothills/4078/
EXTRACT_SUFX= .zip
@@ -11,6 +10,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.geocities.com/SiliconValley/Foothills/4078/
COMMENT= disassembler for Win32 code
+WRKSRC= ${WRKDIR}
+
# LP64 problems
NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 9b93fa56d32..f51023944a3 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:39:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:21 agc Exp $
#
# pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000.
@@ -18,7 +18,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://akpublic.research.att.com/sw/tools/sfio/
COMMENT= Safe and Fast IO library
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-extract:
@${MKDIR} ${WRKDIR}
diff --git a/devel/sgi-stl/Makefile b/devel/sgi-stl/Makefile
index 3112d234f07..2775e9e2281 100644
--- a/devel/sgi-stl/Makefile
+++ b/devel/sgi-stl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/31 10:27:50 dent Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:21 agc Exp $
DISTNAME= stl
PKGNAME= sgi-stl-3.3
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.sgi.com/tech/stl/
COMMENT= SGI Standard Template Library
DIST_SUBDIR= ${PKGNAME}
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
NO_BUILD= # defined
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 895eaf5c6f8..aa9aaef6d52 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/05/01 09:16:24 agc Exp $
+# $NetBSD: Makefile,v 1.18 2001/09/09 20:36:21 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
#
@@ -13,7 +13,7 @@ COMMENT= Unix version of Rob Pike's editor for plan9
DEPENDS+= libXgFonts-1.0:../../fonts/Xg
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
MANCOMPRESSED= yes
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index d07ce49a2d3..398c5f3888e 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/17 18:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:21 agc Exp $
DISTNAME= wordperfect-personal-8
CATEGORIES= editors
@@ -24,7 +24,7 @@ IS_INTERACTIVE= # defined
DIST_SUBDIR= ${DISTNAME}
INSTALL_FILE= ${WRKDIR}/INSTALL
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
WPDIR= lib/wordperfect
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 8ee27c5dfa9..a53e1894047 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/19 03:56:35 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:22 agc Exp $
#
DISTNAME= freebsd_lib-2.2.7
@@ -11,7 +11,7 @@ COMMENT= libraries necessary for FreeBSD compatibility, including XFree86
ONLY_FOR_PLATFORM= NetBSD-*-i386
NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-install:
@${INSTALL_DATA_DIR} ${PREFIX}/emul/freebsd
diff --git a/emulators/mmix/Makefile b/emulators/mmix/Makefile
index 8948b649556..282c5751e42 100644
--- a/emulators/mmix/Makefile
+++ b/emulators/mmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/12 21:52:13 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:22 agc Exp $
DISTNAME= mmix
PKGNAME= mmix-20000918
@@ -11,7 +11,7 @@ COMMENT= Simulators for Knuth's MMIX RISC architecture
BUILD_DEPENDS+= cweb-*:../../devel/cweb
DIST_SUBDIR= ${PKGNAME}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
ALL_TARGET= all doc
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 716678320ad..f351e24a03e 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:22 agc Exp $
#
DISTNAME= sim_2.3d
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/
MAINTAINER= packages@netbsd.org
COMMENT= PDP, IBM 1401, and Nova CPU simulator
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= ${FILESDIR}/Makefile
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index fc88664cb3e..2a859bfd9ac 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/11 16:19:45 tron Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/09 20:36:22 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp
#
@@ -11,7 +11,7 @@ MAINTAINER= deberg@netbsd.org
HOMEPAGE= http://www.cs.wisc.edu/~larus/spim.html
COMMENT= MIPS R2000 Simulator
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
diff --git a/emulators/vmware-module/Makefile b/emulators/vmware-module/Makefile
index 549c756429e..76a21f36bfe 100644
--- a/emulators/vmware-module/Makefile
+++ b/emulators/vmware-module/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:23 agc Exp $
DISTNAME= vmware-netbsd-1.0
PKGNAME= vmware-module-1.0
@@ -12,7 +12,7 @@ COMMENT= Kernel modules for the VMware emulator
ONLY_FOR_PLATFORM= NetBSD-*-i386
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
NO_SRC_ON_FTP= ${RESTRICTED}
diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile
index ce6cfb617a5..9a9bd8054fa 100644
--- a/fonts/Xg/Makefile
+++ b/fonts/Xg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 14:46:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:23 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/01/27 15:59:35 erich Exp
#
@@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
MAINTAINER= packages@netbsd.org
COMMENT= These are the UNICODE fonts for use with 9term and sam
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/arphicttf/Makefile b/fonts/arphicttf/Makefile
index 7c038baad2a..2181bf5372d 100644
--- a/fonts/arphicttf/Makefile
+++ b/fonts/arphicttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/29 18:17:19 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:23 agc Exp $
#
DISTNAME= arphicttf-2.11
@@ -23,7 +23,7 @@ MISC_FILES= ARPHICPL.TXT logo.gif release.txt
DIST_SUBDIR= ${PKGNAME}
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_PATCH= yes
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index aca7075adb0..9e4b6ab8b4d 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:23 agc Exp $
# Based on FreeBSD Id: Makefile,v 1.6 1999/02/12 17:23:40 motoyuki Exp
#
@@ -13,7 +13,7 @@ MAINTAINER= itojun@itojun.org
COMMENT= X11 X0212-1990 font. 14, 16, 24 and 40 dots availble
USE_X11BASE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_ONLY= ${DISTFILES}
MAKE_ENV+= DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile
index a1939047bbf..9841fed6bf5 100644
--- a/games/colchess-book-large/Makefile
+++ b/games/colchess-book-large/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:24 agc Exp $
DISTNAME= book_large
PKGNAME= ${CHESS_ENGINE}-book-large-20000512
@@ -15,7 +15,7 @@ CONFLICTS= ${CHESS_ENGINE}-book-*
CHESS_ENGINE= colchess
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty-book-enormous/Makefile b/games/crafty-book-enormous/Makefile
index f7ebf7a5541..fb7c1f46479 100644
--- a/games/crafty-book-enormous/Makefile
+++ b/games/crafty-book-enormous/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/21 00:25:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:24 agc Exp $
DISTNAME= enormous
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -24,7 +24,7 @@ NO_SRC_ON_FTP= ${REASON}
CHESS_ENGINE= crafty
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty-book-large/Makefile b/games/crafty-book-large/Makefile
index 7c5ee3287b7..c0433412ab5 100644
--- a/games/crafty-book-large/Makefile
+++ b/games/crafty-book-large/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:24 agc Exp $
DISTNAME= large
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -23,7 +23,7 @@ NO_SRC_ON_FTP= ${REASON}
CHESS_ENGINE= crafty
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile
index 22331821b24..029bf978577 100644
--- a/games/crafty-book-medium/Makefile
+++ b/games/crafty-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:24 agc Exp $
DISTNAME= medium
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -15,7 +15,7 @@ CONFLICTS= ${CHESS_ENGINE}-book-*
CHESS_ENGINE= crafty
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile
index 8ad5ebe2a91..3a0393afd9c 100644
--- a/games/crafty-book-small/Makefile
+++ b/games/crafty-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:25 agc Exp $
DISTNAME= small
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -15,7 +15,7 @@ CONFLICTS= ${CHESS_ENGINE}-book-*
CHESS_ENGINE= crafty
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 890d8dce41a..cbee2f0e612 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/06/01 00:38:51 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:25 agc Exp $
DISTNAME= crafty-18.9
CATEGORIES= games
@@ -12,7 +12,7 @@ MAINTAINER= jlam@netbsd.org
COMMENT= chess engine
DIST_SUBDIR= ${DISTNAME}
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
CRAFTY_DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
CRAFTY_STARTPGN= start.pgn
CRAFTY_DOCFILES= read.me crafty.faq
diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile
index 90a39d58a6c..4cfd6ac5f6a 100644
--- a/games/exchess-book-medium/Makefile
+++ b/games/exchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:10:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:25 agc Exp $
DISTNAME= medium
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -15,7 +15,7 @@ CONFLICTS= ${CHESS_ENGINE}-book-*
CHESS_ENGINE= exchess
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile
index ca7e09d6b4a..a5de3ff6f74 100644
--- a/games/exchess-book-small/Makefile
+++ b/games/exchess-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:10:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:25 agc Exp $
DISTNAME= small
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -15,7 +15,7 @@ CONFLICTS= ${CHESS_ENGINE}-book-*
CHESS_ENGINE= exchess
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/exchess/Makefile b/games/exchess/Makefile
index e9b1b49f519..3782c80701b 100644
--- a/games/exchess/Makefile
+++ b/games/exchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:10:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:26 agc Exp $
DISTNAME= EXCH314S
PKGNAME= exchess-3.14
@@ -10,7 +10,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://pc.astro.brandeis.edu/BRAG/people/dch/chess.html
COMMENT= experimental chess engine
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
LIBDIR= ${PREFIX}/lib/exchess
diff --git a/games/gnuchess-book-medium/Makefile b/games/gnuchess-book-medium/Makefile
index c52f4a4a528..ce01ccd8bf1 100644
--- a/games/gnuchess-book-medium/Makefile
+++ b/games/gnuchess-book-medium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:26 agc Exp $
DISTNAME= medium
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -15,7 +15,7 @@ CONFLICTS= ${CHESS_ENGINE}-book-*
CHESS_ENGINE= gnuchess
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/gnuchess-book-small/Makefile b/games/gnuchess-book-small/Makefile
index 81bfbdc9d8f..d938ddd2b78 100644
--- a/games/gnuchess-book-small/Makefile
+++ b/games/gnuchess-book-small/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:26 agc Exp $
DISTNAME= small
PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511
@@ -15,7 +15,7 @@ CONFLICTS= ${CHESS_ENGINE}-book-*
CHESS_ENGINE= gnuchess
DIST_SUBDIR= chessbooks
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE}
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 89f8332cb3c..fc31d7a7ba5 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:27 agc Exp $
#
DISTNAME= heretic2-demo-x86
@@ -14,7 +14,7 @@ HOMEPAGE= http://www.lokigames.com/products/heretic2/demo.php3
COMMENT= Heretic2 - first person Quake 3D engine based (linux demo)
NO_CONFIGURE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
${GTAR} xzf -
diff --git a/games/knightcap-brain/Makefile b/games/knightcap-brain/Makefile
index d97430ac439..a693a9bf9e6 100644
--- a/games/knightcap-brain/Makefile
+++ b/games/knightcap-brain/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:27 agc Exp $
DISTNAME= new_brain
PKGNAME= knightcap-brain-19980616
@@ -15,7 +15,7 @@ ONLY_FOR_PLATFORMS= *-*-i386
DIST_SUBDIR= ${PKGNAME}
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
EGDIR= ${PREFIX}/share/examples/knightcap
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 3cbf40e2197..b1cb93792c2 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/16 15:10:57 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/09 20:36:27 agc Exp $
DISTNAME= q1source
PKGNAME= quake-2.30
@@ -21,7 +21,7 @@ EXTRACT_CMD= unzip -q ${DOWNLOADED_DISTFILE}
USE_GMAKE= yes
MAKE_ENV+= MAINDIR=${WRKSRC}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
USE_X11BASE= yes
USE_MESA= yes
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 87db9328f91..6e7acc7b8a0 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/28 10:28:28 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:27 agc Exp $
#
DISTNAME= linuxq3ademo-1_11-6_x86_gz
@@ -18,7 +18,7 @@ DEPENDS+= suse_glx-6.4:../../emulators/suse_glx
CONFLICTS= quake3arena-*
NO_CONFIGURE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
${GTAR} xzf -
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index 9cd733dade3..ac4fbb49849 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/03/28 10:28:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:28 agc Exp $
#
DISTNAME= linuxq3apoint-1.17.x86
@@ -21,7 +21,7 @@ NO_SRC_ON_FTP= no
NO_BIN_ON_FTP= no
NO_CONFIGURE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
${GTAR} xzf -
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index c07a6772f09..00b3520f580 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:28 agc Exp $
# Based on FreeBSD ports/games/quakeserver
# FreeBSD: ports/games/quakeserver/Makefile,v 1.20 1999/08/31 06:44:23 mharo Exp
#
@@ -22,7 +22,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
EXTRACT_CMD= unzip -q -o ${DOWNLOADED_DISTFILE} -d ${WRKDIR} resource.*
-NO_WRKSUBDIR= YES
+WRKSRC= ${WRKDIR}
NO_BUILD= YES
post-extract:
diff --git a/games/svb/Makefile b/games/svb/Makefile
index a988ff33a2c..b13bd237502 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:59 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:28 agc Exp $
DISTNAME= svb
PKGNAME= svb-1.0
@@ -10,7 +10,7 @@ MAINTAINER= root@garbled.net
COMMENT= Spy Vs. Bob, the timeless classic
USE_IMAKE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
NO_INSTALL_MANPAGES= yes
diff --git a/games/ularn/Makefile b/games/ularn/Makefile
index 12247133412..b20cc597398 100644
--- a/games/ularn/Makefile
+++ b/games/ularn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/27 15:27:30 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:28 agc Exp $
DISTNAME= ularn
PKGNAME= ularn-6.12.92
@@ -10,7 +10,7 @@ MAINTAINER= collver@linuxfreemail.com
HOMEPAGE= http://www.win.tue.nl/games/roguelike/larn/
COMMENT= fantasy roguelike game based on vintage larn
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
HAS_CONFIGURE= # defined
CONFIGURE_ENV+= PREFIX=${LOCALBASE}
CONFIGURE_SCRIPT= ./Configure
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 87e6dbc3302..1894b35d353 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:11:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:29 agc Exp $
DISTNAME= xevil1.5.1e
PKGNAME= xevil-1.5.1e
@@ -10,7 +10,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.xevil.com/
COMMENT= violent game of killing, contains profanity
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKE_ENV= HOSTTYPE="netbsd" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_MAN="${INSTALL_MAN}"
diff --git a/graphics/fbm/Makefile b/graphics/fbm/Makefile
index 7838063e60b..153858e62ba 100644
--- a/graphics/fbm/Makefile
+++ b/graphics/fbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:22:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:29 agc Exp $
# FreeBSD Id: ports/graphics/fbm/Makefile,v 1.5 2000/04/29 23:54:02 steve Exp
DISTNAME= fbm-1.2
@@ -9,6 +9,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
COMMENT= Fuzzy Pixmap Manipulation utilities
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile
index 9e0206fe610..f8bfb5ccdd7 100644
--- a/graphics/fujiplay/Makefile
+++ b/graphics/fujiplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:29 agc Exp $
#
DISTNAME= fujiplay
@@ -11,7 +11,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://topo.math.u-psud.fr/~bousch/fujiplay.html
COMMENT= Download pictures from some Fujifilm digital cameras
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
DIST_SUBDIR= fujiplay-1.33
do-install:
diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile
index 600bc3dec5b..2faa33e59a6 100644
--- a/graphics/jhead/Makefile
+++ b/graphics/jhead/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/02 15:35:37 veego Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:30 agc Exp $
#
DISTNAME= jhead
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.sentex.net/~mwandel/jhead/
COMMENT= Extract EXIF header from JPEG image
DIST_SUBDIR= ${DISTNAME}
-NO_WRKSUBDIR= YES
+WRKSRC= ${WRKDIR}
LIBS= -lm
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index 2bf14732fcb..b2c2b4e06d3 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/16 15:22:32 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:30 agc Exp $
DISTNAME= gdmodule.c
PKGNAME= py-gd-1.3
@@ -13,7 +13,7 @@ COMMENT= Python interface to gd graphics library
DEPENDS+= python>=2.0:../../lang/python
DEPENDS+= gd>=1.8.3:../../graphics/gd
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
ALL_TARGET= default
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 233dc45c84c..00166a27ae2 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/02/26 16:56:35 agc Exp $
+# $NetBSD: Makefile,v 1.20 2001/09/09 20:36:30 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp
DISTNAME= urt
@@ -21,7 +21,7 @@ EXTRACT_ONLY= urt-3.1b.tar.Z
USE_LIBTOOL= yes
USE_X11= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
CONFIGURE_SCRIPT=./Configure
CONFIGURE_ARGS= config/urt
HAS_CONFIGURE= yes
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 781dd69aaf6..6e9fc7f097c 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/08/22 17:38:58 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/09 20:36:31 agc Exp $
DISTNAME= xli-1.16nb1
CATEGORIES= graphics x11
@@ -10,7 +10,7 @@ DISTFILES= xli.1.16.tar.gz \
MAINTAINER= packages@netbsd.org
COMMENT= Version of xloadimage, an X11 Image Loading Utility
-NO_WRKSUBDIR= YES
+WRKSRC= ${WRKDIR}
USE_IMAKE= YES
pre-patch:
diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile
index a51e7e0f8fc..f41badc3952 100644
--- a/japanese/a2ps/Makefile
+++ b/japanese/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:31 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1999/04/16 04:57:06 taoka Exp $
DISTNAME= a2ps.pl-1.44
@@ -14,7 +14,7 @@ COMMENT= Text file to postscript converter (with Japanese support)
USE_PERL5= YES
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_BUILD= yes
do-install:
diff --git a/japanese/p5-jcode/Makefile b/japanese/p5-jcode/Makefile
index f249da16532..a4e9e02134a 100644
--- a/japanese/p5-jcode/Makefile
+++ b/japanese/p5-jcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/20 16:22:06 taca Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:31 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1999/01/17 10:56:40 vanilla Exp $
DISTNAME= jcode.pl-2.13
@@ -13,7 +13,7 @@ HOMEPAGE= # not available
COMMENT= Perl library for Japanese character code conversion
USE_PERL5= yes
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_BUILD= # defined
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index e784d840fcf..ef046856b99 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/05/09 15:14:16 agc Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:31 agc Exp $
DISTNAME= cint5.14
PKGNAME= cint-5.14.40
-NO_WRKSUBDIR= yes
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_BACKUP}
@@ -13,6 +12,8 @@ COMMENT= C/C++ interpreter
#same distribution file name for minor versions
DIST_SUBDIR= ${PKGNAME}
+WRKSRC= ${WRKDIR}
+
do-build:
@cd ${WRKDIR}; \
case ${OPSYS} in \
diff --git a/lang/cu-prolog/Makefile b/lang/cu-prolog/Makefile
index 655c3aac2e2..4be630865a3 100644
--- a/lang/cu-prolog/Makefile
+++ b/lang/cu-prolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/05 21:23:07 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:31 agc Exp $
# FreeBSD Id: Makefile,v 1.2 2000/04/12 06:18:03 obrien Exp
DISTNAME= cu-prolog-3.94
@@ -10,7 +10,6 @@ MAINTAINER= packages@netbsd.org
COMMENT= Experimental constraint logic programming language
DIST_SUBDIR= ${DISTNAME}
-NO_WRKSUBDIR= #defined
WRKSRC= ${WRKDIR}/src
MAKEFILE= makefile
ALL_TARGET= cup
diff --git a/lang/java-lang-spec/Makefile b/lang/java-lang-spec/Makefile
index f78e706c8bb..0ce347e629b 100644
--- a/lang/java-lang-spec/Makefile
+++ b/lang/java-lang-spec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:14 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:32 agc Exp $
DISTNAME= langspec-2.0.html
PKGNAME= java-lang-spec-2.0
@@ -10,7 +10,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://java.sun.com/docs/books/jls/index.html
COMMENT= The Java(TM) Language Specification (HTML)
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
NO_BUILD= # defined
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 701a439e3de..6ab4be0b139 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:22 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:32 agc Exp $
#
DISTNAME= awk
@@ -12,7 +12,7 @@ COMMENT= Brian Kernighan's pattern-directed scanning and processing language
DIST_SUBDIR= ${PKGNAME}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile
ALL_TARGET= a.out
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index 7ad9ada7759..17be3f3851b 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/17 09:07:26 agc Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:32 agc Exp $
#
DISTNAME= html-2.0
@@ -13,7 +13,7 @@ COMMENT= HTML Documentation for Python
DIST_SUBDIR= python
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index fb64c5a1d63..7a270981573 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/22 14:00:19 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:33 agc Exp $
DISTNAME= siod
PKGNAME= siod-3.0
@@ -12,7 +12,7 @@ COMMENT= Small-footprint implementation of the Scheme programming language
ONLY_FOR_PLATFORM= SunOS-*-* # untested on NetBSD
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile
ALL_TARGET= ${OPSYS}
MAKE_ENV+= CC="${CC}"
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index ca1192de396..9bb840c1ce0 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/28 23:59:17 jtb Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/09 20:36:33 agc Exp $
# FreeBSD Id: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp
DISTNAME= ${SML_VERSION}-bin.${BOX}-unix
@@ -33,7 +33,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 SunOS-*-sparc NetBSD-*-sparc
# ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/
DIST_SUBDIR= sml-nj
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_ONLY= ${SML_VERSION}-config.tar.Z
USE_GMAKE= yes
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index a1018c833a8..0ae6c6efbeb 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:33 agc Exp $
#
DISTNAME= drac
PKGNAME= drac-1.10
-NO_WRKSUBDIR= yes
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cc.umanitoba.ca/src/
EXTRACT_SUFX= .tar.Z
@@ -12,4 +11,6 @@ MAINTAINER= groo@netbsd.org
HOMEPAGE= http://mail.cc.umanitoba.ca/drac/
COMMENT= Dynamic Relay Authorization Control
+WRKSRC= ${WRKDIR}
+
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index fd3764ee2f2..3db1a491810 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/04 21:30:51 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:33 agc Exp $
#
DISTNAME= fromto-1.5
@@ -12,7 +12,7 @@ COMMENT= Sendmail logfile viewer
RESTRICTED= "Redistribution allowed for non-commercial purposes only"
USE_PERL5= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-extract:
${MKDIR} ${WRKSRC}
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index 3719fad78ea..3bd9678d05c 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/22 03:52:25 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:33 agc Exp $
DISTNAME= imap-utils
PKGNAME= imap-uw-utils-20001220
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.washington.edu/imap/
COMMENT= UW IMAP mailbox utilities
DIST_SUBDIR= ${PKGNAME}
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
USE_BUILDLINK_ONLY= # defined
SRCDIRS= chkmail dmail icat ifrom imapcopy imapxfer \
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index 367160b9a39..03b35511c68 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/08/01 14:09:38 rh Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:34 agc Exp $
#
DISTNAME= mailserv
PKGNAME= ${DISTNAME}-3.27
-NO_WRKSUBDIR= YES
CATEGORIES= mail
MASTER_SITES= http://www.csicop.org/~fitz/www/mailserv/
@@ -13,6 +12,7 @@ COMMENT= WWW interface to several types of mailing list servers
USE_PERL5= YES
NO_BUILD= YES
+WRKSRC= ${WRKDIR}
do-configure:
.for file in mailserv cgi-lib.pl
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index a38a68f1dca..ade8b5b8f36 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/04 22:05:19 jtb Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:34 agc Exp $
DISTNAME= mush-7.2.5
PKGNAME= mush-7.2.6.b4.pl1
@@ -23,7 +23,7 @@ LICENSE= mush-license
DIST_SUBDIR= mush
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
pre-configure:
${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/config.h-dist > ${WRKSRC}/config.h
diff --git a/math/blas/Makefile b/math/blas/Makefile
index c19f69a1398..df89ace53eb 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/14 21:43:50 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:35 agc Exp $
#
DISTNAME= blas
@@ -13,7 +13,6 @@ MAINTAINER= packages@netbsd.org
COMMENT= Basic Linear Algebra Subprograms (Fortran)
WRKSRC= ${WRKDIR}
-NO_WRKSUBDIR= YES
USE_FORTRAN= YES
post-extract:
diff --git a/math/ruby-bigfloat/Makefile b/math/ruby-bigfloat/Makefile
index 2de1f604214..6c35762060f 100644
--- a/math/ruby-bigfloat/Makefile
+++ b/math/ruby-bigfloat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/01 13:06:57 taca Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:35 agc Exp $
# FreeBSD: ports/math/ruby-bigfloat/Makefile,v 1.8 2000/10/02 14:57:26 knu Exp
DISTNAME= bigfloat-1.1.6
@@ -13,7 +13,7 @@ COMMENT= Variable precision floating library for Ruby
DIST_SUBDIR= ruby
USE_RUBY_EXTCONF= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
INSTALL_TARGET= site-install
DOCS= README
diff --git a/math/sc/Makefile b/math/sc/Makefile
index e9868a17672..f9786523ed2 100644
--- a/math/sc/Makefile
+++ b/math/sc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 18:22:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:35 agc Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1998/08/10 00:20:29 steve Exp
DISTNAME= sc-6.21
@@ -9,6 +9,6 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= eric@fox.phoenix.az.us
COMMENT= Curses-based spreadsheet program
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 997dabbd2c5..5804ce8be80 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/05/05 19:51:16 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/09/09 20:36:35 agc Exp $
#
DISTNAME= nt.1.5a23
@@ -13,7 +13,7 @@ COMMENT= Multicast Network Text Editor
DEPENDS+= tk>=8.3.2:../../x11/tk
CRYPTO= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
USE_GMAKE= yes
# Pass this on to our child
diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile
index 20d192adf68..d25cc59db39 100644
--- a/misc/9menu/Makefile
+++ b/misc/9menu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:08:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:36 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/09/08 12:23:55 tg Exp
#
@@ -15,7 +15,7 @@ COMMENT= Simple menu patterened after plan9
MANCOMPRESSED= yes
.endif
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
USE_X11= yes
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index ab3a8b6a231..f5db0f160ae 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/06/08 00:41:35 jtb Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/09 20:36:36 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
#
@@ -26,7 +26,7 @@ USE_X11BASE= yes
EXTRACT_CMD= ${SH} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.shr
DIST_SUBDIR= astrolog
ALL_TARGET= astrolog
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-install:
@${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index cc54dfda13e..393304cb0a1 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/08 01:16:45 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:36 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1996/11/11 05:49:31 obrien Exp
#
@@ -15,7 +15,7 @@ RESTRICTED= Do not redistribute for a fee
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MANCOMPRESSED= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/ibutton-pdkit/Makefile b/misc/ibutton-pdkit/Makefile
index 8d0fb4d5d26..0555f7c52f7 100644
--- a/misc/ibutton-pdkit/Makefile
+++ b/misc/ibutton-pdkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:09:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:36 agc Exp $
#
DISTNAME= ulinuxgnu
@@ -11,7 +11,7 @@ MAINTAINER= damon@brodiefamily.org
HOMEPAGE= http://ibutton.com
COMMENT= 1-Wire Public Domain Kit Version 2.00
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile
SCRIPTS_ENV+= SED=${SED}
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 4c98ba3571b..cea14c2054a 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:37 agc Exp $
DISTNAME= root_v2.23.08.source
PKGNAME= root-2.23
-NO_WRKSUBDIR= yes
CATEGORIES= misc
MASTER_SITES= ftp://root.cern.ch/root/
@@ -18,6 +17,8 @@ USE_XPM= YES
ALL_TARGET= netbsd
MAKE_ENV= LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR}
+WRKSRC= ${WRKDIR}
+
do-configure:
${CP} ${FILESDIR}/Makefile.netbsd ${WRKDIR}/src
${INSTALL_PROGRAM_DIR} ${WRKDIR}/bin
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 2bf07bd842c..ddebdf47c53 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.804 2001/08/27 15:05:54 tv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.805 2001/09/09 20:36:07 agc Exp $
#
# This file is in the public domain.
#
@@ -480,9 +480,10 @@ WRKDIR_BASENAME?= work
WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME}
.if defined(NO_WRKSUBDIR)
-WRKSRC?= ${WRKDIR}
-.else # NO_WRKSUBDIR
-WRKSRC?= ${WRKDIR}/${DISTNAME}
+.BEGIN:
+ @${ECHO_MSG} 'NO_WRKSUBDIR has been deprecated - please replace it with an explicit'
+ @${ECHO_MSG} 'assignment of WRKSRC= $${WRKDIR}'
+ @${FALSE}
.endif # NO_WRKSUBDIR
# A few aliases for *-install targets
diff --git a/net/6to4/Makefile b/net/6to4/Makefile
index b5328f84868..e54ceca9029 100644
--- a/net/6to4/Makefile
+++ b/net/6to4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/09 00:15:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:37 agc Exp $
#
DISTNAME= 6to4-1.1nb1
@@ -14,7 +14,7 @@ USE_PERL5= YES
# This pkg doesn't regard USE_INET6 (leave this comment for README-IPv6.html!)
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/net/bind4/Makefile b/net/bind4/Makefile
index b8105e48d70..69e5bb3f55b 100644
--- a/net/bind4/Makefile
+++ b/net/bind4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 18:18:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:37 agc Exp $
#
DISTNAME= bind-4.9.8-REL
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.isc.org/
COMMENT= The BIND name server, version 4, as an alternative to BIND 8
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
.if !exists(/usr/sbin/named-bootconf)
IGNORE= "${PKGNAME} is intended for NetBSD 1.4 or higher"
diff --git a/net/fping/Makefile b/net/fping/Makefile
index 4ae0c5715d2..e47e4659ac4 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:38 agc Exp $
# FreeBSD Id: ports/net/fping/Makefile,v 1.10 2000/04/20 20:18:57 mharo Exp
DISTNAME= part01
@@ -15,7 +15,7 @@ COMMENT= Quickly ping many hosts w/o flooding the network
DIST_SUBDIR= fping
EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | ${SED} -e '1,/Archive-Name/d' | ${SH}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
post-install:
${CHMOD} 4555 ${PREFIX}/sbin/fping
diff --git a/net/host/Makefile b/net/host/Makefile
index a7bf351e3a5..6e4cc2e2f1a 100644
--- a/net/host/Makefile
+++ b/net/host/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:38 agc Exp $
DISTNAME= host_991529
PKGNAME= host-991529
@@ -19,7 +19,7 @@ MAKE_ENV+= ALLOW_HOSTALIASES=-DALLOW_HOSTALIASES
.endif
NO_CONFIGURE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
# MAKE_ENV will have the right effect...
MAKEFLAGS+= -e
diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index c49c943af85..0ce50740b2b 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:38 agc Exp $
# FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp
#
@@ -11,7 +11,7 @@ COMMENT= Mirror packages on remote sites
USE_PERL5= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile
SCRIPTS_ENV+= PERL5=${PERL5}
diff --git a/net/mouse-pppoe/Makefile b/net/mouse-pppoe/Makefile
index 29234b5af47..e34d1c89a03 100644
--- a/net/mouse-pppoe/Makefile
+++ b/net/mouse-pppoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/31 11:14:30 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:38 agc Exp $
DISTNAME= pppoe.20000912
PKGNAME= mouse-${DISTNAME:S/./-/}nb1
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/mouse/pppoe/
MAINTAINER= mouse@netbsd.org
COMMENT= derMouse's PPP over Ethernet program
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-build:
(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o pppoe pppoe.c)
diff --git a/net/netsaint-plugin-cluster/Makefile b/net/netsaint-plugin-cluster/Makefile
index b80d6522777..0cc53dbc4f6 100644
--- a/net/netsaint-plugin-cluster/Makefile
+++ b/net/netsaint-plugin-cluster/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/16 08:03:26 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:39 agc Exp $
#
DISTNAME= check_cluster
PKGNAME= netsaint-plugin-cluster-20001207
-NO_WRKSUBDIR= YES
CATEGORIES= net
MASTER_SITES= http://netsaint.sourceforge.net/download/alpha/
EXTRACT_SUFX= .c
@@ -15,6 +14,7 @@ COMMENT= host and service cluster plugin for NetSaint
DEPENDS+= netsaint-base-*:../../net/netsaint-base
EXTRACT_CMD= ${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC}
+WRKSRC= ${WRKDIR}
do-build:
cd ${WRKSRC} && \
diff --git a/net/py-soaplib/Makefile b/net/py-soaplib/Makefile
index c6853013ae2..782f5a3a761 100644
--- a/net/py-soaplib/Makefile
+++ b/net/py-soaplib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/19 12:52:18 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:39 agc Exp $
#
DISTNAME= soaplib-0.8-20000621
@@ -11,7 +11,7 @@ MAINTAINER= drochner@netbsd.org
HOMEPAGE= http://www.pythonware.com/products/soap/index.htm
COMMENT= implementation of the SOAP 1.1 protocol
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_PYTHON= yes
diff --git a/net/py-xmlrpclib/Makefile b/net/py-xmlrpclib/Makefile
index a0d43aa33a4..72c6480ee7e 100644
--- a/net/py-xmlrpclib/Makefile
+++ b/net/py-xmlrpclib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/19 12:50:56 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:39 agc Exp $
#
DISTNAME= xmlrpc-0.9.8-990621
@@ -11,7 +11,7 @@ MAINTAINER= drochner@netbsd.org
HOMEPAGE= http://www.pythonware.com/products/xmlrpc/
COMMENT= implementation of the XML-RPC protocol for Python
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_BUILD= yes
USE_PYTHON= yes
diff --git a/net/smb2www/Makefile b/net/smb2www/Makefile
index ac74466ee20..34b72bf5cf8 100644
--- a/net/smb2www/Makefile
+++ b/net/smb2www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/18 04:52:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:39 agc Exp $
#
DISTNAME= smb2www-980804
@@ -15,7 +15,7 @@ DEPENDS+= samba-[0-9]*:../../net/samba
DEPENDS+= perl-[0-9]*:../../lang/perl5
DEPENDS+= apache{,6}-[0-9]*:../../www/apache
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
SMB2WWW_MASTER_BROWSER_SERVER?= # set for non-empty
APACHE_USER?= nobody
diff --git a/net/yale-tftpd/Makefile b/net/yale-tftpd/Makefile
index c51e41e7fe1..2a2ce585d99 100644
--- a/net/yale-tftpd/Makefile
+++ b/net/yale-tftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:40 agc Exp $
# FreeBSD Id: ports/ftp/yale-tftpd/Makefile,v 1.14 2000/04/12 05:31:29 mharo Exp
DISTNAME= yale-tftpd-3.0
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.cert.dfn.de/pub/tools/net/yale-tftpd/
MAINTAINER= packages@netbsd.org
COMMENT= Enhanced tftpd(8) from Yale University and cisco Systems
-NO_WRKSUBDIR=
+WRKSRC= ${WRKDIR}
post-configure:
${MV} ${WRKSRC}/tftpd.8 ${WRKSRC}/tftpd.8.in
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
index eeba8fd3a4f..2a47f7450af 100644
--- a/news/xrn/Makefile
+++ b/news/xrn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:40 agc Exp $
#
DISTNAME= 9.01
@@ -14,7 +14,7 @@ COMMENT= Usenet News reader for the X window system
DIST_SUBDIR= xrn
USE_IMAKE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
pre-install:
${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/xrn
diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index 154da46ece1..a8917cca97f 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/02/17 17:52:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/09/09 20:36:40 agc Exp $
DISTNAME= glunix-release-1-0a
PKGNAME= glunix-1.0a
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_PERL5= yes
IS_INTERACTIVE= yes
NO_MTREE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NOW_ROOT= ${LOCALBASE}/now
MESSAGE_SUBST+= NOW_ROOT=${NOW_ROOT}
diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile
index a4e4b02e60e..1f67b7c3405 100644
--- a/pkgtools/buildlink-x11/Makefile
+++ b/pkgtools/buildlink-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/22 17:45:57 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:41 agc Exp $
DISTNAME= buildlink-x11-0.8
CATEGORIES= pkgtools devel x11
@@ -11,7 +11,7 @@ COMMENT= allows X11 pkgs to be built using the buildlink.mk infrastructure
EXTRACT_ONLY= # empty
NO_CHECKSUM= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
NO_MTREE= # defined
USE_X11BASE= # defined
diff --git a/pkgtools/pkgconflict/Makefile b/pkgtools/pkgconflict/Makefile
index f91a2c583bf..caba25e33c2 100644
--- a/pkgtools/pkgconflict/Makefile
+++ b/pkgtools/pkgconflict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/10 14:21:56 wennmach Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:41 agc Exp $
#
DISTNAME= pkgconflict-0.3
@@ -11,7 +11,7 @@ COMMENT= Scripts to find conflicting packages in pkgsrc
DEPENDS+= postgresql>=7.0:../../databases/postgresql
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index 739ac28c4be..dec6e19833d 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:51:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:42 agc Exp $
#
DISTNAME= pkgdep-1.0
@@ -12,7 +12,7 @@ COMMENT= Script for displaying dependence information on software packages
USE_PERL5= YES
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index e47a5e9d563..22fc546d463 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/31 10:24:40 dent Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:42 agc Exp $
#
DISTNAME= pkgdiff-0.100
@@ -13,7 +13,7 @@ COMMENT= Tools to ease creating and maintaining patches for pkgsrc
USE_PERL5= YES
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index feed707133e..d054712db3c 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2001/07/15 12:56:58 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2001/09/09 20:36:42 agc Exp $
#
DISTNAME= pkglint-3.07
@@ -15,7 +15,7 @@ DEPENDS+= digest-2001*:../../pkgtools/digest
USE_PERL5= YES
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/pkgtools/pkgmanpages/Makefile b/pkgtools/pkgmanpages/Makefile
index 1eb28c51208..4d27571f02d 100644
--- a/pkgtools/pkgmanpages/Makefile
+++ b/pkgtools/pkgmanpages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:51:30 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:42 agc Exp $
#
DISTNAME= pkgmanpages-19991222
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.netbsd.org/
COMMENT= manual page(s) for the packages collection
NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index 72695168d37..1a1c93a80af 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/24 11:06:09 sakamoto Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/09 20:36:43 agc Exp $
#
DISTNAME= port2pkg-1.9
@@ -14,7 +14,7 @@ DEPENDS+= pkglint-[0-9]*:../../pkgtools/pkglint
USE_PERL5= YES
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 1e1baf5ac50..731e4a825c5 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/04/13 18:13:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:43 agc Exp $
#
DISTNAME= url2pkg-1.15
@@ -10,7 +10,7 @@ MAINTAINER= hubertf@netbsd.org
COMMENT= Shellscript to help with the first steps to build a package
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_BUILD= yes
NO_PATCH= yes
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 1f54a19bfa1..78687e8c520 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/29 22:24:49 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:43 agc Exp $
DISTNAME= x11-links-0.2
CATEGORIES= pkgtools x11
@@ -11,7 +11,7 @@ COMMENT= shadow tree of links to X11R6 headers and libraries
EXTRACT_ONLY= # empty
NO_CHECKSUM= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_BUILD= # defined
NO_MTREE= # defined
USE_X11= # defined
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 68611586dbf..89ef8435f79 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/07/13 07:09:22 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/09/09 20:36:43 agc Exp $
#
DISTNAME= xpkgwedge-1.6
@@ -12,7 +12,7 @@ COMMENT= allows X11 pkgs to be built and used outside of /usr/X11R6
EXTRACT_ONLY= # empty
NO_CONFIGURE= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= # defined
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index a5a2dc3daf3..58f33919435 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/15 18:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:44 agc Exp $
DISTNAME= cupsomatic
PKGNAME= ${DISTNAME}-1.6
@@ -31,7 +31,7 @@ DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
DEPENDS+= mpage-[0-9]*:../../print/mpage
USE_PERL5= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile
index da5cdb23000..b5f8cd04609 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/15 18:26:11 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:44 agc Exp $
DISTNAME= foomatic-gswrapper
PKGNAME= ${DISTNAME}-1.2
@@ -26,7 +26,7 @@ DIST_SUBDIR= ${PKGNAME}
DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
USE_PERL5= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
diff --git a/print/hugelatex/Makefile b/print/hugelatex/Makefile
index 96308646118..5d9fa508368 100644
--- a/print/hugelatex/Makefile
+++ b/print/hugelatex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/02 19:51:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:44 agc Exp $
#
DISTNAME= hugelatex-1.0
@@ -15,7 +15,7 @@ EXTRACT_ONLY= # nothing
NO_CHECKSUM= yes
NO_PATCH= yes
NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
TEXMF_CNF= ${LOCALBASE}/share/texmf/web2c/texmf.cnf
diff --git a/print/if-psprint/Makefile b/print/if-psprint/Makefile
index c8a41a33e39..1b631b2ceb4 100644
--- a/print/if-psprint/Makefile
+++ b/print/if-psprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/07/24 10:35:45 abs Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:44 agc Exp $
#
DISTNAME= if-psprint-1.4
@@ -15,7 +15,7 @@ DEPENDS+= enscript-[0-9]*:../../print/enscript
USE_PERL5= YES
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 85e4c39b557..fbbfeccb032 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/02 17:07:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:45 agc Exp $
#
DISTNAME= jadetex-2.20
@@ -12,7 +12,7 @@ COMMENT= Process tex files produced by the TeX backend of Jade
DEPENDS+= hugelatex-1.0:../hugelatex
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_BUILD= yes
TEXMF_CNF= ${LOCALBASE}/share/texmf/web2c/texmf.cnf
diff --git a/print/papersize/Makefile b/print/papersize/Makefile
index f552f178669..22ceeb51908 100644
--- a/print/papersize/Makefile
+++ b/print/papersize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:51:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:45 agc Exp $
#
DISTNAME= papersize-1.0.2
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
COMMENT= Manipulate the default papersize in certain packages
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/print/pcps/Makefile b/print/pcps/Makefile
index 2c4df43cf25..96abb06f603 100644
--- a/print/pcps/Makefile
+++ b/print/pcps/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:51:51 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:45 agc Exp $
#
DISTNAME= pcps840
PKGNAME= pcps-8.40
-NO_WRKSUBDIR= yes
CATEGORIES= print textproc
MASTER_SITES= ftp://garbo.uwasa.fi/unix/pcps/
@@ -15,6 +14,7 @@ MAKEFILE= makefile
ALL_TARGET=
MAKE_ENV+= "CC=${CC} ${CFLAGS} -DUNIX"
NO_CONFIGURE= yes
+WRKSRC= ${WRKDIR}
LICENSE= shareware
RESTRICTED= This is shareware for your evaluation and subsequent payment
diff --git a/print/psify/Makefile b/print/psify/Makefile
index 99c3ad382db..a79ed8b2782 100644
--- a/print/psify/Makefile
+++ b/print/psify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:51:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:46 agc Exp $
#
DISTNAME= psify-19980216
@@ -12,7 +12,7 @@ COMMENT= Pretty print C, CLU, SCHEME, Java and ARGUS source files
DIST_SUBDIR= psify
EXTRACT_ONLY= #empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= yes
INSTALL_TARGET= install prefix=${PREFIX}
diff --git a/security/uvscan-dat/Makefile b/security/uvscan-dat/Makefile
index 965034f9e35..0cc5dded9e1 100644
--- a/security/uvscan-dat/Makefile
+++ b/security/uvscan-dat/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2001/08/16 00:01:24 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/09/09 20:36:46 agc Exp $
#
DISTNAME= dat-4154
PKGNAME= uvscan-${DISTNAME}
-NO_WRKSUBDIR= YES
CATEGORIES= security
MASTER_SITES= http://download.nai.com/products/datfiles/4.x/nai/ \
http://gd.tuwien.ac.at/pc/nai/antivirus/datfiles/4.x/ \
@@ -22,6 +21,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
+WRKSRC= ${WRKDIR}
DOCDIR= ${PREFIX}/share/doc/uvscan
DATDIR= ${PREFIX}/share/uvscan
DATFILES= clean.dat internet.dat names.dat scan.dat readme.txt
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 9953e13ce65..ebed0fb7aa4 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/08/16 05:09:21 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/09 20:36:46 agc Exp $
DISTNAME= vlnx414e
PKGNAME= uvscan-4.14.0
-NO_WRKSUBDIR= YES
CATEGORIES= security
MASTER_SITES= http://download.nai.com/products/evaluation/virusscan/english/unix/linux/v4.14.0/
EXTRACT_SUFX= .tar.Z
@@ -25,6 +24,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
+WRKSRC= ${WRKDIR}
DOCDIR= ${PREFIX}/share/doc/uvscan
UVSCANDIR= ${PREFIX}/libexec/uvscan
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index ec3c97278ce..e81bce02463 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/29 05:40:04 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:46 agc Exp $
DISTNAME= apNetBSD
PKGNAME= aperture-2.0nb1
@@ -31,7 +31,7 @@ EXTRACT_CMD= ${SH} ${DOWNLOADED_DISTFILE}
INSTALL_FILE= ${WRKDIR}/INSTALL
INSTALL_TARGET= dirs includes install
MANCOMPRESSED_IF_MANZ= YES
-NO_WRKSUBDIR= YES
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= YES
OSVERSION_SPECIFIC= YES
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index 2066f697ff3..0bd6a59933c 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:42:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:47 agc Exp $
#
DISTNAME= crashme-2.4
@@ -10,7 +10,7 @@ MAINTAINER= agc@netbsd.org
HOMEPAGE= http://people.delphi.com/gjc/crashme.html
COMMENT= Try to crash machine with random arguments to random system calls
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${SH} ${DOWNLOADED_DISTFILE}
MAKEFILE= makefile
diff --git a/sysutils/fix4SA110rev2/Makefile b/sysutils/fix4SA110rev2/Makefile
index 89e44f104ea..991f9715f0b 100644
--- a/sysutils/fix4SA110rev2/Makefile
+++ b/sysutils/fix4SA110rev2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:13 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:47 agc Exp $
#
DISTNAME= fix4SA110rev2-1.0
-NO_WRKSUBDIR= yes
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/
DISTFILES= fix4SA110rev2.c fix4SA110rev2.README
@@ -14,6 +13,8 @@ COMMENT= Modify arm32 binaries to work around SA rev2 problems
ONLY_FOR_PLATFORM= NetBSD-*-arm32
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
+WRKSRC= ${WRKDIR}
+
do-build:
${CC} ${CFLAGS} -o ${WRKSRC}/fix4SA110rev2 ${WRKSRC}/fix4SA110rev2.c
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index d16251d3023..0ae1e5732c9 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/19 03:56:40 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:47 agc Exp $
# FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
#
@@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.vix.com/pub/vixie/
MAINTAINER= packages@netbsd.org
COMMENT= multiuser "tip"/"cu" replacement with logging
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
pre-configure:
${CHMOD} -R u+w ${WRKDIR}
diff --git a/sysutils/sysgen/Makefile b/sysutils/sysgen/Makefile
index f55a98cd2e2..9d0ac6f9991 100644
--- a/sysutils/sysgen/Makefile
+++ b/sysutils/sysgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:47 agc Exp $
#
DISTNAME= sysgen
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= abs@netbsd.org
COMMENT= assign DEC Qbus or UNIBUS standard CSR and vector addresses
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
ALL_TARGET= sysgen
do-install:
diff --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile
index 5c8c7ca036b..c988b8400d6 100644
--- a/sysutils/tkcron/Makefile
+++ b/sysutils/tkcron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/05 19:51:19 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:48 agc Exp $
#
DISTNAME= tkcron-2.12
@@ -13,7 +13,7 @@ DEPENDS+= tk>=8.3.2:../../x11/tk
USE_X11= yes
EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-build:
${SED} -e "\:/usr/local/bin/wish: s;;${LOCALBASE}/bin/wish;g" ${WRKSRC}/tkcron.tcl > ${WRKSRC}/tkcron
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 44a5d5cbb71..6453c21f836 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/07 21:16:10 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:48 agc Exp $
#
DISTNAME= cdif-1.15
@@ -13,7 +13,7 @@ LICENSE= no-commercial-use
USE_PERL5= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
NO_BUILD= # defined
diff --git a/textproc/detex/Makefile b/textproc/detex/Makefile
index 54644311d75..b8c8ddd837e 100644
--- a/textproc/detex/Makefile
+++ b/textproc/detex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:48 agc Exp $
#
DISTNAME= detex-2.7
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cs.purdue.edu/homes/trinkle/detex/
COMMENT= remove LaTeX commands
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/detex ${PREFIX}/bin
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index f05c4c436db..15a5253ee73 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:48 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
#
@@ -22,7 +22,7 @@ DEPENDS+= iso8879-1986:../../textproc/iso8879
NO_MTREE= yes
EXTRACT_ONLY= # empty
NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
INSTDIR= ${PREFIX}/share/sgml/docbook
ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 83cfba8663b..e6c64fdcb6a 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/03/14 01:43:40 jwise Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:49 agc Exp $
#
# Note: we currently use the pre-built (-bin) distribution of FOP,
# because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -12,7 +12,7 @@
DISTNAME= fop-0_15_0-forBeginners
PKGNAME= fop-0.15.0
-NO_WRKSUBDIR=
+WRKSRC= ${WRKDIR}
CATEGORIES= textproc www
MASTER_SITES= http://xml.apache.org/dist/fop/recent/
EXTRACT_SUFX= .zip
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index 49b583025a9..0e4de915057 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/23 15:47:43 agc Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:49 agc Exp $
#
DISTNAME= helpdc21
@@ -11,7 +11,7 @@ MAINTAINER= collver@linuxfreemail.com
HOMEPAGE= http://www.simtel.net/pub/pd/23694.shtml
COMMENT= windows .hlp to .rtf converter
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
LICENSE= no-commercial-use
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index c73bbfb7098..9a0d7c19d38 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:49 agc Exp $
#
DISTNAME= html-4.0b
@@ -14,7 +14,7 @@ DEPENDS+= iso8879-1986:../../textproc/iso8879
NO_MTREE= yes
EXTRACT_ONLY= # empty
NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
INSTDIR= ${PREFIX}/share/sgml/html
ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index a69133c4666..77767504ff2 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:50 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1998/06/27 05:19:39 asami Exp
#
@@ -17,7 +17,7 @@ DIST_SUBDIR= iso12083
NO_MTREE= yes
NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_ONLY= # empty
INSTDIR= ${PREFIX}/share/sgml/iso12083
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index e35632415a2..22bff93615e 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:50 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1999/02/11 16:01:16 jfieber Exp
#
@@ -15,7 +15,7 @@ COMMENT= Character entity sets from ISO 8879:1986 (SGML)
NO_MTREE= yes
EXTRACT_ONLY= # empty
NO_BUILD= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
INSTDIR= ${PREFIX}/share/sgml/iso8879
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index d6e7350f080..707ce73a50a 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/04/13 05:16:18 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:50 agc Exp $
#
DISTNAME= saxon
PKGNAME= saxon-6.0.2
-NO_WRKSUBDIR=
CATEGORIES= textproc www
MASTER_SITES= ${HOMEPAGE}saxon6.0.2/
EXTRACT_SUFX= .zip
@@ -17,6 +16,7 @@ USE_JAVA= yes
NO_PATCH=
NO_CONFIGURE=
NO_BUILD=
+WRKSRC= ${WRKDIR}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/java
diff --git a/textproc/untex/Makefile b/textproc/untex/Makefile
index a2948842425..62ed2ed0282 100644
--- a/textproc/untex/Makefile
+++ b/textproc/untex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:50 agc Exp $
#
DISTNAME= untex-1.3
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://hal6000.uni-duisburg.de/pub/source/
MAINTAINER= packages@netbsd.org
COMMENT= remove LaTeX commands
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/untex ${PREFIX}/bin
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 6c8da96758c..86bb3a6bb15 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/25 04:18:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:51 agc Exp $
#
# Note: we currently use the pre-built (-bin) distribution of Xalan-J,
# because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -20,7 +20,7 @@ NO_PATCH=
NO_CONFIGURE=
NO_BUILD=
-NO_WRKSUBDIR=
+WRKSRC= ${WRKDIR}
do-install:
${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java
diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile
index 6194f51ba5d..f374b09d70d 100644
--- a/wm/9wm/Makefile
+++ b/wm/9wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:51 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
#
@@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://dhog.g7.org/dhog/9wm.html
COMMENT= 8 1/2-like Window Manager for X
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
USE_IMAKE= yes
diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile
index 0bb3c0ef043..ced16561e23 100644
--- a/wm/olvwm/Makefile
+++ b/wm/olvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 20:36:51 agc Exp $
#
DISTNAME= olvwm4.src4
@@ -17,6 +17,6 @@ USE_X11BASE= # defined
USE_XPM= # defined
USE_IMAKE= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index 9a4d725edd7..4a2a8faad91 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/07/06 19:26:18 tron Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 20:36:52 agc Exp $
DISTNAME= wmthemes-0.62nb1
CATEGORIES= x11 wm
@@ -16,7 +16,7 @@ DIST_SUBDIR= wmthemes
USE_X11BASE= yes
NO_BUILD= yes
NO_CHECKSUM= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
PLIST_SRC= ${WRKDIR}/PLIST
THEME_SUBDIRS= Backgrounds IconSets Icons Pixmaps Sounds Styles Themes
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index bc012854b09..96a9502bdc4 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/05/20 05:23:26 jonb Exp $
+# $NetBSD: Makefile,v 1.21 2001/09/09 20:36:52 agc Exp $
#
# There are a few more mod_auth_cookie's out there doing slightly
# different things. This one pkg would be a good place to dump them all in
@@ -6,7 +6,6 @@
DISTNAME= mod_auth_cookie.c
PKGNAME= ap-auth-cookie-1.7
-NO_WRKSUBDIR= yes
CATEGORIES= www
MASTER_SITES= ftp://ftp.kciLink.com/pub/
EXTRACT_SUFX= .gz
@@ -20,6 +19,7 @@ DEPENDS+= apache{,6}-1.3.*:../../www/apache
BUILD_DEPENDS= perl>=${PERL5_REQD}:../../lang/perl5
EXTRACT_CMD= ${DO_NADA}
+WRKSRC= ${WRKDIR}
post-extract:
@(${ECHO} '#include "ap_compat.h"'; ${GZIP_CMD} -dc ${DISTDIR}/${DISTFILES}) \
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index ebad0cbfa19..892afbd1f02 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/15 02:56:38 jwise Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:52 agc Exp $
#
DISTNAME= hiawatha
PKGNAME= hiawatha-0.1
-NO_WRKSUBDIR=
CATEGORIES= textproc www
MASTER_SITES= ${HOMEPAGE} ${MASTER_SITE_BACKUP}
EXTRACT_SUFX= .zip
@@ -19,6 +18,7 @@ DEPENDS+= saxon-*:../../textproc/saxon
NO_PATCH=
NO_CONFIGURE=
NO_BUILD=
+WRKSRC= ${WRKDIR}
USE_JAVA= yes
DIST_SUBDIR= ${PKGNAME}
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index 963bef0cbe9..08c0112e19d 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/21 13:28:09 kei Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:53 agc Exp $
#
DISTNAME= htmllint
@@ -14,7 +14,7 @@ COMMENT= Another HTML-Lint program
DEPENDS+= p5-Jcode>=0.68:../../japanese/p5-Jcode
USE_PERL5= # defined
-NO_WRKSUBDIR= # defined
+WRKSRC= ${WRKDIR}
NO_CONFIGURE= # defined
NO_BUILD= # defined
diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile
index c4fc349b9c0..5ebe27a9cff 100644
--- a/www/navigator3/Makefile
+++ b/www/navigator3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:53 agc Exp $
DISTNAME= netscape-v304-export.x86-unknown-bsd
PKGNAME= navigator3-3.04
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
USE_X11BASE= yes
SCRIPTS_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
NO_BUILD= yes
diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index bfa3ec75b12..58cc0efe556 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/27 14:26:18 abs Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:53 agc Exp $
#
COMMENT= Open new communicator, navigator, or mozilla window
@@ -22,7 +22,7 @@ DISTFILES= # empty
MASTER_SITES= # empty
EXTRACT_ONLY= # empty
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index c217ce7438b..e4ae1d7247a 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:54 agc Exp $
# FreeBSD Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp
DISTNAME= w3c-httpd-3.0A
@@ -10,7 +10,7 @@ MAINTAINER= package@netbsd.org
HOMEPAGE= http://www.w3.org/pub/WWW/Daemon/
COMMENT= WWW server from the W3 Consortium (W3C)
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
pre-configure:
.if !defined(MD5_PW)
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 786e8b5b5d2..e5ec2fa38d6 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/05 01:56:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:54 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
#
@@ -18,7 +18,7 @@ USE_X11= yes
NOT_FOR_PLATFORM= *-*-alpha #LP64 Problems
MANCOMPRESSED= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKE_ENV+= WRKDIR=${WRKDIR} PKGSRCDIR=${PKGSRCDIR} \
X11PREFIX=${X11PREFIX}
diff --git a/x11/xmeter/Makefile b/x11/xmeter/Makefile
index 4fa6daa9a2a..6c62e71e29c 100644
--- a/x11/xmeter/Makefile
+++ b/x11/xmeter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:07:16 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:54 agc Exp $
DISTNAME= xmeter-1.15
CATEGORIES= x11
@@ -8,6 +8,6 @@ MAINTAINER= packages@netbsd.org
COMMENT= Displays a number of remote machine load meters
USE_IMAKE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index 94de7c14780..a61870e377b 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:54 agc Exp $
#
DISTNAME= xmountains_2.5
@@ -13,7 +13,7 @@ MAINTAINER= fredb@netsd.org
HOMEPAGE= http://www.epcc.ed.ac.uk/~spb/xmountains/
COMMENT= fractal terrain generator
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
USE_IMAKE= yes
DIST_SUBDIR= xmountains
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 0de28931f2b..9e6f2f8e25f 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:55 agc Exp $
# FreeBSD Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp
#
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.informatik.uni-stuttgart.de/ipvr/bv/pns/pns.html
COMMENT= Petri-Net Simulator for Xwindows
USE_X11BASE= yes
-NO_WRKSUBDIR= yes
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile
ALL_TARGET= pns