Wed Aug 4 06:00:55 2010 UTC ()
Prepare for databases/postgresql84-dblink


(mbalmer)
diff -r1.5 -r1.6 pkgsrc/databases/postgresql84/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/postgresql84/files/Makefile.libtool
diff -r0 -r1.1 pkgsrc/databases/postgresql84/patches/patch-ao
cvs diff -r1.5 -r1.6 pkgsrc/databases/postgresql84/Attic/distinfo (switch to unified diff)

--- pkgsrc/databases/postgresql84/Attic/distinfo 2010/05/20 12:36:38 1.5
+++ pkgsrc/databases/postgresql84/Attic/distinfo 2010/08/04 06:00:55 1.6
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.5 2010/05/20 12:36:38 adam Exp $ 1$NetBSD: distinfo,v 1.6 2010/08/04 06:00:55 mbalmer Exp $
2 2
3SHA1 (postgresql-8.4.4.tar.bz2) = 02592977a601976f8bae7bc3a5c69710d4d0344d 3SHA1 (postgresql-8.4.4.tar.bz2) = 02592977a601976f8bae7bc3a5c69710d4d0344d
4RMD160 (postgresql-8.4.4.tar.bz2) = d2d45112c19a2f20d49ab82bd8f86b6ace7decd3 4RMD160 (postgresql-8.4.4.tar.bz2) = d2d45112c19a2f20d49ab82bd8f86b6ace7decd3
5Size (postgresql-8.4.4.tar.bz2) = 13853838 bytes 5Size (postgresql-8.4.4.tar.bz2) = 13853838 bytes
6SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f 6SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
7SHA1 (patch-ab) = 3cf9c7f0f812d2e41681281538c3f707cec232c3 7SHA1 (patch-ab) = 3cf9c7f0f812d2e41681281538c3f707cec232c3
8SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb 8SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
9SHA1 (patch-ad) = fb75df841bbcc25e840ed9c2fed59232d7189200 9SHA1 (patch-ad) = fb75df841bbcc25e840ed9c2fed59232d7189200
10SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936 10SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
11SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214 11SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
12SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64 12SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
13SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc 13SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
14SHA1 (patch-an) = a1e7f421a101cf9ccddcaf3ce17aa1847cf76310 14SHA1 (patch-an) = a1e7f421a101cf9ccddcaf3ce17aa1847cf76310
 15SHA1 (patch-ao) = 81e2ecb62e78e7f5103314db03b7cbb367ee9f10
cvs diff -r1.2 -r1.3 pkgsrc/databases/postgresql84/files/Attic/Makefile.libtool (switch to unified diff)

--- pkgsrc/databases/postgresql84/files/Attic/Makefile.libtool 2010/08/01 17:01:02 1.2
+++ pkgsrc/databases/postgresql84/files/Attic/Makefile.libtool 2010/08/04 06:00:55 1.3
@@ -1,145 +1,149 @@ @@ -1,145 +1,149 @@
1#------------------------------------------------------------------------- 1#-------------------------------------------------------------------------
2# 2#
3# Makefile.libtool 3# Makefile.libtool
4# Common rules for buildling libtool archives 4# Common rules for buildling libtool archives
5# 5#
6# IDENTIFICATION 6# IDENTIFICATION
7# $NetBSD: Makefile.libtool,v 1.2 2010/08/01 17:01:02 jdolecek Exp $ 7# $NetBSD: Makefile.libtool,v 1.3 2010/08/04 06:00:55 mbalmer Exp $
8# 8#
9#------------------------------------------------------------------------- 9#-------------------------------------------------------------------------
10 10
11## 11##
12## Hacks/workarounds for makefiles in certain directories 12## Hacks/workarounds for makefiles in certain directories
13## 13##
14 14
15# The following directories are building loadable shared modules, not 15# The following directories are building loadable shared modules, not
16# shared libraries. 16# shared libraries.
17# 17#
18ifneq (,$(findstring src/backend/utils/mb/conversion_procs/,$(subdir))) 18ifneq (,$(findstring src/backend/utils/mb/conversion_procs/,$(subdir)))
19shmodule = yes 19shmodule = yes
20else 20else
21ifneq (,$(findstring src/backend/snowball,$(subdir))) 21ifneq (,$(findstring src/backend/snowball,$(subdir)))
22shmodule = yes 22shmodule = yes
23else 23else
24ifneq (,$(findstring src/pl/,$(subdir))) 24ifneq (,$(findstring src/pl/,$(subdir)))
25shmodule = yes 25shmodule = yes
26else 26else
27ifneq (,$(findstring contrib/adminpack,$(subdir))) 27ifneq (,$(findstring contrib/adminpack,$(subdir)))
28shmodule = yes 28shmodule = yes
29else 29else
30ifneq (,$(findstring contrib/pgcrypto,$(subdir))) 30ifneq (,$(findstring contrib/pgcrypto,$(subdir)))
31shmodule = yes 31shmodule = yes
32else 32else
 33ifneq (,$(findstring contrib/dblink,$(subdir)))
 34shmodule = yes
 35else
