summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/ns/Makefile22
-rw-r--r--net/ns/distinfo6
-rw-r--r--net/ns2/Makefile22
-rw-r--r--net/ns2/distinfo6
4 files changed, 22 insertions, 34 deletions
diff --git a/net/ns/Makefile b/net/ns/Makefile
index a2c4be0df130..dab6eea4f420 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -6,29 +6,23 @@
#
PORTNAME= ns
-PORTVERSION= 2.30
+PORTVERSION= 2.33
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@FreeBSD.org
COMMENT= Discrete event simulator for networking research
BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
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>
+CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
+USE_GMAKE= yes
+USE_TK= 84
post-patch:
@${REINPLACE_CMD} -e 's|/usr/src/local/Tcl-1.0 \\|${LOCALBASE}/include/tclcl \\|g' \
@@ -37,8 +31,8 @@ post-patch:
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>
diff --git a/net/ns/distinfo b/net/ns/distinfo
index 3bb673352ce4..d09fdef5e002 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -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
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index a2c4be0df130..dab6eea4f420 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -6,29 +6,23 @@
#
PORTNAME= ns
-PORTVERSION= 2.30
+PORTVERSION= 2.33
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@FreeBSD.org
COMMENT= Discrete event simulator for networking research
BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
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>
+CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
+USE_GMAKE= yes
+USE_TK= 84
post-patch:
@${REINPLACE_CMD} -e 's|/usr/src/local/Tcl-1.0 \\|${LOCALBASE}/include/tclcl \\|g' \
@@ -37,8 +31,8 @@ post-patch:
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>
diff --git a/net/ns2/distinfo b/net/ns2/distinfo
index 3bb673352ce4..d09fdef5e002 100644
--- a/net/ns2/distinfo
+++ b/net/ns2/distinfo
@@ -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