From cf10739f24ebe329e652c8a1d5f98da660affe10 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 18 Sep 2008 13:37:41 +0000
Subject: [PATCH] - SYSCONFDIR and LOCALBASE are already part of the generic
 SUBST_VARS

looks good to landry@
---
 devel/xulrunner/Makefile          | 3 +--
 graphics/sane-frontends/Makefile  | 4 +---
 graphics/xsane/Makefile           | 4 +---
 lang/vala/Makefile                | 4 +---
 mail/mozilla-thunderbird/Makefile | 3 +--
 net/openh323/Makefile             | 3 +--
 net/samba/Makefile                | 8 ++++----
 print/cups/Makefile               | 4 +---
 print/foo2zjs/Makefile            | 3 +--
 print/foomatic-db-engine/Makefile | 3 +--
 print/foomatic-db/Makefile        | 4 +---
 print/foomatic-filters/Makefile   | 4 +---
 security/py-crypto/Makefile       | 4 +---
 sysutils/heartbeat/Makefile       | 4 ++--
 www/firefox3/Makefile             | 3 +--
 www/mozilla-firefox/Makefile      | 3 +--
 www/pecl-APC/Makefile             | 3 +--
 www/pecl-memcache/Makefile        | 3 +--
 www/php5/extensions/Makefile      | 4 ++--
 www/seamonkey/Makefile            | 3 +--
 20 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 80b66e1e488..ffa3297fb59 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2008/08/29 01:16:47 martynas Exp $
+# $OpenBSD: Makefile,v 1.29 2008/09/18 13:37:41 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
 
@@ -56,7 +56,6 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 # Regression tests do nothing
 NO_REGRESS=	Yes
-SUBST_VARS=	LOCALBASE
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf
 
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 02e6263b3ca..5f63f3e356e 100755
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2008/06/29 20:44:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=	API for accessing scanners, frontends
 
@@ -32,8 +32,6 @@ MODULES=	devel/gettext
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		sane.>=1::graphics/sane-backends
 
-SUBST_VARS=	LOCALBASE
-
 USE_X11=	Yes
 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 67d5bb9baaf..d0189fcbd7a 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2008/06/29 20:44:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=	scanner frontend for SANE
 
@@ -34,8 +34,6 @@ LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		lcms.>=1::graphics/lcms \
 		sane.>=1::graphics/sane-backends
 
-SUBST_VARS=	LOCALBASE
-
 USE_X11=	Yes
 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 587f833f4d1..69c69f08cec 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2008/06/29 22:04:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=		compiler for the GObject type system
 
@@ -36,8 +36,6 @@ CONFIGURE_ARGS+=	--enable-gen-project \
 CONFIGURE_ENV+= 	LDFLAGS="-L${LOCALBASE}/lib" \
 			CPPFLAGS="-I${LOCALBASE}/include"
 
-SUBST_VARS=		LOCALBASE
-
 pre-regress:
 	${SUBST_CMD} ${WRKSRC}/tests/testrunner.sh
 	chmod +x ${WRKSRC}/tests/testrunner.sh
diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile
index e9d53b9a764..83180e1dc55 100644
--- a/mail/mozilla-thunderbird/Makefile
+++ b/mail/mozilla-thunderbird/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2008/08/23 22:07:03 martynas Exp $
+# $OpenBSD: Makefile,v 1.74 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
@@ -60,7 +60,6 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS=	Yes
-SUBST_VARS=	LOCALBASE
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf \
 				${WRKSRC}/directory/c-sdk/config/autoconf
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 658981f58bd..3b87edefe5f 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2008/09/08 17:17:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -32,7 +32,6 @@ LIB_DEPENDS=	pt.>=2::devel/pwlib \
 		avutil.>=2::graphics/ffmpeg
 
 WRKDIST=	${WRKDIR}/${DISTNAME:S/-/_/}
