3 files changed, 151 insertions, 115 deletions

diff --git a/net/ns3/Makefile b/net/ns3/Makefile
index 5f0fafa8bbbf..de682cf75d76 100644
--- a/net/ns3/Makefile
+++ b/net/ns3/Makefile
@@ -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 @@ COMMENT=	Network simulator for Internet systems
 
 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,21 +27,21 @@ DEBUG_PLIST_SUB=	DEBUG_SUFX="-debug"
 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
 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' \) \
diff --git a/net/ns3/distinfo b/net/ns3/distinfo
index a63f959190a2..ac462a1bb6e9 100644
--- a/net/ns3/distinfo
+++ b/net/ns3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ns-allinone-3.24.1.tar.bz2) = f4294d47dc94c836df1b17e780b8b866d7a77c20c85bd1f780d6024940206b53
-SIZE (ns-allinone-3.24.1.tar.bz2) = 24887273
+TIMESTAMP = 1473766737
+SHA256 (ns-allinone-3.25.tar.bz2) = f2f5a1c291134737c97e94c843bf10e7c921678d6759ccd5b3493fccdb1a2b93
+SIZE (ns-allinone-3.25.tar.bz2) = 25224410
diff --git a/net/ns3/pkg-plist b/net/ns3/pkg-plist
index 6269c8d2b28c..2e93094bba2e 100644
--- a/net/ns3/pkg-plist
+++ b/net/ns3/pkg-plist
@@ -1,22 +1,21 @@
-%%EXAMPLES%%bin/ns%%VERSION%%-basic-energy-model-test%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-ofdm-vht-validation%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-rv-battery-model-test%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-test-interference-helper%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-vht-wifi-network%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-adhoc-aloha-ideal-phy%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-80211n-mimo%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-adaptive-red-tests%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-adhoc-aloha-ideal-phy-matrix-propagation-loss-model%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-adhoc-aloha-ideal-phy-with-microwave-oven%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-adhoc-aloha-ideal-phy%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-aodv%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-basic-energy-model-test%%DEBUG_SUFX%%
 bin/ns%%VERSION%%-bench-packets%%DEBUG_SUFX%%
 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%%-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%%-command-line-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-config-store-save%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-csma-bridge%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-csma-bridge-one-hop%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-csma-bridge%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-csma-broadcast%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-csma-multicast%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-csma-one-subnet%%DEBUG_SUFX%%
@@ -25,12 +24,10 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%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%%
@@ -40,9 +37,10 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-file-helper-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-first%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-fourth%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-fragmentation-ipv6%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-fragmentation-ipv6-two-MTU%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-fragmentation-ipv6%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-global-injection-slash32%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-global-routing-multi-switch-plus-router%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-global-routing-slash32%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-gnuplot-aggregator-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-gnuplot-example%%DEBUG_SUFX%%
@@ -52,6 +50,7 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-hello-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ht-wifi-network%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-icmpv6-redirect%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-ideal-wifi-manager-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-jakes-propagation-model-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-cqi-threshold%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-deactivate-bearer%%DEBUG_SUFX%%
@@ -62,14 +61,14 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-intercell-interference%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-pathloss-traces%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-profiling%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-lena-rem%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-rem-sector-antenna%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-lena-rem%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-rlc-traces%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-lena-simple%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-simple-epc%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-lena-simple%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-uplink-power-control%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-lena-x2-handover%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lena-x2-handover-measures%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-lena-x2-handover%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-li-ion-energy-source%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-loose-routing-ipv6%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-lr-wpan-data%%DEBUG_SUFX%%
@@ -85,54 +84,58 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-main-propagation-loss%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-main-ptr%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-main-random-topology%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-main-random-variable%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-main-random-variable-stream%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-main-random-variable%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-main-random-walk%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-main-simple%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-main-test-sync%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-manet-routing-compare%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-matrix-topology%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-mesh%%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%%-mixed-global-routing%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-mixed-wireless%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-mobility-trace-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-multirate%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-nix-simple%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-nms-p2p-nix%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-nms-p2p-nix-distributed%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-nms-p2p-nix%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ns2-mobility-trace%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-object-names%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ofdm-ht-validation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ofdm-validation%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-ofdm-vht-validation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-olsr-hna%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-packet-socket-apps%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-pfifo-vs-red%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-ping6%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-power-adaptation-distance%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-power-adaptation-interference%%DEBUG_SUFX%%
 bin/ns%%VERSION%%-print-introspected-doxygen%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-radvd%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-radvd-two-prefix%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-radvd%%DEBUG_SUFX%%
 %%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%%-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%%-ripng-simple-network%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-sample-random-variable%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-rv-battery-model-test%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-sample-random-variable-stream%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-sample-random-variable%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-sample-simulator%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-second%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-seventh%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-simple-alternate-routing%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-simple-distributed%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-simple-distributed-empty-node%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-simple-distributed%%DEBUG_SUFX%%
 %%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%%
