[pkgsrc/trunk]: pkgsrc/mk Set DFLT_PKG_SYSCONDIR to the location that PKG_SYS...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fc4f2a89cac
branches:  trunk
changeset: 471566:6fc4f2a89cac
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 29 06:49:04 2004 +0000

description:
Set DFLT_PKG_SYSCONDIR to the location that PKG_SYSCONFDIR would have
been set to if it hadn't been overridden by PKG_SYSCONFDIR.<pkg>.  This
can be used in /etc/mk.conf to re-override certain PKG_SYSCONFDIR.<pkg>
in /etc/mk.conf from various package Makefiles, e.g.

        PKG_SYSCONFDIR.openssl=         ${DFLT_PKG_SYSCONFDIR}
        PKG_SYSCONFDIR.tcp_wrappers=    ${DFLT_PKG_SYSCONFDIR}

diffstat:

 mk/bsd.pkg.mk |  48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diffs (66 lines):

diff -r 0819436e35a0 -r 6fc4f2a89cac mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Mar 29 06:47:30 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Mar 29 06:49:04 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1427 2004/03/27 08:06:24 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1428 2004/03/29 06:49:04 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1331,33 +1331,33 @@
 # Config file related settings - see Packages.txt
 #
 PKG_SYSCONFVAR?=       ${PKGBASE}
+PKG_SYSCONFSUBDIR?=    # empty
+.if ${PKG_INSTALLATION_TYPE} == "overwrite"
+PKG_SYSCONFDEPOTBASE=  # empty
+PKG_SYSCONFBASEDIR=    ${PKG_SYSCONFBASE}
+.else
+.  if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \
+      !empty(PKG_SYSCONFBASE:M${PREFIX}/*)
+PKG_SYSCONFDEPOTBASE=  # empty
+PKG_SYSCONFBASEDIR=    ${PKG_SYSCONFBASE}
+.    if !empty(CONF_DEPENDS)
+_PLIST_IGNORE_FILES+=  ${PKG_SYSCONFDIR:S,^${PREFIX}/,,}
+.    endif
+.  else
+PKG_SYSCONFDEPOTBASE=  ${PKG_SYSCONFBASE}/${DEPOT_SUBDIR}
+PKG_SYSCONFBASEDIR=    ${PKG_SYSCONFDEPOTBASE}/${PKGNAME}
+.  endif
+.endif
+.if empty(PKG_SYSCONFSUBDIR)
+DFLT_PKG_SYSCONFDIR:=  ${PKG_SYSCONFBASEDIR}
+.else
+DFLT_PKG_SYSCONFDIR:=  ${PKG_SYSCONFBASEDIR}/${PKG_SYSCONFSUBDIR}
+.endif
+PKG_SYSCONFDIR=                ${DFLT_PKG_SYSCONFDIR}
 .if defined(PKG_SYSCONFDIR.${PKG_SYSCONFVAR})
 PKG_SYSCONFDIR=                ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}}
 PKG_SYSCONFBASEDIR=    ${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}}
 PKG_SYSCONFDEPOTBASE=  # empty
-.else
-PKG_SYSCONFSUBDIR?=    # empty
-.  if ${PKG_INSTALLATION_TYPE} == "overwrite"
-PKG_SYSCONFDEPOTBASE=  # empty
-PKG_SYSCONFBASEDIR=    ${PKG_SYSCONFBASE}
-.  else
-.    if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \
-        !empty(PKG_SYSCONFBASE:M${PREFIX}/*)
-PKG_SYSCONFDEPOTBASE=  # empty
-PKG_SYSCONFBASEDIR=    ${PKG_SYSCONFBASE}
-.      if !empty(CONF_DEPENDS)
-_PLIST_IGNORE_FILES+=  ${PKG_SYSCONFDIR:S,^${PREFIX}/,,}
-.      endif
-.    else
-PKG_SYSCONFDEPOTBASE=  ${PKG_SYSCONFBASE}/${DEPOT_SUBDIR}
-PKG_SYSCONFBASEDIR=    ${PKG_SYSCONFDEPOTBASE}/${PKGNAME}
-.    endif
-.  endif
-.  if empty(PKG_SYSCONFSUBDIR)
-PKG_SYSCONFDIR=                ${PKG_SYSCONFBASEDIR}
-.  else
-PKG_SYSCONFDIR=                ${PKG_SYSCONFBASEDIR}/${PKG_SYSCONFSUBDIR}
-.  endif
 .endif
 
 CONFIGURE_ENV+=                PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"