[csw-devel] SF.net SVN: gar:[16557] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sun Dec 18 14:44:44 CET 2011


Revision: 16557
          http://gar.svn.sourceforge.net/gar/?rev=16557&view=rev
Author:   guengel
Date:     2011-12-18 13:44:44 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
postgresql/branches/postgresql-8.3-raos: Put EXPANDVARS back in place. Bumped version 8.3.17.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-i386-libecpg.so.4.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv8-libecpg.so.4.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv9-libecpg.so.4.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-i386-libecpg.so.5.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv8-libecpg.so.5.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv9-libecpg.so.5.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-i386-libecpg_compat.so.2.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv8-libecpg_compat.so.2.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv9-libecpg_compat.so.2.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-i386-libpgtypes.so.1.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv8-libpgtypes.so.1.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv9-libpgtypes.so.1.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-i386-libpgtypes.so.2.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv8-libpgtypes.so.2.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv9-libpgtypes.so.2.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-i386-libpq.so.3.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv8-libpq.so.3.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv9-libpq.so.3.2
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-i386-libpq.so.4.1
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv8-libpq.so.4.1
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv9-libpq.so.4.1
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2011-12-18 09:01:01 UTC (rev 16556)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2011-12-18 13:44:44 UTC (rev 16557)
@@ -92,7 +92,7 @@
 BASE_VERSION = 8.3
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 16
+PATCHLEVEL = 17
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = apps
 
@@ -176,37 +176,32 @@
 INITSCRIPTFILETMPL	= $(INITSCRIPTFILE).tmpl
 INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT)
 
+# The postinstall script for the postgreSQL server
+SERVERPOSTINSTTMPL  = CSWpostgresql-server.postinstall.tmpl
+SERVERPOSTINST_VERSIONED = CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall
 
+
 # These are the alternatives provided for the packages.  I use them in the
 # recipe to iterate over all possible alternatives (see 'post-merge:')
 myALTERNATIVES= server client dev contrib
 
 POSTMSG = $(foreach n,$(myALTERNATIVES),$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg)
 
-
-# My sed, since EXPANDVARS has proven unreliable to me
-mySED = gsed -e 's|@USERGROUPFILE_VERSIONED@|$(USERGROUPFILE_VERSIONED)|g' \
-	-e 's|@CSWPGSQLCONFFILE_VERSIONED@|$(CSWPGSQLCONFFILE_VERSIONED)|g' \
-	-e 's|@INITSCRIPTFILE_VERSIONED@|$(INITSCRIPTFILE_VERSIONED)|g' \
-	-e 's|@NAME@|$(NAME)|g' \
-	-e 's|@VERSION@|$(VERSION)|g' \
-	-e 's|@BASE_VERSION_NODOT@|$(BASE_VERSION_NODOT)|g' \
-	-e 's|@PGLOCALSTATEDIR_BASE@|$(PGLOCALSTATEDIR_BASE)|g' \
-	-e 's|@PGDATA@|$(PGDATA)|g' \
-	-e 's|@sysconfdir@|$(sysconfdir)|g' \
-	-e 's|@bindir@|$(bindir)|g'
-
-
 MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 DISTFILES += README-CSW.txt
-DISTFILES += CSWpostgresql-server.postinstall.tmpl
+DISTFILES += $(SERVERPOSTINSTTMPL)
 DISTFILES += $(INITSCRIPTFILETMPL)
 DISTFILES += $(USERGROUPFILETMPL)
 DISTFILES += $(CSWPGSQLCONFFILETMPL)
 DISTFILES += $(notdir $(POSTMSG))
 NOCHECKSUM = $(notdir $(POSTMSG))
 
+EXPANDVARS  = $(CSWPGSQLCONFFILETMPL)
+EXPANDVARS += $(INITSCRIPTFILETMPL)
+EXPANDVARS += $(CSWPGSQLCONFFILETMPL)
+EXPANDVARS += $(SERVERPOSTINSTTMPL)
+EXPANDVARS += $(USERGROUPFILETMPL)
 
 # This patch will replace /usr/local/include by /opt/csw/include in
 # ecpg.c and thus silence a checkpkg error.
@@ -327,6 +322,8 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt
 # Those '/usr/local' are ok, they are in a HPUX section of the file
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
+# That's ok too, it's docbook stuff which we don't use in this build
+CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
 #ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i))
 
 PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
@@ -441,15 +438,6 @@
 	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i))))
 # Create the PGDATA directory
 	ginstall -d $(PKGROOT)$(PGDATA)
