- Move RESETPREFIX to default PLIST_SUB

With hat: portmgr
svn path=/head/; revision=365325
2025-07-18 17:59:20 -04:00 · 2014-08-18 16:43:24 +00:00 · 2014-08-18 16:43:24 +00:00 · 69f82727cf · 2021-03-31 03:12:20 +00:00
commit 69f82727cf
parent da1ccc4d38
26 changed files with 8 additions and 35 deletions
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -1570,7 +1570,8 @@ CONFIGURE_WRKSRC?=	${WRKSRC}
 BUILD_WRKSRC?=	${WRKSRC}
 INSTALL_WRKSRC?=${WRKSRC}

-PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE}
+PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} \
+			RESETPREFIX=${PREFIX}
 SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
 		DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
 		WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@ -22,6 +22,5 @@ USE_PYDISTUTILS=	yes
 USES=		twisted:run
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
 USE_RC_SUBR=	carbon
-PLIST_SUB+=	RESETPREFIX=${PREFIX}

 .include <bsd.port.mk>
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@ -55,8 +55,7 @@ PLIST_SUB=	PORTVERSION="${PORTVERSION}" \
 		HADOOP_RUNDIR="${HADOOP_RUNDIR}" \
 		HDFS_USER="${HDFS_USER}" \
 		MAPRED_USER="${MAPRED_USER}" \
-		HADOOP_GROUP="${HADOOP_GROUP}" \
-		RESETPREFIX=${PREFIX}
+		HADOOP_GROUP="${HADOOP_GROUP}"
 SUB_LIST=	HDFS_USER="${HDFS_USER}" \
 		MAPRED_USER="${MAPRED_USER}" \
 		HADOOP_GROUP="${HADOOP_GROUP}" \
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@ -33,7 +33,6 @@ PORTDOCS=	*

 PLIST_SUB=	PORTNAME=${PORTNAME} \
 		PORTVERSION=${PORTVERSION} \
-		RESETPREFIX=${PREFIX} \
 		JAVA_HOME=${JAVA_HOME}

 ZOOKEEPER_LOGDIR?=	/var/log/${PORTNAME}
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@ -27,7 +27,6 @@ LDFLAGS+=	-L${OPENSSLLIB}

 USE_RC_SUBR=	dma_flushq
 SUB_FILES=	pkg-message
-PLIST_SUB+=	RESETPREFIX=${PREFIX}

 # Allow subports to extend.
 CONFFILES+=	dma.conf auth.conf
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@ -485,7 +485,6 @@ SEDLIST+=	-e 's,^\# (TRUSTED_CONFIG_LIST=).*$$,\1${TRUSTED_CONFIG_LIST:S/,/\\,/g
 .endif

 MAKE_ENV+=	INSTALL_ARG="${EXIM_INSTALL_ARG}"
-PLIST_SUB+=	RESETPREFIX=${PREFIX}
 DUMMY_LDFLAGS!=	${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g'

 pre-everything::
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@ -104,7 +104,7 @@ USE_RC_SUBR=	postfix
 PLIST_SUB+=	BASE="@comment " BMAN=""
 .endif

-PLIST_SUB+=	PFETC=${ETCDIR} RESETPREFIX=${PREFIX}
+PLIST_SUB+=	PFETC=${ETCDIR}

 .if ${PORT_OPTIONS:MDOCS}
 READMEDIR=	${DOCSDIR}
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@ -105,7 +105,7 @@ USE_RC_SUBR=	postfix
 PLIST_SUB+=	BASE="@comment " BMAN=""
 .endif

-PLIST_SUB+=	PFETC=${ETCDIR} RESETPREFIX=${PREFIX}
+PLIST_SUB+=	PFETC=${ETCDIR}

 .if ${PORT_OPTIONS:MDOCS}
 READMEDIR=	${DOCSDIR}
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@ -29,8 +29,7 @@ CACHEDIR?=	${LOCALSTATDIR}/cache

 PLIST_SUB+=	LOCALSTATDIR=${LOCALSTATDIR} \
 		DBDIR=${DBDIR} \
-		CACHEDIR=${CACHEDIR} \
-		RESETPREFIX=${PREFIX}
+		CACHEDIR=${CACHEDIR}

 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}

--- a/multimedia/universal-media-server/Makefile
+++ b/multimedia/universal-media-server/Makefile
@ -57,7 +57,6 @@ UMS_PID_DIR=		/var/run/${PORTNAME}
 SUB_LIST=	RCNAME=${USE_RC_SUBR} JAVA_HOME=${JAVA_HOME} JAVA=${JAVA} \
 		UMS_PROFILE_PATH=${UMS_PROFILE_PATH}
 PLIST_SUB=	${SUB_LIST}
-PLIST_SUB+=	RESETPREFIX=${PREFIX}
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	universal_media_server

--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@ -67,8 +67,6 @@ CONFLICTS=	collectd-4.[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib

-PLIST_SUB+=	RESETPREFIX=${PREFIX}
-
 .include <bsd.port.options.mk>

 # NOTE: Plugins without dependencies are defined further down.
--- a/net-mgmt/flow-tools-ng/Makefile
+++ b/net-mgmt/flow-tools-ng/Makefile
@ -32,7 +32,6 @@ USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip

-PLIST_SUB=	RESETPREFIX=${PREFIX}
 SUB_LIST=	FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}" \
 		FLOW_CAPTURE_PIDDIR="${FLOW_CAPTURE_PIDDIR}"
 USE_RC_SUBR=	flow_capture flow_fanout
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@ -96,7 +96,6 @@ PLASMAMULE_CONFIGURE_ENV= \
 			ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
 			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
 			UPDATE_MIME_DATABASE=/usr/bin/true
