--localstatedir=/var is the default now.

2012-04-28 10:52:08 +00:00 · 2012-04-28 10:52:08 +00:00 · 689f54b24a
commit 689f54b24a
parent 3f0ee525f1
55 changed files with 79 additions and 130 deletions
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/11/04 08:42:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.31 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=	implementation of the Freedesktop sound theme spec.
 COMMENT-gtk=	gtk+2 helper for libcanberra
@ -90,7 +90,6 @@ USE_GMAKE=		Yes

 CONFIGURE_STYLE=	 gnu
 CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
-			--localstatedir="/var" \
 			--enable-sndio \
 			--disable-gstreamer \
 			--disable-oss \
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2012/01/23 14:39:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=		Yes

@ -84,8 +84,7 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--disable-waveout \
 			--disable-gconf \
 			--disable-avahi \
-			--disable-orc \
-			--localstatedir=/var
+			--disable-orc
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib \
 				-Wl,-rpath,${TRUEPREFIX}/lib/pulse-${VERSION}/modules/" \
--- a/databases/apache-couchdb/Makefile
+++ b/databases/apache-couchdb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2012/04/08 17:21:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT =	distributed, document-oriented database

@ -42,7 +42,6 @@ USE_GROFF =	Yes

 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
-		 --localstatedir=/var \
 		 --with-erlang=${LOCALBASE}/lib/erlang/usr/include \
 		 --with-js-include=${LOCALBASE}/include/js \
 		 --with-js-lib=${LOCALBASE}/lib
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.112 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.113 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=	Open source LDAP software (client)
 COMMENT-server=	Open source LDAP software (server)
@ -40,7 +40,6 @@ CONFIGURE_STYLE=	autoconf
 USE_GROFF=		Yes

 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--localstatedir="/var" \
 			--enable-ipv6 \
 			--with-tls=openssl

--- a/databases/openldap23/Makefile
+++ b/databases/openldap23/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	Open source LDAP software (server)

@ -31,7 +31,6 @@ CONFIGURE_STYLE=	gnu
 USE_GROFF=		Yes

 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--localstatedir="/var" \
 			--enable-ipv6

 # slapd options
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/02 17:09:31 kili Exp $
+# $OpenBSD: Makefile,v 1.8 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=		lightweight C library that eases the writing of daemons

@ -18,7 +18,6 @@ MASTER_SITES=		${HOMEPAGE}

 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
-			--localstatedir=/var \
 			--disable-lynx

 USE_LIBTOOL=		Yes
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2012/01/13 00:55:14 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=		GNU editor: extensible, customizable, self-documenting
 COMMENT-el=		elisp sources for those who want to read/modify them
@ -37,7 +37,7 @@ GCCARCH=		${MACHINE_ARCH}-unknown-openbsd${OSREV}

 AUTOCONF_VERSION=	2.61
 CONFIGURE_STYLE=	autoconf
-CONFIGURE_ARGS=		${GCCARCH} --with-pop --localstatedir=/var
+CONFIGURE_ARGS=		${GCCARCH} --with-pop

 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
 				  -I${LOCALBASE}/include/libpng" \
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2012/03/29 18:07:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main =		GNU editor: extensible, customizable, self-documenting
 COMMENT-el =		elisp sources for those who want to read/modify them
@ -35,7 +35,7 @@ GCCARCH =		${MACHINE_ARCH}-unknown-openbsd${OSREV}

 AUTOCONF_VERSION =	2.67
 CONFIGURE_STYLE =	autoconf
-CONFIGURE_ARGS =	${GCCARCH} --localstatedir=/var
+CONFIGURE_ARGS =	${GCCARCH}

 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include \
 				  -I${LOCALBASE}/include/libpng" \
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/07/06 18:41:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	build molecules out of single atoms

@ -34,8 +34,6 @@ LIB_DEPENDS=	x11/gnome/libgnome \
 		x11/gnome/libgnomeui
 RUN_DEPENDS=	devel/desktop-file-utils

-CONFIGURE_ARGS+=--localstatedir=/var
-
 USE_GMAKE=	Yes

 CONFIGURE_STYLE=gnu
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2012/04/23 17:15:18 espie Exp $
+# $OpenBSD: Makefile,v 1.46 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -67,7 +67,6 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-nsbundle \
 		--disable-sdlmixer \
 		--disable-sugar \
