Date: Thu, 19 Dec 2013 07:24:58 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336875 - in head/news/suck: . files Message-ID: <201312190724.rBJ7OwbV000888@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Thu Dec 19 07:24:58 2013 New Revision: 336875 URL: http://svnweb.freebsd.org/changeset/ports/336875 Log: - use STAGEDIR - use OPTIONS_SINGLE - merge defines from slave - cleanup patches - fix path to rnews Added: head/news/suck/files/patch-lmove.c - copied unchanged from r336864, head/news/suck/files/patch-ab Deleted: head/news/suck/files/patch-aa head/news/suck/files/patch-ab head/news/suck/files/patch-ad Modified: head/news/suck/Makefile head/news/suck/files/patch-Makefile.in head/news/suck/pkg-plist Modified: head/news/suck/Makefile ============================================================================== --- head/news/suck/Makefile Thu Dec 19 07:24:19 2013 (r336874) +++ head/news/suck/Makefile Thu Dec 19 07:24:58 2013 (r336875) @@ -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.in 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} -DH 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> Modified: head/news/suck/files/patch-Makefile.in ============================================================================== --- head/news/suck/files/patch-Makefile.in Thu Dec 19 07:24:19 2013 (r336874) +++ head/news/suck/files/patch-Makefile.in Thu Dec 19 07:24:58 2013 (r336875) @@ -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 Copied: head/news/suck/files/patch-lmove.c (from r336864, head/news/suck/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/news/suck/files/patch-lmove.c Thu Dec 19 07:24:58 2013 (r336875, copy of r336864, head/news/suck/files/patch-ab) @@ -0,0 +1,10 @@ +--- lmove.c.orig Fri May 23 08:16:38 1997 ++++ lmove.c Mon Aug 25 16:43:04 1997 +@@ -27,6 +27,7 @@ + #include <sys/stat.h> + #include <errno.h> + #include <signal.h> ++#include <sys/syslimits.h> + + #include "suck_config.h" + #include "both.h" Modified: head/news/suck/pkg-plist ============================================================================== --- head/news/suck/pkg-plist Thu Dec 19 07:24:19 2013 (r336874) +++ head/news/suck/pkg-plist Thu Dec 19 07:24:58 2013 (r336875) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312190724.rBJ7OwbV000888>