pkg/42327: print/cups complies/installs incorrectly with PKG_SYSCONFDIR.cups set

[Steven Drake <sdrake%xnet.co.nz@localhost>]

>Number:         42327
>Category:       pkg
>Synopsis:       print/cups complies/installs incorrectly with 
>PKG_SYSCONFDIR.cups set
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 16 00:05:01 +0000 2009
>Originator:     Steven Drake
>Release:        pkgsrc-2009Q3
>Organization:
>Environment:
System: Linux idran 2.6.30 #2 PREEMPT Sun Aug 9 18:32:44 NZST 2009 i686 
pentium4 i386 GNU/Linux
Architecture: pentium4
Machine: i686
C library: GNU C Library stable release version 2.10.1, by Roland McGrath et al.

>Description:
After compiling/install cups with PKG_SYSCONFDIR.cups=/etc/cups set the 
following syslog message appears when trying to start cupsd:

cupsd: Unable to read configuration file '/etc/cups/cups/cupsd.conf' - exiting!

The configure script adds "/cups" to the sysconfdir, normal the package
Makefile passes ${PKG_SYSCONFBASE} to the script, however in this case
"/etc/cups" is passed.

Setting PKG_SYSCONFDIR.cups to "/etc" fixes the compiled in path but now the
+FILES script copy file config files to /etc.

>Fix:

Index: pkgsrc/print/cups/Makefile
===================================================================
--- pkgsrc.orig/print/cups/Makefile
+++ pkgsrc/print/cups/Makefile
@@ -39,7 +39,7 @@
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:H:Q}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=       --with-cachedir=${VARBASE:Q}/cache/cups
 CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/cups
@@ -125,6 +125,10 @@
 INSTALL_ENV+=          DSTROOT=${DESTDIR:Q}
 
 pre-configure:
+       @if ${TEST} "${PKG_SYSCONFDIR:T}" != "cups" ;then               \
+               ${ERROR_MSG} "PKG_SYSCONFDIR.cups must end with '/cups'";\
+               exit 1;                                                 \
+       fi
        cd ${WRKSRC} && aclocal && autoconf
 
 post-extract:

-- 
Steven