Date: Thu, 20 Sep 2012 01:20:12 GMT From: Craig Leres <leres@ee.lbl.gov> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/171393: [PATCH] net-mgmt/nfsen: fix pkg-plist Message-ID: <201209200120.q8K1KCqF017639@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/171393; it has been noted by GNATS.
From: Craig Leres <leres@ee.lbl.gov>
To: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, JWelcher@lbl.gov, janos.mohacsi@bsd.hu
Subject: Re: ports/171393: [PATCH] net-mgmt/nfsen: fix pkg-plist
Date: Wed, 19 Sep 2012 18:10:31 -0700
This is a multi-part message in MIME format.
--------------020706030305020906030506
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
On 09/16/12 07:16, Raphael Kubo da Costa wrote:
> The patch adds `libexec/%%PORTNAME%%/NfSenRC.pm.orig' to the plist. This
> looks like the wrong fix, as the .orig file should be removed before the
> installation phase instead.
I agree a previous commit should not have installed NfSenRC.pm.orig.
Here's a new patchset that removes the errant file in post-patch.
Craig
--------------020706030305020906030506
Content-Type: text/plain; charset=us-ascii;
name="patch-nfsen"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="patch-nfsen"
--- Makefile.orig 2012-08-16 15:40:58.000000000 -0700
+++ Makefile 2012-09-19 18:04:11.000000000 -0700
@@ -7,7 +7,7 @@
PORTNAME= nfsen
PORTVERSION= 1.3.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
http://nfsen.sourceforge.net/
@@ -44,6 +44,7 @@
@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/
${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${PREFIX}/libexec/${PORTNAME}/
+ ${RM} -f ${WRKSRC}/libexec/NfSenRC.pm.orig
@ if [ -f ${PREFIX}/etc/nfsen.conf ] ; then \
${ECHO_MSG} "installing with existing nfsen.conf"; \
cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${PREFIX}/etc/nfsen.conf; \
--- pkg-plist.orig 2009-07-09 16:29:49.000000000 -0700
+++ pkg-plist 2012-09-19 17:56:40.000000000 -0700
@@ -34,6 +34,7 @@
www/%%PORTNAME%%/icons/arrow.blue.right.png
www/%%PORTNAME%%/icons/arrow.yellow.down.png
www/%%PORTNAME%%/icons/arrow.yellow.right.png
+www/%%PORTNAME%%/icons/cancel.png
www/%%PORTNAME%%/icons/close.png
www/%%PORTNAME%%/icons/cursor-line.png
www/%%PORTNAME%%/icons/cursor-start.png
@@ -65,82 +66,17 @@
www/%%PORTNAME%%/lookup.php
www/%%PORTNAME%%/navigator.php
www/%%PORTNAME%%/nfsen.php
-www/%%PORTNAME%%/nfsen.php.orig
www/%%PORTNAME%%/nfsenutil.php
www/%%PORTNAME%%/overview.php
www/%%PORTNAME%%/pic.php
www/%%PORTNAME%%/process.php
www/%%PORTNAME%%/profileadmin.php
www/%%PORTNAME%%/rrdgraph.php
-www/%%PORTNAME%%/doc/AlertArmed.png
-www/%%PORTNAME%%/doc/AlertArmedMultiple.png
-www/%%PORTNAME%%/doc/AlertArmTrigger.png
-www/%%PORTNAME%%/doc/AlertBlocked.png
-www/%%PORTNAME%%/doc/AlertConditions1.png
-www/%%PORTNAME%%/doc/AlertConditions2.png
-www/%%PORTNAME%%/doc/AlertCreateDialoge.png
-www/%%PORTNAME%%/doc/AlertDefinition.png
-www/%%PORTNAME%%/doc/AlertFired.png
-www/%%PORTNAME%%/doc/AlertFiredOnce.png
-www/%%PORTNAME%%/doc/AlertFlow.png
-www/%%PORTNAME%%/doc/AlertInactive.png
-www/%%PORTNAME%%/doc/AlertInfo.png
-www/%%PORTNAME%%/doc/alerting.png
-www/%%PORTNAME%%/doc/AlertList.png
-www/%%PORTNAME%%/doc/AlertTrigger.png
-www/%%PORTNAME%%/doc/Bookmark.png
-www/%%PORTNAME%%/doc/dirstruct.png
-www/%%PORTNAME%%/doc/BSD-license.html
-www/%%PORTNAME%%/doc/BuildingProfile.png
-www/%%PORTNAME%%/doc/ChannelDialog.png
-www/%%PORTNAME%%/doc/cursor_control.png
-www/%%PORTNAME%%/doc/custom-format.png
-www/%%PORTNAME%%/doc/DefaultFilter.png
-www/%%PORTNAME%%/doc/details-graphs.png
-www/%%PORTNAME%%/doc/DisabledSources.png
-www/%%PORTNAME%%/doc/DragHandle.png
-www/%%PORTNAME%%/doc/edit.png
-www/%%PORTNAME%%/doc/ExpandStat.png
-www/%%PORTNAME%%/doc/flows.png
-www/%%PORTNAME%%/doc/index.html
-www/%%PORTNAME%%/doc/linegraph.png
-www/%%PORTNAME%%/doc/Lookup.png
-www/%%PORTNAME%%/doc/Navigating.png
-www/%%PORTNAME%%/doc/Navigating.psd
-www/%%PORTNAME%%/doc/navigation.png
-www/%%PORTNAME%%/doc/NewProfile.png
-www/%%PORTNAME%%/doc/nfsen-dist.conf
-www/%%PORTNAME%%/doc/OutOfData.png
-www/%%PORTNAME%%/doc/overview.png
-www/%%PORTNAME%%/doc/PluginGuide/plugin-alertaction.png
-www/%%PORTNAME%%/doc/PluginGuide/plugin-alertcondition.png
-www/%%PORTNAME%%/doc/PluginGuide/plugin-guide.html
-www/%%PORTNAME%%/doc/PluginGuide/plugins-comm.png
-www/%%PORTNAME%%/doc/PluginGuide/plugins-concept.png
-www/%%PORTNAME%%/doc/PluginGuide/plugins-frontend-flow.png
-www/%%PORTNAME%%/doc/PortTracker.png
-www/%%PORTNAME%%/doc/processing-1.png
-www/%%PORTNAME%%/doc/ProcessingControls.png
-www/%%PORTNAME%%/doc/ProcessingOutput.png
-www/%%PORTNAME%%/doc/ProfileChannels.png
-www/%%PORTNAME%%/doc/ProfileCommit.png
-www/%%PORTNAME%%/doc/ProfileConversion.png
-www/%%PORTNAME%%/doc/ProfileCreated.png
-www/%%PORTNAME%%/doc/ProfileExamples.png
-www/%%PORTNAME%%/doc/selectprofile.png
-www/%%PORTNAME%%/doc/SelectWindow.png
-www/%%PORTNAME%%/doc/stat.png
-www/%%PORTNAME%%/doc/StatSummary.png
-www/%%PORTNAME%%/doc/TimeWindow.png
-www/%%PORTNAME%%/doc/trigger.png
-www/%%PORTNAME%%/doc/WinScale.png
www/%%PORTNAME%%/conf.php
www/%%PORTNAME%%/plugins/demoplugin.php
@dirrm www/%%PORTNAME%%/css
@dirrm www/%%PORTNAME%%/icons
@dirrm www/%%PORTNAME%%/js
-@dirrm www/%%PORTNAME%%/doc/PluginGuide
-@dirrm www/%%PORTNAME%%/doc
@dirrm www/%%PORTNAME%%/plugins
@dirrm www/%%PORTNAME%%
@exec mkdir -p %D/var/%%PORTNAME%%/profiles-stat/live/
--------------020706030305020906030506--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209200120.q8K1KCqF017639>