-SUBST_VARS=	LOCALBASE
 
 USE_GMAKE=	Yes
 ALL_TARGET=	optshared
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 62dd97650df..4e5546a7e25 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.98 2008/09/17 10:38:59 brad Exp $
+# $OpenBSD: Makefile,v 1.99 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT-main=	SMB and CIFS client and server for UNIX
 COMMENT-docs=	additional documentation and examples for Samba
@@ -35,9 +35,9 @@ MAKE_FLAGS=	PASSWD_PROGRAM="/usr/bin/passwd" \
 		LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \
 		LIBmsrpc_VERSION=${LIBmsrpc_VERSION}
 
-CONFDIR=        ${SYSCONFDIR}/samba
-SAMBA_LOGDIR=   /var/log
-SUBST_VARS=     CONFDIR LOCALBASE SYSCONFDIR
+CONFDIR=	${SYSCONFDIR}/samba
+SAMBA_LOGDIR=	/var/log
+SUBST_VARS=	CONFDIR
 
 SEPARATE_BUILD= concurrent
 CONFIGURE_STYLE= gnu
diff --git a/print/cups/Makefile b/print/cups/Makefile
index d65880d540d..ffab0f0a398 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2007/12/11 08:00:06 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.32 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=		Common Unix Printing System
 
@@ -62,8 +62,6 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
 CFLAGS+=		"-I${LOCALBASE}/include" \
 			"-I${LOCALBASE}/include/libpng"
 