@@ -146,13 +149,16 @@ bin/ns%%VERSION%%-print-introspected-doxygen%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-tcp-nsc-comparison%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-tcp-nsc-lfn%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-tcp-nsc-zoo%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-tcp-pcap-nanosec-example%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-tcp-star-server%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-tcp-variants-comparison%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-test-interference-helper%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-test-ipv6%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-third%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-third-distributed%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-third%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-time-probe-example%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-topology-read%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-topology-example-sim%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-traffic-control%%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%%
@@ -162,21 +168,24 @@ bin/ns%%VERSION%%-print-introspected-doxygen%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-udp-echo%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-udp-trace-client-server%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-vanet-routing-compare%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-vht-wifi-network%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-virtual-net-device%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wave-simple-80211p%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wave-simple-device%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-adhoc%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-aggregation%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-ap%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-blockack%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-clear-channel-cmu%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-example-sim%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-hidden-terminal%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-phy-test%%DEBUG_SUFX%%
-%%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-adhoc%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-adhoc-grid%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-adhoc%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-infra%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-interference%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-sleep%%DEBUG_SUFX%%
+%%EXAMPLES%%bin/ns%%VERSION%%-wifi-tcp%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-timing-attributes%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wifi-wired-bridging%%DEBUG_SUFX%%
 %%EXAMPLES%%bin/ns%%VERSION%%-wimax-ipv4%%DEBUG_SUFX%%
@@ -261,6 +270,7 @@ include/ns%%VERSION%%/ns3/bs-uplink-scheduler-simple.h
 include/ns%%VERSION%%/ns3/bs-uplink-scheduler.h
 include/ns%%VERSION%%/ns3/bsm-application.h
 include/ns%%VERSION%%/ns3/buffer.h
+include/ns%%VERSION%%/ns3/build-profile.h
 include/ns%%VERSION%%/ns3/building-allocator.h
 include/ns%%VERSION%%/ns3/building-container.h
 include/ns%%VERSION%%/ns3/building-list.h
@@ -287,7 +297,7 @@ include/ns%%VERSION%%/ns3/channel.h
 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/codel-queue-disc.h
 include/ns%%VERSION%%/ns3/command-line.h
 include/ns%%VERSION%%/ns3/config-store-config.h
 include/ns%%VERSION%%/ns3/config-store-module.h
@@ -384,6 +394,7 @@ include/ns%%VERSION%%/ns3/epc-x2-sap.h
 include/ns%%VERSION%%/ns3/epc-x2.h
 include/ns%%VERSION%%/ns3/eps-bearer-tag.h
 include/ns%%VERSION%%/ns3/eps-bearer.h
+include/ns%%VERSION%%/ns3/erp-information.h
 include/ns%%VERSION%%/ns3/error-model.h
 include/ns%%VERSION%%/ns3/error-rate-model.h
 include/ns%%VERSION%%/ns3/ethernet-header.h
@@ -426,11 +437,6 @@ include/ns%%VERSION%%/ns3/global-value.h
 include/ns%%VERSION%%/ns3/gnuplot-aggregator.h
 include/ns%%VERSION%%/ns3/gnuplot-helper.h
 include/ns%%VERSION%%/ns3/gnuplot.h
-include/ns%%VERSION%%/ns3/build-profile.h
-include/ns%%VERSION%%/ns3/mac-tx-middle.h
-include/ns%%VERSION%%/ns3/non-copyable.h
-include/ns%%VERSION%%/ns3/vht-capabilities.h
-include/ns%%VERSION%%/ns3/vht-wifi-mac-helper.h
 %%GTK2%%include/ns%%VERSION%%/ns3/gtk-config-store.h
 include/ns%%VERSION%%/ns3/half-duplex-ideal-phy-signal-parameters.h
 include/ns%%VERSION%%/ns3/half-duplex-ideal-phy.h
