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

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sat Oct 5 18:41:27 CEST 2013


Revision: 22120
          http://gar.svn.sourceforge.net/gar/?rev=22120&view=rev
Author:   guengel
Date:     2013-10-05 16:41:25 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
postgresql/trunk: Recipe ready for 9.3.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/trunk/Makefile
    csw/mgar/pkg/postgresql/trunk/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch
    csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch
    csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch
    csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch
    csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2013-10-05 13:18:56 UTC (rev 22119)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2013-10-05 16:41:25 UTC (rev 22120)
@@ -133,8 +133,10 @@
 # 8.4 has removed ipcclean
 BIN_NAMES_SERVER	= postmaster initdb pg_controldata pg_ctl pg_resetxlog pg_receivexlog pg_basebackup postgres
 BIN_NAMES_DEVEL		= ecpg pg_config
-BIN_NAMES_CLIENT	= psql clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore reindexdb vacuumdb clusterdb
-BIN_NAMES_CONTRIB	= oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync pg_test_timing
+# 9.3 has introduced pg_isready
+BIN_NAMES_CLIENT	= psql clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore reindexdb vacuumdb clusterdb  pg_isready
+# 9.3 introduced pg_xlogdump
+BIN_NAMES_CONTRIB	= oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync pg_test_timing pg_xlogdump
 # These are shared objects used by the server. Please note, contrib installs
 # also shared object in the same place, so make sure you don't mix up things
 SO_NAMES_SERVER		 = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so
@@ -159,7 +161,7 @@
 SO_NAMES_CONTRIB	+= pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so
 SO_NAMES_CONTRIB	+= pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so
 SO_NAMES_CONTRIB	+= auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so dummy_seclabel.so
-SO_NAMES_CONTRIB	+= auth_delay.so file_fdw.so tcn.so
+SO_NAMES_CONTRIB	+= auth_delay.so file_fdw.so tcn.so postgres_fdw.so worker_spi.so
 # Those are the extension provided by contrib.
 #
 # This has been introduced with 9.1
@@ -170,7 +172,7 @@
 EXT_NAMES_CONTRIB	+= chkpass--1.0.sql chkpass.control chkpass--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= citext--1.0.sql citext.control citext--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= cube--1.0.sql cube.control cube--unpackaged--1.0.sql
-EXT_NAMES_CONTRIB	+= dblink--1.0.sql dblink.control dblink--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= dblink.control dblink--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= dict_int--1.0.sql dict_int.control dict_int--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= dict_xsyn--1.0.sql dict_xsyn.control dict_xsyn--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= earthdistance--1.0.sql earthdistance.control earthdistance--unpackaged--1.0.sql
@@ -184,14 +186,14 @@
 EXT_NAMES_CONTRIB	+= lo--1.0.sql lo.control lo--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= ltree--1.0.sql ltree.control ltree--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= moddatetime--1.0.sql moddatetime.control moddatetime--unpackaged--1.0.sql
-EXT_NAMES_CONTRIB	+= pageinspect--1.0.sql pageinspect.control pageinspect--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pageinspect.control pageinspect--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= pg_buffercache--1.0.sql pg_buffercache.control pg_buffercache--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= pgcrypto--1.0.sql pgcrypto.control pgcrypto--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= pg_freespacemap--1.0.sql pg_freespacemap.control pg_freespacemap--unpackaged--1.0.sql
-EXT_NAMES_CONTRIB	+= pgrowlocks--1.0.sql pgrowlocks.control pgrowlocks--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pgrowlocks.control pgrowlocks--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= pg_stat_statements--1.1.sql pg_stat_statements--1.0--1.1.sql pg_stat_statements.control pg_stat_statements--unpackaged--1.0.sql
-EXT_NAMES_CONTRIB	+= pgstattuple--1.0.sql pgstattuple.control pgstattuple--unpackaged--1.0.sql
-EXT_NAMES_CONTRIB	+= pg_trgm--1.0.sql pg_trgm.control pg_trgm--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pgstattuple.control pgstattuple--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pg_trgm.control pg_trgm--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= refint--1.0.sql refint.control refint--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= seg--1.0.sql seg.control seg--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= sslinfo--1.0.sql sslinfo.control sslinfo--unpackaged--1.0.sql
@@ -200,8 +202,10 @@
 EXT_NAMES_CONTRIB	+= timetravel--1.0.sql timetravel.control timetravel--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= tsearch2--1.0.sql tsearch2.control tsearch2--unpackaged--1.0.sql
 EXT_NAMES_CONTRIB	+= unaccent--1.0.sql unaccent.control unaccent--unpackaged--1.0.sql
