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

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sun Dec 18 23:52:46 CET 2011


Revision: 16566
          http://gar.svn.sourceforge.net/gar/?rev=16566&view=rev
Author:   guengel
Date:     2011-12-18 22:52:46 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
postgresql/branches/postgresql-8.4-raos: Recipe without -contrib.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2011-12-18 21:36:51 UTC (rev 16565)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2011-12-18 22:52:46 UTC (rev 16566)
@@ -89,10 +89,10 @@
 # This BUILD is NOT READY!  It needs work before it's usable.
 
 NAME = postgresql
-BASE_VERSION = 8.3
+BASE_VERSION = 8.4
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 17
+PATCHLEVEL = 10
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = apps
 
@@ -329,7 +329,7 @@
 PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
 ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1
 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  =  .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.html
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  =  .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
 
 PACKAGES += CSWlibecpg-compat3
 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat
@@ -380,7 +380,7 @@
 CONFIGURE_ARGS += --localstatedir=$(PGDATA)
 CONFIGURE_ARGS += --with-includes=$(includedir)
 CONFIGURE_ARGS += --with-libraries=$(libdir)
-CONFIGURE_ARGS += --with-docdir=$(PGDOCDIR)
+CONFIGURE_ARGS += --docdir=$(PGDOCDIR)
 # configure complains that we are not thread-safe, wtf? --raos
 #CONFIGURE_ARGS += --enable-thread-safety
 
@@ -422,16 +422,13 @@
 	fi
 	@$(MAKECOOKIE)
 
-post-build-modulated:
-	$(BUILD_ENV) gmake -C $(WORKSRC)/contrib all
-	@$(MAKECOOKIE)
+# post-build-modulated:
+# 	$(BUILD_ENV) gmake -C $(WORKSRC)/contrib all
+# 	@$(MAKECOOKIE)
 
-post-install-modulated:
-	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
-	ginstall -d -m 755 $(DESTDIR)$(prefix)/bin
-	[ -r $(DESTDIR)$(bindir)/pg_config ] && \
-	gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true
-	@$(MAKECOOKIE)
+# post-install-modulated:
+# 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
+# 	@$(MAKECOOKIE)
 
 post-merge:
 # Create my alternatives files

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums	2011-12-18 21:36:51 UTC (rev 16565)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums	2011-12-18 22:52:46 UTC (rev 16566)
@@ -1 +1 @@
-cedfbcdb153291c0762492ef34fa7b41  postgresql-8.3.17.tar.bz2
+6fd9b76e1d4df479e0b5402c88b1860e  postgresql-8.4.10.tar.bz2

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch	2011-12-18 21:36:51 UTC (rev 16565)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch	2011-12-18 22:52:46 UTC (rev 16566)
@@ -1,45 +0,0 @@
-From bcfc4c25ea42d70719bc62a9674b2832b106f466 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Sat, 10 Dec 2011 16:41:08 +0100
-Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check
-
----
- src/test/regress/GNUmakefile |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index da117dc..471cef8 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -141,7 +141,8 @@ tablespace-setup:
- ##
- 
- check: all
--	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
-+	install -d /var/tmp/pgsql/tmp_check
-+	./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
- 
- installcheck: all
- 	./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
-@@ -160,7 +161,8 @@ bigtest: all
- 	./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big 
- 
- bigcheck: all
--	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
-+	install -d /var/tmp/pgsql/tmp_check
-+	./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big
- 
- 
- ##
-@@ -174,7 +176,7 @@ clean distclean maintainer-clean: clean-lib
- 	rm -f $(output_files) $(input_files) pg_regress_main.o pg_regress.o pg_regress$(X)
- # things created by various check targets
- 	rm -rf testtablespace
--	rm -rf results tmp_check log
-+	rm -rf results /var/tmp/pgsql/tmp_check log
- 	rm -f regression.diffs regression.out regress.out run_check.out
- ifeq ($(PORTNAME), cygwin)
- 	rm -f regress.def
--- 
-1.7.6.1
-

Added: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch	2011-12-18 22:52:46 UTC (rev 16566)
@@ -0,0 +1,42 @@
+From 8ea189fd88c2e2fb0c0d5df0e9addcd07b7a637d Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 18 Dec 2011 22:09:16 +0100
+Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check
+
+---
+ src/test/regress/GNUmakefile |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
+index 83b02cb..85884ee 100644
+--- a/src/test/regress/GNUmakefile
++++ b/src/test/regress/GNUmakefile
+@@ -141,7 +141,8 @@ tablespace-setup:
+ pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+ 
+ check: all
+-	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
++	install -d /var/tmp/pgsql/tmp_check
++	$(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
+ 
+ installcheck: all
+ 	$(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule
+@@ -160,7 +161,7 @@ bigtest: all
+ 	$(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big 
+ 
+ bigcheck: all
+-	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
++	$(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
+ 
+ 
+ ##
+@@ -173,5 +174,5 @@ clean distclean maintainer-clean: clean-lib
+ # things created by various check targets
+ 	rm -f $(output_files) $(input_files)
+ 	rm -rf testtablespace
+-	rm -rf results tmp_check log
++	rm -rf results /var/tmp/pgsql/tmp_check log
+ 	rm -f regression.diffs regression.out regress.out run_check.out
+-- 
+1.7.6.1
+

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