-		--localstatedir=/var \
 		--enable-sqlite \
 		--enable-gnet \
 		--enable-py-build-only \
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2012/04/26 09:58:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	gtk+ clone of the lines ball logic game

 DISTNAME=	gtkballs-3.1.5
-REVISION=	12
+REVISION=	13
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}dist/ \
 		${MASTER_SITE_SUNSITE:=games/strategy/}
@ -33,10 +33,11 @@ NO_REGRESS=	Yes
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

+LOCALSTATEDIR=	${BASELOCALSTATEDIR}/games
+
 FAKE_FLAGS=	localstatedir=${PREFIX}/share/examples/gtkballs

 .include <bsd.port.mk>
--- a/games/late/Makefile
+++ b/games/late/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/08/01 02:13:45 jolan Exp $
+# $OpenBSD: Makefile,v 1.13 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	puzzle game resembling the arcade game Qix
 DISTNAME=	late-0.1.0
@ -21,7 +21,6 @@ LIB_DEPENDS=	devel/sdl-image


 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=localstatedir=/var
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"

 post-install:
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/12/04 10:01:52 benoit Exp $
+# $OpenBSD: Makefile,v 1.30 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT =	space-based shoot'em up game for X11

@ -20,7 +20,6 @@ WANTLIB =		ICE SM X11 Xpm c
 MASTER_SITES =		${HOMEPAGE}

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	--localstatedir=/var

 MAKE_FLAGS =		CC_OPTIMIZE="${CFLAGS}"

--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2012/04/13 15:03:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	device color profile management daemon

@ -47,7 +47,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--localstatedir=/var \
 		--enable-introspection \
 		--disable-gtk-doc \
 		--disable-reverse \
--- a/lang/php/5.3/Makefile
+++ b/lang/php/5.3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2012/04/28 08:34:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2012/04/28 10:52:08 ajacoutot Exp $

 PV=		5.3
 V=		${PV}.10
@ -14,7 +14,6 @@ PKGNAME-fpm?=		php-fpm-${V}
 MULTI_PACKAGES+=        -fpm
 COMMENT-fpm=		stand-alone FPM version of PHP
 CONFIGURE_ARGS+=	--enable-fpm \
-			--localstatedir=/var \
 			--with-fpm-user=www \
 			--with-fpm-group=www
 LIB_DEPENDS-fpm=	${LIB_DEPENDS-main}
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2012/02/21 22:19:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@ -67,7 +67,6 @@ CONFIGURE_ARGS+=	--enable-static \
 			--with-mailgroup=_courier \
 			--with-pkgconfdir=${SYSCONFDIR}/courier \
 			--with-authdaemonvar=${COURIERSTATE} \
-			--localstatedir=/var \
 			--libdir=${PREFIX}/lib \
 			--includedir=${PREFIX}/include \
 			--enable-ltdl-install=no \
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.185 2012/04/23 17:15:18 espie Exp $
+# $OpenBSD: Makefile,v 1.186 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -57,8 +57,7 @@ RUN_DEPENDS-sqlite= ${BASE_PKGPATH}=${V_DOVECOT}

 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--with-gssapi \
+CONFIGURE_ARGS=	--with-gssapi \
 		--with-rundir=/var/dovecot \
 		--with-sql=plugin \
 		--with-statedir=/var/dovecot \
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/09/16 10:31:22 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=	fully featured POP3 and IMAP4 proxy server
 COMMENT-ldap=	LDAP backend for perdition mail proxy
@ -49,8 +49,7 @@ CONFIGURE_ARGS+=	--enable-ssl \
 			--disable-gdbm \
 			--disable-odbc \
 			--with-user=_perdition \
-			--with-group=_perdition \
-			--localstatedir=/var
+			--with-group=_perdition

 NO_REGRESS=Yes

--- a/mail/zarafa/zarafa/Makefile
+++ b/mail/zarafa/zarafa/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.121 2012/04/26 11:28:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.122 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-web=	zarafa webaccess frontend and MAPI extensions for PHP
@ -98,7 +98,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		ac_cv_lib_pam_pam_start=no
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-static \
-		--localstatedir=/var \
 		--disable-perl \
 		--with-mapi-configdir=${SYSCONFDIR}/mapi \
 		--with-userscript-prefix=${SYSCONFDIR}/zarafa/userscripts \
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2011/09/19 10:14:04 nigel Exp $
+# $OpenBSD: Makefile,v 1.41 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=	network-capable tape backup (client and tape server)
 COMMENT-client=	network-capable tape backup (client only)