-EXT_NAMES_CONTRIB	+= xml2--1.0.sql xml2.control xml2--unpackaged--1.0.sql
-EXT_NAMES_CONTRIB	+= tcn.control tcn--1.0.sql
+EXT_NAMES_CONTRIB	+= xml2--1.0.sql xml2.control xml2--unpackaged--1.0.sql postgres_fdw--1.0.sql postgres_fdw.control
+EXT_NAMES_CONTRIB	+= tcn.control tcn--1.0.sql dblink--1.0--1.1.sql dblink--1.1.sql
+EXT_NAMES_CONTRIB	+= pageinspect--1.0--1.1.sql pageinspect--1.1.sql pg_trgm--1.0--1.1.sql pg_trgm--1.1.sql
+EXT_NAMES_CONTRIB	+= pgrowlocks--1.0--1.1.sql pgrowlocks--1.1.sql pgstattuple--1.0--1.1.sql pgstattuple--1.1.sql
 # Miscellaneous files
 MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql
 MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql
@@ -274,16 +278,36 @@
 
 # This patch will replace /usr/local/include by /opt/csw/include in
 # ecpg.c and thus silence a checkpkg error.
-PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch
-# Test running on a NFS may fail. Thus we let the test run in
-# /var/tmp/pgsql92/tmp_check
-PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch
+PATCHFILES += 0000-ecpg-usr-local-include-replacement.patch
 # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
 # which isn't properly digested by Sun's ld
-PATCHFILES += 0002-Use-plain-rpath.patch
+PATCHFILES += 0000-Use-plain-rpath.patch
 # Please see comment in the patch.
-PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch
+PATCHFILES += 0000-Filter-out-compiler-optimization-for-pg_config.patch
 
+# We used to use a patch for the REINPLACE stuff below, but switched
+# to REINPLACE due to easier maintenance.
+#
+# Please make sure that 
+#
+#  /var/tmp/pgsql/$(BASE_VERSION_NODOT)
+#
+# has been created prior calling `gmake check'. (Can be done in the
+# custom check target below; see TEST_SCRIPTS)
+#
+# Rationale:
+# ----------
+#
+# We need to use a local storage for the tests, since tests may fail
+# when run in a NFS directory.
+REINPLACE_MATCH  = \./tmp_check
+REINPLACE_WITH   = /var/tmp/pgsql/$(BASE_VERSION_NODOT)/tmp_check
+# The list of files can be composed using 
+#  find work/build-isa-amd64/postgresql-X.Y.Z/ -name Makefile\* | xargs grep -l './tmp_check'
+REINPLACE_FILES  = src/Makefile.global.in
+REINPLACE_FILES += src/interfaces/ecpg/test/Makefile
+REINPLACE_FILES += src/test/isolation/Makefile
+
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
 PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED)
@@ -480,8 +504,16 @@
 
 # If the check is not called from within the $(WORKSRC) dir, it
 # fails. This behavior appeared with version 9.1.
+#
+# Also, we require /var/tmp/pgsql/$(BASE_VERSION_NODOT)/
+# to be created prior calling `gmake check' since
+# the checks only create the bottom level directory
+# and not any intermediate directories.
 test-custom:
+	rm -rf /var/tmp/pgsql/$(BASE_VERSION_NODOT)/
+	install -d /var/tmp/pgsql/$(BASE_VERSION_NODOT)/
 	cd $(WORKSRC) ; $(BUILD_ENV) gmake check
+	rm -rf /var/tmp/pgsql/$(BASE_VERSION_NODOT)/
 	@$(MAKECOOKIE)
 
 # This will generate the ALTERNATIVEs for the binaries in
@@ -531,9 +563,6 @@
 		echo "$(WORKSRC)/src/Makefile.global.in not found. Aborting" ; \
 		exit 1 ; \
 	fi
