CVS commit: pkgsrc/net/DarwinStreamingServer

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Mon Aug  7 07:42:34 UTC 2017

Modified Files:
        pkgsrc/net/DarwinStreamingServer: Makefile

Log Message:
Fix creation of the config directory used by DarwinStreamingServer.

There is no REQUIRE_DIRS used by pkgsrc.  I think that REQD_DIRS
was meant to be used; however, REQD_DIRS is also the wrong way to
create the config directory.

Set PKG_SYSCONFSUBDIR to "streaming" to automatically create
${PKG_SYSCONFBASE}/streaming during package installation, and
consistently use ${PKG_SYSCONFDIR} within the package Makefile to
refer to the config directory path.

Bump the PKGREVISION due to the changes in the resulting package
scripts.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/DarwinStreamingServer/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/DarwinStreamingServer/Makefile
diff -u pkgsrc/net/DarwinStreamingServer/Makefile:1.20 pkgsrc/net/DarwinStreamingServer/Makefile:1.21
--- pkgsrc/net/DarwinStreamingServer/Makefile:1.20      Mon Jun  5 14:24:15 2017
+++ pkgsrc/net/DarwinStreamingServer/Makefile   Mon Aug  7 07:42:34 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2017/06/05 14:24:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2017/08/07 07:42:34 jlam Exp $
 
 DISTNAME=      DarwinStreamingSrvr5.5.5-Source
 PKGNAME=       DarwinStreamingServer-5.5.5
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    net multimedia
 MASTER_SITES=  http://static.macosforge.org/dss/downloads/
 
@@ -70,11 +70,11 @@ REPLACE_PERL+=      WebAdmin/WebAdminHtml/vie
 REPLACE_PERL+= WebAdmin/src/streamingadminserver.pl
 REPLACE_PERL+= WinNTSupport/WinPasswdAssistant.pl
 
-REQUIRE_DIRS+= ${PKG_SYSCONFDIR}/streaming
-CONF_FILES=    share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/streaming/qtgroups
-CONF_FILES+=   share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/streaming/qtusers
-CONF_FILES+=   share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/streaming/relayconfig.xml
-CONF_FILES+=   share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streaming/streamingserver.xml
+PKG_SYSCONFSUBDIR=     streaming
+CONF_FILES=    share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/qtgroups
+CONF_FILES+=   share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/qtusers
+CONF_FILES+=   share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/relayconfig.xml
+CONF_FILES+=   share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streamingserver.xml
 
 SUBST_CLASSES+=                makefile
 SUBST_STAGE.makefile=  post-patch
@@ -109,7 +109,7 @@ SUBST_MESSAGE.path= Fixing paths
 SUBST_FILES.path+=     defaultPaths.h
 SUBST_FILES.path+=     WebAdmin/src/streamingadminserver.pl
 SUBST_FILES.path+=     streamingserver.xml-POSIX
-SUBST_SED.path+=       -e "s|/etc/streaming|${PKG_SYSCONFDIR}/streaming|"
+SUBST_SED.path+=       -e "s|/etc/streaming|${PKG_SYSCONFDIR}|"
 SUBST_SED.path+=       -e "s|/movies|/share/streaming/movies|"
 SUBST_SED.path+=       -e "s|/usr/local|${PREFIX}|"
 SUBST_SED.path+=       -e "s|/sbin/StreamingServer|/libexec/StreamingServer|"