pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/news/inn - bump inn version to 2.4.4



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cde646cbca8
branches:  trunk
changeset: 543834:6cde646cbca8
user:      spz <spz%pkgsrc.org@localhost>
date:      Mon Jun 23 09:10:53 2008 +0000

description:
- bump inn version to 2.4.4
- major change of directory structure
- two new options (uucp and perl now both optional)
- change of maintainer

diffstat:

 news/inn/MESSAGE          |   16 +-
 news/inn/Makefile         |  106 +++++++++----
 news/inn/Makefile.common  |    5 +-
 news/inn/PLIST            |  337 +++++++++++++++++++++++----------------------
 news/inn/distinfo         |   16 +-
 news/inn/files/innd.sh    |   10 +-
 news/inn/options.mk       |   26 +++-
 news/inn/patches/patch-aa |   12 +-
 news/inn/patches/patch-ac |   47 ++++--
 news/inn/patches/patch-ah |   18 +-
 10 files changed, 339 insertions(+), 254 deletions(-)

diffs (truncated from 776 to 300 lines):

diff -r 996148ab3068 -r 6cde646cbca8 news/inn/MESSAGE
--- a/news/inn/MESSAGE  Mon Jun 23 08:43:12 2008 +0000
+++ b/news/inn/MESSAGE  Mon Jun 23 09:10:53 2008 +0000
@@ -1,9 +1,19 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/29 10:39:36 jlam Exp $
+$NetBSD: MESSAGE,v 1.4 2008/06/23 09:10:53 spz Exp $
 
 The following programs have been installed suid root on your machine:
 
-       ${PREFIX}/inn/bin/inndstart
-       ${PREFIX}/inn/bin/startinnfeed
+       ${INN_PATHBIN}/inndstart
+       ${INN_PATHBIN}/startinnfeed
+
+---------------------------------------------------------------------------
+UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
 
+The directory structure of the package has changed.
+
+INNs etc is now in ${PREFIX}/etc/inn
+the binaries are now in ${INN_PATHBIN}
+
+UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
+---------------------------------------------------------------------------
 ===========================================================================
diff -r 996148ab3068 -r 6cde646cbca8 news/inn/Makefile
--- a/news/inn/Makefile Mon Jun 23 08:43:12 2008 +0000
+++ b/news/inn/Makefile Mon Jun 23 09:10:53 2008 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.87 2008/01/18 05:08:52 tnn Exp $
+# $NetBSD: Makefile,v 1.88 2008/06/23 09:10:53 spz Exp $
 
-DISTNAME=              inn-2.4.3
-PKGREVISION=           2
+DISTNAME=              inn-2.4.4
 CATEGORIES=            news
 MASTER_SITES=          ftp://ftp.isc.org/isc/inn/ \
                        ftp://ftp.fu-berlin.de/unix/news/inn/
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=            spz%NetBSD.org@localhost
 HOMEPAGE=              http://www.isc.org/sw/inn/
 COMMENT=               The public release of InterNet News (INN)
 
@@ -17,22 +16,29 @@
 BUILD_DEFS+=           INN_DATA_DIR
 FILES_SUBST+=          INN_DATA_DIR=${INN_DATA_DIR:Q}
 
