- Update to upstream release 1.5.4 (2009)

  + This unbreaks the build, removing BROKEN= tag.

- For examples, use [NO]PORTEXAMPLES instead of [NO]PORTDOCS

- HAS_CONFIGURE -> GNU_CONFIGURE

- Drop all patches from files/,
  + patch-configure.in and patch-newsstar.in integrated in upstream
  + patch-Makefile.am no longer needed after further upstream fixes

- Drop USE_AUTOTOOLS, we're no longer patching *.ac/*.am files.

- Mark MAKE_JOBS_SAFE for parallel builds.

- Note I cannot actually test the resulting executable for lack of local
  news servers, hence I'm not taking maintainership either.

Feature safe: yes

6 files changed, 19 insertions, 118 deletions

diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index bada8ec12003..96ba26643e77 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	newsstar
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.5.4
 CATEGORIES=	news
 MASTER_SITES=	SF
 
@@ -18,12 +17,10 @@ LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 
-BROKEN=		does not build
-
 USE_PERL5=	yes
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	automake autoconf aclocal
+MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--with-conf-dir=${PREFIX}/etc/newsstar \
@@ -66,12 +63,14 @@ DOCS=		AUTHORS INSTALL NEWS README TODO docs/QuickStart docs/manual.txt \
 EX_CONFIGS=	cf.server.sample curses.cf.sample filter.pl.sample main.cf.sample \
 		master.ignore.sample master.score.sample newsrc.sample
 
