ports/112689: [MAINTAINER]: Fix net/ntop

[Wesley Shields]

>Number:         112689
>Category:       ports
>Synopsis:       [MAINTAINER]: Fix net/ntop
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 15 18:10:07 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Wesley Shields
>Release:        FreeBSD 6.2-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD syn.csh.rit.edu 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #6: Fri Apr 27 09:18:33 EDT 2007 root at syn.csh.rit.edu:/usr/obj/usr/src/sys/SMP amd64

>Description:
The following is an email sent to me from Robert Noland:

--- QUOTE ---
Hi,

It seems that Qt4 is installing things to /usr/local/lib/plugins, which
ntop is trying to remove in it's post-install target.  This is causing
installation of ntop to fail.

# $FreeBSD: ports/net/ntop/Makefile,v 1.59 2007/02/10 06:05:03 kris Exp
$
#

PORTNAME=       ntop
PORTVERSION=    3.2
PORTREVISION=   4

...

post-install:
        @${MKDIR} ${DBDIR}/ntop
        @${CHOWN} -R nobody:nobody ${DBDIR}/ntop
        @${RMDIR} ${PREFIX}/lib/plugins

rnoland-ibm% ls -l                                                    
total 8184
drwxr-xr-x  2 root  wheel      512 Apr 26 17:05 accessible
drwxr-xr-x  2 root  wheel      512 Apr 26 18:29 iconengines
drwxr-xr-x  2 root  wheel      512 Apr 26 18:27 imageformats
drwxr-xr-x  2 root  wheel      512 Apr 26 18:33 inputmethods
-rwxr-xr-x  1 root  wheel   256951 Apr 26 17:45 libqt3supportwidgets.so
-rw-r--r--  1 root  wheel  8075392 Apr 26 17:45
libqt3supportwidgets.so.debug

rnoland-ibm% pkg_info -W `pwd`/libqt3supportwidgets.so                
/usr/local/lib/plugins/libqt3supportwidgets.so was installed by package
qt4-designer-4.2.3_1
rnoland-ibm% pkg_info -W /usr/local/lib/plugins/iconengines/libqsvg.so
/usr/local/lib/plugins/iconengines/libqsvg.so was installed by package
qt4-iconengines-4.2.3

robert.
--- END QUOTE ---

The attached patch fixes this problem.  It adds files/patch-Makefile.in
which removes the unnecessary line, removes the erroneous post-install
line and bumps PORTREVISION.  I believe bumping PORTREVISION is the
right thing, but please correct me if I am wrong.

>How-To-Repeat:
N/A

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/ntop/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- Makefile	10 Feb 2007 06:05:03 -0000	1.59
+++ Makefile	15 May 2007 15:09:44 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	ntop
 PORTVERSION=	3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -107,6 +107,5 @@
 post-install:
 	@${MKDIR} ${DBDIR}/ntop
 	@${CHOWN} -R nobody:nobody ${DBDIR}/ntop
-	@${RMDIR} ${PREFIX}/lib/plugins
 
 .include <bsd.port.post.mk>
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in	15 May 2007 15:09:44 -0000
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Mon May 14 22:53:04 2007
++++ Makefile.in	Mon May 14 22:53:19 2007
+@@ -1359,7 +1359,6 @@
+         done
+ 
+ install-data-local: ntop.txt ntop.html faq.html
+-	@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
+ 	@if ! test -d $(DESTDIR)/$(datadir)/ntop; then \
+ 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \
+ 	  touch $(DESTDIR)/$(datadir)/ntop/warnuser; \
>Release-Note:
>Audit-Trail:
>Unformatted: