Attachment 155682 Details for Bug 199506 – patch

[patch] patch

localstatedir.patch (text/plain), 10.84 KB, created by Tijl Coosemans on 2015-04-17 21:39:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-04-17 21:39:09 UTC

Size: 10.84 KB

patch

obsolete

>Index: Mk/Scripts/qa.sh
>===================================================================
>--- Mk/Scripts/qa.sh	(revision 384161)
>+++ Mk/Scripts/qa.sh	(working copy)
>@@ -255,7 +255,13 @@ libperl() {
> 	fi
> }
> 
>-checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl"
>+prefixvar() {
>+	if test -d ${STAGEDIR}${PREFIX}/var; then
>+		warn "port uses ${PREFIX}/var instead of /var"
>+	fi
>+}
>+
>+checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar"
> 
> ret=0
> cd ${STAGEDIR}
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 384161)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -805,7 +805,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
> #				  Default: ${PREFIX}
> # CONFIGURE_ARGS
> #				- Pass these args to configure if ${HAS_CONFIGURE} is set.
>-#				  Default: "--prefix=${GNU_CONFIGURE_PREFIX} --infodir=${PREFIX}/${INFO_PATH}
>+#				  Default: "--prefix=${GNU_CONFIGURE_PREFIX}
>+#				  --infodir=${PREFIX}/${INFO_PATH} --localstatedir=/var
> #				  --mandir=${MANPREFIX}/man --build=${CONFIGURE_TARGET}" if
> #				  GNU_CONFIGURE is set, "CC=${CC} CFLAGS=${CFLAGS}
> #				  PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib
>@@ -2678,6 +2679,10 @@ HAS_CONFIGURE=		yes
> 
> SET_LATE_CONFIGURE_ARGS= \
>      _LATE_CONFIGURE_ARGS="" ; \
>+	if [ -z "${CONFIGURE_ARGS:M--localstatedir=*:Q}" ] && \
>+	   ./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \
>+	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --localstatedir=/var" ; \
>+	fi ; \
> 	if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \
> 	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \
> 	fi ; \
>Index: devel/global/Makefile
>===================================================================
>--- devel/global/Makefile	(revision 384161)
>+++ devel/global/Makefile	(working copy)
>@@ -14,6 +14,7 @@ LICENSE=	GPLv3
> OPTIONS_DEFINE=	DOCS
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
> INSTALL_TARGET=	install-strip
> USES=		libtool perl5
> 
>Index: dns/opendnssec/Makefile
>===================================================================
>--- dns/opendnssec/Makefile	(revision 384161)
>+++ dns/opendnssec/Makefile	(working copy)
>@@ -15,6 +15,7 @@ BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/
> LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
> USE_RC_SUBR=	opendnssec
> USE_GNOME=	libxml2
> USES=		perl5
>Index: dns/opendnssec13/Makefile
>===================================================================
>--- dns/opendnssec13/Makefile	(revision 384161)
>+++ dns/opendnssec13/Makefile	(working copy)
>@@ -17,6 +17,7 @@ BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/
> LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
> USE_RC_SUBR=	opendnssec
> USE_GNOME=	libxml2
> USES=		perl5
>Index: games/wolfpack/Makefile
>===================================================================
>--- games/wolfpack/Makefile	(revision 384161)
>+++ games/wolfpack/Makefile	(working copy)
>@@ -17,8 +17,7 @@ USES=		gmake perl5
> USE_PERL5=	build
> GNU_CONFIGURE=	yes
> BINDIR=		${PREFIX}/lib/${PORTNAME}
>-VARDIR=		${PREFIX}/var/${PORTNAME}
>-CONFIGURE_ARGS+=	--bindir=${BINDIR} --sbindir=${BINDIR}
>+CONFIGURE_ARGS=	--bindir=${BINDIR} --sbindir=${BINDIR} --localstatedir="${PREFIX}/var"
> 
> CONFLICTS_INSTALL=	empire-[0-9]*
> 
>Index: games/xlogical/Makefile
>===================================================================
>--- games/xlogical/Makefile	(revision 384161)
>+++ games/xlogical/Makefile	(working copy)
>@@ -14,11 +14,10 @@ COMMENT=	Remake of the classic puzzle ga
> 
> LICENSE=	GPLv2
> 
>-USES=		gmake tar:bzip2 dos2unix
>-USE_AUTOTOOLS=	aclocal automake autoconf
>-AUTOMAKE_ARGS=	--add-missing
>-USE_SDL=	sdl image mixer
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
>+USES=		autoreconf dos2unix gmake tar:bzip2
>+USE_SDL=	sdl image mixer
> 
> OPTIONS_DEFINE=	DOCS
> 
>Index: lang/smalltalk/Makefile
>===================================================================
>--- lang/smalltalk/Makefile	(revision 384161)
>+++ lang/smalltalk/Makefile	(working copy)
>@@ -33,6 +33,7 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	ac_cv_prog_EMACS=no ac_cv_prog_AWK=gawk
> CONFIGURE_ARGS=	--enable-generational-gc=no \
> 		--enable-gtk=no \
>+		--localstatedir="${PREFIX}/var" \
> 		--with-emacs=no \
> 		--with-gmp=no
> USE_LDCONFIG=	yes
>Index: mail/gnarwl/Makefile
>===================================================================
>--- mail/gnarwl/Makefile	(revision 384161)
>+++ mail/gnarwl/Makefile	(working copy)
>@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${P
> USES=		iconv gmake tar:tgz
> USE_OPENLDAP=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
>+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --localstatedir="${PREFIX}/var"
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
> 
>Index: net/ndisc6/Makefile
>===================================================================
>--- net/ndisc6/Makefile	(revision 384161)
>+++ net/ndisc6/Makefile	(working copy)
>@@ -16,7 +16,7 @@ LICENSE=	GPLv2
> USES=		tar:bzip2 perl5
> USE_GCC=	any
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-suid-install
>+CONFIGURE_ARGS=	--disable-suid-install --localstatedir="${PREFIX}/var"
> CONFIGURE_ENV=	PERL=${LOCALBASE}/bin/perl
> MAKE_ENV=	CHOWNPROG=:
> 
>Index: net-mgmt/smokeping/Makefile
>===================================================================
>--- net-mgmt/smokeping/Makefile	(revision 384161)
>+++ net-mgmt/smokeping/Makefile	(working copy)
>@@ -36,6 +36,7 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ENV+=	PERL=${PERL} PERL5LIB=${PREFIX}/smokeping/lib
> CONFIGURE_ARGS+=	\
> 		--sysconfdir=${ETCDIR} \
>+		--localstatedir="${PREFIX}/var" \
> 		--with-htdocs-dir=${PREFIX}/smokeping/htdocs \
> 		--libdir=${PREFIX}/smokeping/lib
> HTDOCSDIR=	${PREFIX}/smokeping/htdocs
>Index: security/krb5/Makefile
>===================================================================
>--- security/krb5/Makefile	(revision 384161)
>+++ security/krb5/Makefile	(working copy)
>@@ -28,7 +28,7 @@ USE_CSTD=		gnu99
> GNU_CONFIGURE=		yes
> USES=			cpe gettext gmake perl5 libtool:build
> CONFIGURE_ARGS?=	--enable-shared --without-system-verto \
>-			--disable-rpath
>+			--disable-rpath --localstatedir="${PREFIX}/var"
> CONFIGURE_ENV=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}"
> MAKE_ARGS=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}"
> 
>Index: security/krb5-111/Makefile
>===================================================================
>--- security/krb5-111/Makefile	(revision 384161)
>+++ security/krb5-111/Makefile	(working copy)
>@@ -32,7 +32,8 @@ USE_PERL5=		build
> USE_LDCONFIG=		yes
> USE_CSTD=		gnu99
> GNU_CONFIGURE=		yes
>-CONFIGURE_ARGS?=	--without-system-verto --disable-rpath
>+CONFIGURE_ARGS?=	--without-system-verto --disable-rpath \
>+			--localstatedir="${PREFIX}/var"
> CONFIGURE_ENV=		NSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}"
> MAKE_ARGS=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}"
> 
>Index: security/krb5-112/Makefile
>===================================================================
>--- security/krb5-112/Makefile	(revision 384161)
>+++ security/krb5-112/Makefile	(working copy)
>@@ -30,7 +30,7 @@ USE_CSTD=		gnu99
> GNU_CONFIGURE=		yes
> USES=			cpe gettext gmake perl5 libtool:build
> CONFIGURE_ARGS?=	--enable-shared --without-system-verto \
>-			--disable-rpath
>+			--disable-rpath --localstatedir="${PREFIX}/var"
> CONFIGURE_ENV=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}"
> MAKE_ARGS=		INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}"
> 
>Index: security/nessus/Makefile
>===================================================================
>--- security/nessus/Makefile	(revision 384161)
>+++ security/nessus/Makefile	(working copy)
>@@ -28,6 +28,7 @@ GTK2_USES=	pkgconfig
> GTK2_USE=	GNOME=gtk20
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
> MAKE_JOBS_UNSAFE=	yes
> SUB_FILES=	nessusd.conf
> USE_RC_SUBR=	nessusd
>Index: security/nessus-libnasl/Makefile
>===================================================================
>--- security/nessus-libnasl/Makefile	(revision 384161)
>+++ security/nessus-libnasl/Makefile	(working copy)
>@@ -21,6 +21,7 @@ LICENSE=	GPLv2
> LIB_DEPENDS=	libnessus.so:${PORTSDIR}/security/nessus-libraries
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
> USES=		bison libtool
> USE_LDCONFIG=	yes
> USE_OPENSSL=	yes
>Index: security/nessus-libraries/Makefile
>===================================================================
>--- security/nessus-libraries/Makefile	(revision 384161)
>+++ security/nessus-libraries/Makefile	(working copy)
>@@ -21,7 +21,7 @@ COMMENT=	Libraries for Nessus, the secur
> LICENSE=	LGPL20
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-cipher
>+CONFIGURE_ARGS=	--enable-cipher --localstatedir="${PREFIX}/var"
> .if defined(WITH_NESSUS_BPF_SHARE)
> CONFIGURE_ARGS+=	--enable-bpf-sharing
> .endif
>Index: security/nessus-plugins/Makefile
>===================================================================
>--- security/nessus-plugins/Makefile	(revision 384161)
>+++ security/nessus-plugins/Makefile	(working copy)
>@@ -24,7 +24,7 @@ USES=		libtool
> WRKSRC=		${WRKDIR}/nessus-plugins
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-fetchcmd=wget
>+CONFIGURE_ARGS=	--with-fetchcmd=wget --localstatedir="${PREFIX}/var"
> 
> post-patch:
> 	@${REINPLACE_CMD} 's/-o $$(installuser)//' ${WRKSRC}/Makefile
>Index: security/softhsm2/Makefile
>===================================================================
>--- security/softhsm2/Makefile	(revision 384161)
>+++ security/softhsm2/Makefile	(working copy)
>@@ -14,11 +14,10 @@ COMMENT=	Software implementation of a Ha
> 
> LICENSE=	BSD2CLAUSE
> 
>-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
>+LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
> 
> GNU_CONFIGURE=	yes
>-
>-CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
>+CONFIGURE_ARGS=	--with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var"
> INSTALL_TARGET=	install-strip
> USES=		libtool
> 
>Index: textproc/mifluz/Makefile
>===================================================================
>--- textproc/mifluz/Makefile	(revision 384161)
>+++ textproc/mifluz/Makefile	(working copy)
>@@ -14,6 +14,7 @@ LICENSE=	GPLv3
> USES=		bison iconv libtool makeinfo pathfix
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-posixmutexes \
>+		--localstatedir="${PREFIX}/var" \
> 		--without-unac
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>Index: textproc/soothsayer/Makefile
>===================================================================
>--- textproc/soothsayer/Makefile	(revision 384161)
>+++ textproc/soothsayer/Makefile	(working copy)
>@@ -22,7 +22,7 @@ CONFIGURE_ENV=	ac_cv_path_CPPUNIT_CONFIG
> 		ac_cv_path_SWIG=no \
> 		ac_cv_prog_HAVE_DOT=no \
> 		ac_cv_prog_HAVE_DOXYGEN=no
>-CONFIGURE_ARGS=	--disable-python-binding
>+CONFIGURE_ARGS=	--disable-python-binding --localstatedir="${PREFIX}/var"
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>

Actions: View | Diff

Attachments on bug 199506: 155682 | 155776