kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

when installing to variable locations, make it so we actually vary where we

Browse source 
expect that which we installed (ie, fix PLIST)
also make sure that our installation destination is under PREFIX
fixes PR 39165
This commit is contained in:
spz 2008-09-03 06:34:32 +00:00
parent 6b1eaa5514
commit adbceb7bae
4 changed files with 120 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
news/inn/MESSAGE
View file

@ -1,10 +1,10 @@
=========================================================================== ===========================================================================
$NetBSD: MESSAGE,v 1.4 2008/06/23 09:10:53 spz Exp $ $NetBSD: MESSAGE,v 1.5 2008/09/03 06:34:32 spz Exp $
The following programs have been installed suid root on your machine: The following programs have been installed suid root on your machine:
${INN_PATHBIN}/inndstart ${PREFIX}/${INN_PATHBIN}/inndstart
${INN_PATHBIN}/startinnfeed ${PREFIX}/${INN_PATHBIN}/startinnfeed
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
@ -12,7 +12,7 @@ UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
The directory structure of the package has changed. The directory structure of the package has changed.
INNs etc is now in ${PREFIX}/etc/inn INNs etc is now in ${PREFIX}/etc/inn
the binaries are now in ${INN_PATHBIN} the binaries are now in ${PREFIX}/${INN_PATHBIN}
UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
--------------------------------------------------------------------------- ---------------------------------------------------------------------------

