From 433a901ea2a9297d5f23808a8a98c79514f9c88d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sun, 6 Aug 2006 13:58:34 +0000 Subject: [PATCH] * cosmetical changes at pkgsel.in and pkg_conf/ --- pkg_conf/apache.conf | 1 - pkg_conf/dropbear.conf | 1 - pkg_conf/firefox.conf | 1 - pkg_conf/flashplayer.conf | 1 - pkg_conf/mod_python.conf | 4 ++-- pkg_conf/mod_security.conf | 2 +- pkg_conf/mozplugger.conf | 1 - pkg_conf/mplayerplug-in.conf | 1 - pkg_conf/openssh.conf | 1 - pkg_conf/php.conf | 1 - pkg_conf/qmail.conf | 5 +++-- pkg_conf/runit.conf | 1 - pkg_conf/samba.conf | 1 + pkg_conf/subversion.conf | 1 - pkg_conf/sudo.conf | 1 - pkg_conf/thunderbird.conf | 1 - pkgsel.in | 1 - 17 files changed, 7 insertions(+), 18 deletions(-) diff --git a/pkg_conf/apache.conf b/pkg_conf/apache.conf index 43dede4..8bfea87 100644 --- a/pkg_conf/apache.conf +++ b/pkg_conf/apache.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/dropbear.conf b/pkg_conf/dropbear.conf index f37ae68..f9ad55d 100644 --- a/pkg_conf/dropbear.conf +++ b/pkg_conf/dropbear.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/firefox.conf b/pkg_conf/firefox.conf index 6b3e875..72c9172 100644 --- a/pkg_conf/firefox.conf +++ b/pkg_conf/firefox.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/flashplayer.conf b/pkg_conf/flashplayer.conf index 0cb02d9..6007f31 100644 --- a/pkg_conf/flashplayer.conf +++ b/pkg_conf/flashplayer.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/mod_python.conf b/pkg_conf/mod_python.conf index 13239ed..badde0f 100644 --- a/pkg_conf/mod_python.conf +++ b/pkg_conf/mod_python.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # @@ -12,9 +11,10 @@ # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -prefix_auto=0 + pkgprefix -t apache prefix=`pkgprefix apache` +prefix_auto=0 set_confopt hook_add postmake 5 'mnemosyne_modpython_addconf' diff --git a/pkg_conf/mod_security.conf b/pkg_conf/mod_security.conf index 345e7bf..36b5285 100644 --- a/pkg_conf/mod_security.conf +++ b/pkg_conf/mod_security.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # @@ -12,6 +11,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. # --- SDE-COPYRIGHT-NOTE-END --- + hook_add postmake 5 'modsec_install_conf' modsec_install_conf() { cat <<-EOT > $sysconfdir/conf.d/mod_security.conf-dist diff --git a/pkg_conf/mozplugger.conf b/pkg_conf/mozplugger.conf index db51ffb..18fa982 100644 --- a/pkg_conf/mozplugger.conf +++ b/pkg_conf/mozplugger.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/mplayerplug-in.conf b/pkg_conf/mplayerplug-in.conf index 8e665bb..bfe5035 100644 --- a/pkg_conf/mplayerplug-in.conf +++ b/pkg_conf/mplayerplug-in.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/openssh.conf b/pkg_conf/openssh.conf index 18ae1b6..1d44ed8 100644 --- a/pkg_conf/openssh.conf +++ b/pkg_conf/openssh.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/php.conf b/pkg_conf/php.conf index ccc12e9..874d499 100644 --- a/pkg_conf/php.conf +++ b/pkg_conf/php.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/qmail.conf b/pkg_conf/qmail.conf index 7be2cfe..8a9b7c8 100644 --- a/pkg_conf/qmail.conf +++ b/pkg_conf/qmail.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # @@ -12,7 +11,9 @@ # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -prefix_auto=0; prefix=opt/qmail + +prefix=opt/qmail +prefix_auto=0 set_confopt controldir="${sysconfdir#$root/}/control" diff --git a/pkg_conf/runit.conf b/pkg_conf/runit.conf index 1ed933f..f0e3023 100644 --- a/pkg_conf/runit.conf +++ b/pkg_conf/runit.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/samba.conf b/pkg_conf/samba.conf index d2013e1..f28a3f7 100644 --- a/pkg_conf/samba.conf +++ b/pkg_conf/samba.conf @@ -11,6 +11,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. # --- SDE-COPYRIGHT-NOTE-END --- + if pkginstalled openldap; then pkgprefix -t openldap hook_add postmake 5 'cp -v examples/LDAP/samba.schema $( pkgprefix sysconfdir openldap )/schema/' diff --git a/pkg_conf/subversion.conf b/pkg_conf/subversion.conf index 3a6cf90..f4ec26e 100644 --- a/pkg_conf/subversion.conf +++ b/pkg_conf/subversion.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/sudo.conf b/pkg_conf/sudo.conf index 6ed2517..d325820 100644 --- a/pkg_conf/sudo.conf +++ b/pkg_conf/sudo.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkg_conf/thunderbird.conf b/pkg_conf/thunderbird.conf index 60a55ce..800654b 100644 --- a/pkg_conf/thunderbird.conf +++ b/pkg_conf/thunderbird.conf @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # diff --git a/pkgsel.in b/pkgsel.in index c506ffe..bcd7e4e 100644 --- a/pkgsel.in +++ b/pkgsel.in @@ -1,4 +1,3 @@ -#!/bin/sh # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. #