summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortron <tron>1999-04-15 20:39:38 +0000
committertron <tron>1999-04-15 20:39:38 +0000
commitffc4bb646b439066fa7295a1d88c3eca66c58de3 (patch)
tree1527694f852aef837a277727b3ee08bfcd5abdd8 /x11
parent920b4d26c19cf5824374aa96e63263d61f9b98df (diff)
downloadpkgsrc-ffc4bb646b439066fa7295a1d88c3eca66c58de3.tar.gz
Completely replace "MASTER_SITE_SUBDIR" and "PATCH_SITE_SUBDIR" with
variable substituition of "MASTER_SITES" and "PATCH_SITES".
Diffstat (limited to 'x11')
-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
21 files changed, 63 insertions, 85 deletions
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