@@ -444,6 +450,7 @@ include/ns%%VERSION%%/ns3/hierarchical-mobility-model.h
 include/ns%%VERSION%%/ns3/higher-tx-tag.h
 include/ns%%VERSION%%/ns3/histogram.h
 include/ns%%VERSION%%/ns3/ht-capabilities.h
+include/ns%%VERSION%%/ns3/ht-operations.h
 include/ns%%VERSION%%/ns3/ht-wifi-mac-helper.h
 include/ns%%VERSION%%/ns3/hwmp-protocol.h
 include/ns%%VERSION%%/ns3/hwmp-rtable.h
@@ -472,6 +479,7 @@ include/ns%%VERSION%%/ns3/int64x64-double.h
 include/ns%%VERSION%%/ns3/int64x64.h
 include/ns%%VERSION%%/ns3/integer.h
 include/ns%%VERSION%%/ns3/interference-helper.h
+include/ns%%VERSION%%/ns3/internet-apps-module.h
 include/ns%%VERSION%%/ns3/internet-module.h
 include/ns%%VERSION%%/ns3/internet-stack-helper.h
 include/ns%%VERSION%%/ns3/internet-trace-helper.h
@@ -494,8 +502,10 @@ include/ns%%VERSION%%/ns3/ipv4-list-routing-helper.h
 include/ns%%VERSION%%/ns3/ipv4-list-routing.h
 include/ns%%VERSION%%/ns3/ipv4-nix-vector-helper.h
 include/ns%%VERSION%%/ns3/ipv4-nix-vector-routing.h
+include/ns%%VERSION%%/ns3/ipv4-packet-filter.h
 include/ns%%VERSION%%/ns3/ipv4-packet-info-tag.h
 include/ns%%VERSION%%/ns3/ipv4-packet-probe.h
+include/ns%%VERSION%%/ns3/ipv4-queue-disc-item.h
 include/ns%%VERSION%%/ns3/ipv4-raw-socket-factory.h
 include/ns%%VERSION%%/ns3/ipv4-raw-socket-impl.h
 include/ns%%VERSION%%/ns3/ipv4-route.h
@@ -521,9 +531,11 @@ include/ns%%VERSION%%/ns3/ipv6-l3-protocol.h
 include/ns%%VERSION%%/ns3/ipv6-list-routing-helper.h
 include/ns%%VERSION%%/ns3/ipv6-list-routing.h
 include/ns%%VERSION%%/ns3/ipv6-option-header.h
+include/ns%%VERSION%%/ns3/ipv6-packet-filter.h
 include/ns%%VERSION%%/ns3/ipv6-packet-info-tag.h
 include/ns%%VERSION%%/ns3/ipv6-packet-probe.h
 include/ns%%VERSION%%/ns3/ipv6-pmtu-cache.h
+include/ns%%VERSION%%/ns3/ipv6-queue-disc-item.h
 include/ns%%VERSION%%/ns3/ipv6-raw-socket-factory.h
 include/ns%%VERSION%%/ns3/ipv6-route.h
 include/ns%%VERSION%%/ns3/ipv6-routing-helper.h
@@ -539,6 +551,7 @@ include/ns%%VERSION%%/ns3/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h
 include/ns%%VERSION%%/ns3/jakes-process.h
 include/ns%%VERSION%%/ns3/jakes-propagation-loss-model.h
 include/ns%%VERSION%%/ns3/kun-2600-mhz-propagation-loss-model.h
+include/ns%%VERSION%%/ns3/li-ion-energy-source-helper.h
 include/ns%%VERSION%%/ns3/li-ion-energy-source.h
 include/ns%%VERSION%%/ns3/list-scheduler.h
 include/ns%%VERSION%%/ns3/llc-snap-header.h
@@ -634,6 +647,7 @@ include/ns%%VERSION%%/ns3/mac-low.h
 include/ns%%VERSION%%/ns3/mac-messages.h
 include/ns%%VERSION%%/ns3/mac-rx-middle.h
 include/ns%%VERSION%%/ns3/mac-stats-calculator.h
+include/ns%%VERSION%%/ns3/mac-tx-middle.h
 include/ns%%VERSION%%/ns3/mac16-address.h
 include/ns%%VERSION%%/ns3/mac48-address.h
 include/ns%%VERSION%%/ns3/mac64-address.h
