Various MASTER_SITES-related fixes.

21 files changed, 79 insertions, 84 deletions

diff --git a/biology/mpqc/Makefile b/biology/mpqc/Makefile
index f906211054e..8c88693aebe 100644
--- a/biology/mpqc/Makefile
+++ b/biology/mpqc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2013/04/01 22:23:17 asau Exp $
+# $NetBSD: Makefile,v 1.5 2013/04/06 14:09:32 rodent Exp $
 
 DISTNAME=	mpqc-2.3.1
 CATEGORIES=	biology
-MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=mpqc/)
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpqc/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	asau@inbox.ru
diff --git a/devel/clisp-zlib/Makefile b/devel/clisp-zlib/Makefile
index 580684deaf5..ef04948f992 100644
--- a/devel/clisp-zlib/Makefile
+++ b/devel/clisp-zlib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2011/12/02 20:49:10 marino Exp $
+# $NetBSD: Makefile,v 1.3 2013/04/06 14:09:32 rodent Exp $
 #
 
 CLISP_MODULE=	zlib
 
-PKGNAME=	clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=	clisp-${CLISP_MODULE}-${CLISP_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=clisp/)
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clisp/}
 
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://clisp.cons.org/
diff --git a/devel/libexecinfo/Makefile b/devel/libexecinfo/Makefile
index a5622c98421..aa9ad52edb0 100644
--- a/devel/libexecinfo/Makefile
+++ b/devel/libexecinfo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2013/03/14 22:27:15 asau Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/06 14:09:32 rodent Exp $
 
 DISTNAME=	libexecinfo-1.1
 CATEGORIES=	devel
-MASTER_SITES=	$(MASTER_SITE_FREEBSD)
+MASTER_SITES=	${MASTER_SITE_FREEBSD}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ober@NetBSD.org
diff --git a/devel/nspr-reference/Makefile b/devel/nspr-reference/Makefile
index 32e3792ea9f..0f9590f8c99 100644
--- a/devel/nspr-reference/Makefile
+++ b/devel/nspr-reference/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2012/10/31 11:17:33 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/04/06 14:09:32 rodent Exp $
 #
 
-DISTNAME=		nspr-reference
-PKGNAME=		${DISTNAME}-0.1
-PKGREVISION=		1
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=nspr/doc/}
+DISTNAME=	nspr-reference
+PKGNAME=	${DISTNAME}-0.1
+PKGREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_MOZILLA_ALL:=nspr/doc/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		ftp://ftp.mozilla.org/pub/mozilla.org/nspr/doc/
-COMMENT=		HTML Documentation for NSPR
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	${MASTER_SITE_MOZILLA_ESR:=nspr/doc/}
+COMMENT=	HTML Documentation for NSPR
 
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
diff --git a/devel/ruby-gemcutter/Makefile b/devel/ruby-gemcutter/Makefile
index 2d24a89c84b..51b74895692 100644
--- a/devel/ruby-gemcutter/Makefile
+++ b/devel/ruby-gemcutter/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2011/12/14 17:04:15 taca Exp $
+# $NetBSD: Makefile,v 1.5 2013/04/06 14:09:32 rodent Exp $
 
 DISTNAME=	gemcutter-0.7.1
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubygems.org/gems/gemcutter
+HOMEPAGE=	${MASTER_SITE_RUBYGEMS:=gemcutter/}
 COMMENT=	Commands to interact with RubyGems.org
 LICENSE=	mit
 
diff --git a/devel/ruby-logging/Makefile b/devel/ruby-logging/Makefile
index 05dda4ef044..02237759f40 100644
--- a/devel/ruby-logging/Makefile
+++ b/devel/ruby-logging/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2013/01/12 09:14:59 taca Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/06 14:09:33 rodent Exp $
 
 DISTNAME=	logging-1.8.1
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubygems.org/gems/logging
+HOMEPAGE=	${MASTER_SITE_RUBYGEMS:=logging/}
 COMMENT=	Flexible logging library for Ruby based on log4j
 LICENSE=	ruby-license
 