-# The usergroup file
-	ginstall -d $(PKGROOT)$(USERGROUPDIR)
-	$(mySED) $(FILEDIR)/$(USERGROUPFILETMPL) > $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
-# The init script
-	ginstall -d $(PKGROOT)$(sysconfdir)/init.d
-	$(mySED) $(FILEDIR)/$(INITSCRIPTFILETMPL) > $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
-	chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
-# The init script config
-	$(mySED) $(FILEDIR)/$(CSWPGSQLCONFFILETMPL) > $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
 # Adjust the man page names for man1
 	for f in $(PKGROOT)$(datadir)/man/man1/* ; do \
 		f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \
@@ -465,8 +453,21 @@
 	$(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n)))
 	@$(MAKECOOKIE)
 
+
 pre-package:
-	$(mySED) $(FILEDIR)/CSWpostgresql-server.postinstall.tmpl > $(WORKDIR)/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall
+# The postinstall for the server package
+	ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
+# The usergroup file
+	ginstall -d $(PKGROOT)$(USERGROUPDIR)
+	ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
+# The init script
+	ginstall -d $(PKGROOT)$(sysconfdir)/init.d
+	ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+# The init script config
+	ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
+	@$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 $(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))):
 	@echo " ==> Generating $(notdir $@)"

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums	2011-12-18 09:01:01 UTC (rev 16556)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums	2011-12-18 13:44:44 UTC (rev 16557)
@@ -1 +1 @@
-92004b0494b646748a1f562cea7d695e  postgresql-8.3.16.tar.bz2
+cedfbcdb153291c0762492ef34fa7b41  postgresql-8.3.17.tar.bz2

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl	2011-12-18 09:01:01 UTC (rev 16556)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl	2011-12-18 13:44:44 UTC (rev 16557)
@@ -9,16 +9,12 @@
 #   - Style changes
 #              
 #
-# This files is a template.  The following variables need to be substituted
-# before it can be run:
-#
-# - PGDATA
-# - bindir
-# - sysconfdir
 
+VERSION=@BASE_VERSION_NODOT@
+
 USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
-PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@
-PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@
+PGCTL=@bindir@/pg_ctl-${VERSION}
+PGINIT=@bindir@/initdb-${VERSION}
 
 # Read in the user configuration file
 [ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-i386-libecpg.so.4.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv8-libecpg.so.4.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv9-libecpg.so.4.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-i386-libecpg.so.5.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv8-libecpg.so.5.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv9-libecpg.so.5.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-i386-libecpg_compat.so.2.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv8-libecpg_compat.so.2.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv9-libecpg_compat.so.2.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-i386-libpgtypes.so.1.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv8-libpgtypes.so.1.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv9-libpgtypes.so.1.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-i386-libpgtypes.so.2.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv8-libpgtypes.so.2.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv9-libpgtypes.so.2.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-i386-libpq.so.3.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv8-libpq.so.3.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv9-libpq.so.3.2
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-i386-libpq.so.4.1
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv8-libpq.so.4.1
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv9-libpq.so.4.1
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh	2011-12-18 09:01:01 UTC (rev 16556)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh	2011-12-18 13:44:44 UTC (rev 16557)
@@ -1,41 +0,0 @@
-#!/opt/csw/bin/bash
-# $Id$
-
-set -u
-set -e
-set -x
-
-declare -r ARCH=$1
-declare -r SOURCE_DIR=$2
-declare -r TARGET_DIR=$3
-
-if [[ "${ARCH}" = "i386" ]]; then
-  archs="i386 amd64"
-elif [[ "${ARCH}" = "sparc" ]]; then
-  archs="sparcv8 sparcv9"
-else
-  echo "Wrong arch: ${ARCH}"
-  exit 1
-fi
-
-for arch in ${archs}; do
-  files=${SOURCE_DIR}/lib*-${arch}-*
-  for f in $files; do
-    if [[ -r ${f} ]]; then
-      bn=$(basename ${f})
-      soname=$(echo $bn | cut -d- -f1)
-      filename=$(echo $bn | cut -d- -f3)
-      echo + ${bn}
-      if [[ "${arch}" = "sparcv8" || "${arch}" = "i386" ]]; then
-        gcp ${SOURCE_DIR}/${bn} ${TARGET_DIR}/${filename}
-        gln -s ${filename} ${TARGET_DIR}/${soname}
-      else
-        mkdir -p ${TARGET_DIR}/${arch}
-        gcp ${SOURCE_DIR}/${bn} ${TARGET_DIR}/${arch}/${filename}
-        gln -s ${filename} ${TARGET_DIR}/${arch}/${soname}
-      fi
-    else
-      echo - ${f}
-    fi
-  done
-done

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