6 files changed, 89 insertions, 58 deletions

diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index 86807d95a1a9..be3b90c9ac4c 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	newsstar
-PORTVERSION=	1.3.2
+PORTVERSION=	1.5.3
 CATEGORIES=	news
 MASTER_SITES=	SF
 
@@ -14,11 +14,15 @@ MAINTAINER=	anray@FreeBSD.org
 COMMENT=	Transfer news between a local NNTP server (INN, sn, s-news)
 
 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
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
+USE_ICONV=	yes
+USE_AUTOTOOLS=	automake:110 autoconf:262 aclocal:110
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} --mandir=${PREFIX}/man \
+CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--with-conf-dir=${PREFIX}/etc/newsstar \
 		--with-rc-dir=/var/spool/newsstar/lib \
 		--with-incoming-dir=/var/spool/newsstar/incoming
@@ -53,7 +57,8 @@ MAN1=		newsstar.1
 DOCS=		AUTHORS INSTALL NEWS README TODO docs/QuickStart docs/manual.txt \
 		docs/index.html docs/ar01s02.html docs/ar01s03.html docs/ar01s04.html \
 		docs/ar01s05.html docs/ar01s06.html docs/ar01s07.html docs/ar01s08.html \
-		docs/ar01s09.html docs/ar01s10.html docs/ar01s11.html docs/ar01s12.html
+		docs/ar01s09.html docs/ar01s10.html docs/ar01s11.html docs/ar01s12.html \
+		docs/news.html
 
 EX_CONFIGS=	cf.server.sample curses.cf.sample filter.pl.sample main.cf.sample \
 		master.ignore.sample master.score.sample newsrc.sample
@@ -70,4 +75,7 @@ post-install:
 .endfor
 .endif
 
+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 38b6b21d2ef2..4bcd05206757 100644
--- a/news/newsstar/distinfo
+++ b/news/newsstar/distinfo
@@ -1,3 +1,3 @@
-MD5 (newsstar-1.3.2.tar.gz) = bb1f677e6fd41ec70f349803a412018a
-SHA256 (newsstar-1.3.2.tar.gz) = 3d9c53a569a5baefba8dfa6c560f715f2ead4f0b9038086d0a5d307a88b0e370
-SIZE (newsstar-1.3.2.tar.gz) = 248661
+MD5 (newsstar-1.5.3.tar.gz) = 7e36bccd80bb548e3d0fc65c38783fbc
+SHA256 (newsstar-1.5.3.tar.gz) = 2b667b5cde20b595e15d5e1e26fe46790320c91bb17cbe323b5f69e048fa9b34
+SIZE (newsstar-1.5.3.tar.gz) = 247226
diff --git a/news/newsstar/files/patch-Makefile.am b/news/newsstar/files/patch-Makefile.am
new file mode 100644
index 000000000000..7e4b9926644a
--- /dev/null
+++ b/news/newsstar/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..7793a8d0d423
--- /dev/null
+++ b/news/newsstar/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- 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
index d40fb213307b..192557490eaa 100644
--- a/news/newsstar/files/patch-newsstar.in
+++ b/news/newsstar/files/patch-newsstar.in
@@ -1,6 +1,6 @@
---- newsstar.in.orig	Tue Aug 17 22:33:53 2004
-+++ newsstar.in	Thu Aug 19 19:18:38 2004
-@@ -30,7 +30,6 @@
+--- 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@";
@@ -8,11 +8,11 @@
  $NEWSSTAR_BIN = "@NEWSSTAR_BIN@";
  $MAINCF = $CONF_DIR . "/main.cf";
  $INCOMING_DIR = "@INCOMING_DIR@";
-@@ -261,7 +260,17 @@
+@@ -266,7 +265,17 @@
+ 		}
  	}
-     }
-     $OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/newsstar";
--    $ACTIVE_FILE = "/var/lib/news/active" if ($ACTIVE_FILE eq "");
+ 	$OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/newsstar";
+-	$ACTIVE_FILE = "/var/lib/news/active" if ($ACTIVE_FILE eq "");
 +    if ($ACTIVE_FILE eq "")
 +    {
 +	if ($USE_SNEWS)
@@ -24,54 +24,54 @@
 +	    $ACTIVE_FILE = "${prefix}/news/db/active";
 +	}
 +    }
-     if ($ARTICLES_DIR eq "")
-     {
- 	if ($USE_SNEWS)
-@@ -292,21 +301,9 @@
+ 	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")
-+	if (-x "${prefix}/sbin/snstore")
+ 	if ($SNSTORE eq "")
  	{
--	    $SNSTORE = "/usr/local/sbin/snstore"
--	}
--	elsif (-x "/usr/bin/snstore")
--	{
--	    $SNSTORE = "/usr/bin/snstore"
--	}
--	elsif (-x "/usr/local/bin/snstore")
--	{
--	    $SNSTORE = "/usr/local/bin/snstore"
+-		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
- 	{
-@@ -323,21 +320,9 @@
+ 		}
+ 		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")
+ 	if ($OVERVIEW eq "")
  	{
--	    $OVERVIEW = "/usr/local/bin/overview"
+-		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
- 	{
+ 		}
+ 		else
+ 		{
diff --git a/news/newsstar/pkg-plist b/news/newsstar/pkg-plist
index 285df83c3459..28deeb9ecd34 100644
--- a/news/newsstar/pkg-plist
+++ b/news/newsstar/pkg-plist
@@ -7,6 +7,7 @@ libexec/newsstar.bin
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/QuickStart
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/news.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ar01s02.html
 %%PORTDOCS%%%%DOCSDIR%%/ar01s03.html