From nobody@FreeBSD.org  Fri Jan  6 19:05:15 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F747106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Jan 2012 19:05:15 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 5999F8FC18
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Jan 2012 19:05:15 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q06J5FE5049727
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 6 Jan 2012 19:05:15 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q06J5FFV049726;
	Fri, 6 Jan 2012 19:05:15 GMT
	(envelope-from nobody)
Message-Id: <201201061905.q06J5FFV049726@red.freebsd.org>
Date: Fri, 6 Jan 2012 19:05:15 GMT
From: Veniamin Gvozdikov <g.veniamin@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update]: security/nmapsi up to 0.3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         163869
>Category:       ports
>Synopsis:       [update]: security/nmapsi up to 0.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 06 19:10:07 UTC 2012
>Closed-Date:    Sat Jan 07 20:41:38 UTC 2012
>Last-Modified:  Sat Jan 07 20:41:38 UTC 2012
>Originator:     Veniamin Gvozdikov
>Release:        FreeBSD 8.2-RELEASE
>Organization:
>Environment:
FreeBSD  8.2-RELEASE FreeBSD 8.2-RELEASE #0 r219081M: Wed Mar  2 08:23:31 CET 2011     root@www4:/usr/obj/i386/usr/src/sys/GENERIC  i386
>Description:
See changlog
>How-To-Repeat:

>Fix:
diff -ruN nmapsi4.orig/Makefile nmapsi4/Makefile
--- nmapsi4.orig/Makefile	2012-01-06 19:02:04.330085074 +0000
+++ nmapsi4/Makefile	2012-01-06 12:04:28.821098598 +0000
@@ -6,23 +6,29 @@
 #
 
 PORTNAME=	nmapsi4
-PORTVERSION=	0.2.1
+PORTVERSION=	0.3
 CATEGORIES=	security
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	GUI frontend for the nmap scanning utility
 
-RUN_DEPENDS=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
-
 LICENSE=	GPLv2
 
+RUN_DEPENDS=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
+
 USE_CMAKE=	yes
+USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui xml qmake_build uic_build moc_build rcc_build network \
 		linguist webkit
 
+pre-configure:
+	${REINPLACE_CMD} -e 's#share/applications/kde4/#share/applications/#g' \
+		${WRKSRC}/${PORTNAME}/CMakeLists.txt \
+		${WRKSRC}/${PORTNAME}-logr/CMakeLists.txt
+
 post-install:
 	${CHMOD} 755 ${PREFIX}/bin/${PORTNAME}
 	${CHMOD} 755 ${PREFIX}/bin/${PORTNAME}-logr