20
news/inn/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.88 2008/06/23 09:10:53 spz Exp $ # $NetBSD: Makefile,v 1.89 2008/09/03 06:34:32 spz Exp $
DISTNAME= inn-2.4.4 DISTNAME= inn-2.4.4
CATEGORIES= news CATEGORIES= news
@ -17,10 +17,12 @@ BUILD_DEFS+= INN_DATA_DIR
FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR:Q} FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR:Q}
BUILD_DEFS+= INN_PATHBIN BUILD_DEFS+= INN_PATHBIN
FILES_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} FILES_SUBST+= INN_PATHBIN=${PREFIX}/${INN_PATHBIN:Q}
MESSAGE_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} MESSAGE_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q}
PLIST_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q}
GNU_CONFIGURE= YES GNU_CONFIGURE= YES
GNU_CONFIGURE_PREFIX= ${INN_PREFIX} GNU_CONFIGURE_PREFIX= ${INN_PREFIX}
GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR}
@ -29,8 +31,8 @@ CONFIGURE_ARGS+= --enable-setgid-inews \
--with-openssl=${SSLBASE:Q} \ --with-openssl=${SSLBASE:Q} \
--with-etc-dir=${PREFIX}/etc/inn \ --with-etc-dir=${PREFIX}/etc/inn \
--with-doc-dir=${PREFIX}/share/doc/inn \ --with-doc-dir=${PREFIX}/share/doc/inn \
--with-control-dir=${INN_PATHBIN}/control \ --with-control-dir=${PREFIX}/${INN_PATHBIN}/control \
--with-filter-dir=${INN_PATHBIN}/filter \ --with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \
--with-tmp-dir=${INN_DATA_DIR}/tmp \ --with-tmp-dir=${INN_DATA_DIR}/tmp \
--with-db-dir=${INN_DATA_DIR}/db \ --with-db-dir=${INN_DATA_DIR}/db \
--with-log-dir=${INN_DATA_DIR}/log \ --with-log-dir=${INN_DATA_DIR}/log \
@ -109,13 +111,13 @@ GCC_REQD+= 2.95.3
post-patch: post-patch:
${RM} -f ${WRKSRC}/samples/inn.conf.in.orig_dist ${RM} -f ${WRKSRC}/samples/inn.conf.in.orig_dist
${SED} -e "s#^PATHBIN.*#PATHBIN = ${INN_PATHBIN}#" \ ${SED} -e "s#^PATHBIN.*#PATHBIN = ${PREFIX}/${INN_PATHBIN}#" \
${WRKSRC}/Makefile.global.in \ ${WRKSRC}/Makefile.global.in \
> ${WRKSRC}/Makefile.global.in.patch; \ > ${WRKSRC}/Makefile.global.in.patch; \
${MV} ${WRKSRC}/Makefile.global.in.patch \ ${MV} ${WRKSRC}/Makefile.global.in.patch \
${WRKSRC}/Makefile.global.in; \ ${WRKSRC}/Makefile.global.in; \
for FILE in innshellvars.in innshellvars.pl.in innshellvars.tcl.in ; do \ for FILE in innshellvars.in innshellvars.pl.in innshellvars.tcl.in ; do \
${SED} -e "s#@prefix@/bin/innconfval #${INN_PATHBIN}/innconfval #" \ ${SED} -e "s#@prefix@/bin/innconfval #${PREFIX}/${INN_PATHBIN}/innconfval #" \
${WRKSRC}/scripts/$$FILE \ ${WRKSRC}/scripts/$$FILE \
> ${WRKSRC}/scripts/$$FILE.patch ; \ > ${WRKSRC}/scripts/$$FILE.patch ; \
${MV} ${WRKSRC}/scripts/$$FILE.patch \ ${MV} ${WRKSRC}/scripts/$$FILE.patch \
@ -141,10 +143,10 @@ pre-install:
post-install: post-install:
for FILE in cnfsstat ctlinnd inndstart makehistory ; do \ for FILE in cnfsstat ctlinnd inndstart makehistory ; do \
${LN} -s ${INN_PATHBIN}/$$FILE ${PREFIX}/sbin/$$FILE ; \ ${LN} -s ${PREFIX}/${INN_PATHBIN}/$$FILE ${PREFIX}/sbin/$$FILE ; \
done done
${LN} -s ${INN_PATHBIN}/inews ${PREFIX}/bin/inews ${LN} -s ${PREFIX}/${INN_PATHBIN}/inews ${PREFIX}/bin/inews
${LN} -s ${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews ${LN} -s ${PREFIX}/${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews
for FILE in libinn.a libstorage.a libinnhist.a ; do \ for FILE in libinn.a libstorage.a libinnhist.a ; do \
${CHMOD} 644 ${PREFIX}/lib/$$FILE ; \ ${CHMOD} 644 ${PREFIX}/lib/$$FILE ; \
done done

4
news/inn/Makefile.common
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile.common,v 1.3 2008/06/23 09:10:53 spz Exp $ # $NetBSD: Makefile.common,v 1.4 2008/09/03 06:34:32 spz Exp $
# #
INN_PREFIX?= ${PREFIX} INN_PREFIX?= ${PREFIX}
INN_PATHBIN?= ${PREFIX}/libexec/inn INN_PATHBIN?= libexec/inn
INN_DATA_DIR?= ${VARBASE}/news INN_DATA_DIR?= ${VARBASE}/news
INN_SPOOL?= ${INN_DATA_DIR}/spool INN_SPOOL?= ${INN_DATA_DIR}/spool

206
news/inn/PLIST
View file

@ -1,116 +1,116 @@
@comment $NetBSD: PLIST,v 1.12 2008/06/23 09:10:53 spz Exp $ @comment $NetBSD: PLIST,v 1.13 2008/09/03 06:34:32 spz Exp $
include/inn/config.h include/inn/config.h
include/inn/dbz.h include/inn/dbz.h
include/inn/libinn.h include/inn/libinn.h
include/inn/storage.h include/inn/storage.h
libexec/inn/actmerge ${INN_PATHBIN}/actmerge
libexec/inn/actsync ${INN_PATHBIN}/actsync
libexec/inn/actsyncd ${INN_PATHBIN}/actsyncd
libexec/inn/archive ${INN_PATHBIN}/archive
libexec/inn/auth/passwd/auth_smb ${INN_PATHBIN}/auth/passwd/auth_smb
libexec/inn/auth/passwd/ckpasswd ${INN_PATHBIN}/auth/passwd/ckpasswd
libexec/inn/auth/passwd/radius ${INN_PATHBIN}/auth/passwd/radius
libexec/inn/auth/resolv/domain ${INN_PATHBIN}/auth/resolv/domain
libexec/inn/auth/resolv/ident ${INN_PATHBIN}/auth/resolv/ident
libexec/inn/batcher ${INN_PATHBIN}/batcher
libexec/inn/buffchan ${INN_PATHBIN}/buffchan
libexec/inn/cnfsheadconf ${INN_PATHBIN}/cnfsheadconf
libexec/inn/cnfsstat ${INN_PATHBIN}/cnfsstat
sbin/cnfsstat sbin/cnfsstat
libexec/inn/control/checkgroups.pl ${INN_PATHBIN}/control/checkgroups.pl
libexec/inn/control/ihave.pl ${INN_PATHBIN}/control/ihave.pl
libexec/inn/control/newgroup.pl ${INN_PATHBIN}/control/newgroup.pl
libexec/inn/control/rmgroup.pl ${INN_PATHBIN}/control/rmgroup.pl
libexec/inn/control/sendme.pl ${INN_PATHBIN}/control/sendme.pl
libexec/inn/control/sendsys.pl ${INN_PATHBIN}/control/sendsys.pl
libexec/inn/control/senduuname.pl ${INN_PATHBIN}/control/senduuname.pl
libexec/inn/control/version.pl ${INN_PATHBIN}/control/version.pl
libexec/inn/controlbatch ${INN_PATHBIN}/controlbatch
libexec/inn/controlchan ${INN_PATHBIN}/controlchan
libexec/inn/convdate ${INN_PATHBIN}/convdate
libexec/inn/ctlinnd ${INN_PATHBIN}/ctlinnd
sbin/ctlinnd sbin/ctlinnd
libexec/inn/cvtbatch ${INN_PATHBIN}/cvtbatch
libexec/inn/docheckgroups ${INN_PATHBIN}/docheckgroups
libexec/inn/expire ${INN_PATHBIN}/expire
libexec/inn/expireover ${INN_PATHBIN}/expireover
libexec/inn/expirerm ${INN_PATHBIN}/expirerm
libexec/inn/fastrm ${INN_PATHBIN}/fastrm
libexec/inn/filechan ${INN_PATHBIN}/filechan
libexec/inn/filter/INN.py ${INN_PATHBIN}/filter/INN.py
libexec/inn/filter/filter.tcl ${INN_PATHBIN}/filter/filter.tcl
libexec/inn/filter/filter_innd.pl ${INN_PATHBIN}/filter/filter_innd.pl
libexec/inn/filter/filter_innd.py ${INN_PATHBIN}/filter/filter_innd.py
libexec/inn/filter/filter_nnrpd.pl ${INN_PATHBIN}/filter/filter_nnrpd.pl
libexec/inn/filter/nnrpd_access.pl ${INN_PATHBIN}/filter/nnrpd_access.pl
libexec/inn/filter/nnrpd_auth.pl ${INN_PATHBIN}/filter/nnrpd_auth.pl
libexec/inn/filter/nnrpd_auth.py ${INN_PATHBIN}/filter/nnrpd_auth.py
libexec/inn/filter/startup.tcl ${INN_PATHBIN}/filter/startup.tcl
libexec/inn/filter/startup_innd.pl ${INN_PATHBIN}/filter/startup_innd.pl
libexec/inn/getlist ${INN_PATHBIN}/getlist
libexec/inn/gpgverify ${INN_PATHBIN}/gpgverify
libexec/inn/grephistory ${INN_PATHBIN}/grephistory
libexec/inn/imapfeed ${INN_PATHBIN}/imapfeed
libexec/inn/inews ${INN_PATHBIN}/inews
bin/inews bin/inews
libexec/inn/inncheck ${INN_PATHBIN}/inncheck
libexec/inn/innconfval ${INN_PATHBIN}/innconfval
libexec/inn/innd ${INN_PATHBIN}/innd
libexec/inn/inndf ${INN_PATHBIN}/inndf
libexec/inn/inndstart ${INN_PATHBIN}/inndstart
sbin/inndstart sbin/inndstart
libexec/inn/innfeed ${INN_PATHBIN}/innfeed
libexec/inn/innmail ${INN_PATHBIN}/innmail
libexec/inn/innreport ${INN_PATHBIN}/innreport
libexec/inn/innstat ${INN_PATHBIN}/innstat
libexec/inn/innupgrade ${INN_PATHBIN}/innupgrade
libexec/inn/innwatch ${INN_PATHBIN}/innwatch
libexec/inn/innxbatch ${INN_PATHBIN}/innxbatch
libexec/inn/innxmit ${INN_PATHBIN}/innxmit
libexec/inn/mailpost ${INN_PATHBIN}/mailpost
libexec/inn/makedbz ${INN_PATHBIN}/makedbz
libexec/inn/makehistory ${INN_PATHBIN}/makehistory
sbin/makehistory sbin/makehistory
libexec/inn/mod-active ${INN_PATHBIN}/mod-active
libexec/inn/news.daily ${INN_PATHBIN}/news.daily
libexec/inn/news2mail ${INN_PATHBIN}/news2mail
libexec/inn/ninpaths ${INN_PATHBIN}/ninpaths
libexec/inn/nnrpd ${INN_PATHBIN}/nnrpd
libexec/inn/nntpget ${INN_PATHBIN}/nntpget
libexec/inn/nntpsend ${INN_PATHBIN}/nntpsend
libexec/inn/ovdb_init ${INN_PATHBIN}/ovdb_init
libexec/inn/ovdb_monitor ${INN_PATHBIN}/ovdb_monitor
libexec/inn/ovdb_server ${INN_PATHBIN}/ovdb_server
libexec/inn/ovdb_stat ${INN_PATHBIN}/ovdb_stat
libexec/inn/overchan ${INN_PATHBIN}/overchan
libexec/inn/perl-nocem ${INN_PATHBIN}/perl-nocem
libexec/inn/pgpverify ${INN_PATHBIN}/pgpverify
libexec/inn/procbatch ${INN_PATHBIN}/procbatch
libexec/inn/prunehistory ${INN_PATHBIN}/prunehistory
libexec/inn/pullnews ${INN_PATHBIN}/pullnews
libexec/inn/rc.news ${INN_PATHBIN}/rc.news
libexec/inn/rnews ${INN_PATHBIN}/rnews
bin/rnews bin/rnews
libexec/inn/rnews.libexec/c7unbatch ${INN_PATHBIN}/rnews.libexec/c7unbatch
libexec/inn/rnews.libexec/decode ${INN_PATHBIN}/rnews.libexec/decode
libexec/inn/rnews.libexec/encode ${INN_PATHBIN}/rnews.libexec/encode
libexec/inn/rnews.libexec/gunbatch ${INN_PATHBIN}/rnews.libexec/gunbatch
libexec/inn/scanlogs ${INN_PATHBIN}/scanlogs
libexec/inn/scanspool ${INN_PATHBIN}/scanspool
libexec/inn/send-ihave ${INN_PATHBIN}/send-ihave
libexec/inn/send-nntp ${INN_PATHBIN}/send-nntp
libexec/inn/send-uucp ${INN_PATHBIN}/send-uucp
libexec/inn/sendinpaths ${INN_PATHBIN}/sendinpaths
libexec/inn/sendxbatches ${INN_PATHBIN}/sendxbatches
libexec/inn/shlock ${INN_PATHBIN}/shlock
libexec/inn/shrinkfile ${INN_PATHBIN}/shrinkfile
libexec/inn/signcontrol ${INN_PATHBIN}/signcontrol
libexec/inn/simpleftp ${INN_PATHBIN}/simpleftp
libexec/inn/sm ${INN_PATHBIN}/sm
libexec/inn/startinnfeed ${INN_PATHBIN}/startinnfeed
libexec/inn/tally.control ${INN_PATHBIN}/tally.control
libexec/inn/tdx-util ${INN_PATHBIN}/tdx-util
libexec/inn/writelog ${INN_PATHBIN}/writelog
share/doc/inn/CONTRIBUTORS share/doc/inn/CONTRIBUTORS
share/doc/inn/GPL share/doc/inn/GPL
share/doc/inn/HACKING share/doc/inn/HACKING