Attachment 174621 Details for Bug 210158 – ns3-v4

[patch] ns3-v4

ns3.25.diff (text/plain), 9.44 KB, created by Pawel Pekala on 2016-09-10 15:04:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pekala

Created: 2016-09-10 15:04:12 UTC

Size: 9.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(wersja 421622)
>+++ Makefile	(kopia robocza)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ns3
>-PORTVERSION=	3.24.1
>+PORTVERSION=	3.25
> CATEGORIES=	net
> MASTER_SITES=	https://www.nsnam.org/release/
> DISTNAME=	ns-allinone-${PORTVERSION}
>@@ -11,10 +11,8 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
>-		libsqlite3.so:databases/sqlite3
>-
>-USES=		pkgconfig python tar:bzip2 waf
>+USES=		gettext pkgconfig python sqlite tar:bzip2 waf
>+USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
> WRKSRC_SUBDIR=	ns-${DISTVERSION}
> CONFIGURE_ARGS=	--int64x64=cairo
>@@ -29,13 +27,14 @@
> DEBUG_CONFIGURE_OFF=	--build-profile=release
> DEBUG_PLIST_SUB_OFF=	DEBUG_SUFX=""
> 
>-EXAMPLES_CONFIGURE_ON=	--enable-examples
>-EXAMPLES_CONFIGURE_OFF=	--disable-examples
>+EXAMPLES_CONFIGURE_ENABLE=	examples
> 
> GSL_DESC=		GNU Scientific Library support
> GSL_LIB_DEPENDS=	libgsl.so:math/gsl
> 
>-GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20
>+GTK2_USE=		GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
>+GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+			libfreetype.so:print/freetype2
> GTK2_CONFIGURE_OFF=	--disable-gtk
> 
> SUDO_DESC=		Use sudo to set suid bits on executables
>@@ -42,8 +41,7 @@
> SUDO_BUILD_DEPENDS=	sudo:security/sudo
> SUDO_CONFIGURE_ON=	--enable-sudo
> 
>-TEST_CONFIGURE_ON=	--enable-tests
>-TEST_CONFIGURE_OFF=	--disable-tests
>+TEST_CONFIGURE_ENABLE=	tests
> 
> post-install:
> 	@${FIND} ${STAGEDIR} $ -path '*/bin/*' -or -name '*.so' $ \
>Index: distinfo
>===================================================================
>--- distinfo	(wersja 421622)
>+++ distinfo	(kopia robocza)
>@@ -1,2 +1,2 @@
>-SHA256 (ns-allinone-3.24.1.tar.bz2) = f4294d47dc94c836df1b17e780b8b866d7a77c20c85bd1f780d6024940206b53
>-SIZE (ns-allinone-3.24.1.tar.bz2) = 24887273
>+SHA256 (ns-allinone-3.25.tar.bz2) = f2f5a1c291134737c97e94c843bf10e7c921678d6759ccd5b3493fccdb1a2b93
>+SIZE (ns-allinone-3.25.tar.bz2) = 25224410
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(wersja 421622)
>+++ pkg-plist	(kopia robocza)
>@@ -11,8 +11,6 @@
> bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-bonnmotion-ns2-example%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-buildings-pathloss-profiler%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-codel-vs-droptail-asymmetric%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-codel-vs-droptail-basic-test%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-command-line-example%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-config-store-save%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-csma-bridge%%DEBUG_SUFX%%
>@@ -25,12 +23,10 @@
> %%EXAMPLES%%bin/ns%%VERSION%%-csma-raw-ip-socket%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-csma-star%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-double-probe-example%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-droptail_vs_red%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-dsdv-manet%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-dsr%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-dumbbell-animation%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-dynamic-global-routing%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-dynamic_linknode%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-energy-model-example%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-energy-model-with-harvesting-example%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-example-ping-lr-wpan%%DEBUG_SUFX%%
>@@ -115,7 +111,6 @@
> %%EXAMPLES%%bin/ns%%VERSION%%-rate-adaptation-distance%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-realtime-udp-echo%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-red-tests%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-resources_demo%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-ripng-simple-network%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-sample-random-variable%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-sample-random-variable-stream%%DEBUG_SUFX%%
>@@ -128,11 +123,8 @@
> %%EXAMPLES%%bin/ns%%VERSION%%-simple-error-model%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-simple-global-routing%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-simple-ht-hidden-stations%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-simple-mpdu-aggregation%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-simple-msdu-aggregation%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-simple-point-to-point-olsr%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-simple-routing-ping6%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-simple-two-level-aggregation%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-sixth%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-socket-bound-static-routing%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-socket-bound-tcp-static-routing%%DEBUG_SUFX%%
>@@ -152,7 +144,6 @@
> %%EXAMPLES%%bin/ns%%VERSION%%-third%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-third-distributed%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-time-probe-example%%DEBUG_SUFX%%
>-%%EXAMPLES%%bin/ns%%VERSION%%-topology-read%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-tv-trans-example%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-tv-trans-regional-example%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-uan-animation%%DEBUG_SUFX%%
>@@ -184,6 +175,58 @@
> %%EXAMPLES%%bin/ns%%VERSION%%-wimax-simple%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-wireless-animation%%DEBUG_SUFX%%
> %%EXAMPLES%%bin/ns%%VERSION%%-wsn-ping6%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-80211n-mimo%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-adaptive-red-tests%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-codel-vs-pfifo-asymmetric%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-codel-vs-pfifo-basic-test%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-colors-link-description%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-global-routing-multi-switch-plus-router%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-ideal-wifi-manager-example%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-minstrel-ht-wifi-manager-example%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-mixed-bg-network%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-pfifo-vs-red%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-red-vs-ared%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-resources-counters%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-rip-simple-network%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-tcp-pcap-nanosec-example%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-topology-example-sim%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-traffic-control%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-aggregation%%DEBUG_SUFX%%
>+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-tcp%%DEBUG_SUFX%%
>+include/ns%%VERSION%%/ns3/codel-queue-disc.h
>+include/ns%%VERSION%%/ns3/erp-information.h
>+include/ns%%VERSION%%/ns3/ht-operations.h
>+include/ns%%VERSION%%/ns3/internet-apps-module.h
>+include/ns%%VERSION%%/ns3/ipv4-packet-filter.h
>+include/ns%%VERSION%%/ns3/ipv4-queue-disc-item.h
>+include/ns%%VERSION%%/ns3/ipv6-packet-filter.h
>+include/ns%%VERSION%%/ns3/ipv6-queue-disc-item.h
>+include/ns%%VERSION%%/ns3/li-ion-energy-source-helper.h
>+include/ns%%VERSION%%/ns3/minstrel-ht-wifi-manager.h
>+include/ns%%VERSION%%/ns3/msdu-standard-aggregator.h
>+include/ns%%VERSION%%/ns3/packet-filter.h
>+include/ns%%VERSION%%/ns3/pfifo-fast-queue-disc.h
>+include/ns%%VERSION%%/ns3/queue-disc-container.h
>+include/ns%%VERSION%%/ns3/queue-disc.h
>+include/ns%%VERSION%%/ns3/red-queue-disc.h
>+include/ns%%VERSION%%/ns3/rip-header.h
>+include/ns%%VERSION%%/ns3/rip-helper.h
>+include/ns%%VERSION%%/ns3/rip.h
>+include/ns%%VERSION%%/ns3/sll-header.h
>+include/ns%%VERSION%%/ns3/tcp-congestion-ops.h
>+include/ns%%VERSION%%/ns3/tcp-highspeed.h
>+include/ns%%VERSION%%/ns3/tcp-hybla.h
>+include/ns%%VERSION%%/ns3/traffic-control-helper.h
>+include/ns%%VERSION%%/ns3/traffic-control-layer.h
>+include/ns%%VERSION%%/ns3/traffic-control-module.h
>+include/ns%%VERSION%%/ns3/wifi-mac-helper.h
>+lib/libns%%VERSION%%-internet-apps%%DEBUG_SUFX%%.so
>+%%TEST%%lib/libns%%VERSION%%-traffic-control-test%%DEBUG_SUFX%%.so
>+lib/libns%%VERSION%%-traffic-control%%DEBUG_SUFX%%.so
>+%%PYTHON_SITELIBDIR%%/ns/internet_apps.so
>+%%PYTHON_SITELIBDIR%%/ns/traffic_control.so
>+libdata/pkgconfig/libns%%VERSION%%-internet-apps%%DEBUG_SUFX%%.pc
>+libdata/pkgconfig/libns%%VERSION%%-traffic-control%%DEBUG_SUFX%%.pc
> include/ns%%VERSION%%/ns3/a2-a4-rsrq-handover-algorithm.h
> include/ns%%VERSION%%/ns3/a3-rsrp-handover-algorithm.h
> include/ns%%VERSION%%/ns3/aarf-wifi-manager.h
>@@ -287,7 +330,6 @@
> include/ns%%VERSION%%/ns3/chunk.h
> include/ns%%VERSION%%/ns3/cid-factory.h
> include/ns%%VERSION%%/ns3/cid.h
>-include/ns%%VERSION%%/ns3/codel-queue.h
> include/ns%%VERSION%%/ns3/command-line.h
> include/ns%%VERSION%%/ns3/config-store-config.h
> include/ns%%VERSION%%/ns3/config-store-module.h
>@@ -774,7 +816,6 @@
> include/ns%%VERSION%%/ns3/random-waypoint-mobility-model.h
> include/ns%%VERSION%%/ns3/realtime-simulator-impl.h
> include/ns%%VERSION%%/ns3/rectangle.h
>-include/ns%%VERSION%%/ns3/red-queue.h
> include/ns%%VERSION%%/ns3/ref-count-base.h
> include/ns%%VERSION%%/ns3/regular-wifi-mac.h
> include/ns%%VERSION%%/ns3/rem-spectrum-phy.h
>@@ -857,15 +898,11 @@
> include/ns%%VERSION%%/ns3/tag.h
> include/ns%%VERSION%%/ns3/tcp-header.h
> include/ns%%VERSION%%/ns3/tcp-l4-protocol.h
>-include/ns%%VERSION%%/ns3/tcp-newreno.h
> include/ns%%VERSION%%/ns3/tcp-option.h
>-include/ns%%VERSION%%/ns3/tcp-reno.h
>-include/ns%%VERSION%%/ns3/tcp-rfc793.h
> include/ns%%VERSION%%/ns3/tcp-rx-buffer.h
> include/ns%%VERSION%%/ns3/tcp-socket-base.h
> include/ns%%VERSION%%/ns3/tcp-socket-factory.h
> include/ns%%VERSION%%/ns3/tcp-socket.h
>-include/ns%%VERSION%%/ns3/tcp-tahoe.h
> include/ns%%VERSION%%/ns3/tcp-tx-buffer.h
> include/ns%%VERSION%%/ns3/tcp-westwood.h
> include/ns%%VERSION%%/ns3/tdbet-ff-mac-scheduler.h

Actions: View | Diff

Attachments on bug 210158: 171226 | 174467 | 174621 | 174651