diff --git a/devel/ruby-loquacious/Makefile b/devel/ruby-loquacious/Makefile
index 9761029782e..ec598f708f8 100644
--- a/devel/ruby-loquacious/Makefile
+++ b/devel/ruby-loquacious/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/12/16 11:46:20 taca Exp $
+# $NetBSD: Makefile,v 1.4 2013/04/06 14:09:33 rodent Exp $
 
 DISTNAME=	loquacious-1.9.1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubygems.org/gems/loquacious
+HOMEPAGE=	${MASTER_SITE_RUBYGEMS:=loquacious/}
 COMMENT=	Descriptive configuration files for Ruby written in Ruby
 LICENSE=	mit
 
diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile
index ebbb55061b3..833d1b2bd0e 100644
--- a/lang/racket-textual/Makefile
+++ b/lang/racket-textual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/04/06 11:39:26 rodent Exp $
+# $NetBSD: Makefile,v 1.18 2013/04/06 14:09:33 rodent Exp $
 
 PKGNAME=	racket-textual-5.3.3
 DISTNAME=	$(PKGNAME_NOREV)-src-unix
@@ -9,7 +9,7 @@ MASTER_SITES_PLT=	http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)
 		http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/ \
 		ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/ \
 		http://russell.cs.bilgi.edu.tr/racket-installers/$(PKGVERSION_NOREV)/
-MASTER_SITES=	$(MASTER_SITES_PLT:=racket-textual/)
+MASTER_SITES=	${MASTER_SITES_PLT:=racket-textual/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	asau@inbox.ru
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index ca54e52e8db..25aaa01b3a3 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/04/06 11:39:26 rodent Exp $
+# $NetBSD: Makefile,v 1.28 2013/04/06 14:09:33 rodent Exp $
 
 PKGNAME=	racket-5.3.3
 DISTNAME=	$(PKGNAME_NOREV)-src-unix
@@ -9,7 +9,7 @@ MASTER_SITES_PLT=	http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)
 		http://mirror.informatik.uni-tuebingen.de/mirror/racket/$(PKGVERSION_NOREV)/ \
 		ftp://infogroep.be/pub/racket/installers/$(PKGVERSION_NOREV)/ \
 		http://russell.cs.bilgi.edu.tr/racket-installers/$(PKGVERSION_NOREV)/
-MASTER_SITES=	$(MASTER_SITES_PLT:=racket/)
+MASTER_SITES=	${MASTER_SITES_PLT:=racket/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	asau@inbox.ru
diff --git a/lang/tinyscheme/Makefile b/lang/tinyscheme/Makefile
index 97b46773435..a5f04e6e802 100644
--- a/lang/tinyscheme/Makefile
+++ b/lang/tinyscheme/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 20:11:55 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 14:09:33 rodent Exp $
 
 DISTNAME=	tinyscheme-1.40
 CATEGORIES=	lang
-MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=tinyscheme/)
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tinyscheme/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tinyscheme.sourceforge.net/home.html
@@ -13,7 +13,7 @@ USE_LIBTOOL=	yes
 
 MAKE_FILE=	makefile
 
-INSTALLATION_DIRS=	bin include lib share/tinyscheme
+INSTALLATION_DIRS+=	bin include lib share/tinyscheme
 
 MAKE_FLAGS+=		SYS_LIBS=-lm\ ${BUILDLINK_LDADD.dl:Q}
 MAKE_FLAGS+=		CC=${CC:Q} LDFLAGS=${LDFLAGS:Q} DEBUG=
diff --git a/lang/vslisp/Makefile b/lang/vslisp/Makefile
index 827b92dd9e7..5b57e2c8461 100644
--- a/lang/vslisp/Makefile
+++ b/lang/vslisp/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.18 2012/10/02 20:11:57 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 14:09:33 rodent Exp $
 
