[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Update: Multiple ports in /usr/ports



I'll take care of the existing ports@ SUBDIR fixes.


jsyn

On Tue, May 14, 2002 at 12:21:19AM +0700, Jim Geovedi wrote:
> patch for some ports in /usr/ports, for MASTER_SITE_SUBDIR fix.
> 
> -- 
> JG -> jim_(_at_)_corebsd_(_dot_)_or_(_dot_)_id -> http://funky.corebsd.or.id
> 

> --- astro/jday/Makefile.orig	Mon May 13 22:35:11 2002
> +++ astro/jday/Makefile	Mon May 13 22:36:38 2002
> @@ -15,8 +15,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	jday
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=jday/}
>  
>  CONFIGURE_STYLE=	gnu
>  
> --- astro/kstars/Makefile.orig	Mon May 13 22:38:56 2002
> +++ astro/kstars/Makefile	Mon May 13 22:39:28 2002
> @@ -15,8 +15,7 @@
>  PERMIT_DISTFILES_CDROM=Yes
>  PERMIT_DISTFILES_FTP=  Yes
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	kstars
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kstars/}
>  
>  BUILD_DEPENDS=	::x11/qt2-designer \
>  		:zsh-*:shells/zsh/stable
> --- audio/p5-Audio-CD/Makefile.orig	Mon May 13 22:39:46 2002
> +++ audio/p5-Audio-CD/Makefile	Mon May 13 22:40:06 2002
> @@ -13,8 +13,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Audio
> +MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Audio/}
>  
>  CONFIGURE_STYLE= perl
>  CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> --- audio/aumix/Makefile.orig	Mon May 13 22:40:14 2002
> +++ audio/aumix/Makefile	Mon May 13 22:40:37 2002
> @@ -15,10 +15,9 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aumix/} \
>  		http://jpj.net/~trevor/aumix/ \
>  		http://jpj.net/~trevor/aumix/old/
> -MASTER_SITE_SUBDIR= aumix
>  
>  MODULES=	gettext
>  
> --- audio/flac/Makefile.orig	Mon May 13 22:41:40 2002
> +++ audio/flac/Makefile	Mon May 13 22:42:00 2002
> @@ -14,8 +14,8 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	flac
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
> +
>  EXTRACT_SUFX=		-src.tar.gz
>  
>  LIB_DEPENDS=	ogg.3::audio/libogg
> --- audio/gom/Makefile.orig	Mon May 13 22:42:53 2002
> +++ audio/gom/Makefile	Mon May 13 22:43:11 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	gom-0.29.103
>  CATEGORIES=     audio
>  NEED_VERSION=	1.305
> -MASTER_SITES=	${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR= apps/sound/mixers
> +MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
>  
>  
>  MAINTAINER=	Scott Robinson <scott_(_at_)_tranzoa_(_dot_)_com>
> --- audio/gqmpeg/Makefile.orig	Mon May 13 22:43:17 2002
> +++ audio/gqmpeg/Makefile	Mon May 13 22:43:41 2002
> @@ -16,8 +16,7 @@
>  PERMIT_DISTFILES_FTP=	Yes
>  
>  MASTER_SITES=		http://ftp1.sourceforge.net/gqmpeg/ \
> -			${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	gqmpeg
> +			${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
>  
>  MODULES=		gettext
>  BUILD_DEPENDS=		::audio/mpg123
> --- audio/lame/Makefile.orig	Mon May 13 22:43:47 2002
> +++ audio/lame/Makefile	Mon May 13 22:43:58 2002
> @@ -7,8 +7,7 @@
>  DISTNAME=	lame-${VERSION}
>  CATEGORIES=	audio
>  NEED_VERSION=	1.507
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= lame
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/}
>  
>  HOMEPAGE=	http://www.mp3dev.org/
>  
> --- audio/libcdaudio/Makefile.orig	Mon May 13 22:44:04 2002
> +++ audio/libcdaudio/Makefile	Mon May 13 22:44:17 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	libcdaudio
> +MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=libcdaudio/}
>  
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
> --- audio/lopster/Makefile.orig	Mon May 13 22:44:26 2002
> +++ audio/lopster/Makefile	Mon May 13 22:44:39 2002
> @@ -5,8 +5,7 @@
>  CATEGORIES=	audio
>  NEED_VERSION=	1.500
>  MASTER_SITES=	http://lopster.sourceforge.net/download/ \
> -		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= lopster
> +		${MASTER_SITE_SOURCEFORGE:=lopster/}
>  
>  HOMEPAGE=	http://lopster.sourceforge.net
>  
> --- audio/mad/Makefile.orig	Mon May 13 22:44:46 2002
> +++ audio/mad/Makefile	Mon May 13 22:45:08 2002
> @@ -17,8 +17,7 @@
>  PERMIT_DISTFILES_FTP=   Yes
>  
>  MASTER_SITES=	ftp://ftp.mars.org/pub/mpeg/ \
> -		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= mad
> +		${MASTER_SITE_SOURCEFORGE:=mad/}
>  
>  MODULES=	gettext
>  
> --- audio/mp3info/Makefile.orig	Mon May 13 22:45:14 2002
> +++ audio/mp3info/Makefile	Mon May 13 22:45:27 2002
> @@ -5,8 +5,7 @@
>  CATEGORIES=	audio
>  NEED_VERSION=	1.364
>  MASTER_SITES=	ftp://bimbo.hive.no/pub/mp3info/ \
> -		${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR= apps/sound/editors
> +		${MASTER_SITE_SUNSITE:=apps/sound/editors/}
>  
>  MAINTAINER=	Angelos D. Keromytis <angelos_(_at_)_openbsd_(_dot_)_org>
>  
> --- audio/mpg321/Makefile.orig	Mon May 13 22:45:36 2002
> +++ audio/mpg321/Makefile	Mon May 13 22:45:48 2002
> @@ -15,8 +15,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	mpg321
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mpg321/}
>  
>  LIB_DEPENDS=	ao.3::audio/libao \
>  		mad.1,id3tag.1::audio/mad
> --- audio/nap/Makefile.orig	Mon May 13 22:45:54 2002
> +++ audio/nap/Makefile	Mon May 13 22:46:07 2002
> @@ -16,11 +16,10 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nap/} \
>  		http://quasar.mathstat.uottawa.ca/~selinger/nap/ \
>  		http://theory.stanford.edu/~selinger/nap/
>  	      	
> -MASTER_SITE_SUBDIR= nap
>  
>  SEPARATE_BUILD=	concurrent
>  CONFIGURE_STYLE= gnu
> --- audio/nspmod/Makefile.orig	Mon May 13 22:46:14 2002
> +++ audio/nspmod/Makefile	Mon May 13 22:46:30 2002
> @@ -5,8 +5,7 @@
>  CATEGORIES=	audio
>  NEED_VERSION=	1.515
>  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=	Angelos D. Keromytis <angelos_(_at_)_openbsd_(_dot_)_org>
>  
> --- audio/opennap/Makefile.orig	Mon May 13 22:46:35 2002
> +++ audio/opennap/Makefile	Mon May 13 22:46:46 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	opennap-0.42
>  CATEGORIES=	audio net
>  NEED_VERSION=	1.413
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= opennap
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opennap/}
>  
>  HOMEPAGE=	http://opennap.sourceforge.net/
>  
> --- audio/p5-MP3-ID3v1Tag/Makefile.orig	Mon May 13 22:46:53 2002
> +++ audio/p5-MP3-ID3v1Tag/Makefile	Mon May 13 22:47:07 2002
> @@ -13,8 +13,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= MP3
> +MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=MP3/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- audio/p5-MP3-Info/Makefile.orig	Mon May 13 22:47:12 2002
> +++ audio/p5-MP3-Info/Makefile	Mon May 13 22:47:24 2002
> @@ -5,8 +5,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	audio perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} 
> -MASTER_SITE_SUBDIR= mp3-info
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3-info/} 
>  
>  HOMEPAGE=	http://sourceforge.net/projects/mp3-info/
>  
> --- audio/sox/Makefile.orig	Mon May 13 22:47:31 2002
> +++ audio/sox/Makefile	Mon May 13 22:47:48 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	sox
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sox/}
>  
>  SEPARATE_BUILD=	concurrent
>  CONFIGURE_STYLE= autoconf
> --- audio/workman/Makefile.orig	Mon May 13 22:48:39 2002
> +++ audio/workman/Makefile	Mon May 13 22:48:52 2002
> @@ -5,8 +5,7 @@
>  PKGNAME=	${DISTNAME:L}
>  CATEGORIES=	audio
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_XCONTRIB}
> -MASTER_SITE_SUBDIR= applications/WorkMan
> +MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/WorkMan/}
>  
>  PERMIT_PACKAGE_CDROM=	Yes
>  PERMIT_PACKAGE_FTP=	Yes
> --- audio/xhippo/Makefile.orig	Mon May 13 22:49:00 2002
> +++ audio/xhippo/Makefile	Mon May 13 22:49:14 2002
> @@ -15,8 +15,7 @@
>  PERMIT_DISTFILES_CDROM=Yes
>  PERMIT_DISTFILES_FTP=  Yes
>  
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR=	xhippo
> +MASTER_SITES=	${MASTER_SITE_GNU:=xhippo/}
>  
>  LIB_DEPENDS=	gtk.1.2,gdk.1.2::x11/gtk+
>  
> --- audio/xmix/Makefile.orig	Mon May 13 22:49:40 2002
> +++ audio/xmix/Makefile	Mon May 13 22:49:51 2002
> @@ -5,7 +5,6 @@
>  CATEGORIES=	audio
>  NEED_VERSION=	1.515
>  MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
> -MASTER_SITE_SUBDIR=	apps/sound/mixers
>  
>  PATCHFILES=		xmix-2.1.mixers.patch
>  
> --- audio/xmp/Makefile.orig	Mon May 13 22:50:15 2002
> +++ audio/xmp/Makefile	Mon May 13 22:50:27 2002
> @@ -4,8 +4,7 @@
>  DISTNAME=	xmp-1.1.5
>  CATEGORIES=	audio
>  NEED_VERSION=	1.363
> -MASTER_SITES=	${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR= apps/sound/players
> +MASTER_SITES=	${MASTER_SITE_SUNSITE:apps/sound/players/}
>  
>  # GPL
>  PERMIT_PACKAGE_CDROM=	Yes
> --- audio/libmikmod/Makefile.orig	Mon May 13 22:51:13 2002
> +++ audio/libmikmod/Makefile	Mon May 13 22:51:26 2002
> @@ -18,8 +18,7 @@
>  PERMIT_DISTFILES_FTP=	Yes
>  
>  MASTER_SITES=	${HOMEPAGE}/files/libmikmod/ \
> -		${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR=apps/sound/libs
> +		${MASTER_SITE_SUNSITE:=apps/sound/libs/}
>  
>  PATCH_LIST=     ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \
>                  ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \
> --- audio/xmms-flac/Makefile.orig	Mon May 13 22:51:47 2002
> +++ audio/xmms-flac/Makefile	Mon May 13 22:51:58 2002
> @@ -18,8 +18,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	flac
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
>  
>  LIB_DEPENDS=	xmms.2::audio/xmms \
>  		FLAC.2::audio/flac
> --- audio/p5-CDDB_get/Makefile.orig	Mon May 13 22:52:02 2002
> +++ audio/p5-CDDB_get/Makefile	Mon May 13 22:52:42 2002
> @@ -9,8 +9,7 @@
>  
>  HOMEPAGE= 		http://armin.emx.at/cddb/
>  
> -MASTER_SITES= 		${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR=	../by-authors/id/F/FO/FONKIE
> +MASTER_SITES= 		${MASTER_SITE_PERL_CPAN:=../by-authors/id/F/FO/FONKIE/}
>  
>  MAINTAINER=     	Felix Kronlage <fkr_(_at_)_grummel_(_dot_)_net>	
>  
> --- converters/p5-Convert-UU/Makefile.orig	Mon May 13 22:53:45 2002
> +++ converters/p5-Convert-UU/Makefile	Mon May 13 22:54:01 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-Convert-UU-0.40
>  CATEGORIES=	converters perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Convert
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Convert/}
>  
>  MAINTAINER=	Angelos D. Keromytis <angelos_(_at_)_openbsd_(_dot_)_org>
>  
> --- converters/libiconv/Makefile.orig	Mon May 13 22:54:07 2002
> +++ converters/libiconv/Makefile	Mon May 13 22:54:19 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	libiconv-1.7
>  CATEGORIES=	converters devel
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= libiconv
> +MASTER_SITES=	${MASTER_SITE_GNU:libiconv/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/libiconv/
>  
> --- converters/mimepp/Makefile.orig	Mon May 13 22:54:25 2002
> +++ converters/mimepp/Makefile	Mon May 13 22:54:35 2002
> @@ -13,8 +13,7 @@
>  PERMIT_DISTFILES_CDROM=	"restrictive non-commercial license"
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR=	devel/lang/c++
> +MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/c++/}
>  
>  MAKE_FILE=		makefile.unx
>  ALL_TARGET=		lib
> --- converters/p5-Convert-ASN1/Makefile.orig	Mon May 13 22:54:45 2002
> +++ converters/p5-Convert-ASN1/Makefile	Mon May 13 22:54:56 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Convert
> +MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Convert/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- converters/p5-Convert-BER/Makefile.orig	Mon May 13 22:55:01 2002
> +++ converters/p5-Convert-BER/Makefile	Mon May 13 22:55:12 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Convert
> +MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Convert/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- converters/p5-MIME-Base64/Makefile.orig	Mon May 13 22:55:16 2002
> +++ converters/p5-MIME-Base64/Makefile	Mon May 13 22:55:26 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	converters perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= MIME
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MIME/}
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
>  
> --- converters/p5-Text-Iconv/Makefile.orig	Mon May 13 22:55:32 2002
> +++ converters/p5-Text-Iconv/Makefile	Mon May 13 22:55:42 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Text
> +MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Text/}
>  
>  MODULES=	iconv
>  
> --- converters/p5-Unicode-Map8/Makefile.orig	Mon May 13 22:55:49 2002
> +++ converters/p5-Unicode-Map8/Makefile	Mon May 13 22:55:59 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Unicode
> +MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Unicode/}
>  
>  BUILD_DEPENDS=	::converters/p5-Unicode-String
>  
> --- converters/p5-Unicode-String/Makefile.orig	Mon May 13 22:56:06 2002
> +++ converters/p5-Unicode-String/Makefile	Mon May 13 22:56:15 2002
> @@ -14,7 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Unicode/}
>  MASTER_SITE_SUBDIR= Unicode
>  
>  BUILD_DEPENDS=	::converters/p5-MIME-Base64
> --- converters/recode/Makefile.orig	Mon May 13 22:56:19 2002
> +++ converters/recode/Makefile	Mon May 13 22:56:29 2002
> @@ -16,8 +16,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= recode
> +MASTER_SITES=	${MASTER_SITE_GNU:=recode/}
>  
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ARGS=	--without-included-gettext
> --- converters/wv/Makefile.orig	Mon May 13 22:56:35 2002
> +++ converters/wv/Makefile	Mon May 13 22:56:48 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	wv-0.6.5
>  CATEGORIES=	converters
>  NEED_VERSION=	1.460
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= wvware
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wvware/}
>  
>  HOMEPAGE=	http://www.wvware.com/
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
> --- converters/p5-DateManip/Makefile.orig	Mon May 13 22:56:53 2002
> +++ converters/p5-DateManip/Makefile	Mon May 13 22:57:03 2002
> @@ -5,8 +5,7 @@
>  PKGNAME=	p5-DateManip-5.40
>  CATEGORIES=	converters perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Date
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
>  
>  HOMEPAGE=	http://www.cise.ufl.edu/~sbeck/
>  
> --- databases/p5-ldap/Makefile.orig	Mon May 13 22:57:15 2002
> +++ databases/p5-ldap/Makefile	Mon May 13 22:57:25 2002
> @@ -8,8 +8,7 @@
>  CATEGORIES=	databases perl5
>  NEED_VERSION=	1.515
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR=	Net
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
>  
>  HOMEPAGE=	http://perl-ldap.sourceforge.net/
>  
> --- databases/freetds/Makefile.orig	Mon May 13 22:58:26 2002
> +++ databases/freetds/Makefile	Mon May 13 22:58:38 2002
> @@ -11,8 +11,7 @@
>  
>  COMMENT=	"project to document and implement the TDS protocol"
>  HOMEPAGE=	http://www.freetds.org/
> -MASTER_SITES=	${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR= ALPHA/freetds
> +MASTER_SITES=	${MASTER_SITE_SUNSITE:=ALPHA/freetds/}
>  EXTRACT_SUFX=	.tgz
>  
>  MAINTAINER=	Joshua Stein <jcs_(_at_)_rt_(_dot_)_fm>
> --- databases/gdbm/Makefile.orig	Mon May 13 22:58:42 2002
> +++ databases/gdbm/Makefile	Mon May 13 22:58:52 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	gdbm-1.8.0
>  CATEGORIES=	databases
>  NEED_VERSION=	1.402
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= gdbm
> +MASTER_SITES=	${MASTER_SITE_GNU:=gdbm/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/gdbm/
>  
> --- databases/gnats/Makefile.orig	Mon May 13 22:59:01 2002
> +++ databases/gnats/Makefile	Mon May 13 22:59:19 2002
> @@ -4,8 +4,7 @@
>  
>  DISTNAME=	gnats-3.113.1
>  CATEGORIES=	databases devel
> -MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
> -MASTER_SITE_SUBDIR=gnats/snapshots
> +MASTER_SITES=	${MASTER_SITE_SOURCEWARE:=gnats/snapshots/}
>  HOMEPAGE=	http://sources.redhat.com/gnats/
>  MAINTAINER=	Dug Song <dugsong_(_at_)_monkey_(_dot_)_org>
>  NEED_VERSION=	1.444
> --- databases/p5-AsciiDB-TagFile/Makefile.orig	Mon May 13 22:59:57 2002
> +++ databases/p5-AsciiDB-TagFile/Makefile	Mon May 13 23:00:07 2002
> @@ -5,8 +5,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	databases perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= AsciiDB
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=AsciiDB/}
>  
>  MAINTAINER=	Marc Espie <espie_(_at_)_openbsd_(_dot_)_org>
>  
> --- databases/p5-DBI/Makefile.orig	Mon May 13 23:00:16 2002
> +++ databases/p5-DBI/Makefile	Mon May 13 23:00:28 2002
> @@ -7,8 +7,7 @@
>  CATEGORIES=	databases perl5
>  NEED_VERSION=	1.524
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= DBI
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBI/}
>  
>  HOMEPAGE=	http://dbi.perl.org/index.html
>  MAINTAINER=	Shell Hung <shell_(_at_)_openbsd_(_dot_)_org>
> --- databases/p5-DBIx-XHTML_Table/Makefile.orig	Mon May 13 23:00:33 2002
> +++ databases/p5-DBIx-XHTML_Table/Makefile	Mon May 13 23:00:44 2002
> @@ -8,8 +8,7 @@
>  CATEGORIES=	databases www perl5
>  NEED_VERSION=	1.525
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= DBIx
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
>  
>  MAINTAINER=	Shell Hung <shell_(_at_)_openbsd_(_dot_)_org>
>  
> --- databases/p5-SQL-Statement/Makefile.orig	Mon May 13 23:00:54 2002
> +++ databases/p5-SQL-Statement/Makefile	Mon May 13 23:01:03 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= SQL
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SQL/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- databases/p5-Tie-DBI/Makefile.orig	Mon May 13 23:01:07 2002
> +++ databases/p5-Tie-DBI/Makefile	Mon May 13 23:01:22 2002
> @@ -17,8 +17,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR=	Tie
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tie/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- databases/py-mysql/Makefile.orig	Mon May 13 23:01:26 2002
> +++ databases/py-mysql/Makefile	Mon May 13 23:01:38 2002
> @@ -8,8 +8,7 @@
>  CATEGORIES=		databases
>  NEED_VERSION=		1.515
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	mysql-python
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mysql-python/}
>  
>  HOMEPAGE=		http://dustman.net/andy/python/MySQLdb/
>  
> --- databases/p5-DBD-Pg/Makefile.orig	Mon May 13 23:01:44 2002
> +++ databases/p5-DBD-Pg/Makefile	Mon May 13 23:01:59 2002
> @@ -7,8 +7,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	databases perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= DBD
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
>  
>  LIB_DEPENDS=	pq.2::databases/postgresql
>  BUILD_DEPENDS=	::databases/p5-DBI
> --- devel/p5-Algorithm-Permute/Makefile.orig	Mon May 13 23:02:04 2002
> +++ devel/p5-Algorithm-Permute/Makefile	Mon May 13 23:02:19 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR=	Algorithm
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Algorithm/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/ElectricFence/Makefile.orig	Mon May 13 23:02:32 2002
> +++ devel/ElectricFence/Makefile	Mon May 13 23:02:50 2002
> @@ -5,8 +5,7 @@
>  PKGNAME=	electricfence-2.0.5
>  DISTNAME=	ElectricFence-2.0.5
>  CATEGORIES=	devel
> -MASTER_SITES=	${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR=	devel/lang/c
> +MASTER_SITES=	${MASTER_SITE_SUNSITE:=devel/lang/c/}
>  NEED_VERSION=	1.515
>  
>  MAINTAINER=	Niklas Hallqvist <niklas_(_at_)_openbsd_(_dot_)_org>
> --- devel/ORBit/Makefile.orig	Mon May 13 23:02:54 2002
> +++ devel/ORBit/Makefile	Mon May 13 23:03:04 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	ORBit-0.5.13
>  CATEGORIES=	devel
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_GNOME}
> -MASTER_SITE_SUBDIR= stable/sources/ORBit
> +MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/ORBit/}
>  
>  HOMEPAGE=	http://www.labs.redhat.com/orbit/
>  
> --- devel/astyle/Makefile.orig	Mon May 13 23:03:08 2002
> +++ devel/astyle/Makefile	Mon May 13 23:03:22 2002
> @@ -15,8 +15,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	astyle
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=astyle/}
>  EXTRACT_SUFX=		.zip
>  USE_GMAKE=		Yes
>  ALL_TARGET=		astyle
> --- devel/bison/Makefile.orig	Mon May 13 23:03:28 2002
> +++ devel/bison/Makefile	Mon May 13 23:03:38 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=       bison-1.32
>  CATEGORIES=	devel
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= bison
> +MASTER_SITES=	${MASTER_SITE_GNU:=bison/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/bison/
>  
> --- devel/cscope/Makefile.orig	Mon May 13 23:04:00 2002
> +++ devel/cscope/Makefile	Mon May 13 23:04:11 2002
> @@ -16,8 +16,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	cscope
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cscope/}
>  
>  CONFIGURE_STYLE=	autoconf
>  NEW_AUTOCONF=		Yes
> --- devel/cvsweb/Makefile.orig	Mon May 13 23:05:01 2002
> +++ devel/cvsweb/Makefile	Mon May 13 23:05:15 2002
> @@ -16,9 +16,8 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_FREEBSD_LOCAL} \
> +MASTER_SITES=		${MASTER_SITE_FREEBSD_LOCAL:=knu/} \
>  			http://www.iDaemons.org/distfiles/
> -MASTER_SITE_SUBDIR=	knu
>  
>  NO_BUILD=	Yes
>  NO_REGRESS=	Yes
> --- devel/ddd/Makefile.orig	Mon May 13 23:05:20 2002
> +++ devel/ddd/Makefile	Mon May 13 23:05:31 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	ddd-3.3
>  CATEGORIES=	devel
>  NEED_VERSION=	1.402
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= ddd
> +MASTER_SITES=	${MASTER_SITE_GNU:=ddd/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/ddd/
>  
> --- devel/dejagnu/Makefile.orig	Mon May 13 23:05:34 2002
> +++ devel/dejagnu/Makefile	Mon May 13 23:05:45 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	dejagnu-1.3
>  CATEGORIES=	devel
>  NEED_VERSION=	1.474
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= dejagnu
> +MASTER_SITES=	${MASTER_SITE_GNU:=dejagnu/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/dejagnu/
>  
> --- devel/doc++/Makefile.orig	Mon May 13 23:05:49 2002
> +++ devel/doc++/Makefile	Mon May 13 23:06:05 2002
> @@ -15,8 +15,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	docpp
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docpp/}
>  
>  RUN_DEPENDS=	:ghostscript-*:print/ghostscript/gnu \
>  		:teTeX_base-*:print/teTeX/base
> --- devel/ectags/Makefile.orig	Mon May 13 23:06:09 2002
> +++ devel/ectags/Makefile	Mon May 13 23:06:17 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=		e${DISTNAME}
>  CATEGORIES=		devel
>  NEED_VERSION=		1.402
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	ctags
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ctags/}
>  
>  HOMEPAGE=		http://ctags.sourceforge.net/
>  
> --- devel/gconf/Makefile.orig	Mon May 13 23:06:31 2002
> +++ devel/gconf/Makefile	Mon May 13 23:06:44 2002
> @@ -9,8 +9,7 @@
>  HOMEPAGE=		http://www.gnome.org
>  MAINTAINER=		Nils Nordman <nino_(_at_)_nforced_(_dot_)_com>
>  
> -MASTER_SITES=		${MASTER_SITE_GNOME}
> -MASTER_SITE_SUBDIR= 	stable/sources/GConf
> +MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/GConf/}
>  EXTRACT_SUFX=           .tar.bz2
>  
>  LIB_DEPENDS=		oaf.::x11/gnome/oaf \
> --- devel/gettext/Makefile.orig	Mon May 13 23:06:54 2002
> +++ devel/gettext/Makefile	Mon May 13 23:07:05 2002
> @@ -6,8 +6,7 @@
>  DISTNAME=	gettext-0.10.40
>  CATEGORIES=	devel
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= gettext
> +MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/gettext/
>  
> --- devel/gindent/Makefile.orig	Mon May 13 23:07:17 2002
> +++ devel/gindent/Makefile	Mon May 13 23:07:27 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	indent-2.2.6
>  CATEGORIES=	devel
>  NEED_VERSION=	1.402
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= indent
> +MASTER_SITES=	${MASTER_SITE_GNU:=indent/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/indent/
>  
> --- devel/glade/Makefile.orig	Mon May 13 23:07:32 2002
> +++ devel/glade/Makefile	Mon May 13 23:07:41 2002
> @@ -9,8 +9,7 @@
>  
>  MAINTAINER=		Nils Nordman <nino_(_at_)_nforced_(_dot_)_com>
>  
> -MASTER_SITES=		${MASTER_SITE_GNOME}
> -MASTER_SITE_SUBDIR= 	stable/sources/glade
> +MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/glade/}
>  EXTRACT_SUFX=		.tar.bz2
>  
>  LIB_DEPENDS=		gtk.1.2,gdk.1.2::x11/gtk+
> --- devel/glib/Makefile.orig	Mon May 13 23:07:47 2002
> +++ devel/glib/Makefile	Mon May 13 23:08:00 2002
> @@ -6,8 +6,7 @@
>  DISTNAME=	glib-1.2.10
>  CATEGORIES=	devel
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_GNOME}
> -MASTER_SITE_SUBDIR= stable/sources/glib
> +MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/glib/}
>  
>  HOMEPAGE=	http://www.gtk.org/
>  
> --- devel/gmake/Makefile.orig	Mon May 13 23:08:05 2002
> +++ devel/gmake/Makefile	Mon May 13 23:08:15 2002
> @@ -5,8 +5,7 @@
>  PKGNAME=	gmake-3.79.1
>  CATEGORIES=	devel
>  NEED_VERSION=	1.460
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= make
> +MASTER_SITES=	${MASTER_SITE_GNU:=make/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/make/
>  
> --- devel/gmp/Makefile.orig	Mon May 13 23:08:20 2002
> +++ devel/gmp/Makefile	Mon May 13 23:08:29 2002
> @@ -6,8 +6,7 @@
>  CATEGORIES=	devel math
>  NEED_VERSION=	1.363
>  
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= gmp
> +MASTER_SITES=	${MASTER_SITE_GNU:=gmp/}
>  
>  HOMEPAGE=	http://www.swox.com/gmp/
>  
> --- devel/gperf/Makefile.orig	Mon May 13 23:08:36 2002
> +++ devel/gperf/Makefile	Mon May 13 23:08:49 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR=	gperf
> +MASTER_SITES=	${MASTER_SITE_GNU:=gperf/}
>  
>  # Don't use SEPARATE_BUILD, the doc doesn't like it
>  CONFIGURE_STYLE=	gnu
> --- devel/gsl/Makefile.orig	Mon May 13 23:09:05 2002
> +++ devel/gsl/Makefile	Mon May 13 23:09:18 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	gsl-0.6
>  CATEGORIES=	devel
>  NEED_VERSION=	1.444
> -MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
> -MASTER_SITE_SUBDIR=gsl
> +MASTER_SITES=	${MASTER_SITE_SOURCEWARE:=gsl/}
>  HOMEPAGE=	http://sources.redhat.com/gsl/
>  
>  MAINTAINER=	Bruno Rohee <rohee_(_at_)_openbsd_(_dot_)_org>
> --- devel/help2man/Makefile.orig	Mon May 13 23:09:28 2002
> +++ devel/help2man/Makefile	Mon May 13 23:09:37 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	help2man-1.24
>  CATEGORIES=	devel
>  NEED_VERSION=	1.435
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= help2man
> +MASTER_SITES=	${MASTER_SITE_GNU:=help2man/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/help2man/
>  
> --- devel/libavl/Makefile.orig	Mon May 13 23:09:59 2002
> +++ devel/libavl/Makefile	Mon May 13 23:10:10 2002
> @@ -17,8 +17,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=   ${MASTER_SITE_GNU} 
> -MASTER_SITE_SUBDIR=	avl
> +MASTER_SITES=   ${MASTER_SITE_GNU:=avl/} 
>  
>  CONFIGURE_STYLE= gnu
>  
> --- devel/libglade/Makefile.orig	Mon May 13 23:10:16 2002
> +++ devel/libglade/Makefile	Mon May 13 23:10:26 2002
> @@ -8,8 +8,7 @@
>  HOMEPAGE=		http://www.gnome.org
>  MAINTAINER=		Nils Nordman <nino_(_at_)_nforced_(_dot_)_com>
>  
> -MASTER_SITES=		${MASTER_SITE_GNOME}
> -MASTER_SITE_SUBDIR= 	stable/sources/libglade
> +MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/libglade/}
>  
>  # GPL
>  PERMIT_PACKAGE_CDROM=	Yes
> --- devel/libgtop/Makefile.orig	Mon May 13 23:10:30 2002
> +++ devel/libgtop/Makefile	Mon May 13 23:10:43 2002
> @@ -8,8 +8,7 @@
>  HOMEPAGE=		http://www.home-of-linux.org/gnome/libgtop/
>  MAINTAINER=		Nils Nordman <nino_(_at_)_nforced_(_dot_)_com>
>  
> -MASTER_SITES=		${MASTER_SITE_GNOME}
> -MASTER_SITE_SUBDIR= 	stable/sources/libgtop
> +MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/libgtop/}
>  
>  FLAVORS= 		gnome guile
>  FLAVOR?=
> --- devel/libproplist/Makefile.orig	Mon May 13 23:10:51 2002
> +++ devel/libproplist/Makefile	Mon May 13 23:11:05 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	libproplist-0.10.1
>  CATEGORIES=	devel
>  NEED_VERSION=	1.475
> -MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
> -MASTER_SITE_SUBDIR= libs
> +MASTER_SITES=	${MASTER_SITE_WINDOWMAKER:=libs/}
>  
>  HOMEPAGE=	http://www.windowmaker.org/
>  
> --- devel/libsigc++/Makefile.orig	Mon May 13 23:11:08 2002
> +++ devel/libsigc++/Makefile	Mon May 13 23:11:18 2002
> @@ -7,8 +7,7 @@
>  NEED_VERSION=	1.504
>  
>  HOMEPAGE=	http://libsigc.sf.net/
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	libsigc
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libsigc/}
>  
>  MAINTAINER=	Shell Hung <shell_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/libtool/Makefile.orig	Mon May 13 23:11:23 2002
> +++ devel/libtool/Makefile	Mon May 13 23:11:35 2002
> @@ -7,8 +7,7 @@
>  PKGNAME=	${DISTNAME}p3
>  CATEGORIES=	devel
>  NEED_VERSION=	1.460
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= libtool
> +MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/libtool/
>  
> --- devel/libusb/Makefile.orig	Mon May 13 23:11:41 2002
> +++ devel/libusb/Makefile	Mon May 13 23:11:51 2002
> @@ -16,8 +16,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= libusb
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libusb/}
>  
>  SEPARATE_BUILD=	concurrent
>  CONFIGURE_STYLE= gnu
> --- devel/libuta/Makefile.orig	Mon May 13 23:11:56 2002
> +++ devel/libuta/Makefile	Mon May 13 23:12:07 2002
> @@ -16,8 +16,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= libuta
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libuta/}
>  
>  PATCH_LIST=	${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \
>  		${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \
> --- devel/m4/Makefile.orig	Mon May 13 23:12:11 2002
> +++ devel/m4/Makefile	Mon May 13 23:12:23 2002
> @@ -6,8 +6,7 @@
>  DISTNAME=	m4-1.4
>  CATEGORIES=	devel
>  NEED_VERSION=	1.402
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= m4
> +MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/m4/
>  
> --- devel/nasm/Makefile.orig	Mon May 13 23:12:27 2002
> +++ devel/nasm/Makefile	Mon May 13 23:12:36 2002
> @@ -7,8 +7,7 @@
>  DISTNAME=	nasm-0.98
>  CATEGORIES=	devel lang
>  NEED_VERSION=	1.402
> -MASTER_SITES=	${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR= devel/lang/assemblers
> +MASTER_SITES=	${MASTER_SITE_SUNSITE:=devel/lang/assemblers/}
>  
>  HOMEPAGE=	http://www.web-sites.co.uk/nasm/
>  
> --- devel/p5-Algorithm-Diff/Makefile.orig	Mon May 13 23:12:39 2002
> +++ devel/p5-Algorithm-Diff/Makefile	Mon May 13 23:12:49 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Algorithm
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Algorithm/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Algorithm-MDiff/Makefile.orig	Mon May 13 23:12:53 2002
> +++ devel/p5-Algorithm-MDiff/Makefile	Mon May 13 23:13:03 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Algorithm
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Algorithm/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Algorithm-MarkovChain/Makefile.orig	Mon May 13 23:13:07 2002
> +++ devel/p5-Algorithm-MarkovChain/Makefile	Mon May 13 23:13:17 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Algorithm
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Algorithm/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-B-Graph/Makefile.orig	Mon May 13 23:13:24 2002
> +++ devel/p5-B-Graph/Makefile	Mon May 13 23:13:43 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= B
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=B/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-BSD-Resource/Makefile.orig	Mon May 13 23:13:47 2002
> +++ devel/p5-BSD-Resource/Makefile	Mon May 13 23:14:08 2002
> @@ -15,8 +15,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= BSD
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=BSD/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-C-Scan/Makefile.orig	Mon May 13 23:15:30 2002
> +++ devel/p5-C-Scan/Makefile	Mon May 13 23:15:42 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= C
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=C/}
>  
>  PERL_MODULES=	${LOCALBASE}/libdata/perl5/site_perl
>  BUILD_DEPENDS=	::devel/p5-Data-Flow
> --- devel/p5-Class-Date/Makefile.orig	Mon May 13 23:15:46 2002
> +++ devel/p5-Class-Date/Makefile	Mon May 13 23:16:04 2002
> @@ -16,8 +16,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Class
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Class/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Class-Loader/Makefile.orig	Mon May 13 23:16:28 2002
> +++ devel/p5-Class-Loader/Makefile	Mon May 13 23:16:41 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Class
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Class/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Class-MethodMaker/Makefile.orig	Mon May 13 23:16:46 2002
> +++ devel/p5-Class-MethodMaker/Makefile	Mon May 13 23:16:56 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Class
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Class/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Curses/Makefile.orig	Mon May 13 23:17:00 2002
> +++ devel/p5-Curses/Makefile	Mon May 13 23:17:11 2002
> @@ -7,8 +7,7 @@
>  
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Curses
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Curses/}
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/p5-Curses-Widgets/Makefile.orig	Mon May 13 23:17:23 2002
> +++ devel/p5-Curses-Widgets/Makefile	Mon May 13 23:17:31 2002
> @@ -7,8 +7,7 @@
>  
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.502
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Curses
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Curses/}
>  
>  HOMEPAGE=	http://www.odinicfoundation.org/arthur/
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
> --- devel/p5-Data-Flow/Makefile.orig	Mon May 13 23:17:36 2002
> +++ devel/p5-Data-Flow/Makefile	Mon May 13 23:17:51 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Data
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Data/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Date-Calc/Makefile.orig	Mon May 13 23:17:56 2002
> +++ devel/p5-Date-Calc/Makefile	Mon May 13 23:18:06 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.499
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Date
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/p5-Date-Handler/Makefile.orig	Mon May 13 23:18:12 2002
> +++ devel/p5-Date-Handler/Makefile	Mon May 13 23:18:21 2002
> @@ -7,8 +7,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.524
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Date
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
>  
>  MAINTAINER=	Shell Hung <shell_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/p5-Devel-SmallProf/Makefile.orig	Mon May 13 23:18:24 2002
> +++ devel/p5-Devel-SmallProf/Makefile	Mon May 13 23:18:38 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM=	Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR=	Devel
> +MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/}
>  
>  BUILD_DEPENDS=  	::devel/p5-Time-HiRes
>  RUN_DEPENDS=    	${BUILD_DEPENDS}
> --- devel/p5-File-Tail/Makefile.orig	Mon May 13 23:18:52 2002
> +++ devel/p5-File-Tail/Makefile	Mon May 13 23:19:04 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= File
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
>  
>  PERL_MODULES=	${LOCALBASE}/libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd
>  BUILD_DEPENDS=	::devel/p5-Time-HiRes
> --- devel/p5-FreezeThaw/Makefile.orig	Mon May 13 23:19:08 2002
> +++ devel/p5-FreezeThaw/Makefile	Mon May 13 23:19:18 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= FreezeThaw
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=FreezeThaw/}
>  
>  PERMIT_PACKAGE_CDROM=	Yes
>  PERMIT_PACKAGE_FTP=	Yes
> --- devel/p5-Net-Server/Makefile.orig	Mon May 13 23:28:12 2002
> +++ devel/p5-Net-Server/Makefile	Mon May 13 23:28:21 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel net perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Net
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/p5-Params-Validate/Makefile.orig	Mon May 13 23:28:51 2002
> +++ devel/p5-Params-Validate/Makefile	Mon May 13 23:29:02 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR=  Attribute
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Attribute/}
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/p5-Parse-RecDescent/Makefile.orig	Mon May 13 23:29:09 2002
> +++ devel/p5-Parse-RecDescent/Makefile	Mon May 13 23:29:21 2002
> @@ -6,7 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Parse/}
>  MASTER_SITE_SUBDIR= Parse
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
> --- devel/p5-Set-Scalar/Makefile.orig	Mon May 13 23:29:30 2002
> +++ devel/p5-Set-Scalar/Makefile	Mon May 13 23:29:41 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Set
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Set/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Storable/Makefile.orig	Mon May 13 23:29:45 2002
> +++ devel/p5-Storable/Makefile	Mon May 13 23:29:54 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Storable
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Storable/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Test-Simple/Makefile.orig	Mon May 13 23:30:19 2002
> +++ devel/p5-Test-Simple/Makefile	Mon May 13 23:30:29 2002
> @@ -8,8 +8,7 @@
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.525
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Test
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
>  
>  MAINTAINER=	Shell Hung <shell_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/p5-Time-HiRes/Makefile.orig	Mon May 13 23:30:37 2002
> +++ devel/p5-Time-HiRes/Makefile	Mon May 13 23:30:46 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-Time-HiRes-1.20
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Time
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Time/}
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/p5-Time-TimeDate/Makefile.orig	Mon May 13 23:30:53 2002
> +++ devel/p5-Time-TimeDate/Makefile	Mon May 13 23:31:08 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-Time-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Time
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Time/}
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/pcre/Makefile.orig	Mon May 13 23:31:38 2002
> +++ devel/pcre/Makefile	Mon May 13 23:31:50 2002
> @@ -6,8 +6,7 @@
>  CATEGORIES=	devel
>  NEED_VERSION=	1.508
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= pcre
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcre/}
>  
>  HOMEPAGE=	http://www.pcre.org/
>  
> --- devel/perltidy/Makefile.orig	Mon May 13 23:33:47 2002
> +++ devel/perltidy/Makefile	Mon May 13 23:33:58 2002
> @@ -5,8 +5,8 @@
>  DISTNAME=	perltidy-20010328
>  CATEGORIES=	devel
>  NEED_VERSION=	1.515
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= perltidy
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=perltidy/}
> +
>  EXTRACT_SUFX=	.tgz
>  
>  HOMEPAGE=	http://perltidy.sourceforge.net/
> --- devel/pth/Makefile.orig	Mon May 13 23:34:15 2002
> +++ devel/pth/Makefile	Mon May 13 23:34:24 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	pth-1.4.1
>  CATEGORIES=	devel
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= pth
> +MASTER_SITES=	${MASTER_SITE_GNU:=pth/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/pth/
>  
> --- devel/py-Checker/Makefile.orig	Mon May 13 23:34:33 2002
> +++ devel/py-Checker/Makefile	Mon May 13 23:34:43 2002
> @@ -19,8 +19,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	pychecker
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pychecker/}
>  
>  PYTHON_VER=	2.2
>  
> --- devel/py-unit/Makefile.orig	Mon May 13 23:34:47 2002
> +++ devel/py-unit/Makefile	Mon May 13 23:34:58 2002
> @@ -19,8 +19,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	pyunit
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pyunit/}
>  
>  FLAVORS=		no_x11
>  FLAVOR?=
> --- devel/sdlmm/Makefile.orig	Mon May 13 23:35:07 2002
> +++ devel/sdlmm/Makefile	Mon May 13 23:35:23 2002
> @@ -17,8 +17,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= sdlmm
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sdlmm/}
>  
>  LIB_DEPENDS=	SDL::devel/sdl
>  
> --- devel/shtool/Makefile.orig	Mon May 13 23:35:36 2002
> +++ devel/shtool/Makefile	Mon May 13 23:35:45 2002
> @@ -6,8 +6,7 @@
>  DISTNAME=	shtool-1.5.4
>  CATEGORIES=	devel
>  NEED_VERSION=	1.413
> -MASTER_SITES=	${MASTER_SITE_GNU}
> -MASTER_SITE_SUBDIR= shtool
> +MASTER_SITES=	${MASTER_SITE_GNU:=shtool/}
>  
>  HOMEPAGE=	http://www.gnu.org/software/shtool/
>  
> --- devel/swig/Makefile.orig	Mon May 13 23:36:05 2002
> +++ devel/swig/Makefile	Mon May 13 23:36:15 2002
> @@ -9,8 +9,7 @@
>  PKGNAME-examples= swig-examples-${VERSION}
>  CATEGORIES=	devel
>  NEED_VERSION=	1.516
> -MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= swig
> +MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=swig/}
>  
>  HOMEPAGE=       http://www.swig.org/
>  
> --- devel/t1lib/Makefile.orig	Mon May 13 23:36:20 2002
> +++ devel/t1lib/Makefile	Mon May 13 23:36:30 2002
> @@ -6,8 +6,7 @@
>  DISTNAME=	t1lib-${VERSION}
>  CATEGORIES=	devel textproc
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_SUNSITE}
> -MASTER_SITE_SUBDIR= libs/graphics
> +MASTER_SITES=	${MASTER_SITE_SUNSITE:=libs/graphics/}
>  
>  MAINTAINER=	Brad Smith <brad_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/libicq2000/Makefile.orig	Mon May 13 23:36:38 2002
> +++ devel/libicq2000/Makefile	Mon May 13 23:36:46 2002
> @@ -5,8 +5,7 @@
>  DISTNAME=	libicq2000-0.3.1
>  CATEGORIES=	net
>  NEED_VERSION=	1.525
> -MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR= libicq2000
> +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libicq2000/}
>  
>  HOMEPAGE=	http://libicq2000.sourceforge.net
>  
> --- devel/p5-Config-IniFiles/Makefile.orig	Mon May 13 23:36:50 2002
> +++ devel/p5-Config-IniFiles/Makefile	Mon May 13 23:37:00 2002
> @@ -6,8 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.500
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Config
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Config/}
>  
>  MAINTAINER=	Sam Smith <s_(_at_)_msmith_(_dot_)_net>
>  
> --- devel/p5-MLDBM-Sync/Makefile.orig	Mon May 13 23:37:40 2002
> +++ devel/p5-MLDBM-Sync/Makefile	Mon May 13 23:37:49 2002
> @@ -8,8 +8,7 @@
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.515
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= MLDBM
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MLDBM/}
>  
>  MAINTAINER=	Peter Galbavy <peter_(_dot_)_galbavy_(_at_)_knowtion_(_dot_)_net>
>  
> --- devel/p5-String-CRC32/Makefile.orig	Mon May 13 23:37:53 2002
> +++ devel/p5-String-CRC32/Makefile	Mon May 13 23:38:02 2002
> @@ -14,8 +14,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=   Yes
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR=	String
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=String/}
>  
>  CONFIGURE_STYLE= perl
>  
> --- devel/p5-Test-Harness/Makefile.orig	Mon May 13 23:38:08 2002
> +++ devel/p5-Test-Harness/Makefile	Mon May 13 23:38:15 2002
> @@ -8,8 +8,7 @@
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.525
>  
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> -MASTER_SITE_SUBDIR= Test
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Test/}
>  
>  MAINTAINER=	Shell Hung <shell_(_at_)_openbsd_(_dot_)_org>
>  
> --- devel/py-optik/Makefile.orig	Mon May 13 23:38:19 2002
> +++ devel/py-optik/Makefile	Mon May 13 23:38:28 2002
> @@ -19,8 +19,7 @@
>  PERMIT_DISTFILES_CDROM= Yes
>  PERMIT_DISTFILES_FTP=	Yes
>  
> -MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
> -MASTER_SITE_SUBDIR=	optik
> +MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=optik/}
>  
>  PYTHON_VER=	2.1
>  BUILD_DEPENDS=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
> --- devel/p5-Attribute-Handlers/Makefile.orig	Mon May 13 23:38:32 2002
> +++ devel/p5-Attribute-Handlers/Makefile	Mon May 13 23:38:40 2002
> @@ -6,7 +6,7 @@
>  PKGNAME=	p5-${DISTNAME}
>  CATEGORIES=	devel perl5
>  NEED_VERSION=	1.499
> -MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> +MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Attribute/}
>  MASTER_SITE_SUBDIR=  Attribute
>  
>  MAINTAINER=	Anil Madhavapeddy <avsm_(_at_)_openbsd_(_dot_)_org>