- use STAGEDIR

- use OPTIONS_SINGLE
- merge defines from slave
- cleanup patches
- fix path to rnews

6 files changed, 71 insertions, 57 deletions

diff --git a/news/suck/Makefile b/news/suck/Makefile
index f208124e3221..df3cc7eb4e50 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	suck
 PORTVERSION=	4.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	news
 #MASTER_SITES=	http://www.sucknews.org/
 MASTER_SITES=	http://home.comcast.net/~bobyetman/ \
@@ -14,7 +14,6 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Receives/sends news to/from localhost via NNTP
 
 CONFLICTS?=	suckblow-1.*
-NO_STAGE=	yes
 
 USES=		gmake
 GNU_CONFIGURE=	yes
@@ -26,11 +25,19 @@ EX_SCRIPTS=	get.news.generic get.news.inn perl_kill.pl perl_xover.pl \
 EX_DATA=	suckkillfile.sample sucknewsrc.sample suckothermsgs.sample
 
 OPTIONS_DEFINE=	SSL EXAMPLES
-OPTIONS_DEFAULT=	SSL
+OPTIONS_SINGLE=	NEWS
+OPTIONS_SINGLE_NEWS=	INN CNEWS
+OPTIONS_DEFAULT?=	SSL INN
+INN_DESC=	Build for local inn news server
+CNEWS_DESC=	Build for local cnews news server
+
+VARBASE?=	/var
+NEWSBIN?=	${LOCALBASE}/libexec/cnews
+NEWSCTL?=	${VARBASE}/lib/news
 
 .include <bsd.port.options.mk>
 
-.if defined(NEWSBIN) && !defined(SUCK_WITH_INN)
+.if ${PORT_OPTIONS:MCNEWS}
 CNEWS_PORT?=	news/cnews
 CNEWS_SUFFIX=	-cnews
 MAKE_ENV+=	DB_TYPE=-DUSE_DBZ DB_LIB=-lcnews
@@ -38,7 +45,9 @@ MAKE_ENV+=	DB_LIB_LOC=-L${LOCALBASE}/lib
 MAKE_ENV+=	INCDIR2=-I${LOCALBASE}/include
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/${CNEWS_PORT}
 CONFLICTS+=	suck-4.*
-.else
+.endif
+
+.if ${PORT_OPTIONS:MINN}
 CFLAGS+=	-DNO_CONFIGDATA -I${LOCALBASE}/include/inn
 MAKE_ENV+=	DB_TYPE="-DUSE_INN23 -DDO_TAGGED_HASH"
 MAKE_ENV+=	DB_LIB="-linn -lstorage"
@@ -56,28 +65,25 @@ MAKE_ENV+=	SSL_DEFS="-I${OPENSSLINC} -DHAVE_LIBSSL"
 MAKE_ENV+=	SSL_LIB_LOC="-L${OPENSSLLIB}"
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e "s=/usr/local/=${LOCALBASE}/=" \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s=/usr/local/lib/suck=${PREFIX}/lib/suck=" \
-		${WRKSRC}/suck_config.h
-.if defined(NEWSBIN) && !defined(SUCK_WITH_INN)
-	@${REINPLACE_CMD} -e "s=/usr/local/news/lib=${NEWSCTL}=" \
+pre-configure:
+.if ${PORT_OPTIONS:MCNEWS}
+	${REINPLACE_CMD} -e "s=/usr/news/db=${NEWSCTL}=" \
+		-e "s=/usr/lib/news/rnews=${NEWSBIN}/rnews=" \
+		-e "s=/usr/local/lib/suck=${PREFIX}/lib/suck=" \
 		${WRKSRC}/suck_config.h
-.else
-	@${REINPLACE_CMD} -e "s=/usr/local/news/lib=${LOCALBASE}/news/lib=" \
+.endif
+.if ${PORT_OPTIONS:MINN}
+	${REINPLACE_CMD} -e "s=/usr/news/db=${LOCALBASE}/news/lib=" \
+		-e "s=/usr/lib/news/rnews=${LOCALBASE}/libexec/news/bin/rnews=" \
+		-e "s=/usr/local/lib/suck=${PREFIX}/lib/suck=" \
 		${WRKSRC}/suck_config.h
 .endif
-# Add missing dependency to allow parallel (-jX) builds
-	@${GREP} -l '#include "phrases.h"' ${WRKSRC}/*.c | ${SED} -e \
-		's=.*/== ; s=\.c=.o= ; $$s=$$=: phrases.h=' | ${XARGS} \
-		>> ${WRKSRC}/Makefile.in
 
-post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${EX_SCRIPTS:S=^=${WRKSRC}/sample/=} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${EX_DATA:S=^=${WRKSRC}/sample/=} ${EXAMPLESDIR}
+post-install:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${EX_SCRIPTS:S=^=${WRKSRC}/sample/=} ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${EX_DATA:S=^=${WRKSRC}/sample/=} ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/news/suck/files/patch-Makefile.in b/news/suck/files/patch-Makefile.in
index 359f2146ca13..088077408e42 100644
--- a/news/suck/files/patch-Makefile.in
+++ b/news/suck/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Mar 28 20:22:38 2003
-+++ Makefile.in	Tue Apr  1 07:07:42 2003
+--- Makefile.in.orig	2003-03-28 20:22:38.000000000 +0100
++++ Makefile.in	2013-12-19 08:04:14.000000000 +0100
 @@ -6,7 +6,7 @@
  ############################################################################
  
