summaryrefslogtreecommitdiff
path: root/net/ns
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2004-06-13 09:41:53 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2004-06-13 09:41:53 +0000
commit3edae3e24ca6cd78c96be67eab3fd5ae71ca4511 (patch)
treed57d5968a57adff77e17d872c28636759c8215b0 /net/ns
parentAdded CAN-2004-0488, CAN-2004-0492, DBMail vulnerability, smtpproxy vulnerabi... (diff)
Fix build error.
Reported by: Jon <sici@myrealbox.com> Pointed out by: bento via kris Submitted by: Hiroyuki Une <harrier@seiryu.cim.hkg.ac.jp>
Notes
Notes: svn path=/head/; revision=111379
Diffstat (limited to 'net/ns')
-rw-r--r--net/ns/Makefile5
-rw-r--r--net/ns/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in12
-rw-r--r--net/ns/files/patch-indep-utils::webtrace-conv::dec::Makefile.in11
-rw-r--r--net/ns/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in11
4 files changed, 35 insertions, 4 deletions
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 5cdbdc96c0f8..eefe4f0b4652 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ns
PORTVERSION= 2.27
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.isi.edu/nsnam/dist/
DISTNAME= ns-src-2.27
@@ -29,10 +30,6 @@ ALL_TARGET=
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502112
-BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-
.if ${ARCH} == "alpha" && ${OSVERSION} < 500000
BROKEN= "Does not compile on alpha 4.x"
.endif
diff --git a/net/ns/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in b/net/ns/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in
new file mode 100644
index 000000000000..a009fcc0b70f
--- /dev/null
+++ b/net/ns/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in
@@ -0,0 +1,12 @@
+--- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig Mon May 24 08:09:36 2004
++++ indep-utils/cmu-scen-gen/setdest/Makefile.in Mon May 24 08:10:46 2004
+@@ -37,7 +37,7 @@
+ MKDEP = ../../../conf/mkdep
+
+ # when including files from ns, we need to take care STL_NAMESPACE
+-DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@
++DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+ CFLAGS = @V_CCOPT@
+ LDFLAGS = @V_STATIC@
+ LIBS = @V_LIB@ -lm @LIBS@
+
diff --git a/net/ns/files/patch-indep-utils::webtrace-conv::dec::Makefile.in b/net/ns/files/patch-indep-utils::webtrace-conv::dec::Makefile.in
new file mode 100644
index 000000000000..1535cd1256a8
--- /dev/null
+++ b/net/ns/files/patch-indep-utils::webtrace-conv::dec::Makefile.in
@@ -0,0 +1,11 @@
+--- indep-utils/webtrace-conv/dec/Makefile.in.orig Tue Jan 13 09:58:44 2004
++++ indep-utils/webtrace-conv/dec/Makefile.in Sun Jun 13 18:22:22 2004
+@@ -38,7 +38,7 @@
+ # when including files from ns, we need to take care STL_NAMESPACE
+ CC = @CXX@
+ INCLUDE = -I. @V_INCLUDES@
+-CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
++CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+ LDFLAGS = @V_STATIC@
+ LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
+ INSTALL = @INSTALL@
diff --git a/net/ns/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in b/net/ns/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in
new file mode 100644
index 000000000000..d845581f9a33
--- /dev/null
+++ b/net/ns/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in
@@ -0,0 +1,11 @@
+--- indep-utils/webtrace-conv/nlanr/Makefile.in.orig Tue Jan 13 09:58:48 2004
++++ indep-utils/webtrace-conv/nlanr/Makefile.in Sun Jun 13 18:30:51 2004
+@@ -35,7 +35,7 @@
+ # when including files from ns, we need to take care STL_NAMESPACE
+ CC = @CXX@
+ INCLUDE = -I. -I../../.. @V_INCLUDES@
+-CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
++CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+ LDFLAGS = @V_STATIC@
+ LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
+ INSTALL = @INSTALL@