[pkgsrc/trunk]: pkgsrc/news/inn when installing to variable locations, make i...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/news/inn when installing to variable locations, make i...
From: spz <spz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:32:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c5321edfd2a
branches:  trunk
changeset: 546499:3c5321edfd2a
user:      spz <spz%pkgsrc.org@localhost>
date:      Wed Sep 03 06:34:32 2008 +0000

description:
when installing to variable locations, make it so we actually vary where we
expect that which we installed (ie, fix PLIST)
also make sure that our installation destination is under PREFIX
fixes PR 39165

diffstat:

 news/inn/MESSAGE         |    8 +-
 news/inn/Makefile        |   20 ++--
 news/inn/Makefile.common |    4 +-
 news/inn/PLIST           |  206 +++++++++++++++++++++++-----------------------
 4 files changed, 120 insertions(+), 118 deletions(-)

diffs (truncated from 326 to 300 lines):

diff -r 01b277fed96f -r 3c5321edfd2a news/inn/MESSAGE
--- a/news/inn/MESSAGE  Tue Sep 02 23:13:43 2008 +0000
+++ b/news/inn/MESSAGE  Wed Sep 03 06:34:32 2008 +0000
@@ -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:
 
-       ${INN_PATHBIN}/inndstart
-       ${INN_PATHBIN}/startinnfeed
+       ${PREFIX}/${INN_PATHBIN}/inndstart
+       ${PREFIX}/${INN_PATHBIN}/startinnfeed
 
 ---------------------------------------------------------------------------
 UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING
@@ -12,7 +12,7 @@
 The directory structure of the package has changed.
 
 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
 ---------------------------------------------------------------------------
diff -r 01b277fed96f -r 3c5321edfd2a news/inn/Makefile
--- a/news/inn/Makefile Tue Sep 02 23:13:43 2008 +0000
+++ b/news/inn/Makefile Wed Sep 03 06:34:32 2008 +0000
@@ -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
 CATEGORIES=            news
@@ -17,10 +17,12 @@
 FILES_SUBST+=          INN_DATA_DIR=${INN_DATA_DIR:Q}
 
 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}
 
+PLIST_SUBST+=          INN_PATHBIN=${INN_PATHBIN:Q}
+
 GNU_CONFIGURE=         YES
 GNU_CONFIGURE_PREFIX=  ${INN_PREFIX}
 GNU_CONFIGURE_MANDIR=  ${PREFIX}/${PKGMANDIR}
@@ -29,8 +31,8 @@
                        --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-control-dir=${PREFIX}/${INN_PATHBIN}/control \
+                       --with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \
                        --with-tmp-dir=${INN_DATA_DIR}/tmp              \
                        --with-db-dir=${INN_DATA_DIR}/db                \
                        --with-log-dir=${INN_DATA_DIR}/log              \