@@ -651,6 +665,7 @@ include/ns%%VERSION%%/ns3/mesh-wifi-interface-mac-plugin.h
 include/ns%%VERSION%%/ns3/mesh-wifi-interface-mac.h
 include/ns%%VERSION%%/ns3/mgt-headers.h
 include/ns%%VERSION%%/ns3/microwave-oven-spectrum-value-helper.h
+include/ns%%VERSION%%/ns3/minstrel-ht-wifi-manager.h
 include/ns%%VERSION%%/ns3/minstrel-wifi-manager.h
 include/ns%%VERSION%%/ns3/mobility-building-info.h
 include/ns%%VERSION%%/ns3/mobility-helper.h
@@ -662,6 +677,7 @@ include/ns%%VERSION%%/ns3/mpi-interface.h
 include/ns%%VERSION%%/ns3/mpi-module.h
 include/ns%%VERSION%%/ns3/mpi-receiver.h
 include/ns%%VERSION%%/ns3/msdu-aggregator.h
+include/ns%%VERSION%%/ns3/msdu-standard-aggregator.h
 include/ns%%VERSION%%/ns3/multi-model-spectrum-channel.h
 include/ns%%VERSION%%/ns3/names.h
 include/ns%%VERSION%%/ns3/ndisc-cache.h
@@ -677,6 +693,7 @@ include/ns%%VERSION%%/ns3/node-container.h
 include/ns%%VERSION%%/ns3/node-list.h
 include/ns%%VERSION%%/ns3/node.h
 include/ns%%VERSION%%/ns3/non-communicating-net-device.h
+include/ns%%VERSION%%/ns3/non-copyable.h
 include/ns%%VERSION%%/ns3/nqos-wifi-mac-helper.h
 include/ns%%VERSION%%/ns3/ns2-mobility-helper.h
 include/ns%%VERSION%%/ns3/nstime.h
@@ -705,6 +722,7 @@ include/ns%%VERSION%%/ns3/originator-block-ack-agreement.h
 include/ns%%VERSION%%/ns3/output-stream-wrapper.h
 include/ns%%VERSION%%/ns3/packet-burst.h
 include/ns%%VERSION%%/ns3/packet-data-calculators.h
+include/ns%%VERSION%%/ns3/packet-filter.h
 include/ns%%VERSION%%/ns3/packet-loss-counter.h
 include/ns%%VERSION%%/ns3/packet-metadata.h
 include/ns%%VERSION%%/ns3/packet-probe.h
@@ -729,6 +747,7 @@ include/ns%%VERSION%%/ns3/peer-link-frame.h
 include/ns%%VERSION%%/ns3/peer-link.h
 include/ns%%VERSION%%/ns3/peer-management-protocol.h
 include/ns%%VERSION%%/ns3/pf-ff-mac-scheduler.h
+include/ns%%VERSION%%/ns3/pfifo-fast-queue-disc.h
 include/ns%%VERSION%%/ns3/phy-rx-stats-calculator.h
 include/ns%%VERSION%%/ns3/phy-stats-calculator.h
 include/ns%%VERSION%%/ns3/phy-tx-stats-calculator.h
@@ -758,6 +777,8 @@ include/ns%%VERSION%%/ns3/ptr.h
 include/ns%%VERSION%%/ns3/qos-tag.h
 include/ns%%VERSION%%/ns3/qos-utils.h
 include/ns%%VERSION%%/ns3/qos-wifi-mac-helper.h
+include/ns%%VERSION%%/ns3/queue-disc-container.h
+include/ns%%VERSION%%/ns3/queue-disc.h
 include/ns%%VERSION%%/ns3/queue.h
 include/ns%%VERSION%%/ns3/radio-bearer-stats-calculator.h
 include/ns%%VERSION%%/ns3/radio-bearer-stats-connector.h
@@ -774,10 +795,13 @@ include/ns%%VERSION%%/ns3/random-walk-2d-mobility-model.h
 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/red-queue-disc.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
+include/ns%%VERSION%%/ns3/rip-header.h
+include/ns%%VERSION%%/ns3/rip-helper.h
+include/ns%%VERSION%%/ns3/rip.h
 include/ns%%VERSION%%/ns3/ripng-header.h
 include/ns%%VERSION%%/ns3/ripng-helper.h
 include/ns%%VERSION%%/ns3/ripng.h
