From roe@dragon.roe.ch  Tue Dec 13 23:29:46 2005
Return-Path: <roe@dragon.roe.ch>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 69BC016A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Dec 2005 23:29:46 +0000 (GMT)
	(envelope-from roe@dragon.roe.ch)
Received: from dragon.roe.ch (dragon.roe.ch [212.53.102.185])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E6BB43D62
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Dec 2005 23:29:45 +0000 (GMT)
	(envelope-from roe@dragon.roe.ch)
Received: from marvin.roe ([192.168.1.6])
	by dragon.roe.ch (envelope-from <roe@dragon.roe.ch>)
	with ESMTP (TLSv1:AES256-SHA:256) id 1EmJaY-0006jo-01
	for FreeBSD-gnats-submit@freebsd.org; Wed, 14 Dec 2005 00:29:43 +0100
Received: from marvin.roe (localhost [127.0.0.1])
	by marvin.roe (8.13.3/8.13.1) with ESMTP id jBDNTLk8033225;
	Wed, 14 Dec 2005 00:29:21 +0100 (CET)
	(envelope-from roe@localhost.roe)
Received: (from roe@localhost)
	by marvin.roe (8.13.3/8.13.1/Submit) id jBDNTL75033224;
	Wed, 14 Dec 2005 00:29:21 +0100 (CET)
	(envelope-from roe)
Message-Id: <200512132329.jBDNTL75033224@marvin.roe>
Date: Wed, 14 Dec 2005 00:29:21 +0100 (CET)
From: Daniel Roethlisberger <daniel@roe.ch>
Reply-To: Daniel Roethlisberger <daniel@roe.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: daniel@roe.ch
Subject: [maintainer] update security/nmap to 3.95
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90371
>Category:       ports
>Synopsis:       [maintainer] update security/nmap to 3.95
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    barner
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 13 23:30:04 GMT 2005
>Closed-Date:    Wed Dec 14 08:48:32 GMT 2005
>Last-Modified:  Wed Dec 14 08:48:32 GMT 2005
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 5.4-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD marvin.roe 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #5: Mon Nov 7 13:20:09 CET 2005 root@marvin.roe:/usr/obj/usr/src/sys/IBMTPX40 i386
>Description:
Update nmap and nmapfe to 3.95.  Notable upstream changes:
 * new help/usage screen and man page
 * new man page currently only available in en, pt_PT and pt_BR
 * nmapfe is now a shiny GTK2 application
>How-To-Repeat:
>Fix:
--- nmap-3.93-3.95.diff begins here ---
diff -ruN nmap.orig/Makefile nmap/Makefile
--- nmap.orig/Makefile	Fri Sep 16 13:05:18 2005
+++ nmap/Makefile	Tue Dec 13 23:54:35 2005
@@ -1,5 +1,5 @@
 # Ports collection makefile for:  nmap
-# Date created:			  Tue Aug 04, 1998
+# Date created:			  1998-08-04
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
 # $FreeBSD: ports/security/nmap/Makefile,v 1.93 2005/09/16 11:05:18 garga Exp $
@@ -17,7 +17,7 @@
 MAINTAINER=	daniel@roe.ch
 COMMENT?=	Port scanning utility for large networks
 
-DISTVERSION=	3.93
+DISTVERSION=	3.95
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -31,8 +31,7 @@
 .ifndef BUILD_NMAPFE
 
 MAN1=		nmap.1
-MANLANG=	"" de.ISO8859-1 es.ISO8859-1 fr.ISO8859-1 it.ISO8859-15 \
-		lt.ISO8859-13 pt.ISO8859-1 ru.KOI8-R
+MANLANG=	"" pt.ISO8859-1 pt_BR.ISO8859-1
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
@@ -54,12 +53,11 @@
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
 post-install:
-	@for lang in de.ISO8859-1=german es.ISO8859-1=spanish fr.ISO8859-1=french it.ISO8859-15=italian \
-		lt.ISO8859-13=lithuanian pt.ISO8859-1=portuguese ru.KOI8-R=russian; do \
+	@for lang in pt.ISO8859-1=pt-pt pt_BR.ISO8859-1=pt-br; do \
 		llang="`expr $${lang} : '\([^=]*\)'`"; \
 		elang="`expr $${lang} : '.*=\([^=]*\)'`"; \
 		${MKDIR} ${DESTDIR}${MAN1PREFIX}/man/$${llang}/man1; \
-		${INSTALL_MAN} ${WRKSRC}/docs/nmap_$${elang}.1 \
+		${INSTALL_MAN} ${WRKSRC}/docs/man-$${elang}.1 \
 			${DESTDIR}${MAN1PREFIX}/man/$${llang}/man1/nmap.1; \
 	done
 .ifndef NOPORTDOCS
@@ -80,7 +78,7 @@
 MAN1=		nmapfe.1
 MLINKS=		nmapfe.1 xnmap.1
 
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 
 CONFIGURE_ARGS+=--without-openssl
 
diff -ruN nmap.orig/distinfo nmap/distinfo
--- nmap.orig/distinfo	Wed Dec  7 10:52:33 2005
+++ nmap/distinfo	Tue Dec 13 23:12:10 2005
@@ -1,3 +1,3 @@
-MD5 (nmap-3.93.tar.bz2) = 92e69a2e8db0eb59b5d71b8b363892f2
-SHA256 (nmap-3.93.tar.bz2) = dec4f59383e459e30ba0f0dfbfc37311bef411f2d6a7eeeb16eec89c797939ec
-SIZE (nmap-3.93.tar.bz2) = 2029943
+MD5 (nmap-3.95.tar.bz2) = a16e9d7f7912af7c93faa794bd63b6d1
+SHA256 (nmap-3.95.tar.bz2) = ec48a1d9ae7d34bbcab61f75527a36fe5869581336e201d2ca8e9c680d3d5d2f
+SIZE (nmap-3.95.tar.bz2) = 1923771
diff -ruN nmap.orig/pkg-plist nmap/pkg-plist
--- nmap.orig/pkg-plist	Sat Feb 26 16:39:54 2005
+++ nmap/pkg-plist	Tue Dec 13 23:52:35 2005
@@ -12,13 +12,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/nmap.dtd
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/man/es.ISO8859-1/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr.ISO8859-1/man1 2>/dev/null || true
-@unexec rmdir %D/man/it.ISO8859-15/man1 2>/dev/null || true
-@unexec rmdir %D/man/lt.ISO8859-13/man1 2>/dev/null || true
 @unexec rmdir %D/man/pt.ISO8859-1/man1 2>/dev/null || true
-@unexec rmdir %D/man/es.ISO8859-1 2>/dev/null || true
-@unexec rmdir %D/man/fr.ISO8859-1 2>/dev/null || true
-@unexec rmdir %D/man/it.ISO8859-15 2>/dev/null || true
-@unexec rmdir %D/man/lt.ISO8859-13 2>/dev/null || true
+@unexec rmdir %D/man/pt_BR.ISO8859-1/man1 2>/dev/null || true
 @unexec rmdir %D/man/pt.ISO8859-1 2>/dev/null || true
+@unexec rmdir %D/man/pt_BR.ISO8859-1 2>/dev/null || true
--- nmap-3.93-3.95.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->barner 
Responsible-Changed-By: barner 
Responsible-Changed-When: Wed Dec 14 08:21:25 UTC 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90371 
State-Changed-From-To: open->closed 
State-Changed-By: barner 
State-Changed-When: Wed Dec 14 08:48:30 UTC 2005 
State-Changed-Why:  
Committed. Thanks! I did not change thdate in the header. 

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