Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 May 2015 06:54:23 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r386913 - in head/net-mgmt: coovachilli ipplan net-snmp netmagis-common nsca nsca27 phpweathermap rackmonkey rancid rancid3 smokeping spectools
Message-ID:  <201505210654.t4L6sNVE099438@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu May 21 06:54:23 2015
New Revision: 386913
URL: https://svnweb.freebsd.org/changeset/ports/386913

Log:
  - Don't cat pkg-message from Makefiles
  
  Approved by:	portmgr blanket

Modified:
  head/net-mgmt/coovachilli/Makefile
  head/net-mgmt/ipplan/Makefile
  head/net-mgmt/net-snmp/Makefile
  head/net-mgmt/netmagis-common/Makefile
  head/net-mgmt/nsca/Makefile
  head/net-mgmt/nsca27/Makefile
  head/net-mgmt/phpweathermap/Makefile
  head/net-mgmt/rackmonkey/Makefile
  head/net-mgmt/rancid/Makefile
  head/net-mgmt/rancid3/Makefile
  head/net-mgmt/smokeping/Makefile
  head/net-mgmt/spectools/Makefile

Modified: head/net-mgmt/coovachilli/Makefile
==============================================================================
--- head/net-mgmt/coovachilli/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/coovachilli/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -32,6 +32,5 @@ post-install:
 	${INSTALL_MAN} ${FILESDIR}/main.conf.sample ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_MAN} ${FILESDIR}/pf.conf.sample ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_MAN} ${FILESDIR}/ipfw-config.sample ${STAGEDIR}/${EXAMPLESDIR}
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/ipplan/Makefile
==============================================================================
--- head/net-mgmt/ipplan/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/ipplan/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -62,6 +62,5 @@ post-install:
 .if ${PORT_OPTIONS:MPGSQL}
 	@${REINPLACE_CMD} -e 's|INSTALL|INSTALL-POSTGRESQL|g' ${PKGMESSAGE}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Modified: head/net-mgmt/net-snmp/Makefile
==============================================================================
--- head/net-mgmt/net-snmp/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/net-snmp/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -272,7 +272,7 @@ post-build:
 	${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile
 .endif
 
-post-install: strip-files install-config-files install-doc-files display-message
+post-install: strip-files install-config-files install-doc-files
 	@${MKDIR} ${STAGEDIR}/var/agentx
 	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmp.so.${SHLIB_VERSION} libnetsnmp.so)
 	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmpagent.so.${SHLIB_VERSION} libnetsnmpagent.so)
@@ -296,10 +296,6 @@ install-doc-files:
 . endfor
 .endif
 
-display-message:
-	${ECHO_MSG}
-	${CAT} ${PKGMESSAGE}
-
 # Maintainer's note:
 #   Don't forget to bump library version in these ports.
 #   french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,mail/cyrus-imapd23,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/wireshark,net/ifstat,net/quagga,net/rtg,print/hplip,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut

Modified: head/net-mgmt/netmagis-common/Makefile
==============================================================================
--- head/net-mgmt/netmagis-common/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/netmagis-common/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -77,7 +77,7 @@ post-patch:
 
 .if !target(post-install)
 post-install:
-	@if [ -f ${PKGMESSAGE} ] ; then ${CAT} ${PKGMESSAGE} ; fi
+	@${DO_NADA}
 .endif
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/nsca/Makefile
==============================================================================
--- head/net-mgmt/nsca/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/nsca/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -65,6 +65,5 @@ do-install:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/nsca27/Makefile
==============================================================================
--- head/net-mgmt/nsca27/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/nsca27/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -66,6 +66,5 @@ do-install:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/phpweathermap/Makefile
==============================================================================
--- head/net-mgmt/phpweathermap/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/phpweathermap/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -66,6 +66,5 @@ post-install:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/rackmonkey/Makefile
==============================================================================
--- head/net-mgmt/rackmonkey/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/rackmonkey/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -94,6 +94,5 @@ do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} sql ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${WWWDIR}/
 	${CHOWN} -R 80:80 ${STAGEDIR}${WWWDIR}
-	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/rancid/Makefile
==============================================================================
--- head/net-mgmt/rancid/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/rancid/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -57,11 +57,6 @@ post-patch:
 post-install:
 	${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${PREFIX}/bin
 	${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${PREFIX}/bin
-.if !defined(BATCH)
-	@ ${ECHO}
-	@ ${CAT} ${PKGMESSAGE}
-	@ ${ECHO}
-.endif
 .for file in ${NEWCONFIG_FILES}
 	@ if [ -f ${PREFIX}/etc/${PORTNAME}/${file} ] ; then \
 	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \

Modified: head/net-mgmt/rancid3/Makefile
==============================================================================
--- head/net-mgmt/rancid3/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/rancid3/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -63,11 +63,6 @@ post-patch:
 post-install:
 	${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${PREFIX}/bin
 	${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${PREFIX}/bin
-.if !defined(BATCH)
-	@ ${ECHO}
-	@ ${CAT} ${PKGMESSAGE}
-	@ ${ECHO}
-.endif
 .for file in ${NEWCONFIG_FILES}
 	@ if [ -f ${PREFIX}/etc/${PORTNAME}/${file} ] ; then \
 	${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \

Modified: head/net-mgmt/smokeping/Makefile
==============================================================================
--- head/net-mgmt/smokeping/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/smokeping/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -110,8 +110,4 @@ post-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/smokeping/htdocs/img
 	${MKDIR} ${STAGEDIR}/${PREFIX}/var/smokeping
 
-.if !defined(BATCH)
-	${CAT} ${PKGMESSAGE}
-.endif
-
 .include <bsd.port.post.mk>

Modified: head/net-mgmt/spectools/Makefile
==============================================================================
--- head/net-mgmt/spectools/Makefile	Thu May 21 06:53:04 2015	(r386912)
+++ head/net-mgmt/spectools/Makefile	Thu May 21 06:54:23 2015	(r386913)
@@ -64,6 +64,5 @@ post-install:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}/${DOCSDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505210654.t4L6sNVE099438>