summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Packages.txt8
-rw-r--r--audio/cam/Makefile5
-rw-r--r--audio/mikmod/Makefile5
-rw-r--r--audio/nas/Makefile5
-rw-r--r--audio/nspmod/Makefile5
-rw-r--r--audio/xmix/Makefile5
-rw-r--r--cad/ntesla/Makefile5
-rw-r--r--comms/xisp/Makefile5
-rw-r--r--converters/p5-MIME-Base64/Makefile6
-rw-r--r--devel/p5-Curses/Makefile5
-rw-r--r--devel/p5-Data-Dumper/Makefile5
-rw-r--r--devel/p5-Devel-DProf/Makefile5
-rw-r--r--devel/p5-Devel-SmallProf/Makefile5
-rw-r--r--devel/p5-MLDBM/Makefile5
-rw-r--r--devel/p5-PV/Makefile5
-rw-r--r--devel/p5-Time-HiRes/Makefile5
-rw-r--r--devel/xxgdb/Makefile5
-rw-r--r--editors/xcoral/Makefile5
-rw-r--r--emulators/wine/Makefile5
-rw-r--r--games/imaze/Makefile5
-rw-r--r--games/lincity/Makefile5
-rw-r--r--games/mirrormagic/Makefile5
-rw-r--r--games/xbill/Makefile5
-rw-r--r--games/xboing/Makefile5
-rw-r--r--games/xdemineur/Makefile5
-rw-r--r--games/xjig/Makefile5
-rw-r--r--games/xkobo/Makefile5
-rw-r--r--graphics/cdlabelgen/Makefile5
-rw-r--r--graphics/pixmap/Makefile5
-rw-r--r--graphics/xbmbrowser/Makefile5
-rw-r--r--graphics/xfig/Makefile5
-rw-r--r--graphics/xli/Makefile5
-rw-r--r--lang/fort77/Makefile5
-rw-r--r--lang/ucblogo/Makefile5
-rw-r--r--mail/coolmail/Makefile5
-rw-r--r--mail/p5-MailTools/Makefile5
-rw-r--r--math/xldlas/Makefile5
-rw-r--r--misc/cal/Makefile5
-rw-r--r--misc/dialog/Makefile5
-rw-r--r--misc/jive/Makefile5
-rw-r--r--misc/p5-Array-PrintCols/Makefile5
-rw-r--r--misc/p5-Business-CreditCard/Makefile5
-rw-r--r--misc/p5-Locale-Codes/Makefile5
-rw-r--r--misc/p5-Search/Makefile5
-rw-r--r--misc/splitvt/Makefile5
-rw-r--r--misc/xfinans/Makefile5
-rw-r--r--misc/xinvest/Makefile5
-rw-r--r--misc/xrolodex/Makefile5
-rw-r--r--mk/bsd.pkg.mk56
-rw-r--r--net/p5-Net/Makefile5
-rw-r--r--net/p5-SNMP/Makefile5
-rw-r--r--net/xarchie/Makefile5
-rw-r--r--print/magicfilter/Makefile5
-rw-r--r--print/teTeX/Makefile5
-rw-r--r--print/transfig/Makefile5
-rw-r--r--security/p5-MD5/Makefile5
-rw-r--r--sysutils/psmisc/Makefile5
-rw-r--r--textproc/t1lib/Makefile5
-rw-r--r--textproc/t1libx/Makefile5
-rw-r--r--www/ap-perl/Makefile5
-rw-r--r--www/p5-Apache-ASP/Makefile5
-rw-r--r--www/p5-CGI_Lite/Makefile5
-rw-r--r--www/p5-FCGI/Makefile5
-rw-r--r--www/p5-HTML-Parser/Makefile5
-rw-r--r--www/p5-libwww/Makefile5
-rw-r--r--x11/Xaw-Xpm/Makefile5
-rw-r--r--x11/Xaw3d/Makefile5
-rw-r--r--x11/asclock/Makefile5
-rw-r--r--x11/dxpc/Makefile5
-rw-r--r--x11/filerunner/Makefile5
-rw-r--r--x11/p5-Tk/Makefile5
-rw-r--r--x11/rclock/Makefile6
-rw-r--r--x11/rxvt/Makefile6
-rw-r--r--x11/sunclock/Makefile5
-rw-r--r--x11/titrax/Makefile5
-rw-r--r--x11/unclutter/Makefile5
-rw-r--r--x11/x3270/Makefile5
-rw-r--r--x11/xautolock/Makefile5
-rw-r--r--x11/xcb/Makefile5
-rw-r--r--x11/xcolorsel/Makefile5
-rw-r--r--x11/xdaliclock/Makefile5
-rw-r--r--x11/xforms/Makefile36
-rw-r--r--x11/xless/Makefile15
-rw-r--r--x11/xmeter/Makefile5
-rw-r--r--x11/xquote/Makefile5
-rw-r--r--x11/xsnow/Makefile5
86 files changed, 224 insertions, 304 deletions
diff --git a/Packages.txt b/Packages.txt
index b626fa3a73c..cac97e08e62 100644
--- a/Packages.txt
+++ b/Packages.txt
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.52 1999/02/24 10:40:58 agc Exp $
+# $NetBSD: Packages.txt,v 1.53 1999/04/15 20:39:38 tron Exp $
###########################################################################
==========================
@@ -306,10 +306,10 @@ specify a subdirectory of that site. Since these macros may expand to
more than one actual site, you MUST use the following construct to specify
a subdirectory:
- ${MASTER_SITE_GNU:=/subdirectory/name/}
+ ${MASTER_SITE_GNU:=subdirectory/name/}
-(Note the leading and trailing slashes after the := characters.) Use of
-the deprecated MASTER_SITE_SUBDIR will not work.
+(Note the trailing slash after the subdirectory name.) Use of the deprecated
+MASTER_SITE_SUBDIR will not work.
Currently the following values are available for CATEGORIES. If more than
one is used, they need to be separated by spaces:
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 640932ba293..d4a2576b1a1 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 1998/06/18 16:15:10 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:39 tron Exp $
#
DISTNAME= cam-1.02
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 6e74cafcf03..d784e75da13 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.15 1999/04/13 15:31:04 agc Exp $
+# $NetBSD: Makefile,v 1.16 1999/04/15 20:39:39 tron Exp $
#
DISTNAME= mikmod-3.0.3
CATEGORIES= audio
MASTER_SITES= http://www.freenet.tlh.fl.us/~amstpi/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
+ ${MASTER_SITE_SUNSITE:=apps/sound/players/}
MAINTAINER= mycroft@NetBSD.ORG
HOMEPAGE= http://www.freenet.tlh.fl.us/~amstpi/mikmod.html
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index b899a0eb7c6..25acb573304 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 1998/06/18 16:15:10 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:39 tron Exp $
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
DISTNAME= nas-1.2p5
PKGNAME= nas-1.2.5
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= audio/nas
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=audio/nas/}
MAINTAINER= packages@netbsd.org
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index 0a1abf5e374..f28ae30b9e4 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1998/08/20 15:16:39 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:40 tron Exp $
#
DISTNAME= nspmod-0.1
CATEGORIES= audio
MASTER_SITES= http://www.jeton.or.jp/users/toru/www/orgsoft/nspmod/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/players
+ ${MASTER_SITE_SUNSITE:=apps/sound/players/}
MAINTAINER= mycroft@NetBSD.ORG
HOMEPAGE= http://www.jeton.or.jp/users/toru/www/orgsoft/index.html
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 0fed95c40e4..36326621952 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1998/06/18 16:15:11 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:40 tron Exp $
# FreeBSD Id: Makefile,v 1.5 1996/11/18 13:56:53 asami Exp
#
DISTNAME= xmix-2.1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/sound/mixers
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= xmix-2.1.mixers.patch
diff --git a/cad/ntesla/Makefile b/cad/ntesla/Makefile
index a6e0b533f82..24063cc0792 100644
--- a/cad/ntesla/Makefile
+++ b/cad/ntesla/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/01/17 09:31:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:40 tron Exp $
#
DISTNAME= ntesla-1.7
CATEGORIES= cad
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/circuits
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/circuits/}
MAINTAINER= mcmahill@alum.mit.edu
HOMEPAGE= http://www.nic.funet.fi/pub/sci/electrical/tesla/
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index 25e59088e2c..c1513010d4e 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:45 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:40 tron Exp $
#
DISTNAME= xisp-2.5p4
CATEGORIES= comms x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/serial/} \
http://users.hol.gr/~dbouras/release/
-MASTER_SITE_SUBDIR= system/network/serial
MAINTAINER= lamj@stat.cmu.edu
HOMEPAGE= http://users.hol.gr/~dbouras/
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 5063ef12a56..97374684a9c 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.8 1998/12/05 02:25:21 tv Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:40 tron Exp $
# FreeBSD Id: Makefile,v 1.3 1997/08/04 22:47:16 ache Exp
#
DISTNAME= MIME-Base64-2.09
PKGNAME= p5-MIME-Base64-2.09
CATEGORIES= converters perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MIME
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MIME/}
+
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/MIME-Base64/Base64.html
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index 6f06b4ad0a2..422747bf76c 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:49 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:40 tron Exp $
# FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
#
DISTNAME= Curses-1.02
PKGNAME= p5-Curses-1.02
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Curses
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Curses/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Curses/Curses.html
diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index 2461276057c..f7edd7ec4f3 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 1998/11/26 18:22:49 bad Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:40 tron Exp $
# FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:11 jfitz Exp
#
DISTNAME= Data-Dumper-2.10
PKGNAME= p5-Data-Dumper-2.10
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Data
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Data/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Data-Dumper/Dumper.html
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index ff18f37fe1c..258b3c1def6 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/26 18:02:49 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
#
DISTNAME= DProf-19970614
PKGNAME= p5-Devel-DProf-19970614
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Devel/}
MAINTAINER= bad@netbsd.org
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 3dd497d6f34..9a26c6419f6 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/26 18:16:05 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
#
DISTNAME= Devel-SmallProf-0.5
PKGNAME= p5-Devel-SmallProf-0.5
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Devel
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Devel/}
MAINTAINER= bad@netbsd.org
diff --git a/devel/p5-MLDBM/Makefile b/devel/p5-MLDBM/Makefile
index 792d7c9bedd..ecc7db2a817 100644
--- a/devel/p5-MLDBM/Makefile
+++ b/devel/p5-MLDBM/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/05 03:28:48 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
#
DISTNAME= MLDBM-2.00
PKGNAME= p5-MLDBM-2.00
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MLDBM
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MLDBM/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/MLDBM/MLDBM.html
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 2c2b3151c1a..829437a7f8d 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.4 1998/11/19 15:40:45 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:41 tron Exp $
# FreeBSD Id: Makefile,v 1.4 1997/06/24 18:43:28 jfitz Exp
#
DISTNAME= perlvision
PKGNAME= p5-PV-1.0
CATEGORIES= devel net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= PV
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:PV/}
EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 1eca7b1df05..fd3f0443290 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/26 18:19:50 bad Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:41 tron Exp $
#
DISTNAME= Time-HiRes-01.19
PKGNAME= p5-Time-HiRes-01.19
CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Time
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Time/}
MAINTAINER= bad@netbsd.org
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 6ae45b6d35f..773b8082712 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1998/06/22 11:27:51 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:41 tron Exp $
#
DISTNAME= xxgdb-1.12
CATEGORIES= devel x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
MAINTAINER= rh@trapdoor.vip.at
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index b473cf82843..794b6e2fd4a 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1999/02/02 23:14:04 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:41 tron Exp $
# FreeBSD Id: Makefile,v 1.6 1999/01/26 02:16:00 steve Exp
#
DISTNAME= xcoral-3.2
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= editors
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=editors/}
MAINTAINER= packages@netbsd.org
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index cf3db325b06..2bd11f61ba6 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 1999/02/20 22:48:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 1999/04/15 20:39:42 tron Exp $
DISTNAME= Wine-981211
PKGNAME= wine-981211
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= ALPHA/wine/development
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
ONLY_FOR_ARCHS= i386
MAINTAINER= mycroft@netbsd.org
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index a2024f8f689..ab544b303c8 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:47 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:42 tron Exp $
DISTNAME= imaze1.3
PKGNAME= imaze-1.3
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
DISTFILES= imaze-sounds.tar imaze1.3.tar.Z
MAINTAINER= root@garbled.net
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index f0d31ba3e4a..031d2fe71ac 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:48 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:42 tron Exp $
#
DISTNAME= lincity109-src
PKGNAME= lincity-1.09
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=games/strategy/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.floot.demon.co.uk/lincity.html
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 9ea924f3ca9..e549e46cfcd 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:48 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:42 tron Exp $
#
DISTNAME= mirrormagic-1.3
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
MAINTAINER= root@garbled.net
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 5153a1759d4..4a9dfc84dfd 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:56 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:42 tron Exp $
#
DISTNAME= xbill-2.0
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
EXTRACT_SUFX= .tgz
MAINTAINER= root@garbled.net
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 0f6962ce4cd..d751b6c5936 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:57 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:42 tron Exp $
#
DISTNAME= xboing2.4
PKGNAME= xboing-2.4
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.catt.rmit.edu.au/xboing/xboing.html
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 39b54de9a11..6c65192f5ca 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1998/08/20 15:16:57 tsarna Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:42 tron Exp $
#
DISTNAME= xdemineur-2.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/} \
ftp://ftp.agm-ita.ensta.fr/pub/babafou/
-MASTER_SITE_SUBDIR= games
MAINTAINER= bouyer@netbsd.org
HOMEPAGE= http://www.spinne.com/x/games/xdemineur/
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index c3f27e023a3..925727dfd46 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 12:32:17 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:43 tron Exp $
#
DISTNAME= xjig-2.4
CATEGORIES= games x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/multiplayer
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/multiplayer/}
EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 3378c281b30..529022917de 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1998/08/20 15:16:58 tsarna Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:43 tron Exp $
# FreeBSD Id: Makefile,v 1.10 1997/11/12 09:57:17 tg Exp
#
DISTNAME= xkobo-1.11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/} \
ftp://ftp.uoknor.edu/mirrors/X/contrib/games/
-MASTER_SITE_SUBDIR= games
MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://seki.math.hokudai.ac.jp:20080/xkobo-current.html
diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index c1e24acc0da..c72d1e6ad7b 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1999/04/09 21:11:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:43 tron Exp $
#
DISTNAME= cdlabelgen-1.1.3
CATEGORIES= graphics
MASTER_SITES= http://www.red-bean.com/~bwf/software/cdlabelgen/ \
ftp://ftp.red-bean.com/pub/bwf/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/disk-management
+ ${MASTER_SITE_SUNSITE:=utils/disk-management/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.red-bean.com/~bwf/software/cdlabelgen/
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 2dc926a6316..7eade522373 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 1998/07/04 09:19:00 mycroft Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:43 tron Exp $
# FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
#
DISTNAME= pixmap2.6
PKGNAME= pixmap-2.6
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications/pixmap
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/pixmap/}
MAINTAINER= packages@netbsd.org
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 8ab27af8f0f..e5bf61bfec0 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.9 1998/07/04 09:19:03 mycroft Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:43 tron Exp $
# FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp
#
DISTNAME= xbmbrowser5.1
PKGNAME= xbmbrowser-5.1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
MAINTAINER= packages@netbsd.org
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 42565dafcc4..620da566eb1 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.17 1999/02/20 22:48:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 1999/04/15 20:39:43 tron Exp $
#
DISTNAME= xfig.3.2.2
PKGNAME= xfig-3.2.2
WRKSRC= ${WRKDIR}/xfig.3.2.2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/drawing_tools/xfig}
MAINTAINER= root@garbled.net
HOMEPAGE= http://epb1.lbl.gov/BVSmith/xfig/
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 585c48e0fca..185b0fa54a3 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 1998/08/27 11:18:04 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:43 tron Exp $
DISTNAME= xli.1.16
PKGNAME= xli-1.16
CATEGORIES= graphics x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= packages@netbsd.org
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index 94e4a0e2e62..ddc5d8407fa 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/01/14 15:48:29 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:44 tron Exp $
#
DISTNAME= fort77-1.14a
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= devel/lang/fortran
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=devel/lang/fortran/}
MAINTAINER= packages@netbsd.org
diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile
index e0ef8a4b14e..9283eb34a28 100644
--- a/lang/ucblogo/Makefile
+++ b/lang/ucblogo/Makefile
@@ -3,12 +3,11 @@
# Date created: 18 Feb 1999
# Whom: proff
#
-# $NetBSD: Makefile,v 1.2 1999/04/04 17:06:58 proff Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:44 tron Exp $
DISTNAME= ucblogo-4.6
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ucblogo
+MASTER_SITES= ${MASTER_SITE_GNU:=ucblogo/}
MAINTAINER= packages@netbsd.org
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index 278d1324924..619cdb6d72b 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:51 agc Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:44 tron Exp $
DISTNAME= coolmail-1.3
CATEGORIES= mail x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/mail/biffs
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/mail/biffs/}
EXTRACT_SUFX= .tgz
MAINTAINER= root@garbled.net
diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile
index ddfbaaa9d30..d180ee004cf 100644
--- a/mail/p5-MailTools/Makefile
+++ b/mail/p5-MailTools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/02/08 11:10:20 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:44 tron Exp $
DISTNAME= MailTools-1.11
PKGNAME= p5-MailTools-1.11
CATEGORIES= mail perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Mail
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/}
MAINTAINER= packages@netbsd.org
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index a4bfba2c98b..00993658473 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:52 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:44 tron Exp $
# FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp
#
@@ -7,8 +7,7 @@ WRKSRC= ${WRKDIR}/xldlas
CATEGORIES= math
MASTER_SITES= http://a42.com/~thor/xldlas/ \
http://sunsite.math.klte.hu/mirrors/xldlas/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/xapps/math
+ ${MASTER_SITE_SUNSITE:=X11/xapps/math/}
EXTRACT_SUFX= -source.tgz
MAINTAINER= packages@netbsd.org
diff --git a/misc/cal/Makefile b/misc/cal/Makefile
index 6a5548824ff..9e8a8c1464b 100644
--- a/misc/cal/Makefile
+++ b/misc/cal/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:31 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:44 tron Exp $
# FreeBSD Id: Makefile,v 1.5 1997/05/12 06:33:23 max Exp
#
DISTNAME= cal-3.5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/shell
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/shell/}
MAINTAINER= packages@netbsd.org
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index 2acf58b4451..4cc38f45691 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 1998/06/22 12:52:31 agc Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:44 tron Exp $
#
DISTNAME= dialog-0.6z
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/shell
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/shell/}
MAINTAINER= lamj@stat.cmu.edu
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index 4046cbe1d36..63edf589a61 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1998/07/28 10:56:08 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:45 tron Exp $
# FreeBSD Id: Makefile,v 1.2 1997/04/02 07:58:25 obrien Exp
#
DISTNAME= jive-1.1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/amusements
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=games/amusements/}
MAINTAINER= packages@netbsd.org
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index 5f3bb5b90a7..f25294a25fb 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1998/08/20 15:17:14 tsarna Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:45 tron Exp $
# FreeBSD Id: Makefile,v 1.9 1997/09/14 02:54:03 jfitz Exp
#
DISTNAME= Array-PrintCols-1.2
PKGNAME= p5-Array-PrintCols-1.2
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Array
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Array/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Array-PrintCols/PrintCols.html
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index 6d527e1dc80..fac1113a0c6 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 1998/08/20 15:17:15 tsarna Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:45 tron Exp $
# FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp
#
DISTNAME= Business-CreditCard-0.1
PKGNAME= p5-Business-CreditCard-0.1
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Business
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Business/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Business-CreditCard/CreditCard.html
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index e31400b30a5..42d79f7ae3b 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1998/08/20 15:17:15 tsarna Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:45 tron Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:51:12 jfitz Exp
#
DISTNAME= Locale-Codes-0.003
PKGNAME= p5-Locale-Codes-0.003
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Locale
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Locale/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Locale-Codes/Locale/Country.html
diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index 3a937c1adb5..3a882d95af4 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:33 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:45 tron Exp $
# FreeBSD Id: Makefile,v 1.9 1997/06/24 18:43:31 jfitz Exp
#
DISTNAME= Search-0.2
PKGNAME= p5-Search-0.2
CATEGORIES= misc perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Search
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Search/}
MAINTAINER= packages@netbsd.org
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index f07ee5f029e..07bac8fb4fc 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:34 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:45 tron Exp $
# FreeBSD Id: Makefile,v 1.5 1997/04/02 08:39:12 obrien Exp
#
DISTNAME= splitvt-1.6.3
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= utils/console
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/console/}
MAINTAINER= packages@netbsd.org
diff --git a/misc/xfinans/Makefile b/misc/xfinans/Makefile
index 9bf18f03d60..17404270635 100644
--- a/misc/xfinans/Makefile
+++ b/misc/xfinans/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1999/02/09 16:08:59 bad Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:45 tron Exp $
#
DISTNAME= xfinans-5.9
WRKSRC= ${WRKDIR}/Xfinans/Src
CATEGORIES= misc x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/financial/accounting
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/financial/accounting/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.cs.auc.dk/~lupus/xfinans.html
diff --git a/misc/xinvest/Makefile b/misc/xinvest/Makefile
index 9e8f009223c..f0cea140794 100644
--- a/misc/xinvest/Makefile
+++ b/misc/xinvest/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1999/01/29 21:32:21 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:45 tron Exp $
DISTNAME= xinvest-2.5.1
CATEGORIES= misc x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.sunsite.auc.dk/xinvest/xinvest.html
diff --git a/misc/xrolodex/Makefile b/misc/xrolodex/Makefile
index a5611b351c8..d5a83f6c93d 100644
--- a/misc/xrolodex/Makefile
+++ b/misc/xrolodex/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 1999/01/29 21:21:56 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:46 tron Exp $
DISTNAME= xrolodex.1.5.motif
PKGNAME= xrolodex-1.5
CATEGORIES= misc x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
EXTRACT_SUFX= .tar.Z
MAINTAINER= root@garbled.net
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index cd09df44e8b..b03566b30e8 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.253 1999/04/14 19:44:24 tron Exp $
+# $NetBSD: bsd.pkg.mk,v 1.254 1999/04/15 20:39:46 tron Exp $
#
# This file is in the public domain.
#
@@ -577,38 +577,30 @@ FETCH_BEFORE_ARGS += -p
# Popular master sites
MASTER_SITE_XCONTRIB+= \
- ftp://crl.dec.com/pub/X11/contrib/%SUBDIR%/ \
- ftp://ftp.eu.net/X11/contrib/%SUBDIR%/ \
- ftp://ftp.uni-paderborn.de/pub/X11/contrib/%SUBDIR%/ \
- ftp://ftp.x.org/contrib/%SUBDIR%/
+ ftp://crl.dec.com/pub/X11/contrib/ \
+ ftp://ftp.eu.net/X11/contrib/ \
+ ftp://ftp.uni-paderborn.de/pub/X11/contrib/ \
+ ftp://ftp.x.org/contrib/
MASTER_SITE_GNU+= \
- ftp://ftp.gnu.org/pub/gnu/%SUBDIR%/ \
- ftp://wuarchive.wustl.edu/systems/gnu/%SUBDIR%/
+ ftp://ftp.gnu.org/pub/gnu/ \
+ ftp://wuarchive.wustl.edu/systems/gnu/
MASTER_SITE_PERL_CPAN+= \
- ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/%SUBDIR%/ \
- ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/%SUBDIR%/
+ ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/ \
+ ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/
MASTER_SITE_TEX_CTAN+= \
- ftp://ftp.cdrom.com/pub/tex/ctan/%SUBDIR%/ \
- ftp://wuarchive.wustl.edu/packages/TeX/%SUBDIR%/ \
- ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/ \
- ftp://ftp.tex.ac.uk/public/ctan/tex-archive/%SUBDIR%/ \
- ftp://ftp.dante.de/tex-archive/%SUBDIR%/
+ ftp://ftp.cdrom.com/pub/tex/ctan/ \
+ ftp://wuarchive.wustl.edu/packages/TeX/ \
+ ftp://ftp.funet.fi/pub/TeX/CTAN/ \
+ ftp://ftp.tex.ac.uk/public/ctan/tex-archive/ \
+ ftp://ftp.dante.de/tex-archive/
MASTER_SITE_SUNSITE+= \
- ftp://sunsite.unc.edu/pub/Linux/%SUBDIR%/ \
- ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/%SUBDIR%/ \
- ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/%SUBDIR%/
-
-# Empty declaration to avoid "variable MASTER_SITES recursive" error
-MASTER_SITES?=
-PATCH_SITES?=
-
-# Substitute subdirectory names
-MASTER_SITES:= ${MASTER_SITES:S/%SUBDIR%/${MASTER_SITE_SUBDIR}/}
-PATCH_SITES:= ${PATCH_SITES:S/%SUBDIR%/${PATCH_SITE_SUBDIR}/}
+ ftp://sunsite.unc.edu/pub/Linux/ \
+ ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ \
+ ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/
# The primary backup site.
MASTER_SITE_BACKUP?= \
@@ -712,7 +704,19 @@ EXTRACT_ONLY?= ${DISTFILES}
.if defined(LIB_DEPENDS)
.BEGIN:
- @${ECHO_MSG} "LIB_DEPENDS is deprecated, and must be replaced with DEPENDS."
+ @${ECHO_MSG} "LIB_DEPENDS is deprecated and must be replaced with DEPENDS."
+ @${FALSE}
+.endif
+
+.if defined(MASTER_SITE_SUBDIR)
+.BEGIN:
+ @${ECHO_MSG} 'MASTER_SITE_SUBDIR is deprecated and must be replaced with MASTER_SITES.'
+ @${FALSE}
+.endif
+
+.if defined(PATCH_SITE_SUBDIR)
+.BEGIN:
+ @${ECHO_MSG} 'PATCH_SITE_SUBDIR is deprecated and must be replaced with PATCH_SITES.'
@${FALSE}
.endif
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index a1e7a0b3509..3a044548a91 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.12 1998/12/05 02:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/15 20:39:46 tron Exp $
# FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
#
DISTNAME= libnet-1.0605
PKGNAME= p5-Net-1.0605
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/libnet/FAQ.html
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index 175bf3f8371..3d757a4c56c 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1998/09/15 17:05:06 agc Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:46 tron Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp
#
DISTNAME= SNMP-1.7
PKGNAME= p5-SNMP-1.7
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= SNMP
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=SNMP/}
MAINTAINER= packages@netbsd.org
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index 890d975374f..c147aedd16f 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 1998/06/22 12:58:36 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:46 tron Exp $
# FreeBSD Id: Makefile,v 1.12 1996/12/01 01:23:22 obrien Exp
#
DISTNAME= xarchie-2.0.10
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= packages@netbsd.org
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 0342f93bae3..74db934ff68 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/15 20:39:47 tron Exp $
DISTNAME= magicfilter-1.2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/printing
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/printing/}
MAINTAINER= tron@netbsd.org
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 0ffabe10335..b7b22a27a2d 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.13 1999/02/04 19:07:51 agc Exp $
+# $NetBSD: Makefile,v 1.14 1999/04/15 20:39:47 tron Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
DISTNAME= teTeX-src-0.4
PKGNAME= teTeX-0.4p8
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= systems/unix/teTeX/distrib/sources
+MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/distrib/sources/}
DISTFILES= ${TETEX_SRC} ${TETEX_LIB}
PATCH_DIST_STRIP= -p1
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index aaa5ad31b53..6b5f49d412a 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.11 1999/02/20 22:48:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 1999/04/15 20:39:47 tron Exp $
#
DISTNAME= transfig.3.2.1
PKGNAME= transfig-3.2.1
WRKSRC= ${WRKDIR}/transfig.3.2.1
CATEGORIES= graphics print
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications/drawing_tools/transfig
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/drawing_tools/transfig/}
MAINTAINER= root@garbled.net
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index d163c05d6d1..049bad0685e 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 1998/08/20 15:17:24 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:47 tron Exp $
# FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:23 jfitz Exp
#
DISTNAME= MD5-1.7
PKGNAME= p5-MD5-1.7
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= MD5
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MD5/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/MD5/MD5.html
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index eff326811fb..71a25fbc164 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1998/07/20 10:25:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:47 tron Exp $
#
DISTNAME= psmisc-17
CATEGORIES= sysutils
MASTER_SITES= ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= system/status/ps
+ ${MASTER_SITE_SUNSITE:=system/status/ps/}
MAINTAINER= bjh21@cam.ac.uk
diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile
index b0f5eb9bc3d..6afe69cef0c 100644
--- a/textproc/t1lib/Makefile
+++ b/textproc/t1lib/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/05 08:26:03 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:47 tron Exp $
#
DISTNAME= t1lib-0.8-beta
PKGNAME= t1lib-0.8
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics/
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/graphics/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib.html
diff --git a/textproc/t1libx/Makefile b/textproc/t1libx/Makefile
index 2af5dfb7851..65ef05dfe50 100644
--- a/textproc/t1libx/Makefile
+++ b/textproc/t1libx/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 1999/01/30 23:18:54 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:47 tron Exp $
#
DISTNAME= t1lib-0.8-beta
PKGNAME= t1lib-0.8
CATEGORIES= textproc x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics/
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/graphics/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib.html
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 7d2fb0fd75e..ea8c4170bcd 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/12/04 17:25:13 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:47 tron Exp $
#
DISTNAME= mod_perl-1.16
PKGNAME= ap-perl-1.16
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Apache
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/}
MAINTAINER= tv@netbsd.org
HOMEPAGE= http://perl.apache.org/
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 6216314df33..99fc0248376 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/12/05 03:50:46 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:47 tron Exp $
#
DISTNAME= Apache-ASP-0.05
PKGNAME= p5-Apache-ASP-0.05
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Apache/CHAMAS
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/CHAMAS/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Apache-ASP/ASP.html
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 19b8aeb9245..3c4152956cb 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1999/04/01 14:07:56 agc Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:47 tron Exp $
#
DISTNAME= CGI_Lite-1.62.pm
PKGNAME= p5-CGI_Lite-1.62
NO_WRKSUBDIR= YES
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= CGI
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/}
EXTRACT_SUFX= .gz
MAINTAINER= bad@netbsd.org
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index 9ddec5a4369..aef9e83797e 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1998/10/04 18:24:37 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:48 tron Exp $
#
DISTNAME= FCGI-0.42
PKGNAME= p5-FCGI-0.42
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= FCGI
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=FCGI/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.fastcgi.com/
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index c78ca48c61b..4d620e8e78d 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/01/11 22:22:50 kim Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:48 tron Exp $
#
PKGNAME= p5-HTML-Parser-2.22
DISTNAME!= echo ${PKGNAME} | sed -e 's/^p5-//'
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= HTML
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/}
MAINTAINER= packages@netbsd.org
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 4fe6d140563..6a47af94b37 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.9 1999/01/13 02:56:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:48 tron Exp $
# FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
#
PKGNAME= p5-libwww-5.36
DISTNAME!= echo ${PKGNAME} | sed -e 's/^p5-//' -e 's/-/-perl-/'
CATEGORIES= www perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= URI
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=URI/}
MAINTAINER= packages@netbsd.org
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 661ca7b51e6..0066d0a8d36 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:48 tron Exp $
#
DISTNAME= Xaw-Xpm-1.1
WRKSRC= ${WRKDIR}/XawXpm
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/X
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=libs/X/}
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.zip.com.au/~bb/XawXpm/
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index fe8f4e6320b..e10860f4c96 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 1999/02/20 22:48:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 1999/04/15 20:39:48 tron Exp $
#
DISTNAME= Xaw3d-1.5
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
MAINTAINER= tron@netbsd.org
diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile
index 86f73a1c2c6..5578eab2394 100644
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/15 20:39:48 tron Exp $
#
DISTNAME= asclock
PKGNAME= asclock-11
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/clocks
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/clocks/}
MAINTAINER= hubertf@netbsd.org
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index d5d60c206f0..3a15200f802 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:55 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:48 tron Exp $
#
DISTNAME= dxpc-3.7.0
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://ccwf.cc.utexas.edu/~zvonler/dxpc/
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index e9aa2243e6b..cf958db5c51 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.9 1999/04/01 13:38:45 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:48 tron Exp $
# $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
#
DISTNAME= FileRunner-2.4.2
PKGNAME= filerunner-2.4.2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/desktop
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/desktop/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cd.chalmers.se/~hch/filerunner.html
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 1f6985a8fde..15aa908a0f0 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.11 1999/04/01 13:38:46 agc Exp $
+# $NetBSD: Makefile,v 1.12 1999/04/15 20:39:48 tron Exp $
# FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
#
DISTNAME= Tk402.002
PKGNAME= p5-Tk-402.002
CATEGORIES= x11 tk80 perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Tk
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Tk/pod/overview.html
diff --git a/x11/rclock/Makefile b/x11/rclock/Makefile
index 317bb560a2d..f458dfc0d22 100644
--- a/x11/rclock/Makefile
+++ b/x11/rclock/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:57 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:49 tron Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/03/03 16:27:10 obrien Exp
#
DISTNAME= rxvt-2.20
PKGNAME= rclock-2.20
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/rxvt/} \
ftp://ftp.nuclecu.unam.mx/linux/local/rxvt/ \
ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/
-MASTER_SITE_SUBDIR= utils/file/managers/mc/rxvt
-#MASTER_SITE_SUBDIR= X11/xutils/terms
MAINTAINER= packages@netbsd.org
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index be140ad1561..05725a02913 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:57 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:49 tron Exp $
# FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
#
DISTNAME= rxvt-2.20
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/rxvt/} \
ftp://ftp.nuclecu.unam.mx/linux/local/rxvt/ \
ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/
-MASTER_SITE_SUBDIR= utils/file/managers/mc/rxvt
-#MASTER_SITE_SUBDIR= X11/xutils/terms
MAINTAINER= packages@netbsd.org
diff --git a/x11/sunclock/Makefile b/x11/sunclock/Makefile
index dc89cffa8a8..a631f0d31c5 100644
--- a/x11/sunclock/Makefile
+++ b/x11/sunclock/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1998/11/12 14:58:40 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:49 tron Exp $
#
DISTNAME= sunclock-1.4
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= perry@netbsd.org
diff --git a/x11/titrax/Makefile b/x11/titrax/Makefile
index 7e389b6054b..ffcd757be39 100644
--- a/x11/titrax/Makefile
+++ b/x11/titrax/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/08 14:11:00 hwr Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:49 tron Exp $
#
DISTNAME= titrax-1.98
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= office
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.alvestrand.no/domen/titrax/TimeTracker.html
diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile
index 9b2c41632ec..a4c08de5f37 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 1998/10/15 19:51:08 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:49 tron Exp $
#
DISTNAME= unclutter-8
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
EXTRACT_SUFX= .tar.Z
MAINTAINER= mycroft@netbsd.org
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 6dd9765e30a..89d01f7f596 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1998/06/22 13:21:03 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/15 20:39:49 tron Exp $
# FreeBSD Id: Makefile,v 1.10 1997/10/15 20:23:40 max Exp
#
DISTNAME= x3270-3.1.1.6
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= volf@oasis.IAEhv.nl
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 32931f8222d..e257ad0547f 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 1999/04/05 22:46:27 mjl Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:49 tron Exp $
# FreeBSD Id: Makefile,v 1.2 1996/11/18 09:55:42 asami Exp
#
DISTNAME= xautolock-pl15
PKGNAME= xautolock-1.15
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
EXTRACT_SUFX= .tgz
MAINTAINER= eblood@cs.unr.edu
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index b0b323a9dd6..4be69be42d7 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 1998/07/19 10:31:01 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:49 tron Exp $
#
DISTNAME= xcb-2.3
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
MAINTAINER= root@garbled.net
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index d8d8f1d10f6..4c6fcfb57a4 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/07/15 08:13:41 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:49 tron Exp $
#
DISTNAME= xcolorsel-1.1a-src
PKGNAME= xcolorsel-1.1a
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
MAINTAINER= perry@netbsd.org
diff --git a/x11/xdaliclock/Makefile b/x11/xdaliclock/Makefile
index a75a0504a7b..1953c01ab8f 100644
--- a/x11/xdaliclock/Makefile
+++ b/x11/xdaliclock/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 1999/02/05 10:49:43 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:50 tron Exp $
#
DISTNAME= xdaliclock-2.14
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
MAINTAINER= nathanw@netbsd.org
HOMEPAGE= http://www.jwz.org/xdaliclock/
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 83db337c107..c43d75849f6 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,35 +1,35 @@
-# $NetBSD: Makefile,v 1.10 1999/01/30 23:18:57 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/15 20:39:50 tron Exp $
#
-DISTNAME= bxform-088
-PKGNAME= xforms-0.88
-WRKSRC= ${WRKDIR}/xforms
-CATEGORIES= x11
-MASTER_SITES= ftp://bragg.phys.uwm.edu/pub/xforms/%SUBDIR%/
+DISTNAME= bxform-088
+PKGNAME= xforms-0.88
+WRKSRC= ${WRKDIR}/xforms
+CATEGORIES= x11
+MASTER_SITES= ftp://bragg.phys.uwm.edu/pub/xforms/${ARCH_SUBDIR}/
.if (${MACHINE_ARCH} == "arm32")
-MASTER_SITE_SUBDIR= netBSD-arm
+ARCH_SUBDIR= netBSD-arm
.elif (${MACHINE_ARCH} == "i386")
-MASTER_SITE_SUBDIR= netBSD
+ARCH_SUBDIR= netBSD
.elif (${MACHINE_ARCH} == "ns32k")
-MASTER_SITE_SUBDIR= netBSD-pc532
+ARCH_SUBDIR= netBSD-pc532
.else
-MASTER_SITE_SUBDIR= netBSD-${MACHINE_ARCH}
+ARCH_SUBDIR= netBSD-${MACHINE_ARCH}
.endif
-EXTRACT_SUFX= .tgz
+EXTRACT_SUFX= .tgz
-MAINTAINER= lamj@stat.cmu.edu
-HOMEPAGE= http://bragg.phys.uwm.edu/xforms/
+MAINTAINER= lamj@stat.cmu.edu
+HOMEPAGE= http://bragg.phys.uwm.edu/xforms/
-ONLY_FOR_ARCHS= arm32 i386 m68k sparc ns32k
+ONLY_FOR_ARCHS= arm32 i386 m68k sparc ns32k
-DIST_SUBDIR= xforms/${MASTER_SITE_SUBDIR}
+DIST_SUBDIR= xforms/${ARCH_SUBDIR}
## Define OBJMACHINE so WRKDIR is defined to be ${MACHINE_ARCH}-specific.
-OBJMACHINE= yes
+OBJMACHINE= yes
-NO_BUILD= yes
+NO_BUILD= yes
-USE_X11BASE= yes
+USE_X11BASE= yes
post-patch:
${MV} ${WRKSRC}/mkconfig.h ${WRKSRC}/mkconfig.h.orig
diff --git a/x11/xless/Makefile b/x11/xless/Makefile
index 940d364f2c3..6bd1fc4b9c9 100644
--- a/x11/xless/Makefile
+++ b/x11/xless/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.6 1998/06/22 13:21:05 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:50 tron Exp $
# FreeBSD Id: Makefile,v 1.2 1996/12/29 00:51:27 obrien Exp
#
-DISTNAME= xless-1.7
-CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
- ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
-MASTER_SITE_SUBDIR= applications
+DISTNAME= xless-1.7
+CATEGORIES= misc
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} \
+ ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
-MAINTAINER= packages@netbsd.org
+MAINTAINER= packages@netbsd.org
-USE_IMAKE= yes
+USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmeter/Makefile b/x11/xmeter/Makefile
index 177c01ae473..274ecb3de76 100644
--- a/x11/xmeter/Makefile
+++ b/x11/xmeter/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/30 10:53:40 agc Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:50 tron Exp $
DISTNAME= xmeter-1.15
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= misdirected
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=misdirected/}
MAINTAINER= packages@netbsd.org
diff --git a/x11/xquote/Makefile b/x11/xquote/Makefile
index d5a2a699890..abb4a49c0cb 100644
--- a/x11/xquote/Makefile
+++ b/x11/xquote/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/26 16:03:46 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:50 tron Exp $
DISTNAME= xquote-1.1
CATEGORIES= x11
MASTER_SITES= http://www.sunsite.auc.dk/xinvest/ \
- ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+ ${MASTER_SITE_XCONTRIB:=applications/}
DISTFILES= ${DISTNAME}.tar.gz Xquote.ad
MAINTAINER= root@garbled.net
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 425d17f8696..fcb715fd1e5 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 1998/06/22 13:21:06 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/15 20:39:50 tron Exp $
# FreeBSD Id: Makefile,v 1.7 1996/11/18 09:56:45 asami Exp
#
DISTNAME= xsnow-1.40
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=games/}
EXTRACT_SUFX= .tar.Z
MAINTAINER= is@netbsd.org