5 files changed, 27 insertions, 32 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 0f94910bf9c6..e49e9f96c7ae 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -6,38 +6,42 @@
 #
 
 PORTNAME=	slrn
-PORTVERSION=	0.9.7.1
+PORTVERSION=	0.9.7.2
 CATEGORIES=	news ipv6
-MASTER_SITES=	ftp://slrn.sourceforge.net/pub/slrn/
-DISTNAME=	slrn-0.9.7.1
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	xaa+ports@timewasters.nl
+MAINTAINER=	petef@FreeBSD.org
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
-GNU_CONFIGURE=	yes
-ALL_TARGET=	all slrnpull
-MAN1=		slrn.1
+USE_GMAKE=	yes
 
-CONFIGURE_ARGS=	--enable-ipv6 --disable-inews
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-ipv6 --disable-inews --with-slrnpull
 
-.if defined(WITH_SSL)
+.if !defined(WITHOUT_SSL)
 USE_OPENSSL=	YES
 CONFIGURE_ARGS+=	--with-ssl
 .endif
 
+ALL_TARGET=	all slrnpull
+
+MAN1=		slrn.1
+
+post-patch:
+	@${PERL} -pi -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
+		${WRKSRC}/src/slrnfeat.h
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${MACHINE_ARCH}objs/slrn ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${MACHINE_ARCH}objs/slrnpull ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/examples/slrn
 	${INSTALL_DATA} ${WRKSRC}/doc/slrn.rc ${PREFIX}/share/examples/slrn
 	@${MKDIR} ${PREFIX}/share/examples/slrn/slrnpull
-	${INSTALL_DATA} ${WRKSRC}/doc/slrnpull/README ${PREFIX}/share/examples/slrn/slrnpull
-	${INSTALL_DATA} ${WRKSRC}/doc/slrnpull/SETUP ${PREFIX}/share/examples/slrn/slrnpull
-	${INSTALL_DATA} ${WRKSRC}/doc/slrnpull/score ${PREFIX}/share/examples/slrn/slrnpull
-	${INSTALL_DATA} ${WRKSRC}/doc/slrnpull/slrn.rc ${PREFIX}/share/examples/slrn/slrnpull
-	${INSTALL_DATA} ${WRKSRC}/doc/slrnpull/slrnpull.conf ${PREFIX}/share/examples/slrn/slrnpull
-	${INSTALL_DATA} ${WRKSRC}/doc/slrnpull/slrnpull.sh ${PREFIX}/share/examples/slrn/slrnpull
+.for file in FAQ README SETUP score slrn.rc slrnpull.conf slrnpull.sh
+	${INSTALL_DATA} ${WRKSRC}/doc/slrnpull/${file} ${PREFIX}/share/examples/slrn/slrnpull
+.endfor
 	${INSTALL_MAN} ${WRKSRC}/doc/slrn.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index 7838de162c77..3522cbf3dbcc 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1 +1 @@
-MD5 (slrn-0.9.7.1.tar.gz) = 9317401abb8c7ab63a0b177575abb088
+MD5 (slrn-0.9.7.2.tar.gz) = 36645f69e4dc01986c1c1f0277bfca01
diff --git a/news/slrn/files/patch-aa b/news/slrn/files/patch-aa
deleted file mode 100644
index c2db59185626..000000000000
--- a/news/slrn/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/slrnfeat.h.orig	Sun Mar 11 21:55:57 2001
-+++ src/slrnfeat.h	Thu Mar 29 11:11:55 2001
-@@ -150,7 +150,7 @@
- #   define SLRN_FOLLOWUP_FILENAME	".followup"
- #   define SLRN_SIGNATURE_FILE		".signature"
- #   ifndef SLRN_SENDMAIL_COMMAND
--#    define SLRN_SENDMAIL_COMMAND	"/usr/lib/sendmail -oi -t -oem -odb"
-+#    define SLRN_SENDMAIL_COMMAND	"/usr/sbin/sendmail -oi -t -oem -odb"
- #   endif
- #   ifndef SLRN_LIB_DIR
- #    define SLRN_LIB_DIR		"/usr/local/lib/slrn"
diff --git a/news/slrn/pkg-descr b/news/slrn/pkg-descr
index 45282902ab97..2218cc5175f8 100644
--- a/news/slrn/pkg-descr
+++ b/news/slrn/pkg-descr
@@ -1,7 +1,8 @@
-slrn (not to be confused with slnr) is a SLang-based NNTP newsreader with a 
-nice interface.
-
-It now supports SSL (compile with -DWITH_SSL) and IPv6 (but that part is still
-under development)
+slrn is an easy to use but powerful NNTP/spool based newsreader.  It is
+highly customizable, supports scoring, free key bindings, and can be
+extended using the SLang macro language.  slrn supports SSL and IPv6.
 
 WWW: http://slrn.sourceforge.net/
+
+- Pete
+petef@FreeBSD.org
diff --git a/news/slrn/pkg-plist b/news/slrn/pkg-plist
index a787a15a6d58..7446b5795305 100644
--- a/news/slrn/pkg-plist
+++ b/news/slrn/pkg-plist
@@ -1,6 +1,7 @@
 bin/slrn
 bin/slrnpull
 share/examples/slrn/slrn.rc
+share/examples/slrn/slrnpull/FAQ
 share/examples/slrn/slrnpull/README
 share/examples/slrn/slrnpull/SETUP
 share/examples/slrn/slrnpull/score