pkg/45986: news/inn ignores PKG_SYSCONFBASE

[River Tarnell <river%RT.UK.EU.ORG@localhost>]

>Number:         45986
>Category:       pkg
>Synopsis:       news/inn ignores PKG_SYSCONFBASE
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 11 21:55:01 +0000 2012
>Originator:     River Tarnell <river%RT.UK.EU.ORG@localhost>
>Release:        Linux 2.6.32-5-amd64
>Organization:
>Environment:
System: Linux isis 2.6.32-5-amd64 #1 SMP Mon Jan 16 16:22:28 UTC 2012 x86_64 
GNU/Linux
pkgsrc 2011Q4
news/inn 2.5.2nb4

>Description:
news/inn ignores PKG_SYSCONFBASE when installing, so configuration files will
always be put in ${PREFIX}/etc/inn, regardless of what the user has set.
>How-To-Repeat:
Set PKG_SYSCONFBASE in mk.conf and install news/inn.

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/news/inn/Makefile,v
retrieving revision 1.108
diff -u -r1.108 Makefile
--- Makefile    25 Sep 2011 14:00:09 -0000      1.108
+++ Makefile    11 Feb 2012 20:27:38 -0000
@@ -27,6 +27,8 @@
 
 PLIST_SUBST+=          INN_PATHBIN=${INN_PATHBIN:Q}
 
+PKG_SYSCONFSUBDIR=     inn
+
 GNU_CONFIGURE=         YES
 GNU_CONFIGURE_PREFIX=  ${INN_PREFIX}
 GNU_CONFIGURE_MANDIR=  ${PREFIX}/${PKGMANDIR}
@@ -34,7 +36,7 @@
                        --enable-largefiles                             \
                        --bindir=${PREFIX}/${INN_PATHBIN}               \
                        --sbindir=${PREFIX}/${INN_PATHBIN}              \
-                       --sysconfdir=${PREFIX}/etc/inn                  \
+                       --sysconfdir=${PKG_SYSCONFDIR}                  \
                        --with-openssl=${SSLBASE:Q}                     \
                        --with-doc-dir=${PREFIX}/share/doc/inn          \
                        --with-control-dir=${PREFIX}/${INN_PATHBIN}/control \
@@ -75,13 +77,11 @@
 PKG_HOME.${INN_USER}=  ${INN_DATA_DIR}
 PKG_SHELL.${INN_USER}= ${SH}
 
-PKG_SYSCONFDIR.inn=    ${PREFIX}/etc/inn
 EXAMPLEDIR=            ${PREFIX}/share/examples/inn
 INN_DATADIRS=          log log/OLD run tmp db spool http
 INN_SPOOLDIRS=         archive articles overview incoming incoming/bad \
                        outgoing uniover innfeed
 
-INSTALLATION_DIRS+=    etc/nntp
 INSTALLATION_DIRS+=    sbin
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    ${EXAMPLEDIR}
@@ -91,8 +91,7 @@
 MAKE_DIRS+=            ${PREFIX}/sbin
 MAKE_DIRS+=            ${PREFIX}/lib
 
-INN_DIRS+=             ${PREFIX}/etc/nntp
-INN_DIRS+=             ${PREFIX}/etc/inn
+INN_DIRS+=             ${PKG_SYSCONFDIR}
 INN_DIRS+=             ${INN_DATA_DIR}
 
 OWN_DIRS+=             ${PREFIX}/${INN_PATHBIN}