5 files changed, 51 insertions, 144 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index a77674eddce2..31bf9d295e1f 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	slrn
-PORTVERSION=	0.9.8.1
-PORTREVISION=	1
+PORTVERSION=	0.9.9p1
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://angel.sovam.com/pub/tools/net/news/ \
@@ -16,17 +15,11 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.plig.org/pub/slrn/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	http://slrn.sourceforge.net/patches/
-PATCHFILES=	slrn-0.9.8.1-fetch.diff \
-		slrn-0.9.8.1-lastchar2.diff
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	SLang-based newsreader
 
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 
@@ -41,7 +34,6 @@ PLIST_SUB+=	NLS=""
 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"
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	YES
@@ -50,20 +42,16 @@ CONFIGURE_ARGS+=	--with-ssl
 
 .if defined(WITH_DEVIEW)
 LIB_DEPENDS+=	uu.3:${PORTSDIR}/converters/uulib
-CONFIGURE_ARGS+=	--with-uudeview
+CONFIGURE_ARGS+=	--with-uulib
 .endif
 
 ALL_TARGET=	all
 
 MAN1=		slrn.1 slrnpull.1
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	NOPORTDOCS=yes
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
-		${WRKSRC}/src/slrnfeat.h
+		${WRKSRC}/src/slrnfeat.hin
 	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
 		${WRKSRC}/src/jdmacros.h
 
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index c276d00376db..c272177c2d9c 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1,9 +1,3 @@
-MD5 (slrn-0.9.8.1.tar.bz2) = 9b613007df537444a5f8a4a2994fadb7
-SHA256 (slrn-0.9.8.1.tar.bz2) = 46968e442ece567b7928faefa0774f675761b474be80e9487235c20f50a9fd05
-SIZE (slrn-0.9.8.1.tar.bz2) = 1034332
-MD5 (slrn-0.9.8.1-fetch.diff) = 969471685aa7412bc60869649312618f
-SHA256 (slrn-0.9.8.1-fetch.diff) = 0ae228075f15977f0d063cd60ef89be3c984692eed75ea7aa3ebb3bb59d7e243
-SIZE (slrn-0.9.8.1-fetch.diff) = 920
-MD5 (slrn-0.9.8.1-lastchar2.diff) = 01717350eabdcda662ff2444d8b3e560
-SHA256 (slrn-0.9.8.1-lastchar2.diff) = 940e6a10cfb2ee97a6d0ae1b7af8d0744a40fd627db86bf44e8e1a9f2f20f3b8
-SIZE (slrn-0.9.8.1-lastchar2.diff) = 4732
+MD5 (slrn-0.9.9p1.tar.gz) = 6cc8ac6baaff7cc2a8b78f7fbbe3187f
+SHA256 (slrn-0.9.9p1.tar.gz) = 3a896f42b78c32252878fd291b21d6482d466921b68ab97f7d8cbadf4a76b533
+SIZE (slrn-0.9.9p1.tar.gz) = 1535032
diff --git a/news/slrn/files/patch-Makefile.in b/news/slrn/files/patch-Makefile.in
deleted file mode 100644
index 5298a3a84b10..000000000000
--- a/news/slrn/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig	Thu Oct  7 00:30:27 2004
-+++ Makefile.in	Fri Nov  5 21:57:51 2004
-@@ -243,6 +243,7 @@
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- uninstall-info-am:
- install-docDATA: $(doc_DATA)
-+ifndef NOPORTDOCS
- 	@$(NORMAL_INSTALL)
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
- 	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -251,6 +252,7 @@
- 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- 	done
-+endif
- 
- uninstall-docDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -524,9 +526,11 @@
- all-am: Makefile $(DATA) all-local
- installdirs: installdirs-recursive
- installdirs-am:
-+ifndef NOPORTDOCS
- 	for dir in "$(DESTDIR)$(docdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
-+endif
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
diff --git a/news/slrn/files/patch-doc::Makefile.in b/news/slrn/files/patch-doc::Makefile.in
deleted file mode 100644
index ebd9957df90f..000000000000
--- a/news/slrn/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,46 +0,0 @@
---- doc/Makefile.in.orig	Thu Oct  7 00:30:28 2004
-+++ doc/Makefile.in	Fri Nov  5 21:40:07 2004
-@@ -268,6 +268,7 @@
- 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- install-docDATA: $(doc_DATA)
-+ifndef NOPORTDOCS
- 	@$(NORMAL_INSTALL)
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
- 	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -276,6 +277,7 @@
- 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- 	done
-+endif
- 
- uninstall-docDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -447,9 +449,11 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-+ifndef NOPORTDOCS
- 	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
-+endif
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -542,6 +546,7 @@
- 
- 
- install-data-local:
-+ifndef NOPORTDOCS
- 	@if test "x$(SLRNPULL)" = "xslrnpull"; then \
- 	$(mkinstalldirs) $(DESTDIR)$(docdir)/slrnpull; \
- 	list='$(PULLDOCS)'; for p in $$list; do \
-@@ -551,6 +556,7 @@
- 	  fi; \
- 	done; \
- 	fi;
-+endif
- 
- uninstall-local:
- 	list='$(PULLDOCS)'; for p in $$list; do \
diff --git a/news/slrn/pkg-plist b/news/slrn/pkg-plist
index 82199204e183..d14e47406077 100644
--- a/news/slrn/pkg-plist
+++ b/news/slrn/pkg-plist
@@ -1,31 +1,31 @@
 bin/slrn
 bin/slrnpull
