- Update to 2.6 [1]

- Add WITHOUT_NLS knob [1]
- Fix libintl detection if ${LOCALBASE} != /usr/local [2]
- Use DOCSDIR in pkg-plist

PR:		59034 [1]
Submitted by:	maintainer [1], sergei [2]

3 files changed, 41 insertions, 31 deletions

diff --git a/net-mgmt/darkstat/Makefile b/net-mgmt/darkstat/Makefile
index 29439db4d974..71ecde8e25c3 100644
--- a/net-mgmt/darkstat/Makefile
+++ b/net-mgmt/darkstat/Makefile
@@ -6,28 +6,33 @@
 #
 
 PORTNAME=	darkstat
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	net
 MASTER_SITES=	http://members.optushome.com.au/emikulic/net/darkstat/ \
 		http://yallara.cs.rmit.edu.au/~emikulic/_/
 
 MAINTAINER=	emikulic@optushome.com.au
-COMMENT=	Network statistics gatherer, similar to but smaller than ntop
-
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
+COMMENT=	Network statistics gatherer, similar to ntop
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS=	--disable-nls
+PLIST_SUB=	NLS="@comment "
+.else
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
+CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
+PLIST_SUB=	NLS=""
+.endif
 
 MAN1=	darkstat.1
-DOCS=	AUTHORS ChangeLog INSTALL ISSUES README TODO
+DOCS=	AUTHORS ChangeLog INSTALL ISSUES README
 
-post-install:
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
-.endfor
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/darkstat/distinfo b/net-mgmt/darkstat/distinfo
index 55e34c83a4a1..36e0fa775de6 100644
--- a/net-mgmt/darkstat/distinfo
+++ b/net-mgmt/darkstat/distinfo
@@ -1 +1 @@
-MD5 (darkstat-2.5.tar.gz) = 4e1b67a55b6aa2c1242f40ee61df7a40
+MD5 (darkstat-2.6.tar.gz) = 0a1a407acb6f9b35a46d64885c30d08d
diff --git a/net-mgmt/darkstat/pkg-plist b/net-mgmt/darkstat/pkg-plist
index b15a68e17d8b..444354ad22f6 100644
--- a/net-mgmt/darkstat/pkg-plist
+++ b/net-mgmt/darkstat/pkg-plist
@@ -1,21 +1,26 @@
 @comment $FreeBSD$
 sbin/darkstat
-share/locale/da/LC_MESSAGES/darkstat.mo
-share/locale/es/LC_MESSAGES/darkstat.mo
-share/locale/fr/LC_MESSAGES/darkstat.mo
-share/locale/nl/LC_MESSAGES/darkstat.mo
-share/locale/pt_BR/LC_MESSAGES/darkstat.mo
-share/locale/sv/LC_MESSAGES/darkstat.mo
-share/locale/zh_TW/LC_MESSAGES/darkstat.mo
-share/locale/zh_CN/LC_MESSAGES/darkstat.mo
-share/locale/lt/LC_MESSAGES/darkstat.mo
-share/locale/hu/LC_MESSAGES/darkstat.mo
-share/locale/ms/LC_MESSAGES/darkstat.mo
-share/locale/hr/LC_MESSAGES/darkstat.mo
-%%PORTDOCS%%share/doc/darkstat/AUTHORS
-%%PORTDOCS%%share/doc/darkstat/ChangeLog
-%%PORTDOCS%%share/doc/darkstat/INSTALL
-%%PORTDOCS%%share/doc/darkstat/ISSUES
-%%PORTDOCS%%share/doc/darkstat/README
-%%PORTDOCS%%share/doc/darkstat/TODO
-%%PORTDOCS%%@dirrm share/doc/darkstat
+%%NLS%%share/locale/bg/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/da/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/es/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/id/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/darkstat.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/darkstat.mo
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/ISSUES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%