svn commit: r365325 - in head: Mk databases/py-carbon devel/hadoop2 devel/zookeeper mail/dma mail/exim mail/postfix mail/postfix-current mail/py-spambayes multimedia/universal-media-server net-mgmt...

Bryan Drewery bdrewery at FreeBSD.org
Mon Aug 18 16:43:31 UTC 2014 

Author: bdrewery
Date: Mon Aug 18 16:43:24 2014
New Revision: 365325
URL: http://svnweb.freebsd.org/changeset/ports/365325
QAT: https://qat.redports.org/buildarchive/r365325/

Log:
  - Move RESETPREFIX to default PLIST_SUB
  
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk
  head/databases/py-carbon/Makefile
  head/devel/hadoop2/Makefile
  head/devel/zookeeper/Makefile
  head/mail/dma/Makefile
  head/mail/exim/Makefile
  head/mail/postfix-current/Makefile
  head/mail/postfix/Makefile
  head/mail/py-spambayes/Makefile
  head/multimedia/universal-media-server/Makefile
  head/net-mgmt/collectd5/Makefile
  head/net-mgmt/flow-tools-ng/Makefile
  head/net-p2p/amule-devel/Makefile
  head/net-p2p/amule/Makefile
  head/security/clamav/Makefile
  head/security/munge/Makefile
  head/security/opencryptoki/Makefile
  head/security/openvas-server/Makefile
  head/sysutils/mnrpes/Makefile
  head/sysutils/puppet/Makefile
  head/sysutils/puppet27/Makefile
  head/www/free-sa-devel/Makefile
  head/www/linux-f10-flashplugin11/Makefile
  head/www/polipo/Makefile
  head/www/py-graphite-web/Makefile
  head/x11-wm/compiz/Makefile

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/Mk/bsd.port.mk	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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}

Modified: head/databases/py-carbon/Makefile
==============================================================================
--- head/databases/py-carbon/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/databases/py-carbon/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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>

Modified: head/devel/hadoop2/Makefile
==============================================================================
--- head/devel/hadoop2/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/devel/hadoop2/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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}" \

Modified: head/devel/zookeeper/Makefile
==============================================================================
--- head/devel/zookeeper/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/devel/zookeeper/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -33,7 +33,6 @@ PORTDOCS=	*
 
 PLIST_SUB=	PORTNAME=${PORTNAME} \
 		PORTVERSION=${PORTVERSION} \
-		RESETPREFIX=${PREFIX} \
 		JAVA_HOME=${JAVA_HOME}
 
 ZOOKEEPER_LOGDIR?=	/var/log/${PORTNAME}

Modified: head/mail/dma/Makefile
==============================================================================
--- head/mail/dma/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/mail/dma/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/mail/exim/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -485,7 +485,6 @@ SEDLIST+=	-e 's,^\# (TRUSTED_CONFIG_LIST
 .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::

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/mail/postfix-current/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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}

Modified: head/mail/postfix/Makefile
==============================================================================
--- head/mail/postfix/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/mail/postfix/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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}

Modified: head/mail/py-spambayes/Makefile
==============================================================================
--- head/mail/py-spambayes/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/mail/py-spambayes/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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}
 

Modified: head/multimedia/universal-media-server/Makefile
==============================================================================
--- head/multimedia/universal-media-server/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/multimedia/universal-media-server/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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
 

Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/net-mgmt/collectd5/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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.

Modified: head/net-mgmt/flow-tools-ng/Makefile
==============================================================================
--- head/net-mgmt/flow-tools-ng/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/net-mgmt/flow-tools-ng/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/net-p2p/amule-devel/Makefile
==============================================================================
--- head/net-p2p/amule-devel/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/net-p2p/amule-devel/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/net-p2p/amule/Makefile
==============================================================================
--- head/net-p2p/amule/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/net-p2p/amule/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/security/clamav/Makefile
==============================================================================
--- head/security/clamav/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/security/clamav/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/security/munge/Makefile
==============================================================================
--- head/security/munge/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/security/munge/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/security/opencryptoki/Makefile
==============================================================================
--- head/security/opencryptoki/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/security/opencryptoki/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -31,7 +31,6 @@ CONFIGURE_ARGS=	--enable-swtok --enable-
 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

Modified: head/security/openvas-server/Makefile
==============================================================================
--- head/security/openvas-server/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/security/openvas-server/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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>

Modified: head/sysutils/mnrpes/Makefile
==============================================================================
--- head/sysutils/mnrpes/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/sysutils/mnrpes/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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
 

Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/sysutils/puppet/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/sysutils/puppet27/Makefile
==============================================================================
--- head/sysutils/puppet27/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/sysutils/puppet27/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -26,7 +26,6 @@ PORTEXAMPLES=	*
 USERS=		puppet
 GROUPS=		puppet
 SUB_FILES+=	pkg-message
-PLIST_SUB+=	RESETPREFIX=${PREFIX}
 
 PORTSCOUT=	limit:^2\.7\.
 

Modified: head/www/free-sa-devel/Makefile
==============================================================================
--- head/www/free-sa-devel/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/www/free-sa-devel/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -22,7 +22,6 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	CACHEDIR="/var/cache/free-sa"
-PLIST_SUB+=	RESETPREFIX=${PREFIX}
 
 USE_CSTD=	gnu89
 

Modified: head/www/linux-f10-flashplugin11/Makefile
==============================================================================
--- head/www/linux-f10-flashplugin11/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/www/linux-f10-flashplugin11/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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>
 

Modified: head/www/polipo/Makefile
==============================================================================
--- head/www/polipo/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/www/polipo/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -27,7 +27,6 @@ SUB_FILES=	pkg-message pkg-install pkg-d
 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

Modified: head/www/py-graphite-web/Makefile
==============================================================================
--- head/www/py-graphite-web/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/www/py-graphite-web/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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

Modified: head/x11-wm/compiz/Makefile
==============================================================================
--- head/x11-wm/compiz/Makefile	Mon Aug 18 16:10:00 2014	(r365324)
+++ head/x11-wm/compiz/Makefile	Mon Aug 18 16:43:24 2014	(r365325)
@@ -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 \

More information about the svn-ports-head mailing list