- Updated to 4.2.5

- New Master Site, Old Site is not accessible
- included History-Check for cnews and inn2.2

PR:		25411
Submitted by:	dinoex, greg@greg.rim.or.jp

6 files changed, 105 insertions, 32 deletions

diff --git a/news/suck/Makefile b/news/suck/Makefile
index 6b3291ee011b..72de9d22ab7d 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	suck
-PORTVERSION=	4.2.3
+PORTVERSION=	4.2.5
 CATEGORIES=	news
-MASTER_SITES=	http://home.att.net/~bobyetman/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=     system/news/transport
 
 MAINTAINER=	jseger@FreeBSD.org
 
@@ -16,6 +17,20 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		suck.1 rpost.1 testhost.1 lmove.1
 
+.if defined(NEWSBIN)
+EXTRA_PATCHES+=	${FILESDIR}/cnews.patch
+.else
+EXTRA_PATCHES+=	${FILESDIR}/inn2.patch
+BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/news/inn:configure
+.endif
+
+post-patch:
+	@${PERL5} -pi -e "s=/usr/local/=${LOCALBASE}/=" ${WRKSRC}/Makefile.in
+	@${PERL5} -pi -e "s=/usr/local/lib/suck=${PREFIX}/lib/suck=" \
+		${WRKSRC}/suck_config.h
+	@${PERL5} -pi -e "s=/usr/local/news/lib=${LOCALBASE}/news/lib=" \
+		${WRKSRC}/suck_config.h
+
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/suck
 	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.inn ${PREFIX}/share/examples/suck
