3 files changed, 137 insertions, 135 deletions

diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 0bec1a2bf69b..e56478ffeb11 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netwib
-PORTVERSION=	5.20.0
+PORTVERSION=	5.21.0
 CATEGORIES=	net devel ipv6
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwib/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/netwib/download/v5/ \
@@ -23,6 +23,8 @@ USE_REINPLACE=	yes
 MAN3=		netwib.3 netwib_dat.3 netwib_err.3 netwib_net.3 \
 		netwib_pkt.3 netwib_shw.3 netwib_sys.3
 
+PLIST_SUB+=	SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
+
 do-configure:
 		@${REINPLACE_CMD} \
 		-e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/net/netwib/distinfo b/net/netwib/distinfo
index e9f75bfc0078..cc73470f5739 100644
--- a/net/netwib/distinfo
+++ b/net/netwib/distinfo
@@ -1,4 +1,4 @@
-MD5 (netwib-5.20.0-src.tgz) = 5641b2aaf1360cbd36bb5be511c200d0
-SIZE (netwib-5.20.0-src.tgz) = 592049
-MD5 (netwib-5.20.0-doc_html.tgz) = 91f286427b4abd2d44f028c72b85fed4
-SIZE (netwib-5.20.0-doc_html.tgz) = 130409
+MD5 (netwib-5.21.0-src.tgz) = 48e83d0a7bc73c688428e6853dc49bbe
+SIZE (netwib-5.21.0-src.tgz) = 593216
+MD5 (netwib-5.21.0-doc_html.tgz) = dd4b71d519e224ac29360b9d0cbab718
+SIZE (netwib-5.21.0-doc_html.tgz) = 130551
diff --git a/net/netwib/pkg-plist b/net/netwib/pkg-plist
index 6433dcd786a8..e4c83d36bc5e 100644
--- a/net/netwib/pkg-plist
+++ b/net/netwib/pkg-plist
@@ -1,133 +1,133 @@
-bin/netwib520-config
+bin/netwib%%SHORTPORTVERSION%%-config
 bin/netwib-config
 include/netwib.h