@@ -109,13 +111,13 @@
 
 post-patch:
        ${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.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 #" \
+               ${SED} -e "s#@prefix@/bin/innconfval #${PREFIX}/${INN_PATHBIN}/innconfval #" \
                        ${WRKSRC}/scripts/$$FILE                        \
                        > ${WRKSRC}/scripts/$$FILE.patch ;              \
                ${MV} ${WRKSRC}/scripts/$$FILE.patch                    \
@@ -141,10 +143,10 @@
 
 post-install:
        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
-       ${LN} -s ${INN_PATHBIN}/inews ${PREFIX}/bin/inews
-       ${LN} -s ${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews
+       ${LN} -s ${PREFIX}/${INN_PATHBIN}/inews ${PREFIX}/bin/inews
+       ${LN} -s ${PREFIX}/${INN_PATHBIN}/rnews ${PREFIX}/bin/rnews
        for FILE in libinn.a libstorage.a libinnhist.a ; do             \
                ${CHMOD} 644 ${PREFIX}/lib/$$FILE ;                     \
        done
diff -r 01b277fed96f -r 3c5321edfd2a news/inn/Makefile.common
--- a/news/inn/Makefile.common  Tue Sep 02 23:13:43 2008 +0000
+++ b/news/inn/Makefile.common  Wed Sep 03 06:34:32 2008 +0000
@@ -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_PATHBIN?=  ${PREFIX}/libexec/inn
+INN_PATHBIN?=  libexec/inn
 INN_DATA_DIR?= ${VARBASE}/news
 INN_SPOOL?=    ${INN_DATA_DIR}/spool
diff -r 01b277fed96f -r 3c5321edfd2a news/inn/PLIST
--- a/news/inn/PLIST    Tue Sep 02 23:13:43 2008 +0000
+++ b/news/inn/PLIST    Wed Sep 03 06:34:32 2008 +0000
@@ -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/dbz.h
 include/inn/libinn.h
 include/inn/storage.h
-libexec/inn/actmerge
-libexec/inn/actsync
-libexec/inn/actsyncd
-libexec/inn/archive
-libexec/inn/auth/passwd/auth_smb
-libexec/inn/auth/passwd/ckpasswd
-libexec/inn/auth/passwd/radius
-libexec/inn/auth/resolv/domain
-libexec/inn/auth/resolv/ident
-libexec/inn/batcher
-libexec/inn/buffchan
-libexec/inn/cnfsheadconf
-libexec/inn/cnfsstat
+${INN_PATHBIN}/actmerge
+${INN_PATHBIN}/actsync
+${INN_PATHBIN}/actsyncd
+${INN_PATHBIN}/archive
+${INN_PATHBIN}/auth/passwd/auth_smb
+${INN_PATHBIN}/auth/passwd/ckpasswd
+${INN_PATHBIN}/auth/passwd/radius
+${INN_PATHBIN}/auth/resolv/domain
+${INN_PATHBIN}/auth/resolv/ident
+${INN_PATHBIN}/batcher
+${INN_PATHBIN}/buffchan
+${INN_PATHBIN}/cnfsheadconf
+${INN_PATHBIN}/cnfsstat
 sbin/cnfsstat
-libexec/inn/control/checkgroups.pl
-libexec/inn/control/ihave.pl
-libexec/inn/control/newgroup.pl
-libexec/inn/control/rmgroup.pl
-libexec/inn/control/sendme.pl
-libexec/inn/control/sendsys.pl
-libexec/inn/control/senduuname.pl
-libexec/inn/control/version.pl
-libexec/inn/controlbatch
-libexec/inn/controlchan
-libexec/inn/convdate
-libexec/inn/ctlinnd
+${INN_PATHBIN}/control/checkgroups.pl
+${INN_PATHBIN}/control/ihave.pl
+${INN_PATHBIN}/control/newgroup.pl
+${INN_PATHBIN}/control/rmgroup.pl
+${INN_PATHBIN}/control/sendme.pl
+${INN_PATHBIN}/control/sendsys.pl
+${INN_PATHBIN}/control/senduuname.pl
+${INN_PATHBIN}/control/version.pl
+${INN_PATHBIN}/controlbatch
+${INN_PATHBIN}/controlchan
+${INN_PATHBIN}/convdate
+${INN_PATHBIN}/ctlinnd
 sbin/ctlinnd
-libexec/inn/cvtbatch
-libexec/inn/docheckgroups
-libexec/inn/expire
-libexec/inn/expireover
-libexec/inn/expirerm
-libexec/inn/fastrm
-libexec/inn/filechan
-libexec/inn/filter/INN.py
-libexec/inn/filter/filter.tcl
-libexec/inn/filter/filter_innd.pl
-libexec/inn/filter/filter_innd.py
-libexec/inn/filter/filter_nnrpd.pl
-libexec/inn/filter/nnrpd_access.pl
-libexec/inn/filter/nnrpd_auth.pl
-libexec/inn/filter/nnrpd_auth.py
-libexec/inn/filter/startup.tcl
-libexec/inn/filter/startup_innd.pl
-libexec/inn/getlist
-libexec/inn/gpgverify
-libexec/inn/grephistory
-libexec/inn/imapfeed
-libexec/inn/inews
+${INN_PATHBIN}/cvtbatch
+${INN_PATHBIN}/docheckgroups
+${INN_PATHBIN}/expire
+${INN_PATHBIN}/expireover
+${INN_PATHBIN}/expirerm
+${INN_PATHBIN}/fastrm
+${INN_PATHBIN}/filechan
+${INN_PATHBIN}/filter/INN.py
+${INN_PATHBIN}/filter/filter.tcl
+${INN_PATHBIN}/filter/filter_innd.pl
+${INN_PATHBIN}/filter/filter_innd.py
+${INN_PATHBIN}/filter/filter_nnrpd.pl
+${INN_PATHBIN}/filter/nnrpd_access.pl
+${INN_PATHBIN}/filter/nnrpd_auth.pl
+${INN_PATHBIN}/filter/nnrpd_auth.py
+${INN_PATHBIN}/filter/startup.tcl
+${INN_PATHBIN}/filter/startup_innd.pl
+${INN_PATHBIN}/getlist
+${INN_PATHBIN}/gpgverify
+${INN_PATHBIN}/grephistory
+${INN_PATHBIN}/imapfeed
+${INN_PATHBIN}/inews
 bin/inews
-libexec/inn/inncheck
-libexec/inn/innconfval
-libexec/inn/innd
-libexec/inn/inndf
-libexec/inn/inndstart
+${INN_PATHBIN}/inncheck
+${INN_PATHBIN}/innconfval
+${INN_PATHBIN}/innd
+${INN_PATHBIN}/inndf
+${INN_PATHBIN}/inndstart
 sbin/inndstart
-libexec/inn/innfeed
-libexec/inn/innmail
-libexec/inn/innreport
-libexec/inn/innstat
-libexec/inn/innupgrade
-libexec/inn/innwatch
-libexec/inn/innxbatch
-libexec/inn/innxmit
-libexec/inn/mailpost
-libexec/inn/makedbz
-libexec/inn/makehistory
+${INN_PATHBIN}/innfeed
+${INN_PATHBIN}/innmail
+${INN_PATHBIN}/innreport
+${INN_PATHBIN}/innstat
+${INN_PATHBIN}/innupgrade
+${INN_PATHBIN}/innwatch
+${INN_PATHBIN}/innxbatch
+${INN_PATHBIN}/innxmit
+${INN_PATHBIN}/mailpost
+${INN_PATHBIN}/makedbz
+${INN_PATHBIN}/makehistory
 sbin/makehistory
-libexec/inn/mod-active
-libexec/inn/news.daily
-libexec/inn/news2mail
-libexec/inn/ninpaths
-libexec/inn/nnrpd
-libexec/inn/nntpget
-libexec/inn/nntpsend
-libexec/inn/ovdb_init
-libexec/inn/ovdb_monitor
-libexec/inn/ovdb_server
-libexec/inn/ovdb_stat
-libexec/inn/overchan
-libexec/inn/perl-nocem
-libexec/inn/pgpverify
-libexec/inn/procbatch
-libexec/inn/prunehistory
-libexec/inn/pullnews
-libexec/inn/rc.news
-libexec/inn/rnews
+${INN_PATHBIN}/mod-active
+${INN_PATHBIN}/news.daily
+${INN_PATHBIN}/news2mail
+${INN_PATHBIN}/ninpaths
+${INN_PATHBIN}/nnrpd
+${INN_PATHBIN}/nntpget
+${INN_PATHBIN}/nntpsend
+${INN_PATHBIN}/ovdb_init
+${INN_PATHBIN}/ovdb_monitor
+${INN_PATHBIN}/ovdb_server
+${INN_PATHBIN}/ovdb_stat
+${INN_PATHBIN}/overchan
+${INN_PATHBIN}/perl-nocem
+${INN_PATHBIN}/pgpverify
+${INN_PATHBIN}/procbatch
+${INN_PATHBIN}/prunehistory
+${INN_PATHBIN}/pullnews
+${INN_PATHBIN}/rc.news
+${INN_PATHBIN}/rnews
 bin/rnews
-libexec/inn/rnews.libexec/c7unbatch
-libexec/inn/rnews.libexec/decode
-libexec/inn/rnews.libexec/encode
-libexec/inn/rnews.libexec/gunbatch
-libexec/inn/scanlogs
-libexec/inn/scanspool
-libexec/inn/send-ihave
-libexec/inn/send-nntp
-libexec/inn/send-uucp
-libexec/inn/sendinpaths
-libexec/inn/sendxbatches
-libexec/inn/shlock
-libexec/inn/shrinkfile
-libexec/inn/signcontrol
-libexec/inn/simpleftp
-libexec/inn/sm
-libexec/inn/startinnfeed
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc Add & enable p5-Template-Declare
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note one addition and one update:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc Add & enable p5-Template-Declare
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note one addition and one update:
Indexes:
Home | Main Index | Thread Index | Old Index