diff --git a/news/suck/distinfo b/news/suck/distinfo
index 3d1ad9d1e784..99b24d2220b1 100644
--- a/news/suck/distinfo
+++ b/news/suck/distinfo
@@ -1 +1 @@
-MD5 (suck-4.2.3.tar.gz) = fb170ad64f0f73ff944c8aecebd83e0d
+MD5 (suck-4.2.5.tar.gz) = 18dc6902ed40b9a25557423f3c2d9582
diff --git a/news/suck/files/cnews.patch b/news/suck/files/cnews.patch
new file mode 100644
index 000000000000..aad0dbd340c7
--- /dev/null
+++ b/news/suck/files/cnews.patch
@@ -0,0 +1,43 @@
+--- Makefile.in.orig	Sat Dec  2 13:19:00 2000
++++ Makefile.in	Sat Mar 17 12:05:28 2001
+@@ -6,7 +6,8 @@
+ ############################################################################
+ 
+ # Step 1: Define ONE of the CHKHISTORY 
+-CHKHISTORY=chkhistory.o		# use flat file history routine
++#CHKHISTORY=chkhistory.o		# use flat file history routine
++CHKHISTORY=chkhistory_db.o
+ #CHKHISTORY=chkhistory_db.o	# use DB history routine, if you use 
+                                 # DBM, GDBM, NDBM, or DBZ
+                                 # in order to use DBZ with INN you will need
+@@ -22,6 +23,7 @@
+ #DB_TYPE=-DUSE_DBZ	# for inn-1.X.X users
+ #DB_TYPE=-DUSE_INN2	# for inn-2.1-2.X users
+ #DB_TYPE=-DUSE_INN23	# for inn-2.3.X users
++DB_TYPE=-DUSE_DBZ
+ 
+ # Step 3: Define ONE Library that contains the functions
+ # If you are using INN-2.X, and the compiler complains 
+@@ -33,11 +35,13 @@
+ #DB_LIB=-ldbz
+ #DB_LIB=-linn -lstorage	# see note above
+ #DB_LIB=-linn		# INN puts DBZ code in here
++DB_LIB=-lcnews		# cnews puts DBZ code in here
+ 
+ # Step 4: IF your DB Library/Includes are in a non-standard place, 
+ # define These
+ #DB_INC_LOC=-I/usr/src/inn-2.3/include
+ #DB_LIB_LOC=-L/usr/src/inn-2.3/lib
++DB_LIB_LOC=-L/usr/local/lib
+ 
+ # Step 5: If you want to use embedded PERL functions as kill routines
+ # define these. 
+@@ -111,7 +115,7 @@
+ @SET_MAKE@
+ 
+ CFLAGS = @CFLAGS@
+-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
++CPPFLAGS = -I. -I$(srcdir) -I/usr/local/include @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@ $(DMALLOC_LD) $(OS2_LD)
+ DEFS = @DEFS@ -DSUCK_VERSION=\"$(VERSION)\" $(DMALLOC_DEFS) $(OS2_DEFS) $(DMALLOC_INC)
+ LIBS = @LIBS@ $(DMALLOC_LIB)
diff --git a/news/suck/files/inn2.patch b/news/suck/files/inn2.patch
new file mode 100644
index 000000000000..975a2cdbeabf
--- /dev/null
+++ b/news/suck/files/inn2.patch
@@ -0,0 +1,44 @@
+--- Makefile.in.orig	Sat Dec  2 13:19:00 2000
++++ Makefile.in	Sat Mar 17 12:05:28 2001
+@@ -6,7 +6,8 @@
+ ############################################################################
+ 
+ # Step 1: Define ONE of the CHKHISTORY 
+-CHKHISTORY=chkhistory.o		# use flat file history routine
++#CHKHISTORY=chkhistory.o		# use flat file history routine
++CHKHISTORY=chkhistory_db.o
+ #CHKHISTORY=chkhistory_db.o	# use DB history routine, if you use 
+                                 # DBM, GDBM, NDBM, or DBZ
+                                 # in order to use DBZ with INN you will need
+@@ -22,6 +23,7 @@
+ #DB_TYPE=-DUSE_DBZ	# for inn-1.X.X users
+ #DB_TYPE=-DUSE_INN2	# for inn-2.1-2.X users
+ #DB_TYPE=-DUSE_INN23	# for inn-2.3.X users
++DB_TYPE=-DUSE_INN2 -DDO_TAGGED_HASH	# for inn-2.X.X users
+ 
+ # Step 3: Define ONE Library that contains the functions
+ # If you are using INN-2.X, and the compiler complains 
+@@ -33,11 +35,14 @@
+ #DB_LIB=-ldbz
+ #DB_LIB=-linn -lstorage	# see note above
+ #DB_LIB=-linn		# INN puts DBZ code in here
++DB_LIB=-linn -lstorage
+ 
+ # Step 4: IF your DB Library/Includes are in a non-standard place, 
+ # define These
+ #DB_INC_LOC=-I/usr/src/inn-2.3/include
+ #DB_LIB_LOC=-L/usr/src/inn-2.3/lib
++DB_INC_LOC=-I../../../inn/work/inn-2.3.0/include/
++DB_LIB_LOC=-L/usr/local/news/lib
+ 
+ # Step 5: If you want to use embedded PERL functions as kill routines
+ # define these. 
+@@ -111,7 +115,7 @@
+ @SET_MAKE@
+ 
+ CFLAGS = @CFLAGS@
+-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
++CPPFLAGS = -I. -I$(srcdir) -I/usr/local/include @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@ $(DMALLOC_LD) $(OS2_LD)
+ DEFS = @DEFS@ -DSUCK_VERSION=\"$(VERSION)\" $(DMALLOC_DEFS) $(OS2_DEFS) $(DMALLOC_INC)
+ LIBS = @LIBS@ $(DMALLOC_LIB)
diff --git a/news/suck/files/patch-ac b/news/suck/files/patch-ac
deleted file mode 100644
index 47e96fbb9d2c..000000000000
--- a/news/suck/files/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- killprg.c.orig	Thu Aug 21 10:16:02 1997
-+++ killprg.c	Sun Oct  5 14:00:23 1997
-@@ -7,6 +7,8 @@
- #include <unistd.h>
- #endif
- 
-+#include <sys/types.h>
-+
- #ifdef HAVE_DIRENT_H
- # include <dirent.h>
- #else
-@@ -36,7 +38,6 @@
- #endif
- 
- #include <string.h>
--#include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
- 
diff --git a/news/suck/files/patch-ae b/news/suck/files/patch-ae
deleted file mode 100644
index e2beba6ed078..000000000000
--- a/news/suck/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpost.c.orig	Wed Mar 22 11:05:03 2000
-+++ rpost.c	Wed Mar 22 11:05:28 2000
-@@ -6,6 +6,7 @@
- #include <netdb.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/syslimits.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif