- add slrn-0.9.8.0-ranges2.diff [0]

- use %%DOCSDIR%%, USE_SIZE [0]
- portlint [0]
- bump PORTREVISION [0]
- make gettext optional, add WITHOUT_NLS [1]

PR:		62867 [0]
Submitted by:	obraun [0], Phil Pennock <pdp@nl.demon.net> [1]

3 files changed, 61 insertions, 47 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 3791cb6d34d4..46438544e2b2 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slrn
 PORTVERSION=	0.9.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/usenet/readers/unix/slrn/ \
@@ -15,24 +15,35 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.fu-berlin.de/pub/unix/news/slrn/ \
 		ftp://ftp.ntua.gr/pub/lang/slang/slrn/ \
 		ftp://ftp.plig.org/pub/slrn/
-		
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+PATCH_SITES=	http://slrn.sourceforge.net/patches/
+PATCHFILES=	slrn-0.9.8.0-ranges2.diff
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	SLang-based newsreader
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_SIZE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-ipv6 --disable-inews --with-slrnpull \
-		--with-libiconv-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--enable-ipv6 --disable-inews --with-slrnpull \
+			--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	YES
@@ -44,7 +55,7 @@ ALL_TARGET=	all
 MAN1=		slrn.1 slrnpull.1
 
 .if defined(NOPORTDOCS)
-MAKE_ENV+=      NOPORTDOCS=yes
+MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
 post-patch:
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index 3faa94e0b931..49ae0ea8bcbb 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1 +1,4 @@
 MD5 (slrn-0.9.8.0.tar.bz2) = 47e9931771114ba192356a0473e9649e
+SIZE (slrn-0.9.8.0.tar.bz2) = 995881
+MD5 (slrn-0.9.8.0-ranges2.diff) = c6206596799c2e5186648f76c63515a6
+SIZE (slrn-0.9.8.0-ranges2.diff) = 615
diff --git a/news/slrn/pkg-plist b/news/slrn/pkg-plist
index 3c698b5d7470..3d729a1b97ce 100644
--- a/news/slrn/pkg-plist
+++ b/news/slrn/pkg-plist
@@ -1,43 +1,43 @@
 bin/slrn
 bin/slrnpull
-%%PORTDOCS%%share/doc/slrn/COPYING
-%%PORTDOCS%%share/doc/slrn/COPYRIGHT
-%%PORTDOCS%%share/doc/slrn/FAQ
-%%PORTDOCS%%share/doc/slrn/FIRST_STEPS
-%%PORTDOCS%%share/doc/slrn/README
-%%PORTDOCS%%share/doc/slrn/README.GroupLens
-%%PORTDOCS%%share/doc/slrn/README.SSL
-%%PORTDOCS%%share/doc/slrn/README.macros
-%%PORTDOCS%%share/doc/slrn/README.multiuser
-%%PORTDOCS%%share/doc/slrn/THANKS
-%%PORTDOCS%%share/doc/slrn/changes.txt
-%%PORTDOCS%%share/doc/slrn/help.txt
-%%PORTDOCS%%share/doc/slrn/manual.txt
-%%PORTDOCS%%share/doc/slrn/score.sl
-%%PORTDOCS%%share/doc/slrn/score.txt
-%%PORTDOCS%%share/doc/slrn/slrn-doc.html
-%%PORTDOCS%%share/doc/slrn/slrn.rc
-%%PORTDOCS%%share/doc/slrn/slrnfuns.txt
-%%PORTDOCS%%share/doc/slrn/slrnpull/README
-%%PORTDOCS%%share/doc/slrn/slrnpull/README.offline
-%%PORTDOCS%%share/doc/slrn/slrnpull/SETUP
-%%PORTDOCS%%share/doc/slrn/slrnpull/score
-%%PORTDOCS%%share/doc/slrn/slrnpull/setgid.txt
-%%PORTDOCS%%share/doc/slrn/slrnpull/slrn.rc
-%%PORTDOCS%%share/doc/slrn/slrnpull/slrnpull.conf
-%%PORTDOCS%%share/doc/slrn/slrnpull/slrnpull.sh
-share/locale/be/LC_MESSAGES/slrn.mo
-share/locale/da/LC_MESSAGES/slrn.mo
-share/locale/de/LC_MESSAGES/slrn.mo
-share/locale/es/LC_MESSAGES/slrn.mo
-share/locale/fi/LC_MESSAGES/slrn.mo
-share/locale/fr/LC_MESSAGES/slrn.mo
-share/locale/it/LC_MESSAGES/slrn.mo
-share/locale/ko/LC_MESSAGES/slrn.mo
-share/locale/nl/LC_MESSAGES/slrn.mo
-share/locale/pl/LC_MESSAGES/slrn.mo
-share/locale/ru/LC_MESSAGES/slrn.mo
-share/locale/tr/LC_MESSAGES/slrn.mo
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/FIRST_STEPS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.GroupLens
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/README.macros
+%%PORTDOCS%%%%DOCSDIR%%/README.multiuser
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/score.sl
+%%PORTDOCS%%%%DOCSDIR%%/score.txt
+%%PORTDOCS%%%%DOCSDIR%%/slrn-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/slrn.rc
+%%PORTDOCS%%%%DOCSDIR%%/slrnfuns.txt
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/README
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/README.offline
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/SETUP
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/score
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/setgid.txt
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrn.rc
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrnpull.conf
+%%PORTDOCS%%%%DOCSDIR%%/slrnpull/slrnpull.sh
+%%NLS%%share/locale/be/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/da/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/de/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/es/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/it/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/slrn.mo
 share/slrn/macros/color.sl
 share/slrn/macros/gsort.sl
 share/slrn/macros/ispell.sl
@@ -54,5 +54,5 @@ share/slrn/macros/varset.sl
 share/slrn/macros/xcomment.sl
 @dirrm share/slrn/macros
 @dirrm share/slrn
-%%PORTDOCS%%@dirrm share/doc/slrn/slrnpull
-%%PORTDOCS%%@dirrm share/doc/slrn
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/slrnpull
+%%PORTDOCS%%@dirrm %%DOCSDIR%%