[csw-devel] SF.net SVN: gar:[13440] csw/mgar/pkg/postgresql/branches/postgresql-9.0

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Tue Feb 22 11:17:11 CET 2011 

Revision: 13440
          http://gar.svn.sourceforge.net/gar/?rev=13440&view=rev
Author:   wahwah
Date:     2011-02-22 10:17:11 +0000 (Tue, 22 Feb 2011)

Log Message:
-----------
postgresql-9.0: Using OBSOLETES_CSWfoo for CSWlibpq

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2011-02-22 08:32:38 UTC (rev 13439)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2011-02-22 10:17:11 UTC (rev 13440)
@@ -37,11 +37,11 @@
 bindir = $(prefix)$(version_dependent)/bin
 sbindir_install = $(prefix)$(version_dependent)/sbin
 sbindir = $(prefix)$(version_dependent)/sbin
-libdir_install = $(prefix)$(version_dependent)/lib
 # libdir = $(prefix)$(version_dependent)/lib
 # Otherwise initdb can't find the right libraries, see:
 # http://archives.postgresql.org/pgsql-general/2010-01/msg00422.php
-libdir = $(abspath $(prefix)$(version_dependent)/lib/$(MM_LIBDIR))
+# libdir = $(abspath $(prefix)$(version_dependent)/lib/$(MM_LIBDIR))
+# libdir_install = $(prefix)$(version_dependent)/lib
 localstatedir = /var$(prefix)/$(NAME)/$(BASE_VERSION)
 sysconfdir = /etc$(prefix)/postgresql-common
 datadir = $(prefix)/share/$(NAME)/$(BASE_VERSION)
@@ -204,6 +204,7 @@
 SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5
 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt
 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWkrb5lib
+OBSOLETES_CSWlibpq5 += CSWlibpq
 
 PACKAGES += CSWlibecpg6
 CATALOGNAME_CSWlibecpg6 = libecpg6
@@ -211,6 +212,7 @@
 SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6
 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3
 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5
+OBSOLETES_CSWlibecpg6 += CSWlibpq
 
 PACKAGES += CSWlibecpg-compat3
 CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3
@@ -219,12 +221,14 @@
 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6
 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3
 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5
+OBSOLETES_CSWlibecpg-compat3 = CSWlibpq
 
 PACKAGES += CSWlibpgtypes3
 CATALOGNAME_CSWlibpgtypes3 = libpgtypes3
 PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0)
 PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3
+OBSOLETES_CSWlibpgtypes3 = CSWlibpq
 
 PACKAGES += CSWlibpq-dev
 CATALOGNAME_CSWlibpq-dev = libpq_dev
@@ -259,6 +263,7 @@
 PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3
 RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt
+OBSOLETES_CSWlibpq3 = CSWlibpq
 
 PACKAGES += CSWlibpq4
 CATALOGNAME_CSWlibpq4 = libpq4
@@ -270,11 +275,13 @@
 CATALOGNAME_CSWlibpgtypes1 = libpgtypes1
 PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1
+OBSOLETES_CSWlibpgtypes1 = CSWlibpq
 
 PACKAGES += CSWlibpgtypes2
 CATALOGNAME_CSWlibpgtypes2 = libpgtypes2
 PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*)
 SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2
+OBSOLETES_CSWlibpgtypes2 = CSWlibpq
 
 PACKAGES += CSWlibecpg4
 CATALOGNAME_CSWlibecpg4 = libecpg4
@@ -283,6 +290,7 @@
 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1
 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt
 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3
+OBSOLETES_CSWlibecpg4 += CSWlibpq
 
 PACKAGES += CSWlibecpg5
 CATALOGNAME_CSWlibecpg5 = libecpg5
@@ -290,6 +298,7 @@
 SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5
 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2
 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5
+OBSOLETES_CSWlibecpg5 += CSWlibpq
 
 PACKAGES += CSWlibecpg-compat2
 CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2
@@ -298,23 +307,8 @@
 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2
 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5
 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5
+OBSOLETES_CSWlibecpg-compat2 = CSWlibpq
 
-# The horrible transitional package
-PACKAGES += CSWlibpq
-PKGFILES_CSWlibpq += $(prefix)/postgresql.*
-SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4
-RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5
-
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))
@@ -350,38 +344,8 @@
 
 post-merge:
 	ginstall -m 755 -d $(PKGROOT)$(prefix)/bin
-	# for b in $(BIN_NAMES); do \
-	#   gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \
-	# done
 	ginstall -d $(PKGROOT)$(PGDATA)
-	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
-	mkdir -p $(PKGROOT)$(prefix)/lib
-	mkdir -p $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64)
-	for libname in libpq libecpg libecpg_compat libpgtypes; do \
-		mv $(PKGROOT)$(libdir)/$${libname}.so $(PKGROOT)$(prefix)/lib; \
-		mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \
-		mv $(PKGROOT)$(libdir)/$${libname}.so.* $(PKGROOT)$(prefix)/lib; \
-		mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so.* $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \
-	done
 	$(FILEDIR)/merge_legacy_libs.sh $(GARCH) $(FILEDIR) $(PKGROOT)/$(prefix)/lib
-
-	# Backward compatibility provided by CSWlibpq
-	mkdir -p $(PKGROOT)$(prefix)/postgresql/lib
-	mkdir -p $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64)
-	gln -s . $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT)
-	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(prefix)/postgresql/lib/64
-	gln -s $(ISA_DEFAULT) $(PKGROOT)$(prefix)/postgresql/lib/32
-	for f in $(PKGROOT)$(prefix)/lib/*.so.*; do \
-		ln -s \
-			../../lib/`basename $${f}` \
-			$(PKGROOT)$(prefix)/postgresql/lib; \
-	done
-	for f in $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64)/lib*.so.*; do \
-		ln -s \
-			../../lib/$(ISA_DEFAULT64)/`basename $${f}` \
-			$(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64); \
-	done
-
 	# Checks whether the pkgroot contents is OK.
 	$(FILEDIR)/check_pkgroot.sh "$(PKGROOT)"
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh	2011-02-22 08:32:38 UTC (rev 13439)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh	2011-02-22 10:17:11 UTC (rev 13440)
@@ -1,5 +1,9 @@
 #!/opt/csw/bin/bash
 # $Id$
+#
+# Designed to take care of deploying binary blobs from the files directory
+# onto the filesystem.  Each file has the file name, architecture and soname
+# encoded into the filename.
 
 set -u
 set -e


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