* converted pkg_${foo}.conf into pkg_conf/$foo.conf with a parse-config director

parse-config

@@ -0,0 +1,19 @@
+#!/bin/sh
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: target/mnemosyne2/parse-config
+# Copyright (C) 2004 - 2005 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+target=mnemosyne2
+if [ -f $base/target/$target/pkg_conf/$pkg.conf ]; then
+	. $base/target/$target/pkg_conf/$pkg.conf
+fi

pkg_apache.conf → pkg_conf/apache.conf

@@ -2,7 +2,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_apache.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/apache.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -12,6 +12,7 @@
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
 # --- T2-COPYRIGHT-NOTE-END ---
+
 if [ "${SDECFG_PKG_APACHE_DOCROOT:0:1}" == "/" ]; then
 	docroot=$( echo "$SDECFG_PKG_APACHE_DOCROOT" | sed -e 's,/\([^/]*\).*,\1,g' )
 	if [ -z "$( echo $flistroot | tr ' ' '\n' | grep -e "^$docroot\$" )" ]; then
@@ -22,6 +23,7 @@ if [ "${SDECFG_PKG_APACHE_DOCROOT:0:1}" == "/" ]; then
 fi
 
 hook_add postmake 5 'mnemosyne_adapt_apache'
+
 mnemosyne_adapt_apache() {
 	mkdir -vp $sysconfdir/{conf,hosts}.d
 
@@ -36,5 +38,3 @@ mnemosyne_adapt_apache() {
 		Include $sysconfdir/hosts.d/*.conf
 	EOT
 }
-
-. $confdir/apache.conf

pkg_firefox.conf → pkg_conf/firefox.conf

@@ -1,5 +1,17 @@
 #!/bin/sh
-. $confdir/$pkg.conf
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: target/mnemosyne2/pkg_conf/firefox.conf
+# Copyright (C) 2004 - 2005 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- T2-COPYRIGHT-NOTE-END ---
 
 hook_add postmake 5 'mnemosyne_firefox_openurl'
 hook_add postmake 6 'mnemosyne_firefox_prefs'

pkg_mod_mono.conf → pkg_conf/mod_mono.conf

@@ -1,7 +1,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_mod_mono.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/mod_mono.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.

pkg_mod_python.conf → pkg_conf/mod_python.conf

@@ -2,7 +2,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_php.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/mod_python.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -25,5 +25,3 @@ mnemosyne_modpython_addconf() {
 	LoadModule python_module modules/mod_python.so
 	EOT
 }
-
-[ ! -f $confdir/$pkg.conf ] || . $confdir/$pkg.conf

pkg_mod_security.conf → pkg_conf/mod_security.conf

@@ -2,7 +2,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_mod_security.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/mod_security.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -21,5 +21,3 @@ modsec_install_conf() {
 		httpd.conf.example-minimal \
 		>> $sysconfdir/conf.d/mod_security.conf-dist
 }
-
-. $confdir/$pkg.conf

pkg_openssh.conf → pkg_conf/openssh.conf

@@ -1,7 +1,8 @@
+#!/bin/sh
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_openssh.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/openssh.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -11,6 +12,7 @@
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
 # --- T2-COPYRIGHT-NOTE-END ---
+
 pkg_openssh_authkeys() {
 	local adminkeys=$base/config/$config/authorized_keys
 	local sshdir=$xroot/root/.ssh
@@ -24,5 +26,3 @@ pkg_openssh_authkeys() {
 }
 
 hook_add postmake 5 'pkg_openssh_authkeys'
-
-. $confdir/$pkg.conf

pkg_php.conf → pkg_conf/php.conf

@@ -2,7 +2,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_php.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/php.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -25,5 +25,3 @@ mnemosyne_php_addconf() {
 	AddHandler application/x-httpd-php .php
 	EOT
 }
-
-. $confdir/php.conf

pkg_qmail.conf → pkg_conf/qmail.conf

@@ -2,7 +2,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_qmail.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/qmail.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -18,5 +18,3 @@ set_confopt
 controldir="${sysconfdir#$root/}/control"
 queuedir="var/spool/qmail"
 logdir="var/opt/qmail/log"
-
-. $confdir/qmail.conf

pkg_samba.conf → pkg_conf/samba.conf

@@ -1,7 +1,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_samba.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/samba.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -16,5 +16,3 @@ if pkginstalled openldap; then
 	hook_add postmake 5 'cp -v examples/LDAP/samba.schema $( pkgprefix sysconfdir openldap )/schema/'
 	hook_add postmake 5 'cp -v examples/LDAP/README $( pkgprefix sysconfdir openldap )/samba.README'
 fi
-
-. $confdir/$pkg.conf

pkg_subversion.conf → pkg_conf/subversion.conf

@@ -2,7 +2,7 @@
 # --- T2-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: target/mnemosyne/pkg_subversion.conf
+# T2 SDE: target/mnemosyne2/pkg_conf/subversion.conf
 # Copyright (C) 2004 - 2005 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -27,5 +27,3 @@ if pkginstalled apache; then
 		EOT
 	}
 fi
-
-. $confdir/$pkg.conf

pkg_thunderbird.conf → pkg_conf/thunderbird.conf

@@ -1,5 +1,17 @@
 #!/bin/sh
-. $confdir/thunderbird.conf
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: target/mnemosyne2/pkg_conf/thunderbird.conf
+# Copyright (C) 2004 - 2005 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- T2-COPYRIGHT-NOTE-END ---
 
 hook_add postmake 6 'mnemosyne_thunderbird_mailto'
 hook_add postmake 6 'mnemosyne_thunderbird_prefs'