ports/122852: [patch] Update net/ns from 2.30 to 2.33 and some minor cleanup

[Lawrence Stewart]

>Number:         122852
>Category:       ports
>Synopsis:       [patch] Update net/ns from 2.30 to 2.33 and some minor cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 17 13:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Lawrence Stewart
>Release:        FreeBSD 7.0-RELEASE
>Organization:
Swinburne University
>Environment:
FreeBSD lstewart.caia.swin.edu.au 7.0-RELEASE FreeBSD 7.0-RELEASE #2: Wed Apr 16 15:16:48 EST 2008     lstewart at lstewart.caia.swin.edu.au:/usr/obj/usr/src/sys/NEWBOX  i386
>Description:
The patch cleans up what appears to be unrequired cruft in the Makefile, and updates the distinfo.

With this patch applied against the most current net/ns port (ns-2.30), I can successfully fetch, compile and install ns-2.33 and it appears to function correctly.

I have not tested the patch on other FreeBSD releases or architectures yet.
>How-To-Repeat:

>Fix:
To apply patch:

cd /usr/ports/net/ns ; patch -p0 < freebsd_port_ns2.30_to_ns2.33.patch

Patch attached with submission follows:

--- Makefile.orig	2008-04-17 23:08:11.000000000 +1000
+++ Makefile	2008-04-17 23:13:55.000000000 +1000
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	ns
-PORTVERSION=	2.30
+PORTVERSION=	2.33
+PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	http://www.isi.edu/nsnam/dist/
-DISTNAME=	ns-src-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= nsnam
 
 MAINTAINER=	laszlof at FreeBSD.org
 COMMENT=	Discrete event simulator for networking research
@@ -20,15 +21,9 @@
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/ns-${PORTVERSION}
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
-MAKE_ARGS+=	"LDFLAGS=${LDFLAGS}"
-
-ALL_TARGET=
-
-.include <bsd.port.pre.mk>
+USE_GMAKE=      yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/src/local/Tcl-1.0 \\|${LOCALBASE}/include/tclcl \\|g' \
@@ -37,8 +32,8 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- distinfo.orig	2008-04-17 23:08:15.000000000 +1000
+++ distinfo	2008-04-17 23:05:27.000000000 +1000
@@ -1,3 +1,3 @@
-MD5 (ns-src-2.30.tar.gz) = b28ff82b26fa51e115a6bcad4ef3f416
-SHA256 (ns-src-2.30.tar.gz) = 26d0fdf5e4d863a17e5e8d677bc02ba8f2a4a2708e9201cfe2616b08ceeefaf6
-SIZE (ns-src-2.30.tar.gz) = 55990380
+MD5 (ns-2.33.tar.gz) = f12472a4e388572bf0c71354b4bc1898
+SHA256 (ns-2.33.tar.gz) = 2cdd803bc5afec9a60d514e619a1a9c3eaea4ae35e882891519f088ae7d2472b
+SIZE (ns-2.33.tar.gz) = 41649114


>Release-Note:
>Audit-Trail:
>Unformatted: