Bug 169430 - net-mgmt/flowviewer Makefile does not install scripts added upstream
Summary: net-mgmt/flowviewer Makefile does not install scripts added upstream
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Michael Scheidell
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-06-26 00:00 UTC by David Johnson
Modified: 2012-08-10 08:20 UTC (History)
0 users

See Also:


Attachments
patch.txt (2.78 KB, text/plain; charset=us-ascii)
2012-08-10 00:00 UTC, Michael Scheidell
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description David Johnson 2012-06-26 00:00:24 UTC
The following scripts are not referenced in the Makefile.

FlowGrapher_Relay.cgi
FlowGrapher_Sort.cgi
FlowTracker_Dumper.cgi
FlowTracker_Relay.cgi
FlowViewer_Relay.cgi

They are not copied to the installation directory.

Fix: 

Copy the following files from /usr/ports/net-mgmt/flowviewer/work/FlowViewer_3.3.1/ to /usr/local/www/flowviewer/

FlowGrapher_Relay.cgi
FlowGrapher_Sort.cgi
FlowTracker_Dumper.cgi
FlowTracker_Relay.cgi
FlowViewer_Relay.cgi
How-To-Repeat: Install the port.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-06-26 08:35:15 UTC
Maintainer of net-mgmt/flowviewer,

Please note that PR ports/169430 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169430

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-06-26 08:35:19 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Michael Scheidell freebsd_committer freebsd_triage 2012-08-09 13:11:34 UTC
State Changed
From-To: feedback->open

Feedback timeout.
Comment 4 Michael Scheidell freebsd_committer freebsd_triage 2012-08-09 13:21:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->scheidell

I'll take it.
Comment 5 Michael Scheidell freebsd_committer freebsd_triage 2012-08-10 00:00:06 UTC
I have made a couple changes to this port, cleaned it up a little, used the 'PORTDOCS' magic
(see <http://www.freebsd.org/doc/en/books/porters-handbook/install.html>, I almost used COPYTREE_SHARE, but it would not have 
helped with pkg-plist.

As you notice, I removed a pkg-plist entry that refrenced a file that seems to no longer be there.
(install porttools and run 'port test' which would check packageing and removal)
Comment 6 Michael Scheidell freebsd_committer freebsd_triage 2012-08-10 00:10:58 UTC
State Changed
From-To: open->feedback

Ask for maintainer approval.
Comment 7 Oleksii Samorukov freebsd_committer freebsd_triage 2012-08-10 06:21:40 UTC
thank you, please commit
Comment 8 dfilter service freebsd_committer freebsd_triage 2012-08-10 08:10:55 UTC
Author: scheidell
Date: Fri Aug 10 07:10:45 2012
New Revision: 302376
URL: http://svn.freebsd.org/changeset/ports/302376

Log:
  - Add missing files from distribution
  - Remove nonexistant files from Makefile and pkg-plist
  - Use PORTDOCS macro
  - Bump PORTREVISION
  
  PR:		ports/169430
  Submitted by:	David Johnson <djohnson@osbar.org>
  Approved by:	Alex Samorukov <samm@os2.kiev.ua> (maintainer)

Modified:
  head/net-mgmt/flowviewer/Makefile
  head/net-mgmt/flowviewer/pkg-plist

Modified: head/net-mgmt/flowviewer/Makefile
==============================================================================
--- head/net-mgmt/flowviewer/Makefile	Fri Aug 10 04:49:11 2012	(r302375)
+++ head/net-mgmt/flowviewer/Makefile	Fri Aug 10 07:10:45 2012	(r302376)
@@ -6,7 +6,7 @@
 
 PORTNAME=	flowviewer
 PORTVERSION=	3.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://ensight.eos.nasa.gov/FlowViewer/
 DISTNAME=	FlowViewer_${DISTVERSION}
@@ -32,9 +32,7 @@ SUB_FILES=	pkg-message
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-.if !defined(NOPORTDOCS)
-PORTDOC_FILES=	README
-.endif
+PORTDOCS=	README
 
 post-patch:
 	@${REINPLACE_CMD} -E \
@@ -48,10 +46,14 @@ do-install:
 	@${MKDIR} ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher_Main.cgi ${FLOWVIEWERDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher_Relay.cgi ${FLOWVIEWERDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/FlowGrapher_Sort.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker.cgi ${FLOWVIEWERDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Main.cgi ${FLOWVIEWERDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Dumper.cgi ${FLOWVIEWERDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Relay.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Main.cgi ${FLOWVIEWERDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Relay.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Save.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Group.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Utilities.pm ${FLOWVIEWERDIR}
@@ -74,6 +76,6 @@ do-install:
 .endif
 
 post-install:
-	${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/flowviewer/pkg-plist
==============================================================================
--- head/net-mgmt/flowviewer/pkg-plist	Fri Aug 10 04:49:11 2012	(r302375)
+++ head/net-mgmt/flowviewer/pkg-plist	Fri Aug 10 07:10:45 2012	(r302376)
@@ -1,23 +1,25 @@
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%FLOWVIEWERDIR%%/FlowGrapher.cgi
 %%FLOWVIEWERDIR%%/FlowGrapher.png
 %%FLOWVIEWERDIR%%/FlowGrapher_Colors
 %%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi
+%%FLOWVIEWERDIR%%/FlowGrapher_Relay.cgi
+%%FLOWVIEWERDIR%%/FlowGrapher_Sort.cgi
 %%FLOWVIEWERDIR%%/FlowTracker.cgi
 %%FLOWVIEWERDIR%%/FlowTracker.png
 %%FLOWVIEWERDIR%%/FlowTracker_Collector
+%%FLOWVIEWERDIR%%/FlowTracker_Dumper.cgi
 %%FLOWVIEWERDIR%%/FlowTracker_Grapher
 %%FLOWVIEWERDIR%%/FlowTracker_Group.cgi
-%%FLOWVIEWERDIR%%/FlowTracker_Main.cgi
+%%FLOWVIEWERDIR%%/FlowTracker_Relay.cgi
 %%FLOWVIEWERDIR%%/FlowViewer.cgi
 %%FLOWVIEWERDIR%%/FlowViewer.png
 %%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.dist
 %%FLOWVIEWERDIR%%/FlowViewer_Main.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Save.cgi
+%%FLOWVIEWERDIR%%/FlowViewer_Relay.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Utilities.pm
 @dirrm %%FLOWVIEWERDIR%%/tracker
 @dirrm %%FLOWVIEWERDIR%%/tmp
 @dirrm %%FLOWVIEWERDIR%%/reports
 @dirrm %%FLOWVIEWERDIR%%/graphs
 @dirrm %%FLOWVIEWERDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 9 Michael Scheidell freebsd_committer freebsd_triage 2012-08-10 08:11:14 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!