-.if !defined(NOPORTDOCS)
 post-install:
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 .for i in ${EX_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/sample_config/${i} ${EXAMPLESDIR}
 .endfor
+.endif
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -81,4 +80,5 @@ post-install:
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/sgml/docbook/dtd/xml|${LOCALBASE}/share/xml/docbook|' ${WRKSRC}/docs/manual.xml
 	@${REINPLACE_CMD} -e 's|/usr/share/sgml/docbook/dtd/xml|${LOCALBASE}/share/xml/docbook|' ${WRKSRC}/docs/news.xml
+
 .include <bsd.port.post.mk>
diff --git a/news/newsstar/distinfo b/news/newsstar/distinfo
index 4bcd05206757..fdcff2d86f32 100644
--- a/news/newsstar/distinfo
+++ b/news/newsstar/distinfo
@@ -1,3 +1,2 @@
-MD5 (newsstar-1.5.3.tar.gz) = 7e36bccd80bb548e3d0fc65c38783fbc
-SHA256 (newsstar-1.5.3.tar.gz) = 2b667b5cde20b595e15d5e1e26fe46790320c91bb17cbe323b5f69e048fa9b34
-SIZE (newsstar-1.5.3.tar.gz) = 247226
+SHA256 (newsstar-1.5.4.tar.gz) = 5dfd7c598e1f03120e4529165d0ef5e580b86f10ee8a54b5bed367ab5edb44bb
+SIZE (newsstar-1.5.4.tar.gz) = 251941
diff --git a/news/newsstar/files/patch-Makefile.am b/news/newsstar/files/patch-Makefile.am
deleted file mode 100644
index 7e4b9926644a..000000000000
--- a/news/newsstar/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig	2009-07-15 09:02:15.000000000 +0200
-+++ src/Makefile.am	2009-07-15 09:02:54.000000000 +0200
-@@ -37,7 +37,7 @@
- 	vector.c vector.h \
- 	xpat.c xpat.h
- 
--newsstar_bin_LDADD = $(top_builddir)/replace/libreplace.a @CURSES_LIB@ @TH_GDBM_LIB@ @TH_SSL_LIB@ @PTHREAD_LIB@
-+newsstar_bin_LDADD = $(top_builddir)/replace/libreplace.a @CURSES_LIB@ @TH_GDBM_LIB@ @TH_SSL_LIB@ @PTHREAD_LIB@ -liconv
- 
- if DO_CHOWN_NEWS
- install-exec-hook:
diff --git a/news/newsstar/files/patch-configure.in b/news/newsstar/files/patch-configure.in
deleted file mode 100644
index 7793a8d0d423..000000000000
--- a/news/newsstar/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2008-09-09 01:31:21.000000000 +0200
-+++ configure.in	2009-07-15 08:50:31.000000000 +0200
-@@ -208,7 +208,7 @@
- AC_PATH_PROG([SENDMAIL], [sendmail], [/usr/sbin/sendmail],
-     [$PATH:/usr/sbin:/sbin:/usr/local/sbin:/usr/lib])
- 
--if test "x$NEWS_PATH" == "x"
-+if test "x$NEWS_PATH" = "x"
- then
-     TH_CHECK_INN
- fi
diff --git a/news/newsstar/files/patch-newsstar.in b/news/newsstar/files/patch-newsstar.in
deleted file mode 100644
index 192557490eaa..000000000000
--- a/news/newsstar/files/patch-newsstar.in
+++ /dev/null
@@ -1,77 +0,0 @@
---- newsstar.in.orig	2008-09-09 01:30:52.000000000 +0200
-+++ newsstar.in	2009-07-12 17:53:37.000000000 +0200
-@@ -29,7 +29,6 @@
- $NEWS_PATH = '@NEWS_PATH@';
- $prefix = "@prefix@";
- $exec_prefix = "@exec_prefix@";
--$libexecdir = "@libexecdir@";
- $NEWSSTAR_BIN = "@NEWSSTAR_BIN@";
- $MAINCF = $CONF_DIR . "/main.cf";
- $INCOMING_DIR = "@INCOMING_DIR@";
-@@ -266,7 +265,17 @@
- 		}
- 	}
- 	$OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/newsstar";
--	$ACTIVE_FILE = "/var/lib/news/active" if ($ACTIVE_FILE eq "");
-+    if ($ACTIVE_FILE eq "")
-+    {
-+	if ($USE_SNEWS)
-+	{
-+	    $ACTIVE_FILE = "${prefix}/etc/s-news/active";
-+	}
-+	else
-+	{
-+	    $ACTIVE_FILE = "${prefix}/news/db/active";
-+	}
-+    }
- 	if ($ARTICLES_DIR eq "")
- 	{
- 		if ($USE_SNEWS)
-@@ -297,21 +306,9 @@
- {
- 	if ($SNSTORE eq "")
- 	{
--		if (-x "/usr/sbin/snstore")
--		{
--			$SNSTORE = "/usr/sbin/snstore"
--		}
--		elsif (-x "/usr/local/sbin/snstore")
--		{
--			$SNSTORE = "/usr/local/sbin/snstore"
--		}
--		elsif (-x "/usr/bin/snstore")
--		{
--			$SNSTORE = "/usr/bin/snstore"
--		}
--		elsif (-x "/usr/local/bin/snstore")
-+	if (-x "${prefix}/sbin/snstore")
- 		{
--			$SNSTORE = "/usr/local/bin/snstore"
-+	    $SNSTORE = "${prefix}/sbin/snstore"
- 		}
- 		else
- 		{
-@@ -328,21 +325,9 @@
- {
- 	if ($OVERVIEW eq "")
- 	{
--		if (-x "/usr/sbin/overview")
--		{
--			$OVERVIEW = "/usr/sbin/overview"
--		}
--		elsif (-x "/usr/local/sbin/overview")
--		{
--			$OVERVIEW = "/usr/local/sbin/overview"
--		}
--		elsif (-x "/usr/bin/overview")
--		{
--			$OVERVIEW = "/usr/bin/overview"
--		}
--		elsif (-x "/usr/local/bin/overview")
-+	if (-x "${prefix}/sbin/overview")
- 		{
--			$OVERVIEW = "/usr/local/bin/overview"
-+	    $OVERVIEW = "${prefix}/sbin/overview"
- 		}
- 		else
- 		{
diff --git a/news/newsstar/pkg-plist b/news/newsstar/pkg-plist
index 28deeb9ecd34..4c5e70ae74b7 100644
--- a/news/newsstar/pkg-plist
+++ b/news/newsstar/pkg-plist
@@ -1,5 +1,5 @@
 bin/newsstar
-libexec/newsstar.bin
+lib/newsstar/newsstar.bin
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -20,13 +20,14 @@ libexec/newsstar.bin
 %%PORTDOCS%%%%DOCSDIR%%/ar01s10.html
 %%PORTDOCS%%%%DOCSDIR%%/ar01s11.html
 %%PORTDOCS%%%%DOCSDIR%%/ar01s12.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/cf.server.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/curses.cf.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/filter.pl.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/main.cf.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/master.ignore.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/master.score.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/newsrc.sample
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.server.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curses.cf.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/filter.pl.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.cf.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/master.ignore.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/master.score.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsrc.sample
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/newsstar
 @dirrm etc/newsstar