[csw-devel] SF.net SVN: gar:[7533] csw/mgar/pkg/postgresql/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Wed Dec 2 10:07:33 CET 2009


Revision: 7533
          http://gar.svn.sourceforge.net/gar/?rev=7533&view=rev
Author:   wahwah
Date:     2009-12-02 09:07:27 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
postgresql: Symlinks for contrib, trying to make smf work

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/trunk/Makefile
    csw/mgar/pkg/postgresql/trunk/checksums
    csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2009-12-02 03:43:03 UTC (rev 7532)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2009-12-02 09:07:27 UTC (rev 7533)
@@ -82,7 +82,7 @@
 #
 # NO_ISAEXEC = 1
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-includes=/opt/csw/include
 CONFIGURE_ARGS_isa-sparcv8 += --with-libraries=/opt/csw/lib/32
 CONFIGURE_ARGS_isa-i386    += --with-libraries=/opt/csw/lib/32
@@ -90,10 +90,29 @@
 CONFIGURE_ARGS_isa-amd64   += --with-libraries=/opt/csw/lib/64
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
 
+# # Perl support only in the 32-bit version
+# CONFIGURE_ARGS_isa-sparcv8 += --with-perl
+# CONFIGURE_ARGS_isa-i386 += --with-perl
 
+# # Python support in 32-bit only
+# CONFIGURE_ARGS_isa-sparcv8 += --with-python
+# CONFIGURE_ARGS_isa-i386 += --with-python
+
+CONFIGURE_ARGS += --with-gssapi
+# CONFIGURE_ARGS += --with-krb5
+CONFIGURE_ARGS += --with-pam
+# CONFIGURE_ARGS += --with-bonjour
+CONFIGURE_ARGS += --with-openssl
+CONFIGURE_ARGS += --with-libxml
+CONFIGURE_ARGS += --with-libxslt
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
+
+# Skipping tests to save time during packaging, and to enable x86 builds.
+SKIPTEST = 1
 TEST_TARGET = check
 
-EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p"
+# What's that for?
+# EXTRA_PAX_ARGS = -s ",^\./opt/csw/postgresql/share/doc,./opt/csw/share/doc/postgresql,p"
 
 PKGFILES_CSWpostgresqldoc = $(PKGFILES_DOC)
 PKGFILES_CSWpostgresqldevel  = $(PKGFILES_DEVEL)
@@ -102,13 +121,35 @@
 PKGFILES_CSWlibpq += $(libdir)/64
 PKGFILES_CSWlibpq += $(libdir)/32
 
-INITSMF = /etc$(prefix)/init\.d/cswpostgres-$(BASE_VERSION)
+INITSMF = /etc$(prefix)/init\.d/cswpostgresql_$(BASE_VERSION)
 USERGROUP = /etc$(prefix)/pkg/postgresql-$(BASE_VERSION)
 PRESERVECONF = $(sysconfdir)/postgresql\.conf
 
-BIN_NAMES  = clusterdb createdb createlang createuser dropdb droplang dropuser
-BIN_NAMES += ecpg initdb pg_config pg_controldata pg_ctl pg_dump pg_dumpall
-BIN_NAMES += pg_resetxlog pg_restore postgres postmaster psql reindexdb
+BIN_NAMES  = clusterdb
+BIN_NAMES += createdb
+BIN_NAMES += createlang
+BIN_NAMES += createuser
+BIN_NAMES += dropdb
+BIN_NAMES += droplang
+BIN_NAMES += dropuser
+BIN_NAMES += ecpg
+BIN_NAMES += initdb
+BIN_NAMES += oid2name
+BIN_NAMES += pg_config
+BIN_NAMES += pg_controldata
+BIN_NAMES += pg_ctl
+BIN_NAMES += pg_dump
+BIN_NAMES += pg_dumpall
+BIN_NAMES += pg_resetxlog
+BIN_NAMES += pg_restore
+BIN_NAMES += pg_standby
+BIN_NAMES += pgbench
+BIN_NAMES += postgres
+BIN_NAMES += postmaster
+BIN_NAMES += psql
+BIN_NAMES += reindexdb
+BIN_NAMES += vacuumdb
+BIN_NAMES += vacuumlo
 
 PGDATA = $(localstatedir)/pgdata
 