@ -63,7 +63,6 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/config
 # shared libraries, we disable the generation of shared libraries.
 CONFIGURE_ARGS=	--disable-shared \
 		--libexecdir=${PREFIX}/libexec/amanda \
-		--localstatedir=/var \
 		--with-configdir=${SYSCONFDIR}/amanda \
 		--with-user=operator \
 		--with-group=operator
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2012/03/02 07:11:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.79 2012/04/28 10:52:08 ajacoutot Exp $

 ONLY_FOR_ARCHS-mono=	${MONO_ARCHS}

@ -205,7 +205,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		PTHREAD_LIBS="-pthread" \
 		PYTHON="${MODPY_BIN}"
 CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--localstatedir="/var" \
 		--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \
 		--with-avahi-user=_avahi \
 		--with-avahi-group=_avahi \
--- a/net/bird/Makefile
+++ b/net/bird/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2012/03/22 21:49:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main=	bird internet routing daemon
 COMMENT-doc=	bird internet routing daemon (documentation)
@ -46,7 +46,6 @@ FAKE_FLAGS=	sysconfdir=${TRUEPREFIX}/share/examples/bird

 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--localstatedir=/var

 .if ${FLAVOR:L:Mv6}
 CONFIGURE_ARGS+=--enable-ipv6
--- a/net/flowd/Makefile
+++ b/net/flowd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:33 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	NetFlow collector

@ -21,7 +21,6 @@ USE_GROFF =		Yes
 NO_REGRESS=		Yes

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--localstatedir=/var

 post-install:
 	$(INSTALL_DATA_DIR) ${PREFIX}/share/examples/flowd
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2011/12/28 10:44:43 pea Exp $
+# $OpenBSD: Makefile,v 1.42 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=	Yes
 SHARED_LIBS +=  freeradius-radius    4.0      # .0.0
@ -46,7 +46,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"

 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--localstatedir='$${DESTDIR}/var' \
 		--with-large-files \
 		--with-snmp \
 		--with-pic \
--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2012/03/29 13:38:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.49 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	server for streaming various media formats

@ -22,7 +22,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/icecast/
 MODULES=	devel/gettext

 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --localstatedir=/var --with-theora=${LOCALBASE}
+CONFIGURE_ARGS+= --with-theora=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/net/ircd-hybrid/Makefile
+++ b/net/ircd-hybrid/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/10/19 13:46:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY =	Yes

@ -26,7 +26,6 @@ USE_GROFF =	Yes
 USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS=	--tag=disable-static
 CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS=	--localstatedir=/var
 CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2011/09/25 13:57:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.42 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=		jabber server
 DISTNAME=		jabberd-2.0s11
@ -35,8 +35,7 @@ FLAVOR?=		mysql
 USE_LIBTOOL=		Yes
 USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--localstatedir=/var \
-			--enable-debug \
+CONFIGURE_ARGS=		--enable-debug \
 			--enable-ssl \
 			--disable-idn \
 			--with-extra-include-path="${EXTRA_INCLUDE_PATH}" \
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2012/01/13 00:23:29 naddy Exp $
+# $OpenBSD: Makefile,v 1.40 2012/04/28 10:52:08 ajacoutot Exp $

 ONLY_FOR_ARCHS=		i386

@ -36,7 +36,6 @@ CONFIGURE_STYLE=	automake autoconf
 CONFIGURE_ENV+=		KRB5CFLAGS="-I/usr/include/kerberosV -DUSING_HEIMDAL" \
 			KRB5LIBS="-lkrb5"
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--localstatedir=/var \
 			--disable-transarc-paths \
 			--enable-namei-fileserver \
 			--enable-largefile-fileserver \
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.161 2012/04/22 13:44:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.162 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=		Yes

@ -60,7 +60,6 @@ CONFIGURE_STYLE=	gnu
 AUTOCONF_VERSION=	2.63

 CONFIGURE_ARGS=		--disable-fam \