33shmodule = no 36shmodule = no
34endif 37endif
35endif 38endif
36endif 39endif
37endif 40endif
38endif 41endif
 42endif
39 43
40# Fix dependencies in some makefiles that assume the target matches 44# Fix dependencies in some makefiles that assume the target matches
41# %.o so that when built for libtool, the target matches the corresponding 45# %.o so that when built for libtool, the target matches the corresponding
42# %.lo. 46# %.lo.
43# 47#
44ifeq ($(subdir), src/interfaces/ecpg/ecpglib) 48ifeq ($(subdir), src/interfaces/ecpg/ecpglib)
45path.lo: path.c $(top_builddir)/src/port/pg_config_paths.h 49path.lo: path.c $(top_builddir)/src/port/pg_config_paths.h
46endif 50endif
47 51
48ifeq ($(subdir), src/interfaces/libpq) 52ifeq ($(subdir), src/interfaces/libpq)
49fe-connect.lo: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h 53fe-connect.lo: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
50endif 54endif
51 55
52ifeq ($(subdir), src/pl/plpgsql/src) 56ifeq ($(subdir), src/pl/plpgsql/src)
53pl_gram.lo pl_handler.lo pl_comp.lo pl_exec.lo pl_funcs.lo: plpgsql.h 57pl_gram.lo pl_handler.lo pl_comp.lo pl_exec.lo pl_funcs.lo: plpgsql.h
54pl_gram.lo: $(srcdir)/pl_scan.c 58pl_gram.lo: $(srcdir)/pl_scan.c
55endif 59endif
56 60
57 61
58## 62##
59## VARIABLE DEFINITIONS 63## VARIABLE DEFINITIONS
60## 64##
61 65
62# Loadable shared modules are named differently from shared libraries 66# Loadable shared modules are named differently from shared libraries
63# and are installed into $(pkglibdir). 67# and are installed into $(pkglibdir).
64# 68#
65ifeq ($(shmodule),yes) 69ifeq ($(shmodule),yes)
66ltlib = $(NAME)$(DLSUFFIX) 70ltlib = $(NAME)$(DLSUFFIX)
67ltmodule = -module 71ltmodule = -module
68rpathdir = $(pkglibdir) 72rpathdir = $(pkglibdir)
69else 73else
70ltlib = lib$(NAME)$(DLSUFFIX) 74ltlib = lib$(NAME)$(DLSUFFIX)
71ltmodule = 75ltmodule =
72endif 76endif
73 77
74DLSUFFIX = .la 78DLSUFFIX = .la
75SO_MAJOR_VERSION?=0 79SO_MAJOR_VERSION?=0
76SO_MINOR_VERSION?=0 80SO_MINOR_VERSION?=0
77 81
78LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) 82LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS)
79LTLINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(ltmodule) -rpath $(rpathdir) -version-info $(SO_MAJOR_VERSION):$(SO_MINOR_VERSION) 83LTLINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(ltmodule) -rpath $(rpathdir) -version-info $(SO_MAJOR_VERSION):$(SO_MINOR_VERSION)
80LTOBJS = $(OBJS:%.o=%.lo) 84LTOBJS = $(OBJS:%.o=%.lo)
81 85
82# Define INSTALL_SHLIB and shlib for the benefit of Makefiles for 86# Define INSTALL_SHLIB and shlib for the benefit of Makefiles for
83# loadable modules that have their own target for installing the 87# loadable modules that have their own target for installing the
84# module. 88# module.
85# 89#
86INSTALL_LTLIB = $(LIBTOOL) --mode=install $(INSTALL) 90INSTALL_LTLIB = $(LIBTOOL) --mode=install $(INSTALL)
87INSTALL_STLIB = $(INSTALL_LTLIB) 91INSTALL_STLIB = $(INSTALL_LTLIB)
88INSTALL_SHLIB = $(INSTALL_LTLIB) 92INSTALL_SHLIB = $(INSTALL_LTLIB)
89shlib = $(ltlib) 93shlib = $(ltlib)
90 94
91%.lo : %.c 95%.lo : %.c
92 $(LTCOMPILE) -c $< -o $@ 96 $(LTCOMPILE) -c $< -o $@
93 97
94 98
95## 99##
96## BUILD 100## BUILD
97## 101##
98 102
99.PHONY: all-lib all-static-lib all-shared-lib all-la-lib 103.PHONY: all-lib all-static-lib all-shared-lib all-la-lib
100all-lib all-static-lib all-shared-lib: all-la-lib 104all-lib all-static-lib all-shared-lib: all-la-lib
101 105
102all-la-lib: $(ltlib) 106all-la-lib: $(ltlib)
103 107
104$(ltlib): $(LTOBJS) 108$(ltlib): $(LTOBJS)
105 $(LTLINK) -o $@ $(LTOBJS) $(SHLIB_LINK) 109 $(LTLINK) -o $@ $(LTOBJS) $(SHLIB_LINK)
106 110
107 111
108## 112##
109## INSTALL 113## INSTALL
110## 114##
111 115
112.PHONY: install-lib install-lib-static install-lib-shared installdirs-lib install-lib-la 116.PHONY: install-lib install-lib-static install-lib-shared installdirs-lib install-lib-la
113install-lib install-static-lib install-shared-lib: install-lib-la 117install-lib install-static-lib install-shared-lib: install-lib-la
114 118
115install-lib-la: $(ltlib) 119install-lib-la: $(ltlib)
116ifeq ($(shmodule),yes) 120ifeq ($(shmodule),yes)
117 $(INSTALL_LTLIB) $< $(DESTDIR)$(pkglibdir)/$(shlib) 121 $(INSTALL_LTLIB) $< $(DESTDIR)$(pkglibdir)/$(shlib)
118else 122else
119 $(INSTALL_LTLIB) $< $(DESTDIR)$(libdir)/$(ltlib) 123 $(INSTALL_LTLIB) $< $(DESTDIR)$(libdir)/$(ltlib)
120endif 124endif
121 125
122installdirs-lib: 126installdirs-lib:
123ifeq ($(shmodule),yes) 127ifeq ($(shmodule),yes)
124 $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' 128 $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)'
125else 129else
126 $(mkinstalldirs) '$(DESTDIR)$(libdir)' 130 $(mkinstalldirs) '$(DESTDIR)$(libdir)'
127endif 131endif
128 132
129 133
130## 134##
131## UNINSTALL 135## UNINSTALL
132## 136##
133 137
134.PHONY: uninstall-lib 138.PHONY: uninstall-lib
135uninstall-lib: 139uninstall-lib:
136 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(ltlib) 140 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(ltlib)
137 141
138 142
139## 143##
140## CLEAN 144## CLEAN
141## 145##
142 146
143.PHONY: clean-lib 147.PHONY: clean-lib
144clean-lib: 148clean-lib:
145 $(LIBTOOL) --mode=clean rm -f $(ltlib) $(LTOBJS) 149 $(LIBTOOL) --mode=clean rm -f $(ltlib) $(LTOBJS)
File Added: pkgsrc/databases/postgresql84/patches/Attic/patch-ao
--- contrib/dblink/dblink.c.orig	2010-08-01 14:56:33.000000000 +0200
+++ contrib/dblink/dblink.c	2010-08-01 14:56:47.000000000 +0200
@@ -58,7 +58,7 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/dynahash.h"
-#include "utils/fmgroids.h"
+#include "postgresql/server/utils/fmgroids.h"
 #include "utils/hsearch.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"