@@ -814,6 +838,7 @@ include/ns%%VERSION%%/ns3/sixlowpan-header.h
 include/ns%%VERSION%%/ns3/sixlowpan-helper.h
 include/ns%%VERSION%%/ns3/sixlowpan-module.h
 include/ns%%VERSION%%/ns3/sixlowpan-net-device.h
+include/ns%%VERSION%%/ns3/sll-header.h
 include/ns%%VERSION%%/ns3/snr-tag.h
 include/ns%%VERSION%%/ns3/snr-to-block-error-rate-manager.h
 include/ns%%VERSION%%/ns3/snr-to-block-error-rate-record.h
@@ -855,17 +880,16 @@ include/ns%%VERSION%%/ns3/system-thread.h
 include/ns%%VERSION%%/ns3/system-wall-clock-ms.h
 include/ns%%VERSION%%/ns3/tag-buffer.h
 include/ns%%VERSION%%/ns3/tag.h
+include/ns%%VERSION%%/ns3/tcp-congestion-ops.h
 include/ns%%VERSION%%/ns3/tcp-header.h
+include/ns%%VERSION%%/ns3/tcp-highspeed.h
+include/ns%%VERSION%%/ns3/tcp-hybla.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
@@ -885,6 +909,9 @@ include/ns%%VERSION%%/ns3/trace-helper.h
 include/ns%%VERSION%%/ns3/trace-source-accessor.h
 include/ns%%VERSION%%/ns3/traced-callback.h
 include/ns%%VERSION%%/ns3/traced-value.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/trailer.h
 include/ns%%VERSION%%/ns3/tta-ff-mac-scheduler.h
 include/ns%%VERSION%%/ns3/tv-spectrum-transmitter-helper.h
@@ -939,6 +966,8 @@ include/ns%%VERSION%%/ns3/v4ping.h
 include/ns%%VERSION%%/ns3/valgrind.h
 include/ns%%VERSION%%/ns3/vector.h
 include/ns%%VERSION%%/ns3/vendor-specific-action.h
+include/ns%%VERSION%%/ns3/vht-capabilities.h
+include/ns%%VERSION%%/ns3/vht-wifi-mac-helper.h
 include/ns%%VERSION%%/ns3/virtual-net-device-module.h
 include/ns%%VERSION%%/ns3/virtual-net-device.h
 include/ns%%VERSION%%/ns3/vsa-manager.h
@@ -961,6 +990,7 @@ include/ns%%VERSION%%/ns3/wifi-helper.h
 include/ns%%VERSION%%/ns3/wifi-information-element-vector.h
 include/ns%%VERSION%%/ns3/wifi-information-element.h
 include/ns%%VERSION%%/ns3/wifi-mac-header.h
+include/ns%%VERSION%%/ns3/wifi-mac-helper.h
 include/ns%%VERSION%%/ns3/wifi-mac-queue.h
 include/ns%%VERSION%%/ns3/wifi-mac-trailer.h
 include/ns%%VERSION%%/ns3/wifi-mac.h
@@ -991,106 +1021,73 @@ include/ns%%VERSION%%/ns3/yans-error-rate-model.h
 include/ns%%VERSION%%/ns3/yans-wifi-channel.h
 include/ns%%VERSION%%/ns3/yans-wifi-helper.h
 include/ns%%VERSION%%/ns3/yans-wifi-phy.h
-lib/libns%%VERSION%%-antenna%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-antenna-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-aodv%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-antenna%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-aodv-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-applications%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-aodv%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-applications-test%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-applications%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-bridge%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-buildings%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-buildings-test%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-buildings%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-config-store%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-core%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-core-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-csma%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-core%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-csma-layout%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-dsdv%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-csma%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-dsdv-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-dsr%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-dsdv%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-dsr-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-energy%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-dsr%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-energy-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-flow-monitor%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-energy%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-flow-monitor-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-internet%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-flow-monitor%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-internet-apps%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-internet-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-lr-wpan%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-internet%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-lr-wpan-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-lte%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-lr-wpan%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-lte-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-mesh%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-lte%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-mesh-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-mobility%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-mesh%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-mobility-test%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-mobility%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-mpi%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-netanim%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-netanim-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-network%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-netanim%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-network-test%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-network%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-nix-vector-routing%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-olsr%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-olsr-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-point-to-point%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-olsr%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-point-to-point-layout%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-point-to-point-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-propagation%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-point-to-point%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-propagation-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-sixlowpan%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-propagation%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-sixlowpan-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-spectrum%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-sixlowpan%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-spectrum-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-stats%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-spectrum%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-stats-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-test%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-stats%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-test-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-topology-read%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-test%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-topology-read-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-uan%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-topology-read%%DEBUG_SUFX%%.so
+%%TEST%%lib/libns%%VERSION%%-traffic-control-test%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-traffic-control%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-uan-test%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-uan%%DEBUG_SUFX%%.so
 lib/libns%%VERSION%%-virtual-net-device%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-wave%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-wave-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-wifi%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-wave%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-wifi-test%%DEBUG_SUFX%%.so
