diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 2c43d4fac933..78730b771848 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	netwib
 PORTVERSION=	5.38.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net devel
 MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwib/download/v5/ \
 		http://membres.lycos.fr/lauconstantin/common/netw/netwib/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/netwib/download/v5/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tgz ${DISTNAME:S/src/doc_html/}.tgz
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwib network programming library
 WWW=		http://www.laurentconstantin.com/en/netw/netwib/
 
 BROKEN_riscv64=		fails to configure: Could not guess NETWIBDEF_SYSARCH. Edit genemake to set NETWIBDEF_SYSARCH, and rerun genemake.
 
 LIB_DEPENDS=	libnet.so:net/libnet
 
 WRKSRC_SUBDIR=	src
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)\.[0-9]*/\1\2/}
 
 PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} '/^gccIncLnet=/s/=""/=`libnet-config --cflags`/' \
 		${WRKSRC}/genemake
 	@${REINPLACE_CMD} \
 		-e 's|%%PREFIX%%|${PREFIX}|' \
 		-e 's|%%CFLAGS%%|${CFLAGS}|' \
 		-e 's|gcc|${CC}|' \
 		${WRKSRC}/config.dat
 
 do-configure:
 	(cd ${WRKSRC} && ${SH} genemake)
 
 .include <bsd.port.mk>
diff --git a/net/netwib/files/patch-config.dat b/net/netwib/files/patch-config.dat
index e8dae36315db..2723da4d8bfd 100644
--- a/net/netwib/files/patch-config.dat
+++ b/net/netwib/files/patch-config.dat
@@ -1,20 +1,28 @@
---- config.dat.orig	Sun Aug 15 21:04:46 2004
-+++ config.dat	Tue Aug 17 11:15:37 2004
-@@ -7,7 +7,7 @@
- 
- ##########################################################################
- ### directories where netwib will be installed
--NETWIBDEF_INSTPREFIX=/usr/local
-+NETWIBDEF_INSTPREFIX=%%PREFIX%%
+--- config.dat.orig	2010-02-14 17:18:16 UTC
++++ config.dat
+@@ -11,7 +11,7 @@ NETWIBDEF_INSTBIN=${NETWIBDEF_INSTPREFIX}/bin
  NETWIBDEF_INSTINCLUDE=${NETWIBDEF_INSTPREFIX}/include
  NETWIBDEF_INSTLIB=${NETWIBDEF_INSTPREFIX}/lib
  NETWIBDEF_INSTBIN=${NETWIBDEF_INSTPREFIX}/bin
-@@ -26,7 +26,7 @@
+-NETWIBDEF_INSTMAN=${NETWIBDEF_INSTPREFIX}/man
++NETWIBDEF_INSTMAN=${NETWIBDEF_INSTPREFIX}/share/man
+ NETWIBDEF_INSTMAN3=${NETWIBDEF_INSTMAN}/man3
+ 
+ ### installation destination directory
+@@ -19,14 +19,14 @@ NETWIBDEF_INSTDESTDIR=""
+ 
+ ##########################################################################
+ ### programs
+-NETWIBDEF_PROGCC=gcc
++NETWIBDEF_PROGCC=cc
+ NETWIBDEF_PROGAR=ar
+ NETWIBDEF_PROGRANLIB=ranlib
+ NETWIBDEF_PROGGREP=grep
  
  ##########################################################################
  ### compiler options
 -NETWIBDEF_PROGCC_OPT="-Wall -O2"
-+NETWIBDEF_PROGCC_OPT="%%CFLAGS%%"
++NETWIBDEF_PROGCC_OPT="-O2 -pipe  -fstack-protector-strong -fno-strict-aliasing "
  NETWIBDEF_PROGCC_INC=""
  NETWIBDEF_PROGCC_LIB=""
  NETWIBDEF_PROGCC_OPTPIC=""
diff --git a/net/netwib/pkg-plist b/net/netwib/pkg-plist
index 2867a84814ed..5de2f262ec90 100644
--- a/net/netwib/pkg-plist
+++ b/net/netwib/pkg-plist
@@ -1,141 +1,141 @@
 bin/netwib%%SHORTPORTVERSION%%-config
 bin/netwib-config
 include/netwib.h
 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
-man/man3/netwib.3.gz
-man/man3/netwib%%SHORTPORTVERSION%%.3.gz
-man/man3/netwib%%SHORTPORTVERSION%%_dat.3.gz
-man/man3/netwib%%SHORTPORTVERSION%%_err.3.gz
-man/man3/netwib%%SHORTPORTVERSION%%_net.3.gz
-man/man3/netwib%%SHORTPORTVERSION%%_pkt.3.gz
-man/man3/netwib%%SHORTPORTVERSION%%_shw.3.gz
-man/man3/netwib%%SHORTPORTVERSION%%_sys.3.gz
-man/man3/netwib_dat.3.gz
-man/man3/netwib_err.3.gz
-man/man3/netwib_net.3.gz
-man/man3/netwib_pkt.3.gz
-man/man3/netwib_shw.3.gz
-man/man3/netwib_sys.3.gz
+share/man/man3/netwib.3.gz
+share/man/man3/netwib%%SHORTPORTVERSION%%.3.gz
+share/man/man3/netwib%%SHORTPORTVERSION%%_dat.3.gz
+share/man/man3/netwib%%SHORTPORTVERSION%%_err.3.gz
+share/man/man3/netwib%%SHORTPORTVERSION%%_net.3.gz
+share/man/man3/netwib%%SHORTPORTVERSION%%_pkt.3.gz
+share/man/man3/netwib%%SHORTPORTVERSION%%_shw.3.gz
+share/man/man3/netwib%%SHORTPORTVERSION%%_sys.3.gz
+share/man/man3/netwib_dat.3.gz
+share/man/man3/netwib_err.3.gz
+share/man/man3/netwib_net.3.gz
+share/man/man3/netwib_pkt.3.gz
+share/man/man3/netwib_shw.3.gz
+share/man/man3/netwib_sys.3.gz