-SUBST_VARS=		LOCALBASE
-
 WRKDIST=		${WRKDIR}/${DISTNAME:S/-source//}
 USE_GMAKE=		Yes
 
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 63880b009fb..7f5d9c69c6b 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2008/02/13 04:40:17 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=		driver for ZjStream wire protocol compatible printers
 
@@ -26,7 +26,6 @@ MASTER_SITES=		http://bigio.snb.it/openbsd/distfiles/ \
 
 USE_GMAKE=		Yes
 WRKDIST=		${WRKDIR}/foo2zjs
-SUBST_VARS=		LOCALBASE
 
 BUILD_DEPENDS=		::print/ghostscript/gnu # ps2pdf
 RUN_DEPENDS=		::print/ghostscript/gnu
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index b39ac602265..6863879bbf4 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/10/27 23:44:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=		Foomatic PPD generator
 
@@ -75,7 +75,6 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2"
 			CUPS_LPINFO="${LOCALBASE}/sbin/lpinfo"
 
 NO_REGRESS=		Yes
-SUBST_VARS=		LOCALBASE
 
 pre-configure:
 	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 56c10981cd8..48727ac0fa1 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/10/27 23:44:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=		Foomatic PPD data
 
@@ -30,8 +30,6 @@ PKG_ARCH=		*
 
 WRKDIST=		${WRKDIR}/foomatic-db-${V}
 
-SUBST_VARS=		LOCALBASE
-
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
 
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 5f4f2d0f44e..a1e9b7293fb 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2008/09/18 13:37:41 ajacoutot Exp $
 
 COMMENT=		Foomatic PPD print filters
 
@@ -34,8 +34,6 @@ CONFIGURE_ENV=		CUPS="${LOCALBASE}/libexec/cups" \
 
 FAKE_FLAGS=		ETCDIR="${PREFIX}/share/examples/foomatic"
 
-SUBST_VARS+=		SYSCONFDIR
-
 PKG_ARCH=		*
 
 NO_REGRESS=		Yes
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index b808f812aa0..1c06977d740 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2008/06/11 02:59:32 wcmaier Exp $
+# $OpenBSD: Makefile,v 1.11 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -26,8 +26,6 @@ LIB_DEPENDS=	gmp.>=6::devel/gmp
 
 DOCSDIR=	${PREFIX}/share/doc/py-crypto
 
-SUBST_VARS+=	LOCALBASE
-
 pre-configure:
 	@${SUBST_CMD} ${WRKSRC}/setup.py
 
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 2c441b01101..0a3f2eb3c58 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2008/05/18 15:53:54 kili Exp $
+# $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -84,7 +84,7 @@ HBUSER=		_heartbeat
 HBUID=		596
 HBGROUP=	_heartbeat
 HBGID=		596
-SUBST_VARS=	HBUSER HBGROUP HBUID HBGID SYSCONFDIR
+SUBST_VARS=	HBUSER HBGROUP HBUID HBGID
 
 CONFIGURE_SCRIPT=ConfigureMe
 CONFIGURE_STYLE=gnu
diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile
index 788278d19f7..1a7ff876d4d 100644
--- a/www/firefox3/Makefile
+++ b/www/firefox3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2008/09/15 19:20:07 martynas Exp $
+# $OpenBSD: Makefile,v 1.9 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
@@ -62,7 +62,6 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS=	Yes
-SUBST_VARS=	LOCALBASE
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf
 
diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index b82a7b27b4d..6757ea8c410 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.101 2008/08/19 23:53:45 martynas Exp $
+# $OpenBSD: Makefile,v 1.102 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
@@ -61,7 +61,6 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS=	Yes
-SUBST_VARS=	LOCALBASE
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf
 
diff --git a/www/pecl-APC/Makefile b/www/pecl-APC/Makefile
index 1e598a78521..4da40e1d268 100644
--- a/www/pecl-APC/Makefile
+++ b/www/pecl-APC/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2008/06/04 09:02:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -40,7 +40,6 @@ CONFIGURE_ENV=	AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
 
 PREFIX=		/var/www
 DESTDIRNAME=	INSTALL_ROOT
-SUBST_VARS=	LOCALBASE
 
 NO_REGRESS=	Yes
 
diff --git a/www/pecl-memcache/Makefile b/www/pecl-memcache/Makefile
index d3dccdce2b7..2872ed77c6f 100644
--- a/www/pecl-memcache/Makefile
+++ b/www/pecl-memcache/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2008/01/21 20:36:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -36,7 +36,6 @@ CONFIGURE_ENV=	AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
 
 PREFIX=		/var/www
 DESTDIRNAME=	INSTALL_ROOT
-SUBST_VARS=	LOCALBASE
 
 NO_REGRESS=	Yes
 
diff --git a/www/php5/extensions/Makefile b/www/php5/extensions/Makefile
index 41eec663cb3..493a4891f2c 100644
--- a/www/php5/extensions/Makefile
+++ b/www/php5/extensions/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2008/05/20 14:01:45 robert Exp $
+# $OpenBSD: Makefile,v 1.44 2008/09/18 13:37:41 ajacoutot Exp $
 
 FULLPKGNAME-main=	php5-extensions-${V}
 COMMENT-main=		informational package about PHP5 extensions
@@ -364,7 +364,7 @@ MODULE_NAME${i}=	${i:S/-//g}
 MESSAGE=		${PKGDIR}/MESSAGE
 UNMESSAGE=		${PKGDIR}/UNMESSAGE
 
-SUBST_VARS=		MODULE_NAME PHP_CONFIG_FILE LOCALBASE V
+SUBST_VARS=		MODULE_NAME PHP_CONFIG_FILE V
 
 LIB_DEPENDS-main=
 MESSAGE-main=		${PKGDIR}/DESCR-main
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 7bad58419d3..0a7caa7c71c 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2008/07/25 17:41:06 martynas Exp $
+# $OpenBSD: Makefile,v 1.26 2008/09/18 13:37:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 i386 powerpc sparc sparc64
@@ -95,7 +95,6 @@ VMEM_WARNING=	Yes
 USE_X11=	Yes
 USE_GMAKE=	Yes
 NO_REGRESS=	Yes
-SUBST_VARS=	LOCALBASE
 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf \
 				${WRKSRC}/directory/c-sdk/config/autoconf