-PLASMAMULE_PLIST_SUB+=	RESETPREFIX=${PREFIX}

 UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
 UPNP_CONFIGURE_OFF=	--disable-upnp
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@ -95,7 +95,6 @@ PLASMAMULE_CONFIGURE_ENV= \
 			ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
 			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
 			UPDATE_MIME_DATABASE=/usr/bin/true
-PLASMAMULE_PLIST_SUB+=	RESETPREFIX=${PREFIX}

 UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
 UPNP_CONFIGURE_OFF=	--disable-upnp
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@ -62,8 +62,7 @@ PLIST_SUB+=	DBDIR=${DBDIR:S/^\///} \
 		LOGDIR=${LOGDIR:S/^\///} \
 		RUNDIR=${RUNDIR:S/^\///} \
 		CLAMAVUSER=${CLAMAVUSER} \
-		CLAMAVGROUP=${CLAMAVGROUP} \
-		RESETPREFIX=${PREFIX}
+		CLAMAVGROUP=${CLAMAVGROUP}
 PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
 USE_AUTOTOOLS=	libltdl
 OPTIONS_SUB=	yes
--- a/security/munge/Makefile
+++ b/security/munge/Makefile
@ -15,7 +15,6 @@ LICENSE_COMB=	dual

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
-PLIST_SUB=	RESETPREFIX=${PREFIX}
 USES=		libtool pathfix perl5 tar:bzip2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	munged
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@ -31,7 +31,6 @@ CONFIGURE_ARGS=	--enable-swtok --enable-tpmtok \
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_RC_SUBR=	pkcsslotd
-PLIST_SUB=	RESETPREFIX=${PREFIX}
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
 USERS=		_pkcs11
--- a/security/openvas-server/Makefile
+++ b/security/openvas-server/Makefile
@ -21,6 +21,4 @@ CONFIGURE_ARGS=	--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lgcrypt

-PLIST_SUB=	RESETPREFIX=${PREFIX}
-
 .include <bsd.port.mk>
--- a/sysutils/mnrpes/Makefile
+++ b/sysutils/mnrpes/Makefile
@ -21,10 +21,7 @@ GH_COMMIT=	3f9942c
 USE_RC_SUBR=	mnrpes_receiver \
 		mnrpes_scheduler

-RESETPREFIX=	${PREFIX}
-
-PLIST_SUB+=	PORTNAME=${PORTNAME} \
-		RESETPREFIX=${RESETPREFIX}
+PLIST_SUB+=	PORTNAME=${PORTNAME}

 NO_BUILD=	yes

--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@ -29,7 +29,6 @@ USERS=		puppet
 GROUPS=		puppet
 SUB_FILES+=	pkg-message
 SUB_LIST=	RUBY=${RUBY}
-PLIST_SUB+=	RESETPREFIX=${PREFIX}

 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	PACKAGE_ORIGIN
--- a/sysutils/puppet27/Makefile
+++ b/sysutils/puppet27/Makefile
@ -26,7 +26,6 @@ PORTEXAMPLES=	*
 USERS=		puppet
 GROUPS=		puppet
 SUB_FILES+=	pkg-message
-PLIST_SUB+=	RESETPREFIX=${PREFIX}

 PORTSCOUT=	limit:^2\.7\.

--- a/www/free-sa-devel/Makefile
+++ b/www/free-sa-devel/Makefile
@ -22,7 +22,6 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}

 SUB_FILES=	pkg-deinstall
 SUB_LIST=	CACHEDIR="/var/cache/free-sa"
-PLIST_SUB+=	RESETPREFIX=${PREFIX}

 USE_CSTD=	gnu89

--- a/www/linux-f10-flashplugin11/Makefile
+++ b/www/linux-f10-flashplugin11/Makefile
@ -32,7 +32,6 @@ OPTIONS_DEFINE=	GNOME
 GNOME_DESC=	include gnome support for .desktop file

 OPTIONS_SUB=	yes
-PLIST_SUB+=RESETPREFIX=${PREFIX}

 .include <bsd.port.options.mk>

--- a/www/polipo/Makefile
+++ b/www/polipo/Makefile
@ -27,7 +27,6 @@ SUB_FILES=	pkg-message pkg-install pkg-deinstall 400.polipo
 SUB_LIST+=	USER=${PUSER} GROUP=${PGRP} DESTDIR=${DESTDIR} PCONFIGDIR=${PCONFIGDIR} \
 		PCACHEDIR=${PCACHEDIR} PPIDDIR=${PPIDDIR} PPIDFILE=${PPIDFILE} \
 		PLOGFILE=${PLOGFILE}
-PLIST_SUB+=	RESETPREFIX=${PREFIX}

 # polipo installation options, propagated to install scripts
 PUSER?=		polipo
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@ -25,7 +25,6 @@ USE_PYDISTUTILS=yes
 SUB_FILES=	pkg-message
 SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} DATADIR=${DATADIR}
-PLIST_SUB+=	RESETPREFIX=${PREFIX}

 post-patch:
 	@${RM} ${WRKSRC}/bin/build-index.sh.orig
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@ -23,8 +23,6 @@ USE_GNOME=	gconf2 libxslt
 USE_XORG=	glproto ice sm x11 xcomposite xdamage xext xfixes xinerama \
 		xrandr xrender
 USE_LDCONFIG=	yes
-# Workaround buggy pkg_install
-PLIST_SUB=	RESETPREFIX=${PREFIX}

 GCONF_SCHEMAS=	gwd.schemas \
 		compiz-annotate.schemas \