diff -rupN ns3.orig/Makefile ns3/Makefile --- ns3.orig/Makefile 2018-08-29 20:25:36.000000000 +0000 +++ ns3/Makefile 2018-10-04 15:00:55.651693000 +0000 @@ -1,7 +1,7 @@ -# $FreeBSD: head/net/ns3/Makefile 478415 2018-08-29 20:25:36Z swills $ +# $FreeBSD$ PORTNAME= ns3 -PORTVERSION= 3.28.1 +PORTVERSION= 3.29 CATEGORIES= net MASTER_SITES= https://www.nsnam.org/release/ DISTNAME= ns-allinone-${PORTVERSION} diff -rupN ns3.orig/distinfo ns3/distinfo --- ns3.orig/distinfo 2018-08-29 20:25:36.000000000 +0000 +++ ns3/distinfo 2018-10-04 15:00:55.651816000 +0000 @@ -1,3 +1,3 @@ -TIMESTAMP = 1535537143 -SHA256 (ns-allinone-3.28.1.tar.bz2) = 1a777216ef88cfa3ede700582781c4b7ae69b26649406b8749d5588d5d43ea8e -SIZE (ns-allinone-3.28.1.tar.bz2) = 27165424 +TIMESTAMP = 1538661355 +SHA256 (ns-allinone-3.29.tar.bz2) = 4ddfa5c07845c41265efaf25fb3d18d66b916e8885984e6a98d884e057bd2d55 +SIZE (ns-allinone-3.29.tar.bz2) = 27158284 diff -rupN ns3.orig/pkg-plist ns3/pkg-plist --- ns3.orig/pkg-plist 2018-05-04 16:04:09.000000000 +0000 +++ ns3/pkg-plist 2018-10-04 15:00:55.652034000 +0000 @@ -28,6 +28,7 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG %%EXAMPLES%%bin/ns%%VERSION%%-double-probe-example%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-dsdv-manet%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-dsr%%DEBUG_SUFX%% +%%EXAMPLES%%bin/ns%%VERSION%%-dsss-validation%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-dumbbell-animation%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-dynamic-global-routing%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-energy-model-example%%DEBUG_SUFX%% @@ -90,7 +91,6 @@ bin/ns%%VERSION%%-bench-simulator%%DEBUG %%EXAMPLES%%bin/ns%%VERSION%%-main-ptr%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-main-random-topology%%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%% @@ -169,6 +169,7 @@ bin/ns%%VERSION%%-print-introspected-dox %%EXAMPLES%%bin/ns%%VERSION%%-test-string-value-formatting%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-third-distributed%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-third%%DEBUG_SUFX%% +%%EXAMPLES%%bin/ns%%VERSION%%-three-gpp-http-example%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-time-probe-example%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-topology-example-sim%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-traffic-control%%DEBUG_SUFX%% @@ -199,6 +200,8 @@ bin/ns%%VERSION%%-print-introspected-dox %%EXAMPLES%%bin/ns%%VERSION%%-wifi-hidden-terminal%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-wifi-manager-example%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-wifi-multi-tos%%DEBUG_SUFX%% +%%EXAMPLES%%bin/ns%%VERSION%%-wifi-pcf%%DEBUG_SUFX%% +%%EXAMPLES%%bin/ns%%VERSION%%-wifi-phy-configuration%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-wifi-phy-test%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-adhoc-grid%%DEBUG_SUFX%% %%EXAMPLES%%bin/ns%%VERSION%%-wifi-simple-adhoc%%DEBUG_SUFX%% @@ -257,6 +260,7 @@ include/ns%%VERSION%%/ns3/arf-wifi-manag include/ns%%VERSION%%/ns3/arp-cache.h include/ns%%VERSION%%/ns3/arp-header.h include/ns%%VERSION%%/ns3/arp-l3-protocol.h +include/ns%%VERSION%%/ns3/arp-queue-disc-item.h include/ns%%VERSION%%/ns3/ascii-file.h include/ns%%VERSION%%/ns3/ascii-test.h include/ns%%VERSION%%/ns3/assert.h @@ -275,6 +279,7 @@ include/ns%%VERSION%%/ns3/basic-energy-s include/ns%%VERSION%%/ns3/block-ack-agreement.h include/ns%%VERSION%%/ns3/block-ack-cache.h include/ns%%VERSION%%/ns3/block-ack-manager.h +include/ns%%VERSION%%/ns3/block-ack-type.h include/ns%%VERSION%%/ns3/boolean-probe.h include/ns%%VERSION%%/ns3/boolean.h include/ns%%VERSION%%/ns3/box.h @@ -314,6 +319,8 @@ include/ns%%VERSION%%/ns3/candidate-queu include/ns%%VERSION%%/ns3/capability-information.h include/ns%%VERSION%%/ns3/cara-wifi-manager.h include/ns%%VERSION%%/ns3/cc-helper.h +include/ns%%VERSION%%/ns3/cf-parameter-set.h +include/ns%%VERSION%%/ns3/channel-access-manager.h include/ns%%VERSION%%/ns3/channel-coordinator.h include/ns%%VERSION%%/ns3/channel-list.h include/ns%%VERSION%%/ns3/channel-manager.h @@ -358,9 +365,6 @@ include/ns%%VERSION%%/ns3/data-collectio include/ns%%VERSION%%/ns3/data-collector.h include/ns%%VERSION%%/ns3/data-output-interface.h include/ns%%VERSION%%/ns3/data-rate.h -include/ns%%VERSION%%/ns3/dca-txop.h -include/ns%%VERSION%%/ns3/dcf-manager.h -include/ns%%VERSION%%/ns3/dcf-state.h include/ns%%VERSION%%/ns3/default-channel-scheduler.h include/ns%%VERSION%%/ns3/default-deleter.h include/ns%%VERSION%%/ns3/default-simulator-impl.h @@ -404,7 +408,6 @@ include/ns%%VERSION%%/ns3/dsss-error-rat include/ns%%VERSION%%/ns3/dsss-parameter-set.h include/ns%%VERSION%%/ns3/dynamic-queue-limits.h include/ns%%VERSION%%/ns3/edca-parameter-set.h -include/ns%%VERSION%%/ns3/edca-txop-n.h include/ns%%VERSION%%/ns3/empty.h include/ns%%VERSION%%/ns3/energy-harvester-container.h include/ns%%VERSION%%/ns3/energy-harvester-helper.h @@ -515,6 +518,7 @@ include/ns%%VERSION%%/ns3/ie-dot11s-rann include/ns%%VERSION%%/ns3/inet-socket-address.h include/ns%%VERSION%%/ns3/inet-topology-reader.h include/ns%%VERSION%%/ns3/inet6-socket-address.h +include/ns%%VERSION%%/ns3/infrastructure-wifi-mac.h include/ns%%VERSION%%/ns3/int-to-type.h include/ns%%VERSION%%/ns3/int64x64-cairo.h include/ns%%VERSION%%/ns3/int64x64-double.h @@ -817,6 +821,7 @@ include/ns%%VERSION%%/ns3/point-to-point include/ns%%VERSION%%/ns3/pointer.h include/ns%%VERSION%%/ns3/position-allocator.h include/ns%%VERSION%%/ns3/ppp-header.h +include/ns%%VERSION%%/ns3/prio-queue-disc.h include/ns%%VERSION%%/ns3/probe.h include/ns%%VERSION%%/ns3/propagation-cache.h include/ns%%VERSION%%/ns3/propagation-delay-model.h @@ -826,6 +831,7 @@ include/ns%%VERSION%%/ns3/propagation-mo include/ns%%VERSION%%/ns3/pss-ff-mac-scheduler.h include/ns%%VERSION%%/ns3/ptr.h include/ns%%VERSION%%/ns3/qos-blocked-destinations.h +include/ns%%VERSION%%/ns3/qos-txop.h include/ns%%VERSION%%/ns3/qos-utils.h include/ns%%VERSION%%/ns3/queue-disc-container.h include/ns%%VERSION%%/ns3/queue-disc.h @@ -955,10 +961,13 @@ include/ns%%VERSION%%/ns3/tcp-option-sac include/ns%%VERSION%%/ns3/tcp-option-sack.h include/ns%%VERSION%%/ns3/tcp-option-ts.h include/ns%%VERSION%%/ns3/tcp-option-winscale.h +include/ns%%VERSION%%/ns3/tcp-prr-recovery.h +include/ns%%VERSION%%/ns3/tcp-recovery-ops.h include/ns%%VERSION%%/ns3/tcp-rx-buffer.h include/ns%%VERSION%%/ns3/tcp-scalable.h include/ns%%VERSION%%/ns3/tcp-socket-base.h include/ns%%VERSION%%/ns3/tcp-socket-factory.h +include/ns%%VERSION%%/ns3/tcp-socket-state.h include/ns%%VERSION%%/ns3/tcp-socket.h include/ns%%VERSION%%/ns3/tcp-tx-buffer.h include/ns%%VERSION%%/ns3/tcp-vegas.h @@ -969,6 +978,11 @@ include/ns%%VERSION%%/ns3/tdbet-ff-mac-s include/ns%%VERSION%%/ns3/tdmt-ff-mac-scheduler.h include/ns%%VERSION%%/ns3/tdtbfq-ff-mac-scheduler.h include/ns%%VERSION%%/ns3/test.h +include/ns%%VERSION%%/ns3/three-gpp-http-client.h +include/ns%%VERSION%%/ns3/three-gpp-http-header.h +include/ns%%VERSION%%/ns3/three-gpp-http-helper.h +include/ns%%VERSION%%/ns3/three-gpp-http-server.h +include/ns%%VERSION%%/ns3/three-gpp-http-variables.h include/ns%%VERSION%%/ns3/time-data-calculators.h include/ns%%VERSION%%/ns3/time-probe.h include/ns%%VERSION%%/ns3/time-series-adaptor.h @@ -989,6 +1003,7 @@ include/ns%%VERSION%%/ns3/trailer.h include/ns%%VERSION%%/ns3/tta-ff-mac-scheduler.h include/ns%%VERSION%%/ns3/tv-spectrum-transmitter-helper.h include/ns%%VERSION%%/ns3/tv-spectrum-transmitter.h +include/ns%%VERSION%%/ns3/txop.h include/ns%%VERSION%%/ns3/type-id.h include/ns%%VERSION%%/ns3/type-name.h include/ns%%VERSION%%/ns3/type-traits.h @@ -1068,6 +1083,7 @@ include/ns%%VERSION%%/ns3/wifi-mac-trail include/ns%%VERSION%%/ns3/wifi-mac.h include/ns%%VERSION%%/ns3/wifi-mode.h include/ns%%VERSION%%/ns3/wifi-module.h +include/ns%%VERSION%%/ns3/wifi-mpdu-type.h include/ns%%VERSION%%/ns3/wifi-net-device.h include/ns%%VERSION%%/ns3/wifi-phy-listener.h include/ns%%VERSION%%/ns3/wifi-phy-standard.h