diff -ruN nmapsi4.orig/distinfo nmapsi4/distinfo
--- nmapsi4.orig/distinfo	2012-01-06 19:02:04.330085074 +0000
+++ nmapsi4/distinfo	2012-01-06 11:44:34.903069631 +0000
@@ -1,2 +1,2 @@
-SHA256 (nmapsi4-0.2.1.tar.gz) = 4e7589b920473c0efa3aee3e818bd491ff271664fd1695c549b38dbcb5251c2e
-SIZE (nmapsi4-0.2.1.tar.gz) = 300265
+SHA256 (nmapsi4-0.3.tar.bz2) = 51aa7e5e16577c318478b10ab3d533a15ea9e4d8cb7b7fb19a52e9b47f8b201d
+SIZE (nmapsi4-0.3.tar.bz2) = 3398283
diff -ruN nmapsi4.orig/files/patch-nmapsi4-logr_CMakeLists.txt nmapsi4/files/patch-nmapsi4-logr_CMakeLists.txt
--- nmapsi4.orig/files/patch-nmapsi4-logr_CMakeLists.txt	2012-01-06 19:02:04.330085074 +0000
+++ nmapsi4/files/patch-nmapsi4-logr_CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- nmapsi4-logr/CMakeLists.txt.orig	2009-12-29 14:35:41.000000000 +0700
-+++ nmapsi4-logr/CMakeLists.txt	2009-12-29 14:36:02.000000000 +0700
-@@ -67,7 +67,7 @@ endif (WIN32)
- if (Q_WS_X11)
-   install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/nmapsi4/locale)
-   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/nmapsi4-logr" DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
--  install(FILES "src/nmapsi4-logr.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/kde/)
-+  install(FILES "src/nmapsi4-logr.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
- #  install(FILES "src/kde/nmapsi4-admin.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/kde/)
- #  install(FILES "icons/16x16/nmapsi4.png" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps/)
- #  install(FILES "icons/32x32/nmapsi4.png" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/)
diff -ruN nmapsi4.orig/files/patch-nmapsi4_CMakeLists.txt nmapsi4/files/patch-nmapsi4_CMakeLists.txt
--- nmapsi4.orig/files/patch-nmapsi4_CMakeLists.txt	2012-01-06 19:02:04.330085074 +0000
+++ nmapsi4/files/patch-nmapsi4_CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
---- nmapsi4/CMakeLists.txt.orig	2009-12-29 14:34:58.000000000 +0700
-+++ nmapsi4/CMakeLists.txt	2009-12-29 14:35:22.000000000 +0700
-@@ -106,8 +106,8 @@ endif (NOT WIN32)
- if (Q_WS_X11)
-   install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/nmapsi4/locale)
-   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/nmapsi4" DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
--  install(FILES "kde/nmapsi4.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/kde/)
--  install(FILES "kde/nmapsi4-admin.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/kde/)
-+  install(FILES "kde/nmapsi4.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
-+  install(FILES "kde/nmapsi4-admin.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
-   install(FILES "../icons/16x16/nmapsi4.png" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps/)
-   install(FILES "../icons/32x32/nmapsi4.png" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/)
-   install(FILES "../icons/64x64/nmapsi4.png" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps/)
diff -ruN nmapsi4.orig/pkg-plist nmapsi4/pkg-plist
--- nmapsi4.orig/pkg-plist	2012-01-06 19:02:04.330085074 +0000
+++ nmapsi4/pkg-plist	2012-01-06 12:32:45.916706839 +0000
@@ -3,8 +3,8 @@
 share/applications/nmapsi4-admin.desktop
 share/applications/nmapsi4-logr.desktop
 share/applications/nmapsi4.desktop
+share/dbus-1/interfaces/org.nmapsi4.Nmapsi4.xml
 share/icons/hicolor/128x128/apps/nmapsi4.png
-share/icons/hicolor/16x16/apps/nmapsi4.png
 share/icons/hicolor/32x32/apps/nmapsi4.png
 share/icons/hicolor/64x64/apps/nmapsi4.png
 %%DATADIR%%/locale/nmapsi4-logr_cs.qm
@@ -20,6 +20,7 @@
 %%DATADIR%%/locale/nmapsi4_it.qm
 %%DATADIR%%/locale/nmapsi4_pl.qm
 %%DATADIR%%/locale/nmapsi4_pt_BR.qm
+%%DATADIR%%/locale/nmapsi4_ru.qm
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/128x128/apps
@@ -29,7 +30,6 @@
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/32x32
 @dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Sat Jan 7 18:13:50 UTC 2012 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163869 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163869: commit references a PR
Date: Sat,  7 Jan 2012 20:35:34 +0000 (UTC)

 rm          2012-01-07 20:35:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/nmapsi4     Makefile distinfo pkg-plist 
   Removed files:
     security/nmapsi4/files patch-nmapsi4-logr_CMakeLists.txt 
                            patch-nmapsi4_CMakeLists.txt 
   Log:
   - update to 0.3
   - replace patches with REINPLACE_CMD
   - switch to bzip2 distribution
   - move license to proper Makefile section
   
   Changelog:
   https://gitorious.org/nmapsi4/pages/Released
   
   PR:             163869
   Submitted by:   Veniamin Gvozdikov <g.veniamin at googlemail dot com> (maintainer)
   
   Revision  Changes    Path
   1.6       +9 -3      ports/security/nmapsi4/Makefile
   1.3       +2 -2      ports/security/nmapsi4/distinfo
   1.2       +0 -11     ports/security/nmapsi4/files/patch-nmapsi4-logr_CMakeLists.txt (dead)
   1.2       +0 -13     ports/security/nmapsi4/files/patch-nmapsi4_CMakeLists.txt (dead)
   1.3       +2 -2      ports/security/nmapsi4/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Sat Jan 7 20:41:37 UTC 2012 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163869 
>Unformatted:
