Attachment #97990 for bug #136807

View | Details | Raw Unified | Return to bug 136807
Collapse All | Expand All

Lines 6-12 Link Here

(-)/home/hsn/hacked/newsstar/Makefile (-3 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= newsstar	8	PORTNAME= newsstar
9	PORTVERSION= 1.3.2	9	PORTVERSION= 1.5.3
10	CATEGORIES= news	10	CATEGORIES= news
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-25 Link Here
15	COMMENT= Transfer news between a local NNTP server (INN, sn, s-news)	15	COMMENT= Transfer news between a local NNTP server (INN, sn, s-news)
16		16
17	LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm	17	LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
		18	BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \
		19	${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
18		20
19	USE_PERL5= yes	21	USE_PERL5= yes
20	HAS_CONFIGURE= yes	22	HAS_CONFIGURE= yes
		23	USE_ICONV= yes
		24	USE_AUTOTOOLS= automake:110 autoconf:262 aclocal:110
21		25
22	CONFIGURE_ARGS+=--prefix=${PREFIX} --mandir=${PREFIX}/man \	26	CONFIGURE_ARGS+=--prefix=${PREFIX} \
23	--with-conf-dir=${PREFIX}/etc/newsstar \	27	--with-conf-dir=${PREFIX}/etc/newsstar \
24	--with-rc-dir=/var/spool/newsstar/lib \	28	--with-rc-dir=/var/spool/newsstar/lib \
25	--with-incoming-dir=/var/spool/newsstar/incoming	29	--with-incoming-dir=/var/spool/newsstar/incoming
Lines 54-60 Link Here
54	DOCS= AUTHORS INSTALL NEWS README TODO docs/QuickStart docs/manual.txt \	58	DOCS= AUTHORS INSTALL NEWS README TODO docs/QuickStart docs/manual.txt \
55	docs/index.html docs/ar01s02.html docs/ar01s03.html docs/ar01s04.html \	59	docs/index.html docs/ar01s02.html docs/ar01s03.html docs/ar01s04.html \
56	docs/ar01s05.html docs/ar01s06.html docs/ar01s07.html docs/ar01s08.html \	60	docs/ar01s05.html docs/ar01s06.html docs/ar01s07.html docs/ar01s08.html \
57	docs/ar01s09.html docs/ar01s10.html docs/ar01s11.html docs/ar01s12.html	61	docs/ar01s09.html docs/ar01s10.html docs/ar01s11.html docs/ar01s12.html \
		62	docs/news.html
58		63
59	EX_CONFIGS= cf.server.sample curses.cf.sample filter.pl.sample main.cf.sample \	64	EX_CONFIGS= cf.server.sample curses.cf.sample filter.pl.sample main.cf.sample \
60	master.ignore.sample master.score.sample newsrc.sample	65	master.ignore.sample master.score.sample newsrc.sample
Lines 71-74 Link Here
71	.endfor	76	.endfor
72	.endif	77	.endif
73		78
		79	post-patch:
		80	@${REINPLACE_CMD} -e 's\|/usr/share/sgml/docbook/dtd/xml\|${LOCALBASE}/share/xml/docbook\|' ${WRKSRC}/docs/manual.xml
		81	@${REINPLACE_CMD} -e 's\|/usr/share/sgml/docbook/dtd/xml\|${LOCALBASE}/share/xml/docbook\|' ${WRKSRC}/docs/news.xml
74	.include <bsd.port.post.mk>	82	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/home/hsn/hacked/newsstar/distinfo (-3 / +3 lines)
1	MD5 (newsstar-1.3.2.tar.gz) = bb1f677e6fd41ec70f349803a412018a	1	MD5 (newsstar-1.5.3.tar.gz) = 7e36bccd80bb548e3d0fc65c38783fbc
2	SHA256 (newsstar-1.3.2.tar.gz) = 3d9c53a569a5baefba8dfa6c560f715f2ead4f0b9038086d0a5d307a88b0e370	2	SHA256 (newsstar-1.5.3.tar.gz) = 2b667b5cde20b595e15d5e1e26fe46790320c91bb17cbe323b5f69e048fa9b34
3	SIZE (newsstar-1.3.2.tar.gz) = 248661	3	SIZE (newsstar-1.5.3.tar.gz) = 247226

Line 0 Link Here

(-)/home/hsn/hacked/newsstar/files/patch-Makefile.am (+11 lines)
	1	--- src/Makefile.am.orig 2009-07-15 09:02:15.000000000 +0200
	2	+++ src/Makefile.am 2009-07-15 09:02:54.000000000 +0200
	3	@@ -37,7 +37,7 @@
	4	vector.c vector.h \
	5	xpat.c xpat.h
	6
	7	-newsstar_bin_LDADD = $(top_builddir)/replace/libreplace.a @CURSES_LIB@ @TH_GDBM_LIB@ @TH_SSL_LIB@ @PTHREAD_LIB@
	8	+newsstar_bin_LDADD = $(top_builddir)/replace/libreplace.a @CURSES_LIB@ @TH_GDBM_LIB@ @TH_SSL_LIB@ @PTHREAD_LIB@ -liconv
	9
	10	if DO_CHOWN_NEWS
	11	install-exec-hook:

Line 0 Link Here

(-)/home/hsn/hacked/newsstar/files/patch-configure.in (+11 lines)
	1	--- configure.in.orig 2008-09-09 01:31:21.000000000 +0200
	2	+++ configure.in 2009-07-15 08:50:31.000000000 +0200
	3	@@ -208,7 +208,7 @@
	4	AC_PATH_PROG([SENDMAIL], [sendmail], [/usr/sbin/sendmail],
	5	[$PATH:/usr/sbin:/sbin:/usr/local/sbin:/usr/lib])
	6
	7	-if test "x$NEWS_PATH" == "x"
	8	+if test "x$NEWS_PATH" = "x"
	9	then
	10	TH_CHECK_INN
	11	fi




--- 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@";

 $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 "");
-    $ACTIVE_FILE = "/var/lib/news/active" if ($ACTIVE_FILE eq "");
+    if ($ACTIVE_FILE eq "")
+    {
+	if ($USE_SNEWS)

+	    $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")
+	if (-x "${prefix}/sbin/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
 		{
@@ -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 (-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
 		{

Lines 7-12 Link Here

(-)/home/hsn/hacked/newsstar/pkg-plist (+1 lines)
7	%%PORTDOCS%%%%DOCSDIR%%/TODO	7	%%PORTDOCS%%%%DOCSDIR%%/TODO
8	%%PORTDOCS%%%%DOCSDIR%%/QuickStart	8	%%PORTDOCS%%%%DOCSDIR%%/QuickStart
9	%%PORTDOCS%%%%DOCSDIR%%/manual.txt	9	%%PORTDOCS%%%%DOCSDIR%%/manual.txt
		10	%%PORTDOCS%%%%DOCSDIR%%/news.html
10	%%PORTDOCS%%%%DOCSDIR%%/index.html	11	%%PORTDOCS%%%%DOCSDIR%%/index.html
11	%%PORTDOCS%%%%DOCSDIR%%/ar01s02.html	12	%%PORTDOCS%%%%DOCSDIR%%/ar01s02.html
12	%%PORTDOCS%%%%DOCSDIR%%/ar01s03.html	13	%%PORTDOCS%%%%DOCSDIR%%/ar01s03.html

Return to bug 136807

Lines 1-6 Link Here

(-)/home/hsn/hacked/newsstar/files/patch-newsstar.in (-52 / +52 lines)
1	--- newsstar.in.orig Tue Aug 17 22:33:53 2004	1	--- newsstar.in.orig 2008-09-09 01:30:52.000000000 +0200
2	+++ newsstar.in Thu Aug 19 19:18:38 2004	2	+++ newsstar.in 2009-07-12 17:53:37.000000000 +0200
3	@@ -30,7 +30,6 @@	3	@@ -29,7 +29,6 @@
4	$NEWS_PATH = '@NEWS_PATH@';	4	$NEWS_PATH = '@NEWS_PATH@';
5	$prefix = "@prefix@";	5	$prefix = "@prefix@";
6	$exec_prefix = "@exec_prefix@";	6	$exec_prefix = "@exec_prefix@";
Lines 8-18 Link Here
8	$NEWSSTAR_BIN = "@NEWSSTAR_BIN@";	8	$NEWSSTAR_BIN = "@NEWSSTAR_BIN@";
9	$MAINCF = $CONF_DIR . "/main.cf";	9	$MAINCF = $CONF_DIR . "/main.cf";
10	$INCOMING_DIR = "@INCOMING_DIR@";	10	$INCOMING_DIR = "@INCOMING_DIR@";
11	@@ -261,7 +260,17 @@	11	@@ -266,7 +265,17 @@
		12	}
12	}	13	}
13	}	14	$OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/newsstar";
14	$OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/newsstar";	15	- $ACTIVE_FILE = "/var/lib/news/active" if ($ACTIVE_FILE eq "");
15	- $ACTIVE_FILE = "/var/lib/news/active" if ($ACTIVE_FILE eq "");
16	+ if ($ACTIVE_FILE eq "")	16	+ if ($ACTIVE_FILE eq "")
17	+ {	17	+ {
18	+ if ($USE_SNEWS)	18	+ if ($USE_SNEWS)
Lines 24-77 Link Here
24	+ $ACTIVE_FILE = "${prefix}/news/db/active";	24	+ $ACTIVE_FILE = "${prefix}/news/db/active";
25	+ }	25	+ }
26	+ }	26	+ }
27	if ($ARTICLES_DIR eq "")	27	if ($ARTICLES_DIR eq "")
28	{	28	{
29	if ($USE_SNEWS)	29	if ($USE_SNEWS)
30	@@ -292,21 +301,9 @@	30	@@ -297,21 +306,9 @@
31	{	31	{
32	if ($SNSTORE eq "")	32	if ($SNSTORE eq "")
33	{
34	- if (-x "/usr/sbin/snstore")
35	- {
36	- $SNSTORE = "/usr/sbin/snstore"
37	- }
38	- elsif (-x "/usr/local/sbin/snstore")
39	+ if (-x "${prefix}/sbin/snstore")
40	{	33	{
41	- $SNSTORE = "/usr/local/sbin/snstore"	34	- if (-x "/usr/sbin/snstore")
42	- }	35	- {
43	- elsif (-x "/usr/bin/snstore")	36	- $SNSTORE = "/usr/sbin/snstore"
44	- {	37	- }
45	- $SNSTORE = "/usr/bin/snstore"	38	- elsif (-x "/usr/local/sbin/snstore")
46	- }	39	- {
47	- elsif (-x "/usr/local/bin/snstore")	40	- $SNSTORE = "/usr/local/sbin/snstore"
48	- {	41	- }
49	- $SNSTORE = "/usr/local/bin/snstore"	42	- elsif (-x "/usr/bin/snstore")
		43	- {
		44	- $SNSTORE = "/usr/bin/snstore"
		45	- }
		46	- elsif (-x "/usr/local/bin/snstore")
		47	+ if (-x "${prefix}/sbin/snstore")
		48	{
		49	- $SNSTORE = "/usr/local/bin/snstore"
50	+ $SNSTORE = "${prefix}/sbin/snstore"	50	+ $SNSTORE = "${prefix}/sbin/snstore"
51	}	51	}
52	else	52	else
53	{	53	{
54	@@ -323,21 +320,9 @@	54	@@ -328,21 +325,9 @@
55	{	55	{
56	if ($OVERVIEW eq "")	56	if ($OVERVIEW eq "")
57	{
58	- if (-x "/usr/sbin/overview")
59	- {
60	- $OVERVIEW = "/usr/sbin/overview"
61	- }
62	- elsif (-x "/usr/local/sbin/overview")
63	- {
64	- $OVERVIEW = "/usr/local/sbin/overview"
65	- }
66	- elsif (-x "/usr/bin/overview")
67	- {
68	- $OVERVIEW = "/usr/bin/overview"
69	- }
70	- elsif (-x "/usr/local/bin/overview")
71	+ if (-x "${prefix}/sbin/overview")
72	{	57	{
73	- $OVERVIEW = "/usr/local/bin/overview"	58	- if (-x "/usr/sbin/overview")
		59	- {
		60	- $OVERVIEW = "/usr/sbin/overview"
		61	- }
		62	- elsif (-x "/usr/local/sbin/overview")
		63	- {
		64	- $OVERVIEW = "/usr/local/sbin/overview"
		65	- }
		66	- elsif (-x "/usr/bin/overview")
		67	- {
		68	- $OVERVIEW = "/usr/bin/overview"
		69	- }
		70	- elsif (-x "/usr/local/bin/overview")
		71	+ if (-x "${prefix}/sbin/overview")
		72	{
		73	- $OVERVIEW = "/usr/local/bin/overview"
74	+ $OVERVIEW = "${prefix}/sbin/overview"	74	+ $OVERVIEW = "${prefix}/sbin/overview"
75	}	75	}
76	else	76	else
77	{	77	{