@@ -51,7 +51,7 @@
  #SSL_LIB=-lssl -lcrypto
  #SSL_DEFS=-I/usr/local/ssl/include -DHAVE_LIBSSL
  #SSL_LIB_LOC=-L/usr/local/ssl/lib
-@@ -110,7 +112,7 @@
+@@ -110,16 +112,16 @@
  @SET_MAKE@
  
  CFLAGS = @CFLAGS@
@@ -60,3 +60,39 @@
  LDFLAGS = @LDFLAGS@ $(DMALLOC_LD) $(OS2_LD)
  DEFS = @DEFS@ -DSUCK_VERSION=\"$(VERSION)\" $(DMALLOC_DEFS) $(OS2_DEFS) $(DMALLOC_INC)
  LIBS = @LIBS@ $(DMALLOC_LIB)
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = @bindir@
++bindir = ${DESTDIR}@bindir@
+ manext = 1
+-mandir = @mandir@/man$(manext)
++mandir = ${DESTDIR}@mandir@/man$(manext)
+ srcdir = @srcdir@
+ MAN = $(srcdir)/man
+ SMAN= $(srcdir)/Spanish.docs
+@@ -177,7 +179,7 @@
+ 
+ install_bin: suck rpost testhost lmove
+ 	- mkdir -p $(bindir)
+-	- strip -s suck rpost testhost lmove
++	- strip -x suck rpost testhost lmove
+ 	$(INSTALL_PROGRAM) suck $(bindir)/suck
+ 	$(INSTALL_PROGRAM) rpost $(bindir)/rpost
+ 	$(INSTALL_PROGRAM) testhost $(bindir)/testhost
+@@ -195,7 +197,7 @@
+ #	$(MAKE) -C $(SMAN)
+ 
+ install_lpost: lpost $(MAN)/lpost.1
+-	- strip -s lpost
++	- strip -x lpost
+ 	$(INSTALL_PROGRAM) lpost $(bindir)/lpost
+ 	$(INSTALL_DATA) $(MAN)/lpost.1 $(mandir)/lpost.$(manext)
+ 
+@@ -295,3 +297,6 @@
+ 	rm -rf /tmp/suck*
+ # now generate the .sig files
+ 	#pgps -b ~/suck*.rpm ~/suck*.tar.gz
++
++# Add missing dependency to allow parallel (-jX) builds
++active.o batch.o both.o chkhistory.o chkhistory_db.o db.o dedupe.o killfile.o killprg.o lmove.o rpost.o suck.o suckutils.o testhost.o timer.o xover.o: phrases.h
diff --git a/news/suck/files/patch-aa b/news/suck/files/patch-aa
deleted file mode 100644
index 209f4418c455..000000000000
--- a/news/suck/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Mon Mar 22 19:06:50 1999
-+++ Makefile.in	Tue Mar 23 20:41:08 1999
-@@ -153,7 +153,7 @@
- 
- install_bin: suck rpost testhost lmove
- 	- mkdir -p $(bindir)
--	- strip -s suck rpost testhost lmove
-+	- strip -x suck rpost testhost lmove
- 	$(INSTALL_PROGRAM) suck $(bindir)/suck
- 	$(INSTALL_PROGRAM) rpost $(bindir)/rpost
- 	$(INSTALL_PROGRAM) testhost $(bindir)/testhost
-@@ -171,7 +171,7 @@
- #	$(MAKE) -C $(SMAN)
- 
- install_lpost: lpost $(MAN)/lpost.1
--	- strip -s lpost
-+	- strip -x lpost
- 	$(INSTALL_PROGRAM) lpost $(bindir)/lpost
- 	$(INSTALL_DATA) $(MAN)/lpost.1 $(mandir)/lpost.$(manext)
- 
diff --git a/news/suck/files/patch-ad b/news/suck/files/patch-ad
deleted file mode 100644
index c7b3403e32fe..000000000000
--- a/news/suck/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- suck_config.h.orig	Wed Mar 24 14:18:08 1999
-+++ suck_config.h	Wed Mar 24 14:18:53 1999
-@@ -92,7 +92,8 @@
- #define N_XOVER         "suckxover"             /* parameter file for which articles NOT to download via xover */
- 
- #define N_PHRASES "/usr/local/lib/suck.phrases"	/* default location for phrase file */
--#define HISTORY_FILE "/usr/news/db/history"     /* default location for history file */
-+#define HISTORY_FILE "/usr/local/news/lib/history" /* default location for 
-+						    * history file */
- 
- /* TEMP FILES created */
- #define N_NEWRC "suck.newrc"
diff --git a/news/suck/files/patch-ab b/news/suck/files/patch-lmove.c
index c5a471037ff3..c5a471037ff3 100644
--- a/news/suck/files/patch-ab
+++ b/news/suck/files/patch-lmove.c
diff --git a/news/suck/pkg-plist b/news/suck/pkg-plist
index 708e7c3ec9b9..7f4d5328881f 100644
--- a/news/suck/pkg-plist
+++ b/news/suck/pkg-plist
@@ -2,6 +2,10 @@ bin/lmove
 bin/rpost
 bin/suck
 bin/testhost
+man/man1/suck.1.gz
+man/man1/rpost.1.gz
+man/man1/testhost.1.gz
+man/man1/lmove.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/get.news.generic
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/get.news.inn
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl_kill.pl