-DISTNAME=		vslisp-4.0-1
-PKGNAME=		vslisp-4.0.1
-PKGREVISION=		2
-CATEGORIES=		lang
-MASTER_SITES=		$(MASTER_SITE_SOURCEFORGE:=vslisp/)
+DISTNAME=	vslisp-4.0-1
+PKGNAME=	vslisp-4.0.1
+PKGREVISION=	2
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vslisp/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://vslisp.sourceforge.net/
-COMMENT=		Embeddable Lisp library and standalone interpreter
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://vslisp.sourceforge.net/
+COMMENT=	Embeddable Lisp library and standalone interpreter
 
-WRKSRC=			${WRKDIR}/vslisp-4.0
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+WRKSRC=		${WRKDIR}/vslisp-4.0
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/vslisp
diff --git a/math/clisp-pari/Makefile b/math/clisp-pari/Makefile
index 804d80a7c09..5dd3ae02c29 100644
--- a/math/clisp-pari/Makefile
+++ b/math/clisp-pari/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2013/04/06 13:09:25 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/06 14:09:33 rodent Exp $
 #
 
 CLISP_MODULE=	pari
 
-PKGNAME=	clisp-$(CLISP_MODULE)-$(CLISP_VERSION)
+PKGNAME=	clisp-${CLISP_MODULE}-${CLISP_VERSION}
 PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=clisp/)
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clisp/}
 
 MAINTAINER=	hans@NetBSD.org
 HOMEPAGE=	http://clisp.cons.org/
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 69b577ef08f..2c22ac3b2cb 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2013/02/23 13:11:06 asau Exp $
+# $NetBSD: Makefile,v 1.112 2013/04/06 14:09:34 rodent Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 CATEGORIES=	math
-MASTER_SITES=	$(MASTER_SITE_GNU:=octave/) \
+MASTER_SITES=	${MASTER_SITE_GNU:=octave/} \
 		ftp://ftp.octave.org/pub/octave/ \
 		ftp://ftp.octave.org/pub/octave/bleeding-edge/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/parallel/gridscheduler/Makefile b/parallel/gridscheduler/Makefile
index 32ac1f2cbdf..4f3e9bbd4a5 100644
--- a/parallel/gridscheduler/Makefile
+++ b/parallel/gridscheduler/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.6 2013/02/06 23:23:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2013/04/06 14:09:34 rodent Exp $
 
-PKGNAME=		gridscheduler-2011.11
-DISTNAME=		GE2011.11
-PKGREVISION=		3
-CATEGORIES=		parallel sysutils
-MASTER_SITES=		$(MASTER_SITE_SOURCEFORGE:=gridscheduler/)
+PKGNAME=	gridscheduler-2011.11
+DISTNAME=	GE2011.11
+PKGREVISION=	3
+CATEGORIES=	parallel sysutils
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gridscheduler/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://gridscheduler.sourceforge.net/
-COMMENT=		Open Grid Scheduler/Grid Engine resource management system
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://gridscheduler.sourceforge.net/
+COMMENT=	Open Grid Scheduler/Grid Engine resource management system
 
-BUILD_DEPENDS+=		{standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
+BUILD_DEPENDS+=	{standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
 
 # Not 64-bit clean; crashes during build.
 NOT_FOR_PLATFORM=	${LP64PLATFORMS}
 
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake perl:run
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake perl:run
 
 CFLAGS+=		-D${UPPER_OPSYS}
 CONFIGURE_ENV+=		REMOTE=sge
diff --git a/security/xml-security-c/Makefile b/security/xml-security-c/Makefile
index a0cc0f71fa9..d6bd0bc8fc3 100644
--- a/security/xml-security-c/Makefile
+++ b/security/xml-security-c/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.11 2013/02/06 23:21:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/06 14:09:34 rodent Exp $
 
 DISTNAME=	xml-security-c-1.6.1
 PKGREVISION=	1
 CATEGORIES=	security devel
-MASTER_SITES=	http://apache.dataphone.se/santuario/c-library/ \
-		http://www.apache.org/dist//santuario/c-library/
-
+MASTER_SITES=	${MASTER_SITE_APACHE:=/santuario/c-library/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://santuario.apache.org/
 COMMENT=	XML Digital Signature specification implementation
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}"
+USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}"
 
 BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
 .include "../../security/openssl/buildlink3.mk"
diff --git a/sysutils/ruby-directory-watcher/Makefile b/sysutils/ruby-directory-watcher/Makefile
index ed65a7b4d5f..3758443604b 100644
--- a/sysutils/ruby-directory-watcher/Makefile
+++ b/sysutils/ruby-directory-watcher/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2011/09/12 13:36:18 taca Exp $
+# $NetBSD: Makefile,v 1.5 2013/04/06 14:09:34 rodent Exp $
 
 DISTNAME=	directory_watcher-1.4.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/g}
 CATEGORIES=	sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubygems.org/gems/directory_watcher
