- Update port 0.1.6

- Mark as BROKEN on 4.x

PR:		96168
Submitted by:	maintainer

4 files changed, 22 insertions, 26 deletions

diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index a03980144f4..65cd07183d5 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nepenthes
-PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTVERSION=	0.1.6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nepenthes
@@ -29,16 +28,12 @@ DOCS=		README README.VFS logo-shaded.svg
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+.if ${OSVERSION} < 500000
+BROKEN=		Does not compile
 .endif
 
-#post-install:
-#.if !defined(NOPORTDOCS)
-#	${MKDIR} ${DOCSDIR}
-#.for f in ${DOCS}
-#	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
-#.endfor
-#.endif
+.if ${ARCH} != "i386"
+BROKEN=		Does not compile on !i386
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/nepenthes/distinfo b/net/nepenthes/distinfo
index 680061f00da..1be0074157f 100644
--- a/net/nepenthes/distinfo
+++ b/net/nepenthes/distinfo
@@ -1,3 +1,3 @@
-MD5 (nepenthes-0.1.5.tar.gz) = d7eae244a5adef66ca504a233f1c51e1
-SHA256 (nepenthes-0.1.5.tar.gz) = 7c74614cb3027f0c9a409f68ed81baed4793673509e09138bd6296d72b04b08a
-SIZE (nepenthes-0.1.5.tar.gz) = 780788
+MD5 (nepenthes-0.1.6.tar.gz) = 317afd3dc86d57a22570632bdf839ef2
+SHA256 (nepenthes-0.1.6.tar.gz) = f9bae290d49df9658b7f27a2f4c304fd671cc1f2f344a3b960a181c12416d94b
+SIZE (nepenthes-0.1.6.tar.gz) = 794938
diff --git a/net/nepenthes/files/patch-Makefile.in b/net/nepenthes/files/patch-Makefile.in
index 596e45e6d57..00eb9486529 100644
--- a/net/nepenthes/files/patch-Makefile.in
+++ b/net/nepenthes/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  #tools
  EXTRA_DIST = configure.ac CHANGES doc/README doc/README.VFS doc/logo-shaded.svg doc/nepenthes.8 conf/nepenthes.conf.dist
 -docdir = $(prefix)/share/doc
-+docdir = $(prefix)/share/doc/nepenthes
++docdir = $(prefix)/share/nepenthes
  doc_DATA = doc/README doc/README.VFS doc/logo-shaded.svg
  
  #sysconf_DATA = conf/nepenthes.conf.dist
diff --git a/net/nepenthes/pkg-plist b/net/nepenthes/pkg-plist
index ebee90dff6d..f0328597c65 100644
--- a/net/nepenthes/pkg-plist
+++ b/net/nepenthes/pkg-plist
@@ -4,10 +4,10 @@ etc/nepenthes/download-curl.conf
 etc/nepenthes/download-link.conf
 etc/nepenthes/download-nepenthes.conf
 etc/nepenthes/download-tftp.conf
+etc/nepenthes/geolocation-ip2location.conf
 etc/nepenthes/log-download.conf
 etc/nepenthes/log-irc.conf
 etc/nepenthes/log-surfnet.conf
-etc/nepenthes/geolocation-ip2location.conf
 etc/nepenthes/module-portwatch.conf
 etc/nepenthes/nepenthes.conf
 etc/nepenthes/nepenthes.conf.dist
@@ -23,9 +23,9 @@ etc/nepenthes/vuln-dcom.conf
 etc/nepenthes/vuln-iis.conf
 etc/nepenthes/vuln-kuang2.conf
 etc/nepenthes/vuln-lsass.conf
+etc/nepenthes/vuln-msdtc.conf
 etc/nepenthes/vuln-msmq.conf
 etc/nepenthes/vuln-mssql.conf
-etc/nepenthes/vuln-msdtc.conf
 etc/nepenthes/vuln-mydoom.conf
 etc/nepenthes/vuln-netbiosname.conf
 etc/nepenthes/vuln-netdde.conf
@@ -38,9 +38,6 @@ etc/nepenthes/vuln-upnp.conf
 etc/nepenthes/vuln-veritas.conf
 etc/nepenthes/vuln-wins.conf
 etc/nepenthes/x-2.conf
-lib/nepenthes/vulnmsdtc.so
-lib/nepenthes/vulnmsdtc.la
-lib/nepenthes/vulnmsdtc.a
 lib/nepenthes/dnsresolveadns.a
 lib/nepenthes/dnsresolveadns.la
 lib/nepenthes/dnsresolveadns.so
@@ -65,6 +62,9 @@ lib/nepenthes/downloadlink.so
 lib/nepenthes/downloadnepenthes.a
 lib/nepenthes/downloadnepenthes.la
 lib/nepenthes/downloadnepenthes.so
+lib/nepenthes/downloadrcp.a
+lib/nepenthes/downloadrcp.la
+lib/nepenthes/downloadrcp.so
 lib/nepenthes/downloadtftp.a
 lib/nepenthes/downloadtftp.la
 lib/nepenthes/downloadtftp.so
@@ -131,6 +131,9 @@ lib/nepenthes/vulnkuang2.so
 lib/nepenthes/vulnlsass.a
 lib/nepenthes/vulnlsass.la
 lib/nepenthes/vulnlsass.so
+lib/nepenthes/vulnmsdtc.a
+lib/nepenthes/vulnmsdtc.la
+lib/nepenthes/vulnmsdtc.so
 lib/nepenthes/vulnmsmq.a
 lib/nepenthes/vulnmsmq.la
 lib/nepenthes/vulnmsmq.so
@@ -194,11 +197,9 @@ lib/nepenthes/x7.so
 lib/nepenthes/x8.a
 lib/nepenthes/x8.la
 lib/nepenthes/x8.so
-share/doc/nepenthes/README
-share/doc/nepenthes/README.VFS
-share/doc/nepenthes/logo-shaded.svg
-@dirrm share/doc/nepenthes
+%%DATADIR%%/README
+%%DATADIR%%/README.VFS
+%%DATADIR%%/logo-shaded.svg
 @dirrm etc/nepenthes
 @dirrm lib/nepenthes
-@dirrm share/nepenthes
-@dirrm var/cache/nepenthes
+@dirrm %%DATADIR%%