diff options
author | spz <spz> | 2008-09-03 20:19:39 +0000 |
---|---|---|
committer | spz <spz> | 2008-09-03 20:19:39 +0000 |
commit | 7d1f253ee023ecd1ec525ab00f9ada3f0d73602b (patch) | |
tree | 03f050f1457ba56e4b51fcee531c306266cb5214 /news/inn | |
parent | eb39cce43c1bd6f72cbbf8996494b7b6cff4838d (diff) | |
download | pkgsrc-7d1f253ee023ecd1ec525ab00f9ada3f0d73602b.tar.gz |
make inn start successfully on a previously clean box
Diffstat (limited to 'news/inn')
-rw-r--r-- | news/inn/Makefile | 29 | ||||
-rw-r--r-- | news/inn/files/innd.sh | 8 |
2 files changed, 17 insertions, 20 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index 10e3194321a..b81a121f62d 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2008/09/03 06:34:32 spz Exp $ +# $NetBSD: Makefile,v 1.90 2008/09/03 20:19:39 spz Exp $ DISTNAME= inn-2.4.4 CATEGORIES= news @@ -23,6 +23,18 @@ MESSAGE_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} PLIST_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} +SUBST_CLASSES+= BADPATHBIN +SUBST_STAGE.BADPATHBIN= post-patch +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' + + GNU_CONFIGURE= YES GNU_CONFIGURE_PREFIX= ${INN_PREFIX} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} @@ -109,21 +121,6 @@ GCC_REQD+= 2.95.3 .include "options.mk" -post-patch: - ${RM} -f ${WRKSRC}/samples/inn.conf.in.orig_dist - ${SED} -e "s#^PATHBIN.*#PATHBIN = ${PREFIX}/${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 #${PREFIX}/${INN_PATHBIN}/innconfval #" \ - ${WRKSRC}/scripts/$$FILE \ - > ${WRKSRC}/scripts/$$FILE.patch ; \ - ${MV} ${WRKSRC}/scripts/$$FILE.patch \ - ${WRKSRC}/scripts/$$FILE ; \ - done - pre-install: ${INSTALL_DATA_DIR} ${EXAMPLEDIR} for FILE in `ls -1 ${WRKSRC}/samples/* | \ diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh index bd6ca4849d5..5c04e7d80b2 100644 --- a/news/inn/files/innd.sh +++ b/news/inn/files/innd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: innd.sh,v 1.14 2008/06/23 09:10:53 spz Exp $ +# $NetBSD: innd.sh,v 1.15 2008/09/03 20:19:39 spz Exp $ # # PROVIDE: inn # REQUIRE: DAEMON @@ -25,18 +25,18 @@ then if [ $# -eq 0 ] then echo -n ' innd' - su news -c "@INN_PATHBIN@/rc.news start" >/dev/null + su -m news -c "@INN_PATHBIN@/rc.news start" >/dev/null exit 0 fi case "$1" in start ) echo "Starting INN." - su news -c "@INN_PATHBIN@/rc.news $1" >/dev/null + su -m news -c "@INN_PATHBIN@/rc.news $1" >/dev/null exit 0 ;; stop ) - su news -c "@INN_PATHBIN@/rc.news $1" + su -m news -c "@INN_PATHBIN@/rc.news $1" exit 0 ;; restart ) |