diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-10-05 17:26:08 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-10-05 17:26:08 +0000 |
commit | a03737b7df753f5a03e47cb1fc7d87af8a63339b (patch) | |
tree | efd4c4efa768bdf38e320fe6f7673565173bff78 /news/suck | |
parent | use /etc/ssl if OPENSSL_OVERWRITE_BASE is set (diff) |
- Update to 4.3.1
- SSL now default
- honor Options: SUCK_WITHOUT_SSL WITHOUT_SSL
- use MAKE_ENV instead of cnews/inn patches
Notes
Notes:
svn path=/head/; revision=67347
Diffstat (limited to 'news/suck')
-rw-r--r-- | news/suck/Makefile | 17 | ||||
-rw-r--r-- | news/suck/distinfo | 2 | ||||
-rw-r--r-- | news/suck/files/cnews.patch | 43 | ||||
-rw-r--r-- | news/suck/files/inn2.patch | 44 | ||||
-rw-r--r-- | news/suck/files/patch-Makefile.in | 62 |
5 files changed, 75 insertions, 93 deletions
diff --git a/news/suck/Makefile b/news/suck/Makefile index 02536a38d043..14cb21574a41 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -6,7 +6,7 @@ # PORTNAME= suck -PORTVERSION= 4.3.0 +PORTVERSION= 4.3.1 CATEGORIES= news MASTER_SITES= http://www.sucknews.org/ @@ -19,18 +19,25 @@ 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 <bsd.port.pre.mk> -.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" diff --git a/news/suck/distinfo b/news/suck/distinfo index c7c22c98d1f7..04adfccb1ce2 100644 --- a/news/suck/distinfo +++ b/news/suck/distinfo @@ -1 +1 @@ -MD5 (suck-4.3.0.tar.gz) = e67c64a63e593fa26f6c1956e996cedd +MD5 (suck-4.3.1.tar.gz) = bee8b92b9f0d804b1796adb809e64345 diff --git a/news/suck/files/cnews.patch b/news/suck/files/cnews.patch deleted file mode 100644 index aad0dbd340c7..000000000000 --- a/news/suck/files/cnews.patch +++ /dev/null @@ -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) diff --git a/news/suck/files/inn2.patch b/news/suck/files/inn2.patch deleted file mode 100644 index e7d19b4b443c..000000000000 --- a/news/suck/files/inn2.patch +++ /dev/null @@ -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) diff --git a/news/suck/files/patch-Makefile.in b/news/suck/files/patch-Makefile.in new file mode 100644 index 000000000000..11f0702e134f --- /dev/null +++ b/news/suck/files/patch-Makefile.in @@ -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) |