[pkgsrc/trunk]: pkgsrc/news/inn make package somewhat cleaner (includes some ...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/21c47b9d7711
branches:  trunk
changeset: 551945:21c47b9d7711
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Dec 21 11:55:25 2008 +0000

description:
make package somewhat cleaner (includes some PLIST cleanup)

diffstat:

 news/inn/Makefile        |  32 +++++++++++++++++---------------
 news/inn/Makefile.common |   5 ++++-
 news/inn/PLIST           |  27 +--------------------------
 3 files changed, 22 insertions(+), 42 deletions(-)

diffs (125 lines):

diff -r 75019ec9e7fc -r 21c47b9d7711 news/inn/Makefile
--- a/news/inn/Makefile Sun Dec 21 11:41:22 2008 +0000
+++ b/news/inn/Makefile Sun Dec 21 11:55:25 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2008/10/19 19:18:44 he Exp $
+# $NetBSD: Makefile,v 1.94 2008/12/21 11:55:25 spz Exp $
 
 DISTNAME=              inn-2.4.5
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            news
 MASTER_SITES=          ftp://ftp.isc.org/isc/inn/ \
                        ftp://ftp.fu-berlin.de/unix/news/inn/
@@ -15,6 +15,8 @@
 .include "Makefile.common"
 
 BUILD_DEFS+=           INN_DATA_DIR
+BUILD_DEFS+=           VARBASE
+
 FILES_SUBST+=          INN_DATA_DIR=${INN_DATA_DIR:Q}
 
 BUILD_DEFS+=           INN_PATHBIN
@@ -26,14 +28,14 @@
 
 SUBST_CLASSES+=                BADPATHBIN
 SUBST_STAGE.BADPATHBIN=        post-patch
-SUBST_MESSAGE.BADPATHBIN=      "fixing up unfortunate pathbin paths"
+SUBST_MESSAGE.BADPATHBIN=      fixing up unfortunate pathbin paths
 SUBST_FILES.BADPATHBIN= Makefile.global.in \
                        samples/inn.conf.in samples/newsfeeds.in \
                        scripts/innshellvars.in scripts/innshellvars.pl.in \
                        scripts/innshellvars.tcl.in backends/news2mail.in \
                        control/controlbatch.in control/controlchan.in
-SUBST_SED.BADPATHBIN=  -e 's,@prefix@/bin,${PREFIX}/${INN_PATHBIN:Q},g' \
-                       -e 's,$$(PATHNEWS)/bin,${PREFIX}/${INN_PATHBIN:Q},g'
+SUBST_SED.BADPATHBIN=  -e 's,@prefix@/bin,${PREFIX}/${INN_PATHBIN:Q},g'
+SUBST_SED.BADPATHBIN+= -e 's,$$(PATHNEWS)/bin,${PREFIX}/${INN_PATHBIN:Q},g'
 
 
 GNU_CONFIGURE=         YES
@@ -142,7 +144,7 @@
        if [ ! -d ${INN_DATA_DIR}/db ] ; then                           \
                ${INSTALL} -d -o ${INN_USER} ${INN_DATA_DIR}/db ;       \
        fi
-       
+
 
 post-install:
        for FILE in cnfsstat ctlinnd inndstart makehistory ; do         \
@@ -155,15 +157,15 @@
                ${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 "" ;                                               \
+               ${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"
diff -r 75019ec9e7fc -r 21c47b9d7711 news/inn/Makefile.common
--- a/news/inn/Makefile.common  Sun Dec 21 11:41:22 2008 +0000
+++ b/news/inn/Makefile.common  Sun Dec 21 11:55:25 2008 +0000
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.common,v 1.4 2008/09/03 06:34:32 spz Exp $
+# $NetBSD: Makefile.common,v 1.5 2008/12/21 11:55:25 spz Exp $
 #
 
 INN_PREFIX?=   ${PREFIX}
 INN_PATHBIN?=  libexec/inn
 INN_DATA_DIR?= ${VARBASE}/news
 INN_SPOOL?=    ${INN_DATA_DIR}/spool
+
+BUILD_DEFS+=   INN_DATA_DIR
+BUILD_DEFS+=   VARBASE
diff -r 75019ec9e7fc -r 21c47b9d7711 news/inn/PLIST
--- a/news/inn/PLIST    Sun Dec 21 11:41:22 2008 +0000
+++ b/news/inn/PLIST    Sun Dec 21 11:55:25 2008 +0000
@@ -1,31 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2008/09/16 23:06:19 spz Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/12/21 11:55:25 spz Exp $
 bin/inews
 bin/rnews
-etc/inn/actsync.cfg
-etc/inn/actsync.ign
-etc/inn/buffindexed.conf
-etc/inn/control.ctl
-etc/inn/cycbuff.conf
-etc/inn/distrib.pats
-etc/inn/expire.ctl
-etc/inn/incoming.conf
-etc/inn/inn.conf
-etc/inn/innfeed.conf
-etc/inn/innreport.conf
-etc/inn/innwatch.ctl
-etc/inn/moderators
-etc/inn/motd.news
-etc/inn/news2mail.cf
-etc/inn/newsfeeds
-etc/inn/nnrpd.track
-etc/inn/nntpsend.ctl
-etc/inn/ovdb.conf
-etc/inn/overview.fmt
-etc/inn/passwd.nntp
-etc/inn/radius.conf
-etc/inn/readers.conf
-etc/inn/sasl.conf
-etc/inn/storage.conf
 include/inn/conffile.h
 include/inn/config.h
 include/inn/dbz.h