Index: head/news/suck/Makefile =================================================================== --- head/news/suck/Makefile (revision 67346) +++ head/news/suck/Makefile (revision 67347) @@ -1,60 +1,67 @@ # New ports collection makefile for: suck # Date created: 30 Mar 1996 # Whom: graphite@taurus.bekkoame.or.jp # # $FreeBSD$ # PORTNAME= suck -PORTVERSION= 4.3.0 +PORTVERSION= 4.3.1 CATEGORIES= news MASTER_SITES= http://www.sucknews.org/ MAINTAINER= dinoex@FreeBSD.org USE_GMAKE= yes GNU_CONFIGURE= yes MAN1= suck.1 rpost.1 testhost.1 lmove.1 EX_SCRIPTS= get.news.generic get.news.inn perl_kill.pl perl_xover.pl \ post_filter.pl put.news put.news.pl put.news.sm put.news.sm.pl EX_DATA= suckkillfile.sample sucknewsrc.sample suckothermsgs.sample -.if defined(NEWSBIN) +MAKE_ENV+= CHKHISTORY=chkhistory_db.o +.if defined(NEWSBIN) && !defined(SUCK_WITH_INN) PKGNAMESUFFIX= -cnews -EXTRA_PATCHES+= ${FILESDIR}/cnews.patch +MAKE_ENV+= DB_TYPE=-DUSE_DBZ DB_LIB=-lcnews +MAKE_ENV+= DB_LIB_LOC=-L${LOCALBASE}/lib +MAKE_ENV+= INCDIR2=-I${LOCALBASE}/include BUILD_DEPENDS+= ${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/news/cnews .else -EXTRA_PATCHES+= ${FILESDIR}/inn2.patch +MAKE_ENV+= DB_TYPE="-DUSE_INN23 -DDO_TAGGED_HASH" +MAKE_ENV+= DB_LIB="-linn -lstorage" +MAKE_ENV+= DB_LIB_LOC=-L${LOCALBASE}/news/lib +MAKE_ENV+= DB_INC_LOC=-I${LOCALBASE}/news/include +MAKE_ENV+= INCDIR2=-I${LOCALBASE}/include BUILD_DEPENDS+= ${LOCALBASE}/news/lib/libinn.a:${PORTSDIR}/news/inn .endif .include -.if defined(SUCK_WITH_SSL) || defined(WITH_SSL) +.if !defined(SUCK_WITHOUT_SSL) && !defined(WITHOUT_SSL) .include "${PORTSDIR}/security/openssl/Makefile.ssl" MAKE_ENV+= SSL_LIB="-lssl -lcrypto" MAKE_ENV+= SSL_DEFS="-I${OPENSSLINC} -DHAVE_LIBSSL" MAKE_ENV+= SSL_LIB_LOC="-L${OPENSSLLIB}" .endif post-patch: @${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.sed ${SED} -e "s=/usr/local/=${LOCALBASE}/=" \ ${WRKSRC}/Makefile.in.sed > ${WRKSRC}/Makefile.in @${MV} ${WRKSRC}/suck_config.h ${WRKSRC}/suck_config.h.sed ${SED} -e "s=/usr/local/lib/suck=${PREFIX}/lib/suck=" \ -e "s=/usr/local/news/lib=${LOCALBASE}/news/lib=" \ ${WRKSRC}/suck_config.h.sed > ${WRKSRC}/suck_config.h .if !defined(NOPORTDOCS) post-install: ${MKDIR} ${EXAMPLESDIR} .for i in ${EX_SCRIPTS} ${INSTALL_SCRIPT} ${WRKSRC}/sample/${i} ${EXAMPLESDIR}/ .endfor .for i in ${EX_DATA} ${INSTALL_DATA} ${WRKSRC}/sample/${i} ${EXAMPLESDIR}/ .endfor .endif .include Property changes on: head/news/suck/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.37 \ No newline at end of property +1.38 \ No newline at end of property Index: head/news/suck/distinfo =================================================================== --- head/news/suck/distinfo (revision 67346) +++ head/news/suck/distinfo (revision 67347) @@ -1 +1 @@ -MD5 (suck-4.3.0.tar.gz) = e67c64a63e593fa26f6c1956e996cedd +MD5 (suck-4.3.1.tar.gz) = bee8b92b9f0d804b1796adb809e64345 Property changes on: head/news/suck/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/news/suck/files/inn2.patch =================================================================== --- head/news/suck/files/inn2.patch (revision 67346) +++ head/news/suck/files/inn2.patch (nonexistent) @@ -1,44 +0,0 @@ ---- 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_INN23 -DDO_TAGGED_HASH # for inn-2.3.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/usr/local/news/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) Property changes on: head/news/suck/files/inn2.patch ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.4 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/news/suck/files/cnews.patch =================================================================== --- head/news/suck/files/cnews.patch (revision 67346) +++ head/news/suck/files/cnews.patch (nonexistent) @@ -1,43 +0,0 @@ ---- 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) Property changes on: head/news/suck/files/cnews.patch ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/news/suck/files/patch-Makefile.in =================================================================== --- head/news/suck/files/patch-Makefile.in (nonexistent) +++ head/news/suck/files/patch-Makefile.in (revision 67347) @@ -0,0 +1,62 @@ +--- Makefile.in.orig Thu Sep 19 22:41:45 2002 ++++ Makefile.in Fri Sep 27 07:18:47 2002 +@@ -6,7 +6,7 @@ + ############################################################################ + + # Step 1: Define ONE of the CHKHISTORY +-CHKHISTORY=@HISTORY@ ++#CHKHISTORY=@HISTORY@ + #CHKHISTORY=chkhistory.o # use flat file history routine + #CHKHISTORY=chkhistory_db.o # use DB history routine, if you use + # DBM, GDBM, NDBM, or DBZ +@@ -17,7 +17,7 @@ + # If you are using flat file, you can skip the rest, they don't matter + + # Step 2: Define ONE of the Database Types +-DB_TYPE=@DB_TYPE@ ++#DB_TYPE=@DB_TYPE@ + #DB_TYPE=-DUSE_DBM + #DB_TYPE=-DUSE_GDBM + #DB_TYPE=-DUSE_NDBM +@@ -29,18 +29,20 @@ + # If you are using INN-2.X, and the compiler complains + # about Undefined Symbols QIOclose QIOopen QIOread + # Use the DB_LIB that includes -lstorage +-DB_LIB=@DB_LIB@ ++#DB_LIB=@DB_LIB@ + #DB_LIB=-ldbm + #DB_LIB=-lgdbm + #DB_LIB=-lndbm + #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. +@@ -67,8 +69,8 @@ + #OS2_DEFS=-DEMX + + # Step 7: If compiling with SSL uncomment the following +-SSL_LIB=@SSL_LIB@ +-SSL_DEFS=@SSL_DEFS@ ++#SSL_LIB=@SSL_LIB@ ++#SSL_DEFS=@SSL_DEFS@ + #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 @@ + @SET_MAKE@ + + CFLAGS = @CFLAGS@ +-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ ++CPPFLAGS = -I. -I$(srcdir) $(INCDIR2) @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ $(DMALLOC_LD) $(OS2_LD) + DEFS = @DEFS@ -DSUCK_VERSION=\"$(VERSION)\" $(DMALLOC_DEFS) $(OS2_DEFS) $(DMALLOC_INC) + LIBS = @LIBS@ $(DMALLOC_LIB) Property changes on: head/news/suck/files/patch-Makefile.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property