-			--localstatedir="/var" \
 			--libdir="${PREFIX}/lib/samba" \
 			--sbindir="${PREFIX}/libexec" \
 			--with-configdir="${CONFDIR}" \
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2011/12/16 20:08:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	anonymity service using onion routing

@ -19,7 +19,7 @@ WANTLIB += c crypto event m pthread ssl z
 MASTER_SITES=	${HOMEPAGE}dist/

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--with-ssl-dir=/usr --localstatedir=/var
+CONFIGURE_ARGS=	--with-ssl-dir=/usr

 DB_DIR=		/var/tor
 SUBST_VARS+=	DB_DIR
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2012/01/26 08:03:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.55 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=		USENET software package designed for small sites

@ -22,7 +22,6 @@ EXTRACT_SUFX=		.tar.bz2
 LIB_DEPENDS=		devel/pcre

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-lockfile=/var/spool/news/fetchnews.lck
 CONFIGURE_ARGS+=	--with-user=_news
 USE_GROFF =		Yes
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.125 2012/04/22 11:41:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.126 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	Common Unix Printing System

@ -80,7 +80,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 CONFIGURE_STYLE= gnu dest
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-static \
-		--localstatedir=/var \
 		--with-cups-group=_cups \
 		--with-cups-user=_cups \
 		--with-system-groups=wheel \
--- a/security/nessus/Makefile.inc
+++ b/security/nessus/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.10 2007/11/11 09:25:18 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2012/04/28 10:52:08 ajacoutot Exp $

 V=		2.2.9
 CATEGORIES=	security
@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${V}/src/

 CONFIGURE_STYLE=gnu

-CONFIGURE_ARGS+=--localstatedir=/var	\
-		--sharedstatedir=/var	\
+CONFIGURE_ARGS+=--sharedstatedir=/var	\
 		--disable-nessuspcap	\
 		--enable-bpf-sharing	\
 		--enable-shared
--- a/security/prelude/Makefile.inc
+++ b/security/prelude/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2011/09/21 17:20:56 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -14,5 +14,4 @@ PERMIT_PACKAGE_FTP=	Yes

 USE_GMAKE=	Yes

-CONFIGURE_ARGS+=--localstatedir=/var
 CONFIGURE_ENV += ac_cv_path_GREP=/usr/bin/grep ac_cv_path_EGREP=/usr/bin/egrep
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2012/03/29 13:38:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.64 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	SSL encryption wrapper for standard network daemons

@ -26,8 +26,7 @@ SEPARATE_BUILD=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-ssl=/usr \
-			--with-threads=fork \
-			--localstatedir=/var
+			--with-threads=fork
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/auto
 NO_REGRESS=		Yes
 USE_GMAKE=		Yes
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2012/04/23 13:37:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	D-Bus interface for user account query and manipulation

@ -41,7 +41,6 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--localstatedir=/var \
 		--enable-introspection \
 		--disable-docbook-docs

--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/11/18 01:08:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT-main =		system metrics collection engine
 COMMENT-mysql =		collectd mysql plugin
@ -71,7 +71,6 @@ CONFIGURE_ARGS +=--with-ltdl-include=${LOCALBASE}/include \
 		--with-librrd=${LOCALBASE} \
 		--with-libstatgrab=${LOCALBASE} \
 		--with-libnetsnmp=${LOCALBASE}/bin/net-snmp-config \
-		--localstatedir=/var \
 		--without-python \
 		--enable-all-plugins=no

--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2012/01/08 19:42:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.24 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	framework for defining and tracking users

@ -38,7 +38,6 @@ CONFIGURE_STYLE= autoconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--localstatedir=/var \
 		--with-pid-file=/var/run/ConsoleKit/pid \
 		--enable-pam-module=no

--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2011/09/16 11:41:39 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -109,7 +109,6 @@ CONFIGURE_ENV=	LIBNETCONFIG=${LOCALBASE}/bin/libnet-config-1.0 \
 		AUTOCONF_VERSION=${AUTOCONF_VERSION}
 CONFIGURE_ARGS=	configure --prefix=${PREFIX} \
 		--sysconfdir=${SYSCONFDIR} \
-		--localstatedir=/var \
 		--with-initdir=${SYSCONFDIR}/ha.d/init.d \
 		--with-group-id=${HBGID} \
                --with-ccmuser-id=${HBUID} \
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2012/02/16 22:28:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=	framework for granting privileged operations to users

@ -54,7 +54,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-gtk-doc \
 		--disable-systemd \
-		--localstatedir=/var \
 		--mandir=${PREFIX}/man \
 		--enable-introspection \
 		--enable-man-pages \
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.144 2012/04/23 21:35:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.145 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=		Yes
 COMMENT-main=		open source multi-protocol PBX and telephony toolkit
@ -83,8 +83,7 @@ MAKE_FLAGS+=		ASTCFLAGS="${CFLAGS}" \
 			NOISY_BUILD="Yes" \
 			OPTIMIZE=

-CONFIGURE_ARGS+=	--localstatedir=/var \
-			--with-sounds-cache=${DISTDIR}
+CONFIGURE_ARGS+=	--with-sounds-cache=${DISTDIR}

 CONFIGURE_ARGS+=	--with-asound=no \
 			--with-avcodec=no \
--- a/textproc/gonzui/Makefile
+++ b/textproc/gonzui/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2011/09/16 11:41:40 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=		Yes

@ -47,8 +47,7 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-user="_gonzui" \
 			--with-group="_gonzui" \
 			--with-rundir="/var/run/gonzui" \
-			--with-logdir="/var/log" \
-			--localstatedir="/var"
+			--with-logdir="/var/log"

 # Tests want to do cvs checkouts, apt-get, etc.
 NO_REGRESS=		Yes
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/28 09:51:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2012/04/28 10:52:08 ajacoutot Exp $

 COMMENT=		documentation metadata library

@ -29,8 +29,7 @@ RUN_DEPENDS=		shells/bash \
 BUILD_DEPENDS=		${RUN_DEPENDS}

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--localstatedir=/var \
-			--with-convert-dir=${PREFIX}/share/omf \
+CONFIGURE_ARGS+=	--with-convert-dir=${PREFIX}/share/omf \
 			--enable-installed \
 			--enable-scrollkeeper-compat \
 			--enable-omf-read \
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2012/04/28 10:52:08 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -95,7 +95,6 @@ CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
 			--disable-static \
 			--sysconfdir=${SYSCONFDIR} \
-			--localstatedir=/var \
 			--with-wwwroot=/var/cherokee \
 			--with-wwwuser=_cherokee \
 			--with-wwwgroup=_cherokee \
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/22 08:36:47 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2012/04/28 10:52:09 ajacoutot Exp $

 COMMENT =	content scanning web filter
 DISTNAME =	dansguardian-2.10.1.1
@ -29,8 +29,7 @@ LIB_DEPENDS =		devel/pcre \
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS =	--localstatedir=/var \
-			--with-proxygroup=_dansguardian \
+CONFIGURE_ARGS =	--with-proxygroup=_dansguardian \
 			--with-proxyuser=_dansguardian \
 			--enable-segv-backtrace \
 			--enable-clamd
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2011/09/16 12:00:06 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2012/04/28 10:52:09 ajacoutot Exp $

 COMMENT=	secure webserver

@ -27,8 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libxml2" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		webrootdir=${WEBROOTDIR}
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--enable-xslt
+CONFIGURE_ARGS=	--enable-xslt

 USE_GROFF =	Yes

--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/12/26 22:26:39 fgsch Exp $
+# $OpenBSD: Makefile,v 1.11 2012/04/28 10:52:09 ajacoutot Exp $

 SHARED_ONLY =		Yes

@ -29,7 +29,6 @@ USE_LIBTOOL =		Yes
 USE_GROFF =		Yes
 CONFIGURE_STYLE =	autoconf
 AUTOCONF_VERSION =	2.68
-CONFIGURE_ARGS =	--localstatedir=/var

 REGRESS_TARGET =	check

--- a/www/yaws/Makefile
+++ b/www/yaws/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2011/12/17 22:01:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2012/04/28 10:52:09 ajacoutot Exp $

 COMMENT-main=		high performance webserver written in Erlang, libraries
 COMMENT-web=		high performance webserver written in Erlang, docroot
@ -30,8 +30,7 @@ RUN_DEPENDS=		lang/erlang

 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-pam \
-			--disable-sendfile \
-			--localstatedir="/var"
+			--disable-sendfile
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 # erl(1) needs $HOME to be set.
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.80 2012/04/26 09:25:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.81 2012/04/28 10:52:09 ajacoutot Exp $

 COMMENT=	message bus system

@ -30,8 +30,7 @@ USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread"
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--with-dbus-user=_dbus \
+CONFIGURE_ARGS=	--with-dbus-user=_dbus \
 		--with-xml=expat \
 		--with-x \
 		--enable-kqueue \
--- a/x11/gnome/games/Makefile
+++ b/x11/gnome/games/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2011/12/03 22:17:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2012/04/28 10:52:09 ajacoutot Exp $

 BROKEN= 		update needs fixed clutter/Mesa

@ -54,8 +54,7 @@ MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_ICON_CACHE=	Yes
 MODGCONF2_SCHEMAS_DIR=	gnome-games

-CONFIGURE_ARGS+= 	--localstatedir="/var" \
-			--with-scores-group="games"
+CONFIGURE_ARGS+= 	--with-scores-group="games"

 # XXX
 # lightsoff and swell-foop need seed
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.119 2012/01/19 14:14:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.120 2012/04/28 10:52:09 ajacoutot Exp $

 BROKEN=			needs PAM(7)

@ -62,8 +62,7 @@ MODGNOME_ICON_CACHE=	Yes
 MODGNOME_CPPFLAGS=	-I${X11BASE}/include -DHAS_SA_LEN
 MODGNOME_LDFLAGS=	-L${X11BASE}/lib

-CONFIGURE_ARGS=		--localstatedir=/var \
-			--mandir=${PREFIX}/man \
+CONFIGURE_ARGS=		--mandir=${PREFIX}/man \
 			--with-at-spi-registryd-directory=${LOCALBASE}/libexec \
 			--with-custom-conf=${SYSCONFDIR}/X11/gdm/custom.conf \
 			--with-dbus-sys=${SYSCONFDIR}/dbus-1/system.d \
--- a/x11/gnome/online-accounts/Makefile
+++ b/x11/gnome/online-accounts/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2012/04/17 11:48:43 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2012/04/28 10:52:09 ajacoutot Exp $

 COMMENT=	interfaces for interacting with online accounts

@ -42,6 +42,4 @@ LIB_DEPENDS=		devel/json-glib \
 MODGNOME_TOOLS= 	goi
 MODGNOME_ICON_CACHE=	Yes

-CONFIGURE_ARGS=		--localstatedir=/var
-
 .include <bsd.port.mk>
--- a/x11/gnome/screensaver/Makefile
+++ b/x11/gnome/screensaver/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2012/04/14 20:19:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.49 2012/04/28 10:52:09 ajacoutot Exp $

 COMMENT=	screen saver and locker for GNOME

@ -35,8 +35,7 @@ LIB_DEPENDS=	x11/gnome/desktop>=3.2.0p0 \
 RUN_DEPENDS=	devel/gsettings-desktop-schemas \
 		sysutils/consolekit # src/gs-listener-dbus.c

-CONFIGURE_ARGS=	--localstatedir=/var \
-		--enable-docbook-docs \
+CONFIGURE_ARGS=	--enable-docbook-docs \
 		--enable-locking \
 		--with-console-kit \
 		--with-mit-ext \
--- a/x11/gnome/settings-daemon/Makefile
+++ b/x11/gnome/settings-daemon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.72 2012/04/27 10:59:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.73 2012/04/28 10:52:09 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -58,7 +58,6 @@ MODGNOME_CPPFLAGS=	-I${X11BASE}/include
 MODGNOME_LDFLAGS=	-L${X11BASE}/lib

 CONFIGURE_ARGS=	--disable-static \
-		--localstatedir=/var \
 		--disable-packagekit \
 		--disable-gudev \
 		--disable-systemd
--- a/x11/polkit-gnome/Makefile
+++ b/x11/polkit-gnome/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/10/27 15:46:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2012/04/28 10:52:09 ajacoutot Exp $

 COMMENT=	PolicyKit authentication agent for GNOME/GTK+

@ -34,8 +34,7 @@ LIB_DEPENDS=	sysutils/polkit>=0.102 \
 		x11/gtk+3

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--disable-gtk-doc
+CONFIGURE_ARGS=	--disable-gtk-doc

 # XXX no introspection support anymore, but configure still has a check for it
 CONFIGURE_ARGS += --disable-introspection