-lib/libns%%VERSION%%-wimax%%DEBUG_SUFX%%.so
+lib/libns%%VERSION%%-wifi%%DEBUG_SUFX%%.so
 %%TEST%%lib/libns%%VERSION%%-wimax-test%%DEBUG_SUFX%%.so
-libdata/pkgconfig/libns%%VERSION%%-antenna%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-aodv%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-applications%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-bridge%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-buildings%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-config-store%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-core%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-csma%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-csma-layout%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-dsdv%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-dsr%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-energy%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-flow-monitor%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-internet%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-lr-wpan%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-lte%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-mesh%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-mobility%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-mpi%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-netanim%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-network%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-nix-vector-routing%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-olsr%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-point-to-point%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-point-to-point-layout%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-propagation%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-sixlowpan%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-spectrum%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-stats%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-test%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-topology-read%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-uan%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-virtual-net-device%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-wave%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-wifi%%DEBUG_SUFX%%.pc
-libdata/pkgconfig/libns%%VERSION%%-wimax%%DEBUG_SUFX%%.pc
+lib/libns%%VERSION%%-wimax%%DEBUG_SUFX%%.so
 %%PYTHON_SITELIBDIR%%/ns/__init__.py
 %%PYTHON_SITELIBDIR%%/ns/_core.so
 %%PYTHON_SITELIBDIR%%/ns/antenna.so
@@ -1107,6 +1104,7 @@ libdata/pkgconfig/libns%%VERSION%%-wimax%%DEBUG_SUFX%%.pc
 %%PYTHON_SITELIBDIR%%/ns/energy.so
 %%PYTHON_SITELIBDIR%%/ns/flow_monitor.so
 %%PYTHON_SITELIBDIR%%/ns/internet.so
+%%PYTHON_SITELIBDIR%%/ns/internet_apps.so
 %%PYTHON_SITELIBDIR%%/ns/lr_wpan.so
 %%PYTHON_SITELIBDIR%%/ns/lte.so
 %%PYTHON_SITELIBDIR%%/ns/mesh.so
@@ -1122,8 +1120,47 @@ libdata/pkgconfig/libns%%VERSION%%-wimax%%DEBUG_SUFX%%.pc
 %%PYTHON_SITELIBDIR%%/ns/spectrum.so
 %%PYTHON_SITELIBDIR%%/ns/stats.so
 %%PYTHON_SITELIBDIR%%/ns/topology_read.so
+%%PYTHON_SITELIBDIR%%/ns/traffic_control.so
 %%PYTHON_SITELIBDIR%%/ns/uan.so
 %%PYTHON_SITELIBDIR%%/ns/virtual_net_device.so
 %%PYTHON_SITELIBDIR%%/ns/wave.so
 %%PYTHON_SITELIBDIR%%/ns/wifi.so
 %%PYTHON_SITELIBDIR%%/ns/wimax.so
+libdata/pkgconfig/libns%%VERSION%%-antenna%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-aodv%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-applications%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-bridge%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-buildings%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-config-store%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-core%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-csma-layout%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-csma%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-dsdv%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-dsr%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-energy%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-flow-monitor%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-internet-apps%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-internet%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-lr-wpan%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-lte%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-mesh%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-mobility%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-mpi%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-netanim%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-network%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-nix-vector-routing%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-olsr%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-point-to-point-layout%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-point-to-point%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-propagation%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-sixlowpan%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-spectrum%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-stats%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-test%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-topology-read%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-traffic-control%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-uan%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-virtual-net-device%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-wave%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-wifi%%DEBUG_SUFX%%.pc
+libdata/pkgconfig/libns%%VERSION%%-wimax%%DEBUG_SUFX%%.pc