-%%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
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/COPYRIGHT
+%%DOCSDIR%%/FAQ
+%%DOCSDIR%%/FIRST_STEPS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.GroupLens
+%%DOCSDIR%%/README.SSL
+%%DOCSDIR%%/README.macros
+%%DOCSDIR%%/README.multiuser
+%%DOCSDIR%%/THANKS
+%%DOCSDIR%%/changes.txt
+%%DOCSDIR%%/help.txt
+%%DOCSDIR%%/manual.txt
+%%DOCSDIR%%/score.sl
+%%DOCSDIR%%/score.txt
+%%DOCSDIR%%/slrn-doc.html
+%%DOCSDIR%%/slrn.rc
+%%DOCSDIR%%/slrnfuns.txt
+%%DOCSDIR%%/slrnpull/README
+%%DOCSDIR%%/slrnpull/README.offline
+%%DOCSDIR%%/slrnpull/SETUP
+%%DOCSDIR%%/slrnpull/score
+%%DOCSDIR%%/slrnpull/setgid.txt
+%%DOCSDIR%%/slrnpull/slrn.rc
+%%DOCSDIR%%/slrnpull/slrnpull.conf
+%%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
@@ -39,21 +39,22 @@ bin/slrnpull
 %%NLS%%share/locale/ru/LC_MESSAGES/slrn.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/slrn.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/slrn.mo
-%%DATADIR%%/macros/color.sl
-%%DATADIR%%/macros/gsort.sl
-%%DATADIR%%/macros/ispell.sl
-%%DATADIR%%/macros/latin2.sl
-%%DATADIR%%/macros/multipart.sl
-%%DATADIR%%/macros/nn.sl
-%%DATADIR%%/macros/posthook.sl
-%%DATADIR%%/macros/search.sl
-%%DATADIR%%/macros/tin-art.sl
-%%DATADIR%%/macros/tin-group.sl
-%%DATADIR%%/macros/ttyprint.sl
-%%DATADIR%%/macros/util.sl
-%%DATADIR%%/macros/varset.sl
-%%DATADIR%%/macros/xcomment.sl
-@dirrm %%DATADIR%%/macros
+%%DATADIR%%/slang/color.sl
+%%DATADIR%%/slang/gsort.sl
+%%DATADIR%%/slang/ispell.sl
+%%DATADIR%%/slang/latin2.sl
+%%DATADIR%%/slang/multipart.sl
+%%DATADIR%%/slang/nn.sl
+%%DATADIR%%/slang/posthook.sl
+%%DATADIR%%/slang/search.sl
+%%DATADIR%%/slang/slrn.sl
+%%DATADIR%%/slang/tin-art.sl
+%%DATADIR%%/slang/tin-group.sl
+%%DATADIR%%/slang/ttyprint.sl
+%%DATADIR%%/slang/util.sl
+%%DATADIR%%/slang/varset.sl
+%%DATADIR%%/slang/xcomment.sl
+@dirrm %%DATADIR%%/slang
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/slrnpull
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DOCSDIR%%/slrnpull
+@dirrm %%DOCSDIR%%