-	@echo " ===> Setting temp-install dir in $(WORKSRC)/src/Makefile.global.in"
-	gsed -i -r -e 's|\./tmp_check|/var/tmp/pgsql$(BASE_VERSION_NODOT)/tmp_check|g' -e 's|tmp_check/|/var/tmp/pgsql$(BASE_VERSION_NODOT)/tmp_check|g' \
-		$(WORKSRC)/src/Makefile.global.in
 	@$(MAKECOOKIE)
 
 post-build-modulated:
@@ -571,8 +600,8 @@
 # Adjust the man page names.
 	@echo " ===> Adjusting man page file names"
 	@for i in 1 5 ; do \
-		test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \
-		for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \
+		test -d $(PKGROOT)$(mandir)/man$$i || continue ; \
+		for f in $(PKGROOT)$(mandir)/man$$i/* ; do \
 			suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \
 			f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \
 			bname="`basename $${f_no_suffix}`" ; \
@@ -583,6 +612,13 @@
 			fi ; \
 		done ;\
 	done
+# Revert changes on man page name for devel binaries
+	@for f in $(BIN_NAMES_DEVEL) ; do \
+		for i in 1 5 ; do \
+			test -f $(PKGROOT)$(mandir)/man$$i/$$f-$(BASE_VERSION_NODOT).$$i || continue ; \
+			mv $(PKGROOT)$(mandir)/man$$i/$$f-$(BASE_VERSION_NODOT).$$i $(PKGROOT)$(mandir)/man$$i/$$f.$$i ; \
+		done ; \
+	done
 # Change path names in documentation
 	@echo " ===> Adjust path names in documentation"
 	@for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \

Added: csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch	2013-10-05 16:41:25 UTC (rev 22120)
@@ -0,0 +1,49 @@
+From a9443d614442bc01be357b83ddea2893007a0001 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Sat, 5 Oct 2013 16:52:55 +0200
+Subject: [PATCH] Filter out compiler optimization for pg_config
+
+For more information, see comments in this patch and
+https://www.opencsw.org/mantis/view.php?id=5025
+---
+ src/bin/pg_config/Makefile | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
+index 8df4a94..1bc1560 100644
+--- a/src/bin/pg_config/Makefile
++++ b/src/bin/pg_config/Makefile
+@@ -8,6 +8,18 @@
+ #
+ #-------------------------------------------------------------------------
+ 
++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization.
++# This doesn't pan out if PostgreSQL is compiled with compiler A, but
++# pg_config is called to compile software with compiler B. So, we filter out
++# known compiler optimization flags (SunStudio and GCC, so far).
++#
++# This var holds all the compiler optimizations that will be filtered out.
++# Please be aware, that this filtering has only been tested with GMAKE.
++#
++# See also
++#  https://www.opencsw.org/mantis/view.php?id=5025
++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO%
++
+ PGFILEDESC = "pg_config - report configuration information"
+ PGAPPICON=win32
+ 
+@@ -24,9 +36,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
+ override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
+ override CPPFLAGS += -DVAL_CC="\"$(CC)\""
+ override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
+-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\""
+ override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
+-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\""
+ override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
+ override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
+ override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
+-- 
+1.8.3.4
+

Deleted: csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch	2013-10-05 13:18:56 UTC (rev 22119)
+++ csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch	2013-10-05 16:41:25 UTC (rev 22120)
@@ -1,44 +0,0 @@
-From e02c1f65cb7bb300e5ce926b6d96d391f51c8c3b Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <rafisol at opencsw.org>
-Date: Sun, 16 Sep 2012 10:56:57 +0200
-Subject: [PATCH 0/2] Run tests in /var/tmp/pgsql92/tmp_check
-
----
- src/test/regress/GNUmakefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index 0239b6f..376631c 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -135,6 +135,7 @@ tablespace-setup:
- REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS)
- 
- check: all tablespace-setup
-+	install -d /var/tmp/pgsql92/tmp_check
- 	$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS)
- 
- installcheck: all tablespace-setup
-@@ -144,6 +145,7 @@ installcheck-parallel: all tablespace-setup
- 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
- 
- standbycheck: all
-+	install -d /var/tmp/pgsql92/tmp_check
- 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing
- 
- # old interfaces follow...
-@@ -153,9 +155,11 @@ runtest: installcheck
- runtest-parallel: installcheck-parallel
- 
- bigtest: all tablespace-setup
-+	install -d /var/tmp/pgsql92/tmp_check
- 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
- 
- bigcheck: all tablespace-setup
-+	install -d /var/tmp/pgsql92/tmp_check
- 	$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
- 
- 
--- 
-1.7.12
-

Added: csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch	2013-10-05 16:41:25 UTC (rev 22120)
@@ -0,0 +1,25 @@
+From 158e154cada106c38691140b578f7286be0aa387 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Sat, 5 Oct 2013 09:42:10 +0200
+Subject: [PATCH] Use plain rpath
+
+---
+ src/makefiles/Makefile.solaris | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
+index e459de3..a234c30 100644
+--- a/src/makefiles/Makefile.solaris
++++ b/src/makefiles/Makefile.solaris
+@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
+ export_dynamic = -Wl,-E
+ rpath = -Wl,-rpath,'$(rpathdir)'
+ else
+-rpath = -Wl,-R'$(rpathdir)'
++rpath = -R'$(rpathdir)'
+ endif
+ 
+ DLSUFFIX = .so
+-- 
+1.8.3.4
+

Added: csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch	2013-10-05 16:41:25 UTC (rev 22120)
@@ -0,0 +1,25 @@
+From a14f0984beedd1b816a1e1c7365180b89716a672 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Sun, 29 Sep 2013 15:41:42 +0200
+Subject: [PATCH] ecpg /usr/local/include replacement
+
+---
+ src/interfaces/ecpg/preproc/ecpg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
+index 7b2634d..2befa06 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.8.3.4
+

Deleted: csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch	2013-10-05 13:18:56 UTC (rev 22119)
+++ csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch	2013-10-05 16:41:25 UTC (rev 22120)
@@ -1,25 +0,0 @@
-From 3d38c6e422081129b880bf5bdd7ff8a7c370025a Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <rafisol at opencsw.org>
-Date: Sun, 16 Sep 2012 11:01:47 +0200
-Subject: [PATCH 1/2] ecpg /usr/local/include replacement
-
----
- src/interfaces/ecpg/preproc/ecpg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
-index 7e7bae3..2e9b28c 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.12
-

Deleted: csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch	2013-10-05 13:18:56 UTC (rev 22119)
+++ csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch	2013-10-05 16:41:25 UTC (rev 22120)
@@ -1,25 +0,0 @@
-From 127f64d1db4caf7674c739574abf5b3fbf72e784 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <rafisol at opencsw.org>
-Date: Sun, 16 Sep 2012 11:04:08 +0200
-Subject: [PATCH 2/2] Use plain rpath
-
----
- src/makefiles/Makefile.solaris | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
-index e459de3..8729ee8 100644
---- a/src/makefiles/Makefile.solaris
-+++ b/src/makefiles/Makefile.solaris
-@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
- export_dynamic = -Wl,-E
- rpath = -Wl,-rpath,'$(rpathdir)'
- else
--rpath = -Wl,-R'$(rpathdir)'
-+rpath = -R$(rpathdir)
- endif
- 
- DLSUFFIX = .so
--- 
-1.7.12
-

Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2013-10-05 13:18:56 UTC (rev 22119)
+++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2013-10-05 16:41:25 UTC (rev 22120)
@@ -1,29 +1,6 @@
-postgresql92 (9.2.4,REV=2013.04.06)
+postgresql93 (9.3.0,REV=2013.10.05)
 
-  * New upstream release 9.2.4.
+  * New upstream release 9.3.0.
 
- -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 13:24:31 +0200
+ -- Rafael Ostertag <raos at opencsw.org>  Sat, 05 Oct 2013 15:52:31 +0200
 
-
-postgresql92 (9.2.2,REV=2012.12.09)
-
-  * New upstream release 9.2.2.
-
-  * pg_config: do not emit compiler optimization flags (see
-	       https://www.opencsw.org/mantis/view.php?id=5025)
-
- -- Rafael Ostertag <raos at opencsw.org>  Sun, 09 Dec 2012 10:02:08 +0100
-
-
-postgresql92 (9.2.1,REV=2012.10.03)
-
-  * New upstream release 9.2.1
-
- -- Rafael Ostertag <raos at opencsw.org>  Tue, 02 Oct 2012 15:16:34 +0200
-
-
-postgresql92 (9.2.0,REV=2012.09.16)
-
-  * New upstream release 9.2.0
-
- -- Rafael Ostertag <raos at opencsw.org>  Sun, 16 Sep 2012 14:55:51 +0200

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