-include/netwib520.h
-include/netwib520/dat.h
-include/netwib520/dat/array.h
-include/netwib520/dat/buf.h
-include/netwib520/dat/bufdec.h
-include/netwib520/dat/bufenc.h
-include/netwib520/dat/bufpool.h
-include/netwib520/dat/c.h
-include/netwib520/dat/c2.h
-include/netwib520/dat/checksum.h
-include/netwib520/dat/fmt.h
-include/netwib520/dat/hash.h
-include/netwib520/dat/hashi.h
-include/netwib520/dat/ptr.h
-include/netwib520/dat/regexp.h
-include/netwib520/dat/ring.h
-include/netwib520/dat/ringi.h
-include/netwib520/dat/tlv.h
-include/netwib520/dat/types.h
-include/netwib520/dat/uint64.h
-include/netwib520/def.h
-include/netwib520/err.h
-include/netwib520/net.h
-include/netwib520/net/conf.h
-include/netwib520/net/confarp.h
-include/netwib520/net/confdev.h
-include/netwib520/net/confip.h
-include/netwib520/net/confrout.h
-include/netwib520/net/device.h
-include/netwib520/net/eth.h
-include/netwib520/net/eths.h
-include/netwib520/net/ethsi.h
-include/netwib520/net/ip.h
-include/netwib520/net/ips.h
-include/netwib520/net/ipsi.h
-include/netwib520/net/port.h
-include/netwib520/net/ports.h
-include/netwib520/net/portsi.h
-include/netwib520/net/sniff.h
-include/netwib520/net/sock.h
-include/netwib520/net/spoof.h
-include/netwib520/net/types.h
-include/netwib520/pkt.h
-include/netwib520/pkt/arphdr.h
-include/netwib520/pkt/conv.h
-include/netwib520/pkt/icmp4.h
-include/netwib520/pkt/icmp6.h
-include/netwib520/pkt/icmp6nd.h
-include/netwib520/pkt/ip4opt.h
-include/netwib520/pkt/ip4opts.h
-include/netwib520/pkt/ip64bits.h
-include/netwib520/pkt/ip6ext.h
-include/netwib520/pkt/ip6exts.h
-include/netwib520/pkt/ipfrag.h
-include/netwib520/pkt/iphdr.h
-include/netwib520/pkt/layer.h
-include/netwib520/pkt/linkhdr.h
-include/netwib520/pkt/packet.h
-include/netwib520/pkt/tcphdr.h
-include/netwib520/pkt/tcpopt.h
-include/netwib520/pkt/tcpopts.h
-include/netwib520/pkt/types.h
-include/netwib520/pkt/udphdr.h
-include/netwib520/shw.h
-include/netwib520/shw/arphdr.h
-include/netwib520/shw/array.h
-include/netwib520/shw/icmp4.h
-include/netwib520/shw/icmp6.h
-include/netwib520/shw/icmp6nd.h
-include/netwib520/shw/ip4opt.h
-include/netwib520/shw/ip4opts.h
-include/netwib520/shw/ip6ext.h
-include/netwib520/shw/ip6exts.h
-include/netwib520/shw/iphdr.h
-include/netwib520/shw/linkhdr.h
-include/netwib520/shw/packet.h
-include/netwib520/shw/tcphdr.h
-include/netwib520/shw/tcpopt.h
-include/netwib520/shw/tcpopts.h
-include/netwib520/shw/types.h
-include/netwib520/shw/udphdr.h
-include/netwib520/sys.h
-include/netwib520/sys/beep.h
-include/netwib520/sys/bufdec.h
-include/netwib520/sys/bufenc.h
-include/netwib520/sys/dir.h
-include/netwib520/sys/dirname.h
-include/netwib520/sys/disp.h
-include/netwib520/sys/error.h
-include/netwib520/sys/fd.h
-include/netwib520/sys/file.h
-include/netwib520/sys/filename.h
-include/netwib520/sys/global.h
-include/netwib520/sys/init.h
-include/netwib520/sys/internal.h
-include/netwib520/sys/io.h
-include/netwib520/sys/ionew.h
-include/netwib520/sys/iousual.h
-include/netwib520/sys/kbd.h
-include/netwib520/sys/kbdbuf.h
-include/netwib520/sys/kbdchar.h
-include/netwib520/sys/kbdint.h
-include/netwib520/sys/kbdpress.h
-include/netwib520/sys/path.h
-include/netwib520/sys/pathname.h
-include/netwib520/sys/pathstat.h
-include/netwib520/sys/rand.h
-include/netwib520/sys/record.h
-include/netwib520/sys/screen.h
-include/netwib520/sys/stream.h
-include/netwib520/sys/thread.h
-include/netwib520/sys/threadcond.h
-include/netwib520/sys/threadlist.h
-include/netwib520/sys/threadmut.h
-include/netwib520/sys/threadrwl.h
-include/netwib520/sys/threadtsd.h
-include/netwib520/sys/time.h
-include/netwib520/sys/types.h
-include/netwib520/sys/unix.h
-include/netwib520/sys/wait.h
-include/netwib520/sys/waitlist.h
-include/netwib520/sys/windows.h
-lib/libnetwib520.a
+include/netwib%%SHORTPORTVERSION%%.h
+include/netwib%%SHORTPORTVERSION%%/dat.h
+include/netwib%%SHORTPORTVERSION%%/dat/array.h
+include/netwib%%SHORTPORTVERSION%%/dat/buf.h
+include/netwib%%SHORTPORTVERSION%%/dat/bufdec.h
+include/netwib%%SHORTPORTVERSION%%/dat/bufenc.h
+include/netwib%%SHORTPORTVERSION%%/dat/bufpool.h
+include/netwib%%SHORTPORTVERSION%%/dat/c.h
+include/netwib%%SHORTPORTVERSION%%/dat/c2.h
+include/netwib%%SHORTPORTVERSION%%/dat/checksum.h
+include/netwib%%SHORTPORTVERSION%%/dat/fmt.h
+include/netwib%%SHORTPORTVERSION%%/dat/hash.h
+include/netwib%%SHORTPORTVERSION%%/dat/hashi.h
+include/netwib%%SHORTPORTVERSION%%/dat/ptr.h
+include/netwib%%SHORTPORTVERSION%%/dat/regexp.h
+include/netwib%%SHORTPORTVERSION%%/dat/ring.h
+include/netwib%%SHORTPORTVERSION%%/dat/ringi.h
+include/netwib%%SHORTPORTVERSION%%/dat/tlv.h
+include/netwib%%SHORTPORTVERSION%%/dat/types.h
+include/netwib%%SHORTPORTVERSION%%/dat/uint64.h
+include/netwib%%SHORTPORTVERSION%%/def.h
+include/netwib%%SHORTPORTVERSION%%/err.h
+include/netwib%%SHORTPORTVERSION%%/net.h
+include/netwib%%SHORTPORTVERSION%%/net/conf.h
+include/netwib%%SHORTPORTVERSION%%/net/confarp.h
+include/netwib%%SHORTPORTVERSION%%/net/confdev.h
+include/netwib%%SHORTPORTVERSION%%/net/confip.h
+include/netwib%%SHORTPORTVERSION%%/net/confrout.h
+include/netwib%%SHORTPORTVERSION%%/net/device.h
+include/netwib%%SHORTPORTVERSION%%/net/eth.h
+include/netwib%%SHORTPORTVERSION%%/net/eths.h
+include/netwib%%SHORTPORTVERSION%%/net/ethsi.h
+include/netwib%%SHORTPORTVERSION%%/net/ip.h
+include/netwib%%SHORTPORTVERSION%%/net/ips.h
+include/netwib%%SHORTPORTVERSION%%/net/ipsi.h
+include/netwib%%SHORTPORTVERSION%%/net/port.h
+include/netwib%%SHORTPORTVERSION%%/net/ports.h
+include/netwib%%SHORTPORTVERSION%%/net/portsi.h
+include/netwib%%SHORTPORTVERSION%%/net/sniff.h
+include/netwib%%SHORTPORTVERSION%%/net/sock.h
+include/netwib%%SHORTPORTVERSION%%/net/spoof.h
+include/netwib%%SHORTPORTVERSION%%/net/types.h
+include/netwib%%SHORTPORTVERSION%%/pkt.h
+include/netwib%%SHORTPORTVERSION%%/pkt/arphdr.h
+include/netwib%%SHORTPORTVERSION%%/pkt/conv.h
+include/netwib%%SHORTPORTVERSION%%/pkt/icmp4.h
+include/netwib%%SHORTPORTVERSION%%/pkt/icmp6.h
+include/netwib%%SHORTPORTVERSION%%/pkt/icmp6nd.h
+include/netwib%%SHORTPORTVERSION%%/pkt/ip4opt.h
+include/netwib%%SHORTPORTVERSION%%/pkt/ip4opts.h
+include/netwib%%SHORTPORTVERSION%%/pkt/ip64bits.h
+include/netwib%%SHORTPORTVERSION%%/pkt/ip6ext.h
+include/netwib%%SHORTPORTVERSION%%/pkt/ip6exts.h
+include/netwib%%SHORTPORTVERSION%%/pkt/ipfrag.h
+include/netwib%%SHORTPORTVERSION%%/pkt/iphdr.h
+include/netwib%%SHORTPORTVERSION%%/pkt/layer.h
+include/netwib%%SHORTPORTVERSION%%/pkt/linkhdr.h
+include/netwib%%SHORTPORTVERSION%%/pkt/packet.h
+include/netwib%%SHORTPORTVERSION%%/pkt/tcphdr.h
+include/netwib%%SHORTPORTVERSION%%/pkt/tcpopt.h
+include/netwib%%SHORTPORTVERSION%%/pkt/tcpopts.h
+include/netwib%%SHORTPORTVERSION%%/pkt/types.h
+include/netwib%%SHORTPORTVERSION%%/pkt/udphdr.h
+include/netwib%%SHORTPORTVERSION%%/shw.h
+include/netwib%%SHORTPORTVERSION%%/shw/arphdr.h
+include/netwib%%SHORTPORTVERSION%%/shw/array.h
+include/netwib%%SHORTPORTVERSION%%/shw/icmp4.h
+include/netwib%%SHORTPORTVERSION%%/shw/icmp6.h
+include/netwib%%SHORTPORTVERSION%%/shw/icmp6nd.h
+include/netwib%%SHORTPORTVERSION%%/shw/ip4opt.h
+include/netwib%%SHORTPORTVERSION%%/shw/ip4opts.h
+include/netwib%%SHORTPORTVERSION%%/shw/ip6ext.h
+include/netwib%%SHORTPORTVERSION%%/shw/ip6exts.h
+include/netwib%%SHORTPORTVERSION%%/shw/iphdr.h
+include/netwib%%SHORTPORTVERSION%%/shw/linkhdr.h
+include/netwib%%SHORTPORTVERSION%%/shw/packet.h
+include/netwib%%SHORTPORTVERSION%%/shw/tcphdr.h
+include/netwib%%SHORTPORTVERSION%%/shw/tcpopt.h
+include/netwib%%SHORTPORTVERSION%%/shw/tcpopts.h
+include/netwib%%SHORTPORTVERSION%%/shw/types.h
+include/netwib%%SHORTPORTVERSION%%/shw/udphdr.h
+include/netwib%%SHORTPORTVERSION%%/sys.h
+include/netwib%%SHORTPORTVERSION%%/sys/beep.h
+include/netwib%%SHORTPORTVERSION%%/sys/bufdec.h
+include/netwib%%SHORTPORTVERSION%%/sys/bufenc.h
+include/netwib%%SHORTPORTVERSION%%/sys/dir.h
+include/netwib%%SHORTPORTVERSION%%/sys/dirname.h
+include/netwib%%SHORTPORTVERSION%%/sys/disp.h
+include/netwib%%SHORTPORTVERSION%%/sys/error.h
+include/netwib%%SHORTPORTVERSION%%/sys/fd.h
+include/netwib%%SHORTPORTVERSION%%/sys/file.h
+include/netwib%%SHORTPORTVERSION%%/sys/filename.h
+include/netwib%%SHORTPORTVERSION%%/sys/global.h
+include/netwib%%SHORTPORTVERSION%%/sys/init.h
+include/netwib%%SHORTPORTVERSION%%/sys/internal.h
+include/netwib%%SHORTPORTVERSION%%/sys/io.h
+include/netwib%%SHORTPORTVERSION%%/sys/ionew.h
+include/netwib%%SHORTPORTVERSION%%/sys/iousual.h
+include/netwib%%SHORTPORTVERSION%%/sys/kbd.h
+include/netwib%%SHORTPORTVERSION%%/sys/kbdbuf.h
+include/netwib%%SHORTPORTVERSION%%/sys/kbdchar.h
+include/netwib%%SHORTPORTVERSION%%/sys/kbdint.h
+include/netwib%%SHORTPORTVERSION%%/sys/kbdpress.h
+include/netwib%%SHORTPORTVERSION%%/sys/path.h
+include/netwib%%SHORTPORTVERSION%%/sys/pathname.h
+include/netwib%%SHORTPORTVERSION%%/sys/pathstat.h
+include/netwib%%SHORTPORTVERSION%%/sys/rand.h
+include/netwib%%SHORTPORTVERSION%%/sys/record.h
+include/netwib%%SHORTPORTVERSION%%/sys/screen.h
+include/netwib%%SHORTPORTVERSION%%/sys/stream.h
+include/netwib%%SHORTPORTVERSION%%/sys/thread.h
+include/netwib%%SHORTPORTVERSION%%/sys/threadcond.h
+include/netwib%%SHORTPORTVERSION%%/sys/threadlist.h
+include/netwib%%SHORTPORTVERSION%%/sys/threadmut.h
+include/netwib%%SHORTPORTVERSION%%/sys/threadrwl.h
+include/netwib%%SHORTPORTVERSION%%/sys/threadtsd.h
+include/netwib%%SHORTPORTVERSION%%/sys/time.h
+include/netwib%%SHORTPORTVERSION%%/sys/types.h
+include/netwib%%SHORTPORTVERSION%%/sys/unix.h
+include/netwib%%SHORTPORTVERSION%%/sys/wait.h
+include/netwib%%SHORTPORTVERSION%%/sys/waitlist.h
+include/netwib%%SHORTPORTVERSION%%/sys/windows.h
+lib/libnetwib%%SHORTPORTVERSION%%.a
 lib/libnetwib.a
-@dirrm include/netwib520/dat
-@dirrm include/netwib520/net
-@dirrm include/netwib520/pkt
-@dirrm include/netwib520/shw
-@dirrm include/netwib520/sys
-@dirrm include/netwib520
+@dirrm include/netwib%%SHORTPORTVERSION%%/dat
+@dirrm include/netwib%%SHORTPORTVERSION%%/net
+@dirrm include/netwib%%SHORTPORTVERSION%%/pkt
+@dirrm include/netwib%%SHORTPORTVERSION%%/shw
+@dirrm include/netwib%%SHORTPORTVERSION%%/sys
+@dirrm include/netwib%%SHORTPORTVERSION%%