+HOMEPAGE=	${MASTER_SITE_RUBYGEMS:=directory_watcher/}
 COMMENT=	FAM-like facility for Ruby
 LICENSE=	mit
 
diff --git a/textproc/ruby-mab/Makefile b/textproc/ruby-mab/Makefile
index 7355dc1c20e..6d15393d38b 100644
--- a/textproc/ruby-mab/Makefile
+++ b/textproc/ruby-mab/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/03/14 16:11:29 taca Exp $
+# $NetBSD: Makefile,v 1.3 2013/04/06 14:09:34 rodent Exp $
 
 DISTNAME=	mab-0.0.3
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubygems.org/gems/mab/
+HOMEPAGE=	${MASTER_SITE_RUBYGEMS:=mab/}
 COMMENT=	Markup as Ruby, write HTML in plain Ruby
 LICENSE=	mit
 
diff --git a/www/ruby-jquery-rails/Makefile b/www/ruby-jquery-rails/Makefile
index da633dbb6b4..c48bf3e6148 100644
--- a/www/ruby-jquery-rails/Makefile
+++ b/www/ruby-jquery-rails/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2013/04/06 03:45:27 rodent Exp $
+# $NetBSD: Makefile,v 1.5 2013/04/06 14:09:34 rodent Exp $
 
 DISTNAME=	jquery-rails-2.2.1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubygems.org/gems/jquery-rails
+HOMEPAGE=	${MASTER_SITE_RUBYGEMS:=jquery-rails/}
 COMMENT=	Rails jQuery support
 LICENSE=	mit
 
diff --git a/www/ruby-webrobots/Makefile b/www/ruby-webrobots/Makefile
index 85ae30a662e..616b2306c43 100644
--- a/www/ruby-webrobots/Makefile
+++ b/www/ruby-webrobots/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2013/03/17 15:51:54 taca Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/06 14:09:35 rodent Exp $
 
 DISTNAME=	webrobots-0.1.1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubygems.org/gems/webrobots
+HOMEPAGE=	${MASTER_SITE_RUBYGEMS:=webrobots/}
 COMMENT=	Ruby library to help write robots.txt compliant web robots
 LICENSE=	2-clause-bsd
 
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index db793d7d27d..1c7c61eee80 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2012/10/29 05:07:02 asau Exp $
+# $NetBSD: Makefile,v 1.22 2013/04/06 14:09:35 rodent Exp $
 #
 
 DISTNAME=	xearth-1.1
 PKGREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	http://ftp.x.org/contrib/applications/ \
-	ftp://ftp.sunet.se/pub/X11/ftp.x.org/contrib/applications/ \
-	ftp://ftp.kddlabs.co.jp/X11/ftp.x.org/contrib/applications/ \
-	ftp://ftp.gwdg.de/pub/x11/x.org/contrib/applications/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
 MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	# AWOL
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
index 72e016448a0..112b07abb75 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2012/10/29 05:07:23 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/06 14:09:35 rodent Exp $
 #
 
 DISTNAME=	xvidtune-1.0.2
 PKGREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/app/
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://xorg.freedesktop.org/releases/individual/app/
+HOMEPAGE=	${MASTER_SITE_XORG:=app/}
 COMMENT=	Client interface to the X server video mode extension
-LICENSE=		mit
+LICENSE=	mit
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config