From 82dec567e341c1ecd716f5c67d6fcdd2b6ecb691 Mon Sep 17 00:00:00 2001 From: espie Date: Wed, 15 May 2002 17:58:49 +0000 Subject: [PATCH] MASTER_SITE_SUBDIR kill --- news/newsfetch/Makefile | 13 ++++++------- news/p5-Gateway/Makefile | 5 ++--- news/p5-News-Article/Makefile | 5 ++--- news/p5-News-Newsrc/Makefile | 5 ++--- news/trn/Makefile | 5 ++--- palm/bibelot/Makefile | 5 ++--- print/ghostscript/gnu/Makefile | 7 +++---- print/pkfonts/Makefile | 10 +++++----- security/bfbtester/Makefile | 5 ++--- security/ccrypt/Makefile | 5 ++--- security/crank/Makefile | 5 ++--- security/p5-Authen-Radius/Makefile | 5 ++--- security/p5-Crypt-Blowfish/Makefile | 5 ++--- security/p5-Crypt-CBC/Makefile | 5 ++--- security/p5-Crypt-DES/Makefile | 5 ++--- security/p5-Crypt-RC4/Makefile | 5 ++--- security/p5-Crypt-SSLeay/Makefile | 5 ++--- security/p5-Crypt-Twofish/Makefile | 5 ++--- security/p5-Digest-HMAC/Makefile | 5 ++--- security/p5-Digest-MD5/Makefile | 5 ++--- security/p5-Digest-SHA1/Makefile | 5 ++--- security/p5-GPG/Makefile | 5 ++--- security/p5-GnuPG-Interface/Makefile | 5 ++--- security/p5-GnuPG/Makefile | 5 ++--- security/p5-IO-Socket-SSL/Makefile | 5 ++--- security/p5-MD5/Makefile | 5 ++--- security/p5-Net_SSLeay/Makefile | 5 ++--- security/p5-PGP-Sign/Makefile | 5 ++--- security/py-cryptkit/Makefile | 5 ++--- security/py-gnupg/Makefile | 5 ++--- security/py-sslwrapper/Makefile | 5 ++--- www/cgicc/Makefile | 5 ++--- www/libghttp/Makefile | 5 ++--- www/mod_perl/Makefile | 5 ++--- www/netscape/Makefile.inc | 20 ++++++++++---------- www/p5-Apache-ASP/Makefile | 5 ++--- www/p5-Apache-DBI/Makefile | 5 ++--- www/p5-Apache-MP3/Makefile | 5 ++--- www/p5-Blatte-HTML/Makefile | 5 ++--- www/p5-CGI-XMLApplication/Makefile | 5 ++--- www/p5-CGI/Makefile | 5 ++--- www/p5-HTML-Base/Makefile | 5 ++--- www/p5-HTML-CGIChecker/Makefile | 5 ++--- www/p5-HTML-Embperl/Makefile | 5 ++--- www/p5-HTML-Format/Makefile | 5 ++--- www/p5-HTML-FromText/Makefile | 5 ++--- www/p5-HTML-Mason/Makefile | 5 ++--- www/p5-HTML-Parser/Makefile | 5 ++--- www/p5-HTML-Stream/Makefile | 5 ++--- www/p5-HTML-Table/Makefile | 5 ++--- www/p5-HTML-TableExtract/Makefile | 5 ++--- www/p5-HTML-Tagset/Makefile | 5 ++--- www/p5-HTML-Tree/Makefile | 5 ++--- www/p5-HTTP-GHTTP/Makefile | 5 ++--- www/p5-URI/Makefile | 5 ++--- www/p5-libwww/Makefile | 5 ++--- www/w3m/Makefile | 5 ++--- www/wwwcount/Makefile | 19 ++++++++++--------- x11/Xaw3d/Makefile | 5 ++--- x11/aterm/Makefile | 5 ++--- x11/bbkeys/Makefile | 5 ++--- x11/bclock/Makefile | 5 ++--- x11/blackbox/Makefile | 5 ++--- x11/chbg/Makefile | 5 ++--- x11/enlightenment/Makefile | 5 ++--- x11/eterm/Makefile | 5 ++--- x11/fluxbox/Makefile | 5 ++--- x11/fsv/Makefile | 5 ++--- 68 files changed, 160 insertions(+), 224 deletions(-) diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile index 601efb792d0..e8792fd3724 100644 --- a/news/newsfetch/Makefile +++ b/news/newsfetch/Makefile @@ -3,22 +3,21 @@ # Date created: 28 April 1998 # Whom: Ejovi Nuwere # -# $OpenBSD: Makefile,v 1.14 2002/03/21 21:09:21 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2002/05/15 17:58:49 espie Exp $ # COMMENT= "download news articles from NNTP server" DISTNAME= newsfetch-1.21 CATEGORIES= news -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= system/news/readers +MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/news/readers/} NEED_VERSION= 1.515 # License: BSD -PERMIT_PACKAGE_CDROM= YES -PERMIT_PACKAGE_FTP= YES -PERMIT_DISTFILES_CDROM= YES -PERMIT_DISTFILES_FTP= YES +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes MAN1= newsfetch.1 MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}" diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile index 146e6253088..39b5124d6f1 100644 --- a/news/p5-Gateway/Makefile +++ b/news/p5-Gateway/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/12/19 20:43:44 shell Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/15 17:58:49 espie Exp $ COMMENT= "perl module to gateway between news and mail" @@ -6,8 +6,7 @@ DISTNAME= Gateway-0.42 PKGNAME= p5-${DISTNAME} CATEGORIES= news perl5 NEED_VERSION= 1.502 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= News +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=News/} MAINTAINER= Shell Hung diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile index 9d086f8f7af..a27511f612e 100644 --- a/news/p5-News-Article/Makefile +++ b/news/p5-News-Article/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/12/19 20:45:14 shell Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:49 espie Exp $ COMMENT= "perl module for accessing NNTP articles" @@ -6,8 +6,7 @@ DISTNAME= News-Article-1.13 PKGNAME= p5-${DISTNAME} CATEGORIES= news perl5 NEED_VERSION= 1.502 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= News +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=News/} MAINTAINER= Shell Hung diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile index 3a4824f2d7c..238681c755c 100644 --- a/news/p5-News-Newsrc/Makefile +++ b/news/p5-News-Newsrc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/21 21:09:21 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 17:58:49 espie Exp $ COMMENT= "module for managing newsrc files" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= News +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=News/} PERL_MODULES= ${LOCALBASE}/libdata/perl5/site_perl BUILD_DEPENDS= ::math/p5-Set-IntSpan diff --git a/news/trn/Makefile b/news/trn/Makefile index f8f3f0c2042..6892731afef 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:09:21 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:49 espie Exp $ COMMENT= "threaded newsreader" @@ -6,8 +6,7 @@ CATEGORIES= news MAINTAINER= Marc Espie NEED_VERSION= 1.515 -MASTER_SITES=${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=trn +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=trn/} V=76 DISTNAME=trn-4.0-test$V PKGNAME=trn-4.0.$V diff --git a/palm/bibelot/Makefile b/palm/bibelot/Makefile index 83bdead026d..fd46681f670 100644 --- a/palm/bibelot/Makefile +++ b/palm/bibelot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2002/01/25 08:17:34 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 17:58:49 espie Exp $ COMMENT= "format/convert text documents into compressed .pdb files" @@ -17,8 +17,7 @@ PERMIT_DISTFILES_FTP= Yes HOMEPAGE= http://sourceforge.net/projects/bibelot -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PROG} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bibelot/} NO_BUILD= Yes NO_REGRESS= Yes diff --git a/print/ghostscript/gnu/Makefile b/print/ghostscript/gnu/Makefile index cc998ea39ab..69af76a8d39 100644 --- a/print/ghostscript/gnu/Makefile +++ b/print/ghostscript/gnu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2002/04/24 21:34:48 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2002/05/15 17:58:49 espie Exp $ COMMENT="GNU PostScript interpreter" @@ -8,13 +8,12 @@ CATEGORIES= print lang NEED_VERSION= 1.525 DIR= gnu/gs${VERSION:S/.//} -MASTER_SITES= ${GS_SITES} ${MASTER_SITE_GNU} -MASTER_SITES1= ${MASTER_SITE_GNU} +MASTER_SITES= ${GS_SITES} ${MASTER_SITE_GNU:=ghostscript/} +MASTER_SITES1= ${MASTER_SITE_GNU:=ghostscript/} MASTER_SITES2= ${PDF_SITES} HOMEPAGE= http://www.cs.wisc.edu/~ghost/ -MASTER_SITE_SUBDIR= ghostscript DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD}:1 pdf_sec.ps:2 SUBST_VARS= OSREV VERSION diff --git a/print/pkfonts/Makefile b/print/pkfonts/Makefile index 6a12e77828b..ac56a9c61ca 100644 --- a/print/pkfonts/Makefile +++ b/print/pkfonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2002/03/21 21:25:50 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2002/05/15 17:58:49 espie Exp $ COMMENT= "English PK fonts (300dpi) for ghostscript, xdvi, etc." @@ -13,10 +13,10 @@ PERMIT_PACKAGE_FTP= "no license" PERMIT_DISTFILES_CDROM= "no license" PERMIT_DISTFILES_FTP= "no license" -MASTER_SITES= ftp://ports.jp.FreeBSD.org/pub/%SUBDIR%/ \ - ftp://ftp4.jp.FreeBSD.org/pub/%SUBDIR%/ \ - ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/%SUBDIR%/ -MASTER_SITE_SUBDIR= FreeBSD-jp/ports-jp/LOCAL_PORTS/pkfonts +S= FreeBSD-jp/ports-jp/LOCAL_PORTS/pkfonts +MASTER_SITES= ftp://ports.jp.FreeBSD.org/pub/$S/ \ + ftp://ftp4.jp.FreeBSD.org/pub/$S/ \ + ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/$S/ EXTRACT_ONLY= DIST_SUBDIR= pkfonts-${VERSION} diff --git a/security/bfbtester/Makefile b/security/bfbtester/Makefile index 89004c85766..a5699b9d72d 100644 --- a/security/bfbtester/Makefile +++ b/security/bfbtester/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.5 2001/08/23 18:43:52 brad Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:49 espie Exp $ COMMENT= "brute force binary tester" DISTNAME= bfbtester-2.0.1 CATEGORIES= security NEED_VERSION= 1.435 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= bfbtester +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bfbtester/} HOMEPAGE= http://bfbtester.sourceforge.net/ diff --git a/security/ccrypt/Makefile b/security/ccrypt/Makefile index 73f3cb67678..428eafd82fd 100644 --- a/security/ccrypt/Makefile +++ b/security/ccrypt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/01 07:13:29 kevlo Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 17:58:49 espie Exp $ COMMENT= "encrypt and decrypt AES files and streams" @@ -16,8 +16,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/download/ \ - ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ccrypt + ${MASTER_SITE_SOURCEFORGE:=ccrypt/} CONFIGURE_STYLE= gnu diff --git a/security/crank/Makefile b/security/crank/Makefile index 11c8b0f3b2a..57b736b821e 100644 --- a/security/crank/Makefile +++ b/security/crank/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2001/12/24 07:51:06 mark Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/15 17:58:49 espie Exp $ COMMENT= "classical (pen-and-paper) cipher cryptanalysis toolkit" DISTNAME= crank-0.1.4 CATEGORIES= security NEED_VERSION= 1.474 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= crank +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=crank/} HOMEPAGE= http://crank.sourceforge.net/ diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile index 4691513c13f..f6fe5237e87 100644 --- a/security/p5-Authen-Radius/Makefile +++ b/security/p5-Authen-Radius/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/21 02:58:38 jcs Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 17:58:49 espie Exp $ DISTNAME= RadiusPerl-0.05 PKGNAME= p5-Authen-Radius-0.05 @@ -11,8 +11,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes COMMENT= "Perl module to authenticate against a RADIUS server" -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Authen +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Authen/} MAINTAINER= Joshua Stein diff --git a/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile index 3f7f0f0d361..d482701e787 100644 --- a/security/p5-Crypt-Blowfish/Makefile +++ b/security/p5-Crypt-Blowfish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/11/23 03:07:24 kevlo Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 17:58:49 espie Exp $ COMMENT= "interface to the Blowfish encryption alogorithm" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Crypt +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} CONFIGURE_STYLE= perl diff --git a/security/p5-Crypt-CBC/Makefile b/security/p5-Crypt-CBC/Makefile index 8e5deba01f3..16a93edc209 100644 --- a/security/p5-Crypt-CBC/Makefile +++ b/security/p5-Crypt-CBC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:51 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:49 espie Exp $ COMMENT= "cryptographic cipher block chaining mode" @@ -7,8 +7,7 @@ DISTNAME= Crypt-CBC-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Crypt +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} BUILD_DEPENDS= ::security/p5-Digest-MD5 RUN_DEPENDS= ::security/p5-Digest-MD5 diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile index 37a70bf9119..1c5f4fd1861 100644 --- a/security/p5-Crypt-DES/Makefile +++ b/security/p5-Crypt-DES/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/21 21:25:51 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 17:58:49 espie Exp $ COMMENT= "interface to the DES encryption alogorithm" @@ -7,8 +7,7 @@ DISTNAME= Crypt-DES-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Crypt +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} MAINTAINER= Dan Harnett diff --git a/security/p5-Crypt-RC4/Makefile b/security/p5-Crypt-RC4/Makefile index 7c4c6d07a81..6233cc9498a 100644 --- a/security/p5-Crypt-RC4/Makefile +++ b/security/p5-Crypt-RC4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/02/08 06:49:41 kevlo Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/15 17:58:50 espie Exp $ COMMENT= "implementation of the RC4 encryption algorithm" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Crypt +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} CONFIGURE_STYLE= perl diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile index 78a247b2fca..7d770cadad0 100644 --- a/security/p5-Crypt-SSLeay/Makefile +++ b/security/p5-Crypt-SSLeay/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2001/12/26 16:13:18 kevlo Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/15 17:58:50 espie Exp $ COMMENT= "library to provide LWP https support via OpenSSL" @@ -7,8 +7,7 @@ PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.503 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Crypt +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} MAINTAINER= Anil Madhavapeddy diff --git a/security/p5-Crypt-Twofish/Makefile b/security/p5-Crypt-Twofish/Makefile index bcdba12ce35..802b39bd579 100644 --- a/security/p5-Crypt-Twofish/Makefile +++ b/security/p5-Crypt-Twofish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/21 21:25:51 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 17:58:50 espie Exp $ COMMENT= "module to implement the Twofish cipher" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Crypt +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} CONFIGURE_STYLE= perl diff --git a/security/p5-Digest-HMAC/Makefile b/security/p5-Digest-HMAC/Makefile index 41b1ba79a78..92b759e76ad 100644 --- a/security/p5-Digest-HMAC/Makefile +++ b/security/p5-Digest-HMAC/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/02/08 06:56:48 kevlo Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/15 17:58:50 espie Exp $ COMMENT= "interface to HMAC Message-Digest Algorithms" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Digest +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/} BUILD_DEPENDS= ::security/p5-Digest-MD5 \ ::security/p5-Digest-SHA1 diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile index 810502b99d6..ad8907b1c1a 100644 --- a/security/p5-Digest-MD5/Makefile +++ b/security/p5-Digest-MD5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/12/25 09:49:56 kevlo Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/15 17:58:50 espie Exp $ COMMENT= "module to calculate digests" @@ -6,8 +6,7 @@ DISTNAME= Digest-MD5-2.16 PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.503 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Digest +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/} MAINTAINER= Benjamin Lerman diff --git a/security/p5-Digest-SHA1/Makefile b/security/p5-Digest-SHA1/Makefile index b43089d7fca..262ec4590ab 100644 --- a/security/p5-Digest-SHA1/Makefile +++ b/security/p5-Digest-SHA1/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2002/02/08 08:55:08 kevlo Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 17:58:50 espie Exp $ COMMENT= "module to calculate SHA1 digests" @@ -7,8 +7,7 @@ DISTNAME= Digest-SHA1-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.503 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Digest +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/} MAINTAINER= Marc Matteo diff --git a/security/p5-GPG/Makefile b/security/p5-GPG/Makefile index 63bf17f98bd..ba7638cfd4c 100644 --- a/security/p5-GPG/Makefile +++ b/security/p5-GPG/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/03/30 17:54:04 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/15 17:58:50 espie Exp $ COMMENT= "perl5 interface to GnuPG using scalars" @@ -7,8 +7,7 @@ DISTNAME= GPG-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= ../../authors/id/M/MI/MILES +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MI/MILES} BUILD_DEPENDS= :gnupg-*:security/gnupg RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile index 70c051bc9a1..1b7ffe61a20 100644 --- a/security/p5-GnuPG-Interface/Makefile +++ b/security/p5-GnuPG-Interface/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/03/21 21:25:51 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/15 17:58:50 espie Exp $ COMMENT= "perl5 interface to GnuPG" @@ -7,8 +7,7 @@ DISTNAME= GnuPG-Interface-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= GnuPG +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GnuPG/} BUILD_DEPENDS= ::devel/p5-Class-MethodMaker RUN_DEPENDS= ::devel/p5-Class-MethodMaker \ diff --git a/security/p5-GnuPG/Makefile b/security/p5-GnuPG/Makefile index 9a0c2f9d93c..5a240d5bbfa 100644 --- a/security/p5-GnuPG/Makefile +++ b/security/p5-GnuPG/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/11/13 22:13:24 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/15 17:58:50 espie Exp $ COMMENT= "perl5 interface to GnuPG" @@ -7,8 +7,7 @@ DISTNAME= GnuPG-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.496 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= GnuPG +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GnuPG/} RUN_DEPENDS= :gnupg-*:security/gnupg diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile index 1bf5fcc6868..7f4117f1d74 100644 --- a/security/p5-IO-Socket-SSL/Makefile +++ b/security/p5-IO-Socket-SSL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/04/18 14:20:08 shell Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 17:58:50 espie Exp $ COMMENT= "perl interface to SSL sockets" @@ -8,8 +8,7 @@ PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.524 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= IO +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=IO/} MAINTAINER= Shell Hung diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile index cc4902a4dd5..ea0d43e5ca2 100644 --- a/security/p5-MD5/Makefile +++ b/security/p5-MD5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:51 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:50 espie Exp $ COMMENT= "interface to md5 message-digest algorithm" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= MD5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=MD5/} CONFIGURE_STYLE= perl diff --git a/security/p5-Net_SSLeay/Makefile b/security/p5-Net_SSLeay/Makefile index b7028153bea..30b4254b3d4 100644 --- a/security/p5-Net_SSLeay/Makefile +++ b/security/p5-Net_SSLeay/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2002/04/18 14:16:50 shell Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/15 17:58:50 espie Exp $ COMMENT= "perl module for using OpenSSL" @@ -9,8 +9,7 @@ CATEGORIES= security perl5 NEED_VERSION= 1.524 HOMEPAGE= http://www.bacus.pt/Net_SSLeay/index.html -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Net +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/} MAINTAINER= Shell Hung diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile index 06c054ccb3b..674143c9f67 100644 --- a/security/p5-PGP-Sign/Makefile +++ b/security/p5-PGP-Sign/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:51 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:50 espie Exp $ COMMENT= "perl module to create/verify PGP signatures" @@ -6,8 +6,7 @@ DISTNAME= PGP-Sign-0.16 PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= PGP +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=PGP/} MAINTAINER= Shell Hung diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile index b9ccaa45c33..4cd119f069c 100644 --- a/security/py-cryptkit/Makefile +++ b/security/py-cryptkit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2002/02/15 19:53:43 matt Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 17:58:50 espie Exp $ COMMENT= "python Cryptographic Toolkit" @@ -18,8 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= cryptkit +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cryptkit/} PYTHON_VER= 2.1 diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile index 89df702f151..f34dc099107 100644 --- a/security/py-gnupg/Makefile +++ b/security/py-gnupg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/02/15 19:53:43 matt Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 17:58:50 espie Exp $ COMMENT= "python module for GnuPG interface" @@ -18,8 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= py-gnupg +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=py-gnupg/} PYTHON_VER= 2.1 diff --git a/security/py-sslwrapper/Makefile b/security/py-sslwrapper/Makefile index 7d142769b3f..066fd43bc86 100644 --- a/security/py-sslwrapper/Makefile +++ b/security/py-sslwrapper/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/02/15 19:53:43 matt Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:50 espie Exp $ COMMENT= "OpenSSL Wrappers for Python" @@ -17,8 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= pow +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pow/} PYTHON_VER= 2.1 diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index c198a318008..a377e57f129 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/09/28 06:02:15 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 17:58:50 espie Exp $ COMMENT= "c++ compliant CGI applications libraries" @@ -6,8 +6,7 @@ DISTNAME= cgicc-3.1.5 CATEGORIES= www devel NEED_VERSION= 1.427 -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= cgicc +MASTER_SITES= ${MASTER_SITE_GNU:=cgicc/} HOMEPAGE= http://www.gnu.org/software/cgicc/cgicc.html diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile index dee90ee0452..5fd046c0ba2 100644 --- a/www/libghttp/Makefile +++ b/www/libghttp/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2001/04/09 23:06:53 avsm Exp $ +# $OpenBSD: Makefile,v 1.13 2002/05/15 17:58:50 espie Exp $ COMMENT= "GNOME http client library" DISTNAME= libghttp-1.0.9 CATEGORIES= www NEED_VERSION= 1.391 -MASTER_SITES= $(MASTER_SITE_GNOME) -MASTER_SITE_SUBDIR= stable/sources/libghttp +MASTER_SITES= $(MASTER_SITE_GNOME:=stable/sources/libghttp/) MAINTAINER= Brad Smith diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile index fb341477e08..7d5731915fb 100644 --- a/www/mod_perl/Makefile +++ b/www/mod_perl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2002/03/17 04:55:03 brad Exp $ +# $OpenBSD: Makefile,v 1.11 2002/05/15 17:58:50 espie Exp $ # This port currently only works with archs supporting dynamic loading # and has Apache that supports DSO's. @@ -10,8 +10,7 @@ DISTNAME= mod_perl-1.26 CATEGORIES= www perl5 NEED_VERSION= 1.500 MASTER_SITES= http://perl.apache.org/dist/ \ - ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Apache + ${MASTER_SITE_PERL_CPAN:=Apache/} HOMEPAGE= http://perl.apache.org/ diff --git a/www/netscape/Makefile.inc b/www/netscape/Makefile.inc index b9b26565014..70556ccab58 100644 --- a/www/netscape/Makefile.inc +++ b/www/netscape/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.14 2001/11/10 15:00:52 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.15 2002/05/15 17:58:50 espie Exp $ # # Relevant URLs: http://www.bsdi.com/netscape/ # http://www.fortify.net/ @@ -34,20 +34,20 @@ SUPPORTED?= unsupported CATEGORIES= www NEED_VERSION= 1.489 MASTER_SITES= \ - ftp://ftp.netscape.com/pub/%SUBDIR%/ \ - ftp://uiarchive.uiuc.edu/pub/www/netscape/%SUBDIR%/ \ - ftp://netscape.Mirror.McGill.CA/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ \ - ftp://ftp.the.net/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ \ - ftp://sunsite.doc.ic.ac.uk/packages/netscape/pub/%SUBDIR%/ \ - ftp://ftp-de.netscape.com/pub/%SUBDIR%/ \ - ftp://nic.funet.fi/pub/mirrors/ftp.netscape.com/pub/%SUBDIR%/ + ftp://ftp.netscape.com/pub/$S/ \ + ftp://uiarchive.uiuc.edu/pub/www/netscape/$S/ \ + ftp://netscape.Mirror.McGill.CA/pub/mirrors/ftp.netscape.com/pub/$S/ \ + ftp://ftp.the.net/pub/mirrors/ftp.netscape.com/pub/$S/ \ + ftp://sunsite.doc.ic.ac.uk/packages/netscape/pub/$S/ \ + ftp://ftp-de.netscape.com/pub/$S/ \ + ftp://nic.funet.fi/pub/mirrors/ftp.netscape.com/pub/$S/ MASTER_SITES0= \ - ftp://archive.netscape.com/pub/%SUBDIR%/ + ftp://archive.netscape.com/pub/$S/ MASTER_SITES1= ftp://ftp.fortify.net/pub/Fortify/ \ ftp://ftp.sunet.se/pub/security/tools/net/Fortify/ \ ftp://ftp.funet.fi/pub/crypt/mirrors/fortify/ \ ftp://ftp.it.net.au/mirrors/Fortify/ -MASTER_SITE_SUBDIR= communicator/english/${PROGRAM_V}/unix/${SUPPORTED}/${LOCATION} +S= communicator/english/${PROGRAM_V}/unix/${SUPPORTED}/${LOCATION} DIST_SUBDIR= netscape HOMEPAGE= http://www.netscape.com/ diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile index 9a4c4ad5433..c4fb5a92ae3 100644 --- a/www/p5-Apache-ASP/Makefile +++ b/www/p5-Apache-ASP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2002/03/22 08:49:29 peter Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/15 17:58:50 espie Exp $ COMMENT= "Apache ASP support" @@ -7,8 +7,7 @@ DISTNAME= Apache-ASP-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.496 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Apache +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} BUILD_DEPENDS= ::security/p5-Digest-MD5 \ ::devel/p5-MLDBM-Sync diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile index 8e519f48b62..55031ccaefd 100644 --- a/www/p5-Apache-DBI/Makefile +++ b/www/p5-Apache-DBI/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2001/11/13 22:13:25 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 17:58:50 espie Exp $ COMMENT= "DBI persistent connection, authentication and authorization" @@ -7,8 +7,7 @@ DISTNAME= ApacheDBI-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= www databases perl5 NEED_VERSION= 1.496 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Apache +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} RUN_DEPENDS= ::www/mod_perl \ ::databases/p5-DBI diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile index 1fb7ec30654..3e470d477ab 100644 --- a/www/p5-Apache-MP3/Makefile +++ b/www/p5-Apache-MP3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/05/02 19:02:10 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 17:58:50 espie Exp $ COMMENT= "mod_perl class for generating browsable MP3 directory lists" DISTNAME= Apache-MP3-2.22 @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Apache +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} BUILD_DEPENDS= :p5-MP3-Info-*:audio/p5-MP3-Info \ :p5-libvorbis-*:audio/p5-libvorbis diff --git a/www/p5-Blatte-HTML/Makefile b/www/p5-Blatte-HTML/Makefile index f0ad97cfc0c..1cd03bfcd96 100644 --- a/www/p5-Blatte-HTML/Makefile +++ b/www/p5-Blatte-HTML/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:50 espie Exp $ COMMENT= "Blatte functions to generate (X)HTML" @@ -10,8 +10,7 @@ CATEGORIES= www perl5 NEED_VERSION= 1.515 MAINTAINER= Brian J. Kifiak -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= ../by-authors/id/B/BO/BOBG/ +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/B/BO/BOBG/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile index 6e08c3babde..be773e603c8 100644 --- a/www/p5-CGI-XMLApplication/Makefile +++ b/www/p5-CGI-XMLApplication/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/01/01 15:25:32 shell Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 17:58:50 espie Exp $ COMMENT= "object oriented interface for CGI script applications" @@ -15,8 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= CGI +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/} BUILD_DEPENDS= ::textproc/p5-XML-LibXSLT RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile index 245c000479e..156e79554b4 100644 --- a/www/p5-CGI/Makefile +++ b/www/p5-CGI/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:50 espie Exp $ COMMENT= "modules for use in writing cgi scripts" @@ -17,8 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= CGI +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/} PERL_MODULES= ${LOCALBASE}/libdata/perl5/site_perl BUILD_DEPENDS= ::www/p5-libwww diff --git a/www/p5-HTML-Base/Makefile b/www/p5-HTML-Base/Makefile index 7379540247a..64bcaef6ef9 100644 --- a/www/p5-HTML-Base/Makefile +++ b/www/p5-HTML-Base/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:50 espie Exp $ COMMENT= "base HTML library" @@ -6,8 +6,7 @@ DISTNAME= HTML-0.6 PKGNAME= p5-HTML-Base-0.6 CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/www/p5-HTML-CGIChecker/Makefile b/www/p5-HTML-CGIChecker/Makefile index f6bd833c568..a42d6082d08 100644 --- a/www/p5-HTML-CGIChecker/Makefile +++ b/www/p5-HTML-CGIChecker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 17:58:50 espie Exp $ COMMENT= "perl module to detect dangerous HTML code" @@ -8,8 +8,7 @@ PKGNAME= p5-${DISTNAME} CATEGORIES= www security perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} MAINTAINER= Shell Hung diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile index 6757c0bfb4d..21efc125283 100644 --- a/www/p5-HTML-Embperl/Makefile +++ b/www/p5-HTML-Embperl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/15 17:58:50 espie Exp $ COMMENT= "embperl allows you to embed perl in your HTML documents" @@ -7,8 +7,7 @@ DISTNAME= HTML-Embperl-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} MAINTAINER= Peter Galbavy diff --git a/www/p5-HTML-Format/Makefile b/www/p5-HTML-Format/Makefile index 590d6f22766..2fbe341c442 100644 --- a/www/p5-HTML-Format/Makefile +++ b/www/p5-HTML-Format/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 17:58:50 espie Exp $ COMMENT= "HTML text formating class" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} BUILD_DEPENDS= ::www/p5-HTML-Tree RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile index acd0c105e20..cf728ad6ec9 100644 --- a/www/p5-HTML-FromText/Makefile +++ b/www/p5-HTML-FromText/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 17:58:50 espie Exp $ COMMENT= "convert text to HTML with controlling options" @@ -7,8 +7,7 @@ DISTNAME= HTML-FromText-${VERSION} PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} MAINTAINER= Peter Galbavy diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile index e959ab0f58e..69e98f8f4ed 100644 --- a/www/p5-HTML-Mason/Makefile +++ b/www/p5-HTML-Mason/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/15 17:58:50 espie Exp $ COMMENT= "high-performance dynamic web authoring system" @@ -6,8 +6,7 @@ DISTNAME= HTML-Mason-1.03 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} HOMEPAGE= http://www.masonhq.com/ MAINTAINER= Anil Madhavapeddy diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile index ba6e034b2c1..3df08d35691 100644 --- a/www/p5-HTML-Parser/Makefile +++ b/www/p5-HTML-Parser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2002/05/15 17:58:51 espie Exp $ COMMENT= "modules to parse and extract information from HTML" @@ -6,8 +6,7 @@ DISTNAME= HTML-Parser-3.25 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} BUILD_DEPENDS= ::www/p5-HTML-Tagset RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile index 8af0dc80570..613ef99fe38 100644 --- a/www/p5-HTML-Stream/Makefile +++ b/www/p5-HTML-Stream/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 17:58:51 espie Exp $ COMMENT= "HTML output stream class" @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} CONFIGURE_STYLE= perl diff --git a/www/p5-HTML-Table/Makefile b/www/p5-HTML-Table/Makefile index e1baa0562bf..708c25ef49b 100644 --- a/www/p5-HTML-Table/Makefile +++ b/www/p5-HTML-Table/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 17:58:51 espie Exp $ COMMENT= "generate HTML tables for cgi scripts" @@ -17,8 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://www.chime.ucl.ac.uk/~rmhiajp/ \ - ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML + ${MASTER_SITE_PERL_CPAN:=HTML/} CONFIGURE_STYLE= perl diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile index e1e9569805a..5a7733127ae 100644 --- a/www/p5-HTML-TableExtract/Makefile +++ b/www/p5-HTML-TableExtract/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:51 espie Exp $ COMMENT= "module to extract text contained within HTML tables" @@ -7,8 +7,7 @@ PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} PERL_MODULES= ${LOCALBASE}/libdata/perl5/site_perl BUILD_DEPENDS= ::www/p5-HTML-Parser diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile index 697a3b50dbf..ef403ab14c1 100644 --- a/www/p5-HTML-Tagset/Makefile +++ b/www/p5-HTML-Tagset/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/15 17:58:51 espie Exp $ COMMENT= "data tables useful for parsing HTML" @@ -6,8 +6,7 @@ DISTNAME= HTML-Tagset-3.03 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} MAINTAINER= Anil Madhavapeddy diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile index 0d93cf695bb..ec2caadf55b 100644 --- a/www/p5-HTML-Tree/Makefile +++ b/www/p5-HTML-Tree/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/15 17:58:51 espie Exp $ COMMENT= "perl parser that builds an HTML tree" @@ -6,8 +6,7 @@ DISTNAME= HTML-Tree-3.11 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTML +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} PERL_MODULES= ${LOCALBASE}/libdata/perl5/site_perl BUILD_DEPENDS= ::www/p5-HTML-Parser \ diff --git a/www/p5-HTTP-GHTTP/Makefile b/www/p5-HTTP-GHTTP/Makefile index 9b8313b19ad..756f2274d69 100644 --- a/www/p5-HTTP-GHTTP/Makefile +++ b/www/p5-HTTP-GHTTP/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/15 17:58:51 espie Exp $ COMMENT= "perl interface to the Gnome GHTTP library" @@ -6,8 +6,7 @@ DISTNAME= HTTP-GHTTP-1.06 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= HTTP +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTTP/} MAINTAINER= Anil Madhavapeddy diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile index 515c0d630db..8e090ebbe70 100644 --- a/www/p5-URI/Makefile +++ b/www/p5-URI/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/03/21 21:25:54 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 17:58:51 espie Exp $ COMMENT= "library to parse Uniform Resource Identifiers" @@ -6,8 +6,7 @@ DISTNAME= URI-1.17 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= URI +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=URI/} BUILD_DEPENDS= ::converters/p5-MIME-Base64 RUN_DEPENDS= ${BUILD_DEPENDS} diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile index 301328cd485..5e616a84780 100644 --- a/www/p5-libwww/Makefile +++ b/www/p5-libwww/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2001/12/27 22:06:38 avsm Exp $ +# $OpenBSD: Makefile,v 1.12 2002/05/15 17:58:51 espie Exp $ COMMENT= "library for WWW access in Perl" @@ -6,8 +6,7 @@ DISTNAME= libwww-perl-5.63 PKGNAME= p5-${DISTNAME:S/-perl-/-/} CATEGORIES= www perl5 NEED_VERSION= 1.502 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= LWP +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=LWP/} BUILD_DEPENDS= ::www/p5-URI \ ::www/p5-HTML-Parser \ diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 803b69221b3..e600ff9da34 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2002/04/07 00:54:46 naddy Exp $ +# $OpenBSD: Makefile,v 1.45 2002/05/15 17:58:51 espie Exp $ ONLY_FOR_ARCHS= alpha i386 m68k powerpc sparc @@ -19,8 +19,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= w3m +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=w3m/} MASTER_SITES0= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ SUPDISTFILES= w3m-${VERSION}${EXTRACT_SUFX} \ diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile index b910cc03f55..87c38226c80 100644 --- a/www/wwwcount/Makefile +++ b/www/wwwcount/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2001/03/29 09:56:41 form Exp $ +# $OpenBSD: Makefile,v 1.19 2002/05/15 17:58:51 espie Exp $ COMMENT= "access counter, clock and date for WWW pages" @@ -6,14 +6,15 @@ DISTNAME= wwwcount2.5 PKGNAME= wwwcount-2.5 CATEGORIES= www NEED_VERSION= 1.305 -MASTER_SITES= http://wwwcount.yeehaw.net/mirror/%SUBDIR%/ \ - http://mirror.njit.edu/counter/%SUBDIR%/ \ - http://www.neonramp.com/Count/%SUBDIR%/ \ - http://wwwcount.iinetwork.net/%SUBDIR%/ \ - http://www.jesterscastle.com/mirror/Count/%SUBDIR%/ \ - http://www.quiltersdream.com/Count/%SUBDIR%/ \ - http://muquit.com/muquit/software/Count/%SUBDIR%/ -MASTER_SITE_SUBDIR= src/wwwcount2.5 +MASTER_SITES= http://wwwcount.yeehaw.net/mirror/$S/ \ + http://mirror.njit.edu/counter/$S/ \ + http://www.neonramp.com/Count/$S/ \ + http://wwwcount.iinetwork.net/$S/ \ + http://www.jesterscastle.com/mirror/Count/$S/ \ + http://www.quiltersdream.com/Count/$S/ \ + http://muquit.com/muquit/software/Count/$S/ + +S= src/wwwcount2.5 # For digit images look at: # http://www.digitmania.holowww.com/ diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile index 6f91e281157..9464c926463 100644 --- a/x11/Xaw3d/Makefile +++ b/x11/Xaw3d/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2002/03/21 21:25:55 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2002/05/15 17:58:51 espie Exp $ COMMENT= "3D Athena Widget set that looks like Motif" DISTNAME= Xaw3d-1.5 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3 +MASTER_SITES= ${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 82898471cbb..83a543c12fe 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2002/03/17 22:24:18 jcs Exp $ +# $OpenBSD: Makefile,v 1.28 2002/05/15 17:58:51 espie Exp $ DISTNAME= aterm-0.4.2 CATEGORIES= x11 @@ -11,8 +11,7 @@ PERMIT_DISTFILES_FTP= Yes COMMENT= "color vt102 terminal emulator with transparency support" HOMEPAGE= http://aterm.sourceforge.net/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= aterm +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/} MAINTAINER= Joshua Stein diff --git a/x11/bbkeys/Makefile b/x11/bbkeys/Makefile index f8a9b88f6a2..7c924921eeb 100644 --- a/x11/bbkeys/Makefile +++ b/x11/bbkeys/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2002/01/28 02:57:49 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 17:58:51 espie Exp $ COMMENT= "X keygrabber for blackbox" DISTNAME= bbkeys-0.8.4 CATEGORIES= x11 NEED_VERSION= 1.504 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= bbkeys +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbkeys/} HOMEPAGE= http://bbkeys.sourceforge.net/ diff --git a/x11/bclock/Makefile b/x11/bclock/Makefile index 92ea6732478..a75aeca28f3 100644 --- a/x11/bclock/Makefile +++ b/x11/bclock/Makefile @@ -3,15 +3,14 @@ # Date created: 8 January 1998 # Whom: Don Schmidt # -# $OpenBSD: Makefile,v 1.10 2002/03/21 21:25:55 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2002/05/15 17:58:51 espie Exp $ COMMENT= "round, analog X11 clock with bezier curve hands" DISTNAME= bclock-1.0 CATEGORIES= x11 NEED_VERSION= 1.515 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= X11/clocks +MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/clocks/} PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/x11/blackbox/Makefile b/x11/blackbox/Makefile index 7291a5bfe04..004baacc9de 100644 --- a/x11/blackbox/Makefile +++ b/x11/blackbox/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.29 2002/04/28 17:15:55 brad Exp $ +# $OpenBSD: Makefile,v 1.30 2002/05/15 17:58:51 espie Exp $ COMMENT= "small & pretty window manager for 8 and more bits displays" DISTNAME= blackbox-0.62.1 CATEGORIES= x11 NEED_VERSION= 1.522 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= blackboxwm +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blackboxwm/} HOMEPAGE= http://blackboxwm.sourceforge.net/ diff --git a/x11/chbg/Makefile b/x11/chbg/Makefile index 89c125f05f8..0a73cb41235 100644 --- a/x11/chbg/Makefile +++ b/x11/chbg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2002/04/08 22:10:54 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/15 17:58:51 espie Exp $ COMMENT= "Desktop wallpaper manager and X11 screensaver" @@ -17,8 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= chbg +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=chbg/} LIB_DEPENDS= gdk_imlib.19::graphics/imlib diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile index a92116e734e..b87dd38987b 100644 --- a/x11/enlightenment/Makefile +++ b/x11/enlightenment/Makefile @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.28 2001/11/21 02:37:23 brad Exp $ +# $OpenBSD: Makefile,v 1.29 2002/05/15 17:58:51 espie Exp $ COMMENT= "themed window manager" DISTNAME= enlightenment-0.16.5 CATEGORIES= x11 NEED_VERSION= 1.489 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} \ ftp://ftp.squish.org/pub/enlightenment/enlightenment/ \ ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/ -MASTER_SITE_SUBDIR= enlightenment HOMEPAGE= http://www.enlightenment.org/ diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index d6ad8345984..6e20b5633dc 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2001/07/09 17:11:02 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.15 2002/05/15 17:58:51 espie Exp $ COMMENT= "color X11 terminal emulator with transparency support" COMMENT-kanji= "color japanese terminal emulator with transparency support" @@ -7,8 +7,7 @@ FULLPKGNAME-kanji= ja-eterm-0.8.10 DISTNAME= Eterm-0.8.10 CATEGORIES= x11 NEED_VERSION= 1.399 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= eterm +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/} HOMEPAGE= http://eterm.sourceforge.net/ diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile index ae139daa63a..c717cb77da5 100644 --- a/x11/fluxbox/Makefile +++ b/x11/fluxbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/05/06 19:22:24 brad Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/15 17:58:51 espie Exp $ COMMENT= "Blackbox-derived window manager with Gnome and KDE support" @@ -7,8 +7,7 @@ DISTNAME= fluxbox-${VERSION} PKGNAME= ${DISTNAME}p2 CATEGORIES= x11 NEED_VERSION= 1.522 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fluxbox +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} MASTER_SITES0= http://fluxbox.sourceforge.net/download/patches/ PATCHFILES= fluxbox-${VERSION}-bugfix1.patch:0 \ diff --git a/x11/fsv/Makefile b/x11/fsv/Makefile index 69b722545e3..7152f5d1a88 100644 --- a/x11/fsv/Makefile +++ b/x11/fsv/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2001/10/30 02:04:59 kevlo Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/15 17:58:51 espie Exp $ COMMENT= "3D filesystem visualizer" DISTNAME= fsv-0.9 CATEGORIES= x11 NEED_VERSION= 1.396 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fsv +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fsv/} HOMEPAGE= http://fsv.sourceforge.net