[csw-devel] SF.net SVN: gar:[7670] csw/mgar/pkg/apache2/trunk
rthurner at users.sourceforge.net
rthurner at users.sourceforge.net
Fri Dec 18 17:28:54 CET 2009
Revision: 7670
http://gar.svn.sourceforge.net/gar/?rev=7670&view=rev
Author: rthurner
Date: 2009-12-18 16:28:54 +0000 (Fri, 18 Dec 2009)
Log Message:
-----------
apache2 - change to only one package, apache2, for the moment
Modified Paths:
--------------
csw/mgar/pkg/apache2/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall
Removed Paths:
-------------
csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall
Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 16:20:00 UTC (rev 7669)
+++ csw/mgar/pkg/apache2/trunk/Makefile 2009-12-18 16:28:54 UTC (rev 7670)
@@ -4,7 +4,7 @@
GARVERSION = 2.2.14
CATEGORIES = server
-DESCRIPTION = A high performance Unix-based HTTP server.
+DESCRIPTION = A high performance HTTP server.
define BLURB
Apache is the world\'s most popular HTTP server, being quite possibly the
best around in terms of functionality, efficiency, security and speed.
@@ -14,72 +14,19 @@
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-# <maciej> All the admfiles can go away. Move the static prototype files
-# aside, replace them with PKGFILES_CSWfoo = regexp lines.
-
-# <maciej> The PACKAGES variable tell GAR which packages to build
+# The PACKAGES variable tell GAR which packages to build
PACKAGES = CSWapache2
-PACKAGES += CSWapache2c
-PACKAGES += CSWapache2rt
-PACKAGES += CSWap2prefork
-PACKAGES += CSWap2suexec
-PACKAGES += CSWapache2-devel
-PACKAGES += CSWapache2-manual
# packages with dashes need this so gar does not thing -devel is a version number
-CATALOGNAME_CSWapache2-devel = apache2_devel
-CATALOGNAME_CSWapache2-manual = apache2_manual
+# CATALOGNAME_CSWapache2-devel = apache2_devel
# Descriptions for every package
-SPKG_DESC_CSWapache2 = Apache 2.2 web server
-SPKG_DESC_CSWapache2c = Apache 2.2 web server (core)
-SPKG_DESC_CSWapache2rt = Apache 2.2 runtime libraries
-SPKG_DESC_CSWap2prefork = Apache 2.2 prefork MPM
-SPKG_DESC_CSWap2suexec = Apache 2.2 suEXEC support
-SPKG_DESC_CSWapache2-devel = Apache 2.2 development support
-SPKG_DESC_CSWapache2-manual = Apache 2.2 manual
+# SPKG_DESC_CSWapache2 = $(DESCRIPTION)
# Contents for every package.
-# <maciej> The CSWapache2 package is supposed to be an empty meta-package
-PKGFILES_CSWapache2 = non-existing
-# <maciej> You don't define PKGFILES_CSWapache2c, it's going to be the default,
+# You don't define PKGFILES_CSWapache2, it's going to be the default,
# catch-all package.
-# PKGFILES_CSWapache2c =
-# <maciej> The runtime package might use the GAR shortcut for the runtime
-# files.
-PKGFILES_CSWapache2rt = $(PKGFILES_RT)
-PKGFILES_CSWap2prefork = $(sbindir)/httpd.prefork
-PKGFILES_CSWap2suexec = $(libexecdir)/mod_suexec.so
-PKGFILES_CSWap2suexec += $(mandir)/man8/suexec.8
-PKGFILES_CSWap2suexec += $(sbindir)/suexec
+# PKGFILES_CSWapache2 =
-# <maciej> The rest of PKGFILES is for you to do. You look at the rest of the
-# prototype files and construct appropriate regexes for every package.
-# <rt> - this tseems not to work
-# PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
-# PKGFILES_CSWapache2-manual = $(PKGFILES_DOC)
-# PKGFILES_CSWapache2-manual += $(prefix)/etc/extra/httpd-manual.conf
-
-# <maciej> You don't need the $(call admfiles,...) any more. But you might
-# need the files/*.prototype files to figure out how to populate packages by
-# writing regexes.
-## # Dummy toplevel package
-## DISTFILES += $(call admfiles,CSWapache2,prototype)
-## # Runtime
-## DISTFILES += $(call admfiles,CSWapache2rt,prototype checkinstall)
-## # Server (core)
-## CSWapache2c_admfiles = prototype postinstall space
-## DISTFILES += $(call admfiles,CSWapache2c,$(CSWapache2c_admfiles))
-## # Prefork MPM (default)
-## CSWap2prefork_admfiles = prototype postinstall postremove space
-## DISTFILES += $(call admfiles,CSWap2prefork,$(CSWap2prefork_admfiles))
-## # mod_suexec
-## CSWap2suexec_admfiles = prototype postinstall preremove
-## DISTFILES += $(call admfiles,CSWap2suexec,$(CSWap2suexec_admfiles))
-## # Manual
-## DISTFILES += $(call admfiles,CSWapache2-manual,prototype)
-## # Development support
-## DISTFILES += $(call admfiles,CSWapache2-devel,prototype)
-
# Standard package bits
DISTFILES += CSWapache2.killproc cswapache2
@@ -89,31 +36,19 @@
DISTFILES += httpd-ssl.conf.CSW
DISTFILES += update20to22
-REQUIRED_PKGS_CSWapache2 = CSWapache2c CSWap2prefork
-REQUIRED_PKGS_CSWapache2c = CSWapache2rt CSWbdb CSWexpat CSWgdbm CSWiconv
-REQUIRED_PKGS_CSWapache2c += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib
-REQUIRED_PKGS_CSWapache2c += CSWsqlite3 CSWcswclassutils
-REQUIRED_PKGS_CSWapache2rt = CSWbdb CSWexpat CSWgdbm CSWggettextrt CSWgsed
-REQUIRED_PKGS_CSWapache2rt += CSWiconv CSWoldaprt CSWosslrt CSWperl CSWsasl
-REQUIRED_PKGS_CSWapache2rt += CSWzlib CSWsqlite3 CSWlibnet CSWsqlite3rt
-REQUIRED_PKGS_CSWap2prefork = CSWapache2c CSWapache2rt CSWbdb CSWexpat CSWgdbm
-REQUIRED_PKGS_CSWap2prefork += CSWiconv CSWlibnet CSWoldaprt CSWosslrt CSWsasl
-REQUIRED_PKGS_CSWap2prefork += CSWzlib CSWsqlite3
-REQUIRED_PKGS_CSWap2suexec = CSWapache2
-REQUIRED_PKGS_CSWapache2-devel = CSWapache2rt
-REQUIRED_PKGS_CSWapache2-manual = CSWapache2
+REQUIRED_PKGS_CSWapache2 = CSWbdb CSWexpat CSWgdbm CSWiconv
+REQUIRED_PKGS_CSWapache2 += CSWlibnet CSWoldaprt CSWosslrt CSWsasl CSWzlib
+REQUIRED_PKGS_CSWapache2 += CSWsqlite3rt CSWsqlite3 CSWcswclassutils
+REQUIRED_PKGS_CSWapache2 += CSWggettextrt CSWgsed
+REQUIRED_PKGS_CSWapache2 += CSWperl
# The SMF support: you don't need to specify cswinitsmf any more. You need to
# make sure the the /etc/opt/csw/init.d/cswapache file gets installed during
# the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to
# the Makefile.
-# The following line can go:
-## SPKG_CLASSES_CSWapache2c = none cswinitsmf
-
pre-configure-modulated:
- (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); \
- ./buildconf)
+ (cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
# Build Configuration
CONFIGURE_ARGS += --with-mpm=prefork
Copied: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall (from rev 7664, csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall)
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2009-12-18 16:28:54 UTC (rev 7670)
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+
+UPGRADE_CONFIGS="\
+ httpd.conf \
+ ssl.conf \
+ extra/httpd-ssl.conf \
+ extra/httpd-mpm.conf \
+ "
+# Don't overwrite config if it exists
+warn_update=0
+echo "Checking configuration files:"
+for file in $UPGRADE_CONFIGS; do
+ config=$AP2_CONFDIR/$file
+ if [ -f "$config" ]; then
+ if [ -n "`grep mod_auth.so $config`" ]; then
+ echo "Updating syntax of $config to Apache 2.2"
+ $AP2_BINDIR/update20to22 $config
+ warn_update=1
+ fi
+ # Ensure that the PidFile is pointed at ServerRoot relative path.
+ perl -i -plne 's#PidFile /var#PidFile var#'
+ elif [ -f "$config.CSW" ]; then
+ echo "Creating $config from template"
+ hostname=`hostname`
+ sed -e s, at HOSTNAME@,$hostname,g \
+ -e s, at USER@,nobody,g \
+ -e s, at GROUP@,nobody,g \
+ -e s, at ADMIN@,root@$hostname,g $config.CSW > $config
+ fi
+done
+
+if [ $warn_update -eq 1 ] ; then
+cat << EOF
+
+*** NOTICE: Existing configuration files have been updated to
+*** Apache 2.2 syntax. Additional files can be updated using
+*** /opt/csw/apache2/sbin/update20to22.
+
+EOF
+fi
+
+# Copy templates
+template_list="\
+ share/htdocs/index.html \
+ etc/extra/httpd-autoindex.conf \
+ etc/extra/httpd-dav.conf \
+ etc/extra/httpd-default.conf \
+ etc/extra/httpd-info.conf \
+ etc/extra/httpd-languages.conf \
+ etc/extra/httpd-multilang-errordoc.conf \
+ etc/extra/httpd-userdir.conf \
+ etc/extra/httpd-vhosts.conf \
+ etc/magic \
+ etc/mime.types"
+
+echo Copying CSW templates:
+for file in $template_list
+do
+ filepath=$AP2_PREFIX/$file
+ if [ -f "$filepath" ]; then
+ echo " preserving $filepath"
+ elif [ -f "$filepath.CSW" ]; then
+ echo " creating $filepath"
+ cp $filepath.CSW $filepath
+ fi
+done
+
+exit 0
Deleted: csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall 2009-12-18 16:20:00 UTC (rev 7669)
+++ csw/mgar/pkg/apache2/trunk/files/CSWapache2c.postinstall 2009-12-18 16:28:54 UTC (rev 7670)
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_LIBEXEC=$AP2_PREFIX/libexec
-AP2_CONFDIR=$AP2_PREFIX/etc
-AP2_EXTRADIR=$AP2_CONFDIR/extra
-
-UPGRADE_CONFIGS="\
- httpd.conf \
- ssl.conf \
- extra/httpd-ssl.conf \
- extra/httpd-mpm.conf \
- "
-# Don't overwrite config if it exists
-warn_update=0
-echo "Checking configuration files:"
-for file in $UPGRADE_CONFIGS; do
- config=$AP2_CONFDIR/$file
- if [ -f "$config" ]; then
- if [ -n "`grep mod_auth.so $config`" ]; then
- echo "Updating syntax of $config to Apache 2.2"
- $AP2_BINDIR/update20to22 $config
- warn_update=1
- fi
- # Ensure that the PidFile is pointed at ServerRoot relative path.
- perl -i -plne 's#PidFile /var#PidFile var#'
- elif [ -f "$config.CSW" ]; then
- echo "Creating $config from template"
- hostname=`hostname`
- sed -e s, at HOSTNAME@,$hostname,g \
- -e s, at USER@,nobody,g \
- -e s, at GROUP@,nobody,g \
- -e s, at ADMIN@,root@$hostname,g $config.CSW > $config
- fi
-done
-
-if [ $warn_update -eq 1 ] ; then
-cat << EOF
-
-*** NOTICE: Existing configuration files have been updated to
-*** Apache 2.2 syntax. Additional files can be updated using
-*** /opt/csw/apache2/sbin/update20to22.
-
-EOF
-fi
-
-# Copy templates
-template_list="\
- share/htdocs/index.html \
- etc/extra/httpd-autoindex.conf \
- etc/extra/httpd-dav.conf \
- etc/extra/httpd-default.conf \
- etc/extra/httpd-info.conf \
- etc/extra/httpd-languages.conf \
- etc/extra/httpd-multilang-errordoc.conf \
- etc/extra/httpd-userdir.conf \
- etc/extra/httpd-vhosts.conf \
- etc/magic \
- etc/mime.types"
-
-echo Copying CSW templates:
-for file in $template_list
-do
- filepath=$AP2_PREFIX/$file
- if [ -f "$filepath" ]; then
- echo " preserving $filepath"
- elif [ -f "$filepath.CSW" ]; then
- echo " creating $filepath"
- cp $filepath.CSW $filepath
- fi
-done
-
-exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list