pkg/36803: sysutils/gkrellm-server doesn't honour PKG_SYSCONFDIR

[j+nbsd%2007.salmi.ch@localhost]

>Number:         36803
>Category:       pkg
>Synopsis:       sysutils/gkrellm-server doesn't honour PKG_SYSCONFDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 18 10:50:00 +0000 2007
>Originator:     Jukka Salmi
>Release:        pkgsrc HEAD
>Description:
sysutils/gkrellm-server doesn't honour PKG_SYSCONFDIR, thus the config
file (gkrellmd.conf) isn't installed if ${PKG_SYSCONFBASE} !=
${PREFIX}/etc.
>How-To-Repeat:
Try to build and install sysutils/gkrellm-server and notice cp(1)'s
error message when copying the config file.
>Fix:
Index: sysutils/gkrellm-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gkrellm-server/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- sysutils/gkrellm-server/Makefile    15 Jun 2007 18:15:21 -0000      1.23
+++ sysutils/gkrellm-server/Makefile    18 Aug 2007 00:03:13 -0000
@@ -9,7 +9,8 @@ DEPENDS+=               gkrellm-share-${GKRELLM_VERSI
 USE_TOOLS+=            pkg-config
 PTHREAD_OPTS+=         require
 RCD_SCRIPTS=           gkrellmd
-CONF_FILES=            ${PREFIX:Q}/share/examples/gkrellm-server/gkrellmd.conf 
${PREFIX:Q}/etc/gkrellmd.conf
+EGDIR=                 ${PREFIX}/share/examples/gkrellm-server
+CONF_FILES=            ${EGDIR}/gkrellmd.conf ${PKG_SYSCONFDIR}/gkrellmd.conf
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,7 +30,7 @@ PKG_SUPPORTED_OPTIONS=        glib1
 SUBST_CLASSES+=                gkprefix
 SUBST_STAGE.gkprefix=  post-patch
 SUBST_FILES.gkprefix=  server/gkrellmd.h
-SUBST_SED.gkprefix=    -e '/GKRELLMD_SYS_ETC/{s!/etc!${PREFIX}&!;}'
+SUBST_SED.gkprefix=    -e '/GKRELLMD_SYS_ETC/{s!/etc!${PKG_SYSCONFDIR}!;}'
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/examples/gkrellm-server