+BUILD_DEFS+=           INN_PATHBIN
+FILES_SUBST+=          INN_PATHBIN=${INN_PATHBIN:Q}
+
+MESSAGE_SUBST+=                INN_PATHBIN=${INN_PATHBIN:Q}
+
 GNU_CONFIGURE=         YES
 GNU_CONFIGURE_PREFIX=  ${INN_PREFIX}
 GNU_CONFIGURE_MANDIR=  ${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --enable-setgid-inews                           \
-                       --enable-uucp-rnews                             \
-                       --with-perl                                     \
+                       --enable-largefiles                             \
                        --with-openssl=${SSLBASE:Q}                     \
+                       --with-etc-dir=${PREFIX}/etc/inn                \
+                       --with-doc-dir=${PREFIX}/share/doc/inn          \
+                       --with-control-dir=${INN_PATHBIN}/control \
+                       --with-filter-dir=${INN_PATHBIN}/filter \
                        --with-tmp-dir=${INN_DATA_DIR}/tmp              \
                        --with-db-dir=${INN_DATA_DIR}/db                \
-                       --with-etc-dir=${INN_DATA_DIR}/etc              \
                        --with-log-dir=${INN_DATA_DIR}/log              \
                        --with-run-dir=${INN_DATA_DIR}/run              \
+                       --includedir=${PREFIX}/include/inn              \
                        --with-spool-dir=${INN_SPOOL:Q}                 \
                        --with-news-user=${INN_USER:Q}                  \
                        --with-news-group=${INN_GROUP:Q}
-CONFIGURE_ENV+=                _PATH_PERL=${PERL5:Q}
 CONFIGURE_ENV+=                _PATH_AWK=${TOOLS_AWK:Q}
 CONFIGURE_ENV+=                _PATH_EGREP=${TOOLS_EGREP:Q}
 CONFIGURE_ENV+=                _PATH_SED=${TOOLS_SED:Q}
@@ -50,19 +56,27 @@
 PKG_HOME.${INN_USER}=  ${INN_DATA_DIR}
 PKG_SHELL.${INN_USER}= ${SH}
 
-PKG_SYSCONFDIR.inn=    ${INN_DATA_DIR}/etc
+PKG_SYSCONFDIR.inn=    ${PREFIX}/etc/inn
 EXAMPLEDIR=            ${PREFIX}/share/examples/inn
-INN_DATADIRS=          db etc log log/OLD run spool tmp
+INN_DATADIRS=          log log/OLD run tmp
 INN_SPOOLDIRS=         archive articles overview incoming incoming/bad \
                        outgoing uniover innfeed
 
-OWN_DIRS=              ${PREFIX}/etc/nntp
-OWN_DIRS_PERMS=                ${INN_DATA_DIR}                 ${INN_USER} ${INN_GROUP} 0775
+OWN_DIRS+=             ${PREFIX}/etc/nntp
+OWN_DIRS+=             ${PREFIX}/etc/inn
+OWN_DIRS+=             ${INN_DATA_DIR}
+OWN_DIRS+=             ${INN_DATA_DIR}/db
+OWN_DIRS+=             ${INN_DATA_DIR}/spool
+
+.for dir in ${OWN_DIRS}
+OWN_DIRS_PERMS+=       ${dir}  ${INN_USER} ${INN_GROUP} 0775
+.endfor
 .for dir in ${INN_DATADIRS}
-MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/${dir}          ${INN_USER} ${INN_GROUP} 0775
+MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/${dir}  ${INN_USER} ${INN_GROUP} 0775
 .endfor
 .for dir in ${INN_SPOOLDIRS}
-MAKE_DIRS_PERMS+=      ${INN_DATA_DIR}/spool/${dir}    ${INN_USER} ${INN_GROUP} 0775
+OWN_DIRS_PERMS+=       ${INN_DATA_DIR}/spool/${dir} \
+                                               ${INN_USER} ${INN_GROUP} 0775
 .endfor
 
 CFILES=                        actsync.cfg actsync.ign buffindexed.conf \
@@ -95,36 +109,56 @@
 
 post-patch:
        ${RM} -f ${WRKSRC}/samples/inn.conf.in.orig_dist
-
-post-build:
-       for DIR in backends expire frontends innd innfeed lib nnrpd     \
-               storage; do \
-               ${SED} -e 's#-b .OLD##' -e 's#-G#-g#' -e 's#-O#-o#'     \
-                       ${WRKSRC}/$$DIR/Makefile                        \
-                       > ${WRKSRC}/$$DIR/Makefile.patch;               \
-               ${MV} ${WRKSRC}/$$DIR/Makefile.patch                    \
-                       ${WRKSRC}/$$DIR/Makefile;                       \
+       ${SED} -e "s#^PATHBIN.*#PATHBIN = ${INN_PATHBIN}#"      \
+               ${WRKSRC}/Makefile.global.in                    \
+               > ${WRKSRC}/Makefile.global.in.patch;           \
+       ${MV} ${WRKSRC}/Makefile.global.in.patch                \
+               ${WRKSRC}/Makefile.global.in;                   \
+       for FILE in innshellvars.in innshellvars.pl.in innshellvars.tcl.in ; do \
+               ${SED} -e "s#@prefix@/bin/innconfval #${INN_PATHBIN}/innconfval #" \
+                       ${WRKSRC}/scripts/$$FILE                        \
+                       > ${WRKSRC}/scripts/$$FILE.patch ;              \
+               ${MV} ${WRKSRC}/scripts/$$FILE.patch                    \
+                       ${WRKSRC}/scripts/$$FILE ;                      \
        done
 
 pre-install:
-       for DIR in ${INN_DATA_DIR} ${PREFIX}/etc/nntp ${PREFIX}/inn; do \
-               ${INSTALL_DATA_DIR} $$DIR;                              \
-       done
-
-post-install:
-       ${RM} -f ${PREFIX}/bin/inews
-       ${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/inn
-       cd ${PREFIX}/include/inn;                                       \
-       for FILE in config.h dbz.h libinn.h storage.h; do               \
-         ${LN} -s ${INN_PREFIX}/include/$$FILE $$FILE;                 \
-       done
        ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
        for FILE in `ls -1 ${WRKSRC}/samples/* |                        \
                     ${EGREP} -v '(Makefile|.*\.(in|orig)$$)'`; do      \
                ${INSTALL_DATA} $$FILE ${EXAMPLEDIR};                   \
        done
+       # makedbz needs these earlier than pkgsrc will install them normally
+       if [ ! -f ${PKG_SYSCONFDIR}/inn.conf ] ; then                   \
+               ${INSTALL_DATA} ${EXAMPLEDIR}/inn.conf                  \
+                               ${PKG_SYSCONFDIR}/inn.conf ;            \
+       fi
+       if [ ! -d ${INN_DATA_DIR}/db ] ; then                           \
+               ${MKDIR} ${INN_DATA_DIR}/db ;           \
+       fi
+       ${CHOWN} ${INN_USER} ${INN_DATA_DIR}/db
+       
 
-.include "../../lang/perl5/buildlink3.mk"
+post-install:
+       for FILE in cnfsstat ctlinnd inndstart makehistory ; do         \
+               ${LN} -s ${INN_PATHBIN}/$$FILE ${PREFIX}/sbin/$$FILE ; \
+       done
+       ${LN} -s ${INN_PATHBIN}/inews ${PREFIX}/bin/inews
+       ${LN} -s ${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews
+       for FILE in libinn.a libstorage.a libinnhist.a ; do             \
+               ${CHMOD} 644 ${PREFIX}/lib/$$FILE ;                     \
+       done
+       if [ -d ${INN_DATA_DIR}/etc ] ; then                            \
+               echo "" ;                                               \
+               echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING";\
+               echo "" ;                                               \
+               echo "WARNING: old inn config directory ${INN_DATA_DIR}/etc found";\
+               echo "WARNING: please move your config to ${PREFIX}/etc/inn"; \
+               echo "WARNING: before starting your new inn install" ;  \
+               echo "" ;                                               \
+               echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING";\
+               echo "" ;                                               \
+       fi
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 996148ab3068 -r 6cde646cbca8 news/inn/Makefile.common
--- a/news/inn/Makefile.common  Mon Jun 23 08:43:12 2008 +0000
+++ b/news/inn/Makefile.common  Mon Jun 23 09:10:53 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2005/12/27 17:45:40 reed Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/06/23 09:10:53 spz Exp $
 #
 
-INN_PREFIX?=   ${PREFIX}/inn
+INN_PREFIX?=   ${PREFIX}
+INN_PATHBIN?=  ${PREFIX}/libexec/inn
 INN_DATA_DIR?= ${VARBASE}/news
 INN_SPOOL?=    ${INN_DATA_DIR}/spool
diff -r 996148ab3068 -r 6cde646cbca8 news/inn/PLIST
--- a/news/inn/PLIST    Mon Jun 23 08:43:12 2008 +0000
+++ b/news/inn/PLIST    Mon Jun 23 09:10:53 2008 +0000
@@ -1,162 +1,168 @@
-@comment $NetBSD: PLIST,v 1.11 2006/04/10 16:27:02 joerg Exp $
-bin/inews
+@comment $NetBSD: PLIST,v 1.12 2008/06/23 09:10:53 spz Exp $
 include/inn/config.h
 include/inn/dbz.h
 include/inn/libinn.h
 include/inn/storage.h
-inn/bin/actmerge
-inn/bin/actsync
-inn/bin/actsyncd
-inn/bin/archive
-inn/bin/auth/passwd/auth_smb
-inn/bin/auth/passwd/ckpasswd
-inn/bin/auth/passwd/radius
-inn/bin/auth/resolv/domain
-inn/bin/auth/resolv/ident
-inn/bin/batcher
-inn/bin/buffchan
-inn/bin/cnfsheadconf
-inn/bin/cnfsstat
-inn/bin/control/checkgroups.pl
-inn/bin/control/ihave.pl
-inn/bin/control/newgroup.pl
-inn/bin/control/rmgroup.pl
-inn/bin/control/sendme.pl
-inn/bin/control/sendsys.pl
-inn/bin/control/senduuname.pl
-inn/bin/control/version.pl
-inn/bin/controlbatch
-inn/bin/controlchan
-inn/bin/convdate
-inn/bin/ctlinnd
-inn/bin/cvtbatch
-inn/bin/docheckgroups
-inn/bin/expire
-inn/bin/expireover
-inn/bin/expirerm
-inn/bin/fastrm
-inn/bin/filechan
-inn/bin/filter/INN.py
-inn/bin/filter/filter.tcl
-inn/bin/filter/filter_innd.pl
-inn/bin/filter/filter_innd.py
-inn/bin/filter/filter_nnrpd.pl
-inn/bin/filter/nnrpd_auth.pl
-inn/bin/filter/nnrpd_auth.py
-inn/bin/filter/startup.tcl
-inn/bin/filter/startup_innd.pl
-inn/bin/getlist
-inn/bin/gpgverify
-inn/bin/grephistory
-inn/bin/imapfeed
-inn/bin/inews
-inn/bin/inncheck
-inn/bin/innconfval
-inn/bin/innd
-inn/bin/inndf
-inn/bin/inndstart
-inn/bin/innfeed
-inn/bin/innmail
-inn/bin/innreport
-inn/bin/innstat
-inn/bin/innupgrade
-inn/bin/innwatch
-inn/bin/innxbatch
-inn/bin/innxmit
-inn/bin/mailpost
-inn/bin/makedbz
-inn/bin/makehistory
-inn/bin/mod-active
-inn/bin/news.daily
-inn/bin/news2mail
-inn/bin/ninpaths
-inn/bin/nnrpd
-inn/bin/nntpget
-inn/bin/nntpsend
-inn/bin/ovdb_init
-inn/bin/ovdb_monitor
-inn/bin/ovdb_server
-inn/bin/ovdb_stat
-inn/bin/overchan
-inn/bin/perl-nocem
-inn/bin/pgpverify
-inn/bin/procbatch
-inn/bin/prunehistory
-inn/bin/pullnews
-inn/bin/rc.news
-inn/bin/rnews
-inn/bin/rnews.libexec/c7unbatch
-inn/bin/rnews.libexec/decode
-inn/bin/rnews.libexec/encode



Home | Main Index | Thread Index | Old Index