[csw-devel] SF.net SVN: gar:[13655] csw/mgar/pkg/postgresql/branches/postgresql-9.0
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Mar 7 22:12:08 CET 2011
Revision: 13655
http://gar.svn.sourceforge.net/gar/?rev=13655&view=rev
Author: wahwah
Date: 2011-03-07 21:12:08 +0000 (Mon, 07 Mar 2011)
Log Message:
-----------
postgresql: Removed /usr/local occurrences
Also, fixed CSWlibpq4 to obsolete CSWlibpq.
Modified Paths:
--------------
csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
Added Paths:
-----------
csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch
csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch
Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 18:58:50 UTC (rev 13654)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-03-07 21:12:08 UTC (rev 13655)
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
#
-# Based on the Ubuntu PostgreSQL package.
+# The idea is based on the Ubuntu PostgreSQL package.
# This BUILD is NOT READY! It needs work before it's usable.
@@ -65,6 +65,9 @@
DISTFILES += README-CSW.txt
DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall
+PATCHFILES += 0001-postgresql-Removed-two-usr-local-occurrences.patch
+PATCHFILES += 0003-postgresql-Removed-usr-local-from-ecpg.c.patch
+
PACKAGES += CSWpostgresql
CATALOGNAME_CSWpostgresql = postgresql
SPKG_DESC_CSWpostgresql = An advanced open source database
@@ -270,6 +273,7 @@
PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*)
SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4
RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt
+OBSOLETES_CSWlibpq4 = CSWlibpq
PACKAGES += CSWlibpgtypes1
CATALOGNAME_CSWlibpgtypes1 = libpgtypes1
@@ -309,6 +313,22 @@
RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5
OBSOLETES_CSWlibecpg-compat2 = CSWlibpq
+
+# This occurrence is okay.
+# # On HPUX platforms, gcc is usually configured to search for libraries
+# # in /usr/local/lib, but ld won't do so. Add an explicit -L switch so
+# # ld can find the same libraries gcc does. Make sure it goes after any
+# # -L switches provided explicitly.
+# ifeq ($(GCC), yes)
+# SHLIB_LINK += -L/usr/local/lib
+# endif
+#
+# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/postgresql/pgxs/src/Makefile.shlib
+# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/pgxs/src/Makefile.shlib
+
+# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/ecpg
+# CHECKPKG_OVERRIDES_CSWpostgresql-90 += file-with-bad-content|/usr/local|root/opt/csw/lib/postgresql/9.0/bin/sparcv9/ecpg
+
include gar/category.mk
CFLAGS := $(filter-out -I%,$(CFLAGS))
Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0001-postgresql-Removed-two-usr-local-occurrences.patch 2011-03-07 21:12:08 UTC (rev 13655)
@@ -0,0 +1,37 @@
+From e145d2b1f349867b3414324e9a219f31a40b95d7 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 7 Mar 2011 22:06:01 +0100
+Subject: [PATCH] postgresql: Removed two /usr/local occurrences
+
+---
+ src/bin/psql/psqlrc.sample | 2 +-
+ src/interfaces/libpq/pg_service.conf.sample | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/psql/psqlrc.sample b/src/bin/psql/psqlrc.sample
+index 6054fab..7bcc816 100644
+--- a/src/bin/psql/psqlrc.sample
++++ b/src/bin/psql/psqlrc.sample
+@@ -3,5 +3,5 @@
+ --
+ -- This file is read before the .psqlrc file in the user's home directory.
+ --
+--- Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
++-- Copy this to your sysconf directory (typically /etc/opt/csw/postgresql/9.0) and
+ -- rename it psqlrc.
+diff --git a/src/interfaces/libpq/pg_service.conf.sample b/src/interfaces/libpq/pg_service.conf.sample
+index de60028..bd7a16b 100644
+--- a/src/interfaces/libpq/pg_service.conf.sample
++++ b/src/interfaces/libpq/pg_service.conf.sample
+@@ -8,7 +8,7 @@
+ # to look up such parameters. A sample configuration for postgres is
+ # included in this file. Lines beginning with '#' are comments.
+ #
+-# Copy this to your sysconf directory (typically /usr/local/pgsql/etc) and
++# Copy this to your sysconf directory (typically /etc/opt/csw/postgresql/9.0/) and
+ # rename it pg_service.conf.
+ #
+ #
+--
+1.7.3.2
+
Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0003-postgresql-Removed-usr-local-from-ecpg.c.patch 2011-03-07 21:12:08 UTC (rev 13655)
@@ -0,0 +1,25 @@
+From 351cb3ace190b99541c0a1b278ea60b7d953c5f8 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 7 Mar 2011 22:08:38 +0100
+Subject: [PATCH 3/3] postgresql: Removed /usr/local from ecpg.c
+
+---
+ src/interfaces/ecpg/preproc/ecpg.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
+index db52bf5..05cad72 100644
+--- a/src/interfaces/ecpg/preproc/ecpg.c
++++ b/src/interfaces/ecpg/preproc/ecpg.c
+@@ -253,7 +253,7 @@ main(int argc, char *const argv[])
+ }
+
+ add_include_path(".");
+- add_include_path("/usr/local/include");
++ add_include_path("/opt/csw/include");
+ get_include_path(my_exec_path, include_path);
+ add_include_path(include_path);
+ add_include_path("/usr/include");
+--
+1.7.3.2
+
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