@@ -139,10 +180,10 @@
 		-e 's+ at sysconfdir@+$(sysconfdir)+' \
 		-e 's+ at bindir@+$(bindir)+' \
 		< $(FILEDIR)/cswpostgres.tmpl \
-		> $(WORKDIR)/cswpostgres
+		> $(WORKDIR)/cswpostgres_$(BASE_VERSION)
 	ginstall \
-		$(WORKDIR)/cswpostgres \
-		$(PKGROOT)/etc$(prefix)/init.d/cswpostgres-$(BASE_VERSION)
+		$(WORKDIR)/cswpostgres_$(BASE_VERSION) \
+		$(PKGROOT)/etc$(prefix)/init.d/cswpostgres_$(BASE_VERSION)
 	ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(GARNAME)
 	sed -e 's+ at PGDATA@+$(PGDATA)+' \
 		< $(FILEDIR)/cswusergroup.tmpl \

Modified: csw/mgar/pkg/postgresql/trunk/checksums
===================================================================
--- csw/mgar/pkg/postgresql/trunk/checksums	2009-12-02 03:43:03 UTC (rev 7532)
+++ csw/mgar/pkg/postgresql/trunk/checksums	2009-12-02 09:07:27 UTC (rev 7533)
@@ -1,5 +1,5 @@
 6e4e2a7755acf94bc83200a308e21ef3  README-CSW.txt
-922febb720931220e272c2872ebf47e4  cswpostgres.tmpl
+e6f5d88d673c79e3948bf0fde2ba282f  cswpostgres.tmpl
 9e1e49d76fee70cb8e2d49304695ec89  cswusergroup.tmpl
 f2015af17bacbbfe140daf0d1067f9c9  postgresql-8.4.1.tar.bz2
 8237c74666058f607f5418e3b57c74a9  postgresql.conf.tmpl

Modified: csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl	2009-12-02 03:43:03 UTC (rev 7532)
+++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl	2009-12-02 09:07:27 UTC (rev 7533)
@@ -4,10 +4,14 @@
 # PostgreSQL startup script - part of the CSWpostgresql package
 # mark at blastwave.org
 # 
-# 2009-11-29:  Parametrized file locations
-#              Maciej Blizinski (maciej at opencsw.org)
+# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
+#   - Parametrized file locations
+#   - Style changes
+#              
 #
-# Variables to substitute:
+# This files is a template.  The following variables need to be substituted
+# before it can be run:
+#
 # - PGDATA
 # - bindir
 # - sysconfdir
@@ -27,6 +31,8 @@
 # version - it checks if the 64-bit server was last run. If so,
 # it forces the 64-bit server, otherwise it won't start up!
 # And vice-versa for the 32-bit server...
+#
+# This version doesn't check the i386/amd64 architectures.
 if [ -f "${PGDATA}/postmaster.opts" ]; then
   if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then
     echo ${PGCTL} | grep "sparcv8" > /dev/null
@@ -47,14 +53,14 @@
     PGINIT=@bindir@/sparcv8/initdb
   else
   	echo "Couldn't detect whether the previously run version was 32 or 64-bit."
+  	echo "Running the default."
   	PGCTL=@bindir@/pg_ctl
   	PGINIT=@bindir@/initdb
   fi
 fi
 
 # Exit if postgres user hasn't been created.
-grep '^postgres:' /etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
+if ! grep '^postgres:' /etc/passwd >/dev/null; then
         getent passwd postgres >/dev/null
         if [ $? -ne 0 ] ; then
                exit 0
@@ -65,7 +71,7 @@
 # a directory that they can read
 cd /var/tmp
 
-case "${1}" in
+case "$1" in
 start)
       if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
          # PostgreSQL data directory exists and is populated
@@ -110,4 +116,4 @@
 
 esac
 
-# vim:set sw=2 ts=2 sts=2 expandtab:
+# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:


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