diff options
| -rw-r--r-- | news/inn/Makefile | 71 | ||||
| -rw-r--r-- | news/inn/distinfo | 10 | ||||
| -rw-r--r-- | news/inn/options.mk | 4 | ||||
| -rw-r--r-- | news/inn/patches/patch-ab | 24 |
4 files changed, 42 insertions, 67 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index 6899d629d80..c088bb51056 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.102 2010/01/17 12:02:37 wiz Exp $ +# $NetBSD: Makefile,v 1.103 2010/04/13 21:18:00 spz Exp $ -DISTNAME= inn-2.5.1 -PKGREVISION= 2 +DISTNAME= inn-2.5.2 CATEGORIES= news MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ ftp://ftp.fu-berlin.de/unix/news/inn/ @@ -18,7 +17,7 @@ CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]* BUILD_DEFS+= INN_DATA_DIR BUILD_DEFS+= VARBASE -FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR:Q} +FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR} BUILD_DEFS+= INN_PATHBIN FILES_SUBST+= INN_PATHBIN=${PREFIX}/${INN_PATHBIN:Q} @@ -46,14 +45,14 @@ CONFIGURE_ARGS+= --enable-setgid-inews \ --with-run-dir=${INN_DATA_DIR}/run \ --includedir=${PREFIX}/include \ --with-spool-dir=${INN_SPOOL:Q} \ - --with-news-user=${INN_USER:Q} \ - --with-news-group=${INN_GROUP:Q} -CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK:Q} -CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP:Q} -CONFIGURE_ENV+= _PATH_SED=${TOOLS_SED:Q} -CONFIGURE_ENV+= _PATH_SH=${TOOLS_SH:Q} -CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT:Q} -CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q} + --with-news-user=${INN_USER} \ + --with-news-group=${INN_GROUP} +CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK} +CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP} +CONFIGURE_ENV+= _PATH_SED=${TOOLS_SED} +CONFIGURE_ENV+= _PATH_SH=${TOOLS_SH} +CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT} +CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD} USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc LDFLAGS.SunOS+= -lsocket -lnsl @@ -122,17 +121,17 @@ CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \ ${INN_USER} ${INN_GROUP} 0664 .endfor -CONF_FILES_PERMS+= ${EXAMPLEDIR}/active.minimal ${INN_DATA_DIR}/db/active ${INN_USER} ${INN_GROUP} 0664 -CONF_FILES_PERMS+= ${EXAMPLEDIR}/newsgroups.minimal ${INN_DATA_DIR}/db/newsgroups ${INN_USER} ${INN_GROUP} 0664 +CONF_FILES_PERMS+= ${EXAMPLEDIR}/active.minimal ${INN_DATA_DIR}/db/active ${INN_USER} ${INN_GROUP} 0664 +CONF_FILES_PERMS+= ${EXAMPLEDIR}/newsgroups.minimal ${INN_DATA_DIR}/db/newsgroups ${INN_USER} ${INN_GROUP} 0664 DBFILES= active.times history HTTPFILES= innreport.css -CONF_FILES_PERMS+= ${EXAMPLEDIR}/innreport.css ${INN_DATA_DIR}/http/innreport.css ${INN_USER} ${INN_GROUP} 0664 +CONF_FILES_PERMS+= ${EXAMPLEDIR}/innreport.css ${INN_DATA_DIR}/http/innreport.css ${INN_USER} ${INN_GROUP} 0664 .for file in ${DBFILES} -CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \ +CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \ ${INN_USER} ${INN_GROUP} 0664 .endfor @@ -155,31 +154,29 @@ GCC_REQD+= 2.95.3 .include "options.mk" pre-install: - for FILE in ${CFILES} active.minimal newsgroups.minimal; do \ - ${INSTALL_DATA} ${WRKSRC}/site/$$FILE \ - ${DESTDIR}${EXAMPLEDIR}; \ - done - for FILE in ${DBFILES} ${HTTPFILES}; do \ - ${TOUCH} ${WRKSRC}/site/$$FILE ; \ - ${INSTALL_DATA} ${WRKSRC}/site/$$FILE \ - ${DESTDIR}${EXAMPLEDIR}; \ - done +.for file in ${CFILES} active.minimal newsgroups.minimal + ${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR} +.endfor +.for file in ${DBFILES} ${HTTPFILES} + ${TOUCH} ${WRKSRC}/site/${file} + ${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR} +.endfor post-install: - for FILE in cnfsstat ctlinnd makehistory innbind; do \ - ${RM} -f ${DESTDIR}${PREFIX}/sbin/$$FILE ; \ - ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/$$FILE \ - ${DESTDIR}${PREFIX}/sbin ; \ - done - ${RM} -f ${DESTDIR}${PREFIX}/sbin/inews ; - ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews \ +.for file in cnfsstat ctlinnd makehistory innbind + ${RM} -f ${DESTDIR}${PREFIX}/sbin/${file} + ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/${file} \ + ${DESTDIR}${PREFIX}/sbin +.endfor + ${RM} -f ${DESTDIR}${PREFIX}/sbin/inews + ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews \ ${DESTDIR}${PREFIX}/bin - ${RM} -f ${DESTDIR}${PREFIX}/sbin/rnews ; - ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews \ + ${RM} -f ${DESTDIR}${PREFIX}/sbin/rnews + ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews \ ${DESTDIR}${PREFIX}/bin - for FILE in libinn.a libstorage.a libinnhist.a ; do \ - ${CHMOD} 644 ${DESTDIR}${PREFIX}/lib/$$FILE ; \ - done +.for file in libinn.a libstorage.a libinnhist.a + ${CHMOD} 644 ${DESTDIR}${PREFIX}/lib/${file} +.endfor .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/inn/distinfo b/news/inn/distinfo index 874c9986cd1..d68150eb633 100644 --- a/news/inn/distinfo +++ b/news/inn/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.25 2010/01/16 09:46:16 spz Exp $ +$NetBSD: distinfo,v 1.26 2010/04/13 21:18:00 spz Exp $ -SHA1 (inn-2.5.1.tar.gz) = e49a58a3484bbb7fd230b37ca17cc34eb10c10f1 -RMD160 (inn-2.5.1.tar.gz) = 8cb24ac4fcea299b02b2b0b043a4f5506b902c47 -Size (inn-2.5.1.tar.gz) = 2305406 bytes +SHA1 (inn-2.5.2.tar.gz) = e7a9512acb5fa09ecdf116a4bde39c9f5efe65db +RMD160 (inn-2.5.2.tar.gz) = 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c +Size (inn-2.5.2.tar.gz) = 2331916 bytes SHA1 (patch-aa) = 8ed86de4d20ab8510c7521528a9979c1d3e6d9e8 -SHA1 (patch-ab) = c48e442cc710f0655904c10031c2402e9dea7560 +SHA1 (patch-ab) = 5f98336273de9763c38df3bb122f141cbd16527a SHA1 (patch-ac) = 2b801b9b8c5eae1feacaa3532e78b4c46210f755 SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d SHA1 (patch-ag) = ec28feef2392567cbc607e7b27fe85f1acd349a7 diff --git a/news/inn/options.mk b/news/inn/options.mk index 374283872f1..fb13fc1236e 100644 --- a/news/inn/options.mk +++ b/news/inn/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2009/12/16 22:10:25 spz Exp $ +# $NetBSD: options.mk,v 1.6 2010/04/13 21:18:00 spz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.inn PKG_SUPPORTED_OPTIONS= inet6 perl python uucp @@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --without-perl ### Python support for INN ### .if !empty(PKG_OPTIONS:Mpython) -CONFIGURE_ARGS+= --with-python +CONFIGURE_ARGS+= --with-python CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q} .include "../../lang/python/application.mk" diff --git a/news/inn/patches/patch-ab b/news/inn/patches/patch-ab index b1d13a77a00..b5cebdc10e1 100644 --- a/news/inn/patches/patch-ab +++ b/news/inn/patches/patch-ab @@ -1,29 +1,7 @@ -$NetBSD: patch-ab,v 1.9 2009/12/16 22:10:25 spz Exp $ +$NetBSD: patch-ab,v 1.10 2010/04/13 21:18:00 spz Exp $ --- scripts/news.daily.in.orig 2009-05-21 22:08:33.000000000 +0200 +++ scripts/news.daily.in -@@ -232,17 +232,17 @@ then - cd "${PATHSPOOL}/${INNFEEDSPOOL}" - - # Find the PIDs of innfeed. -- LOCKS=`cat *.lock 2>/dev/null | ${SORT} -u` -+ INNFEEDLOCKS=`cat *.lock 2>/dev/null | ${SORT} -u` - - # Process files like "innfeed-dropped.A001703" where -- # 1703 is not in $LOCKS. -+ # 1703 is not in $INNFEEDLOCKS. - for file in `find . -name "innfeed-dropped*" -print` - do - PID=`echo "$file" | ${SED} 's/^.*[A-Z]0*//'` - FOUND=false -- for LOCK in $LOCKS -+ for INNFEEDLOCK in $INNFEEDLOCKS - do -- if [ "$PID" = "$LOCK" ] -+ if [ "$PID" = "$INNFEEDLOCK" ] - then - FOUND=true - fi @@ -256,6 +256,10 @@ fi cd ${PATHETC} |