kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changes 8.3.9nb2:

Browse source 
* Make pgxs.mk and Makefile.shlib compatible with PostgreSQL 8.4.x
* Ready for PostGIS
This commit is contained in:
adam 2010-01-21 12:45:28 +00:00
parent 6be6637aca
commit 46d8dd5b0a
6 changed files with 90 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
databases/postgresql83-client/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.11 2010/01/17 12:02:11 wiz Exp $
# $NetBSD: Makefile,v 1.12 2010/01/21 12:45:28 adam Exp $
PKGNAME= postgresql83-client-${BASE_VERS}
PKGREVISION= 1
PKGREVISION= 2
COMMENT= PostgreSQL database client programs
PKG_DESTDIR_SUPPORT= user-destdir

4
databases/postgresql83-server/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.8 2010/01/17 12:02:11 wiz Exp $
# $NetBSD: Makefile,v 1.9 2010/01/21 12:45:28 adam Exp $
PKGNAME= postgresql83-server-${BASE_VERS}
PKGREVISION= 1
PKGREVISION= 2
COMMENT= PostgreSQL database server programs
PKG_DESTDIR_SUPPORT= user-destdir

4
databases/postgresql83-server/PLIST
View file

@ -1,8 +1,9 @@
@comment $NetBSD: PLIST,v 1.8 2009/12/16 14:23:13 adam Exp $
@comment $NetBSD: PLIST,v 1.9 2010/01/21 12:45:28 adam Exp $
${PG_SUBPREFIX}bin/postgres
${PG_SUBPREFIX}bin/postmaster
${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
${PG_SUBPREFIX}lib/postgresql/cyrillic_and_mic.la
${PG_SUBPREFIX}lib/postgresql/dict_snowball.la
${PG_SUBPREFIX}lib/postgresql/euc_cn_and_mic.la
${PG_SUBPREFIX}lib/postgresql/euc_jis_2004_and_shift_jis_2004.la
${PG_SUBPREFIX}lib/postgresql/euc_jp_and_sjis.la
@ -10,7 +11,6 @@ ${PG_SUBPREFIX}lib/postgresql/euc_kr_and_mic.la
${PG_SUBPREFIX}lib/postgresql/euc_tw_and_big5.la
${PG_SUBPREFIX}lib/postgresql/latin2_and_win1250.la
${PG_SUBPREFIX}lib/postgresql/latin_and_mic.la
${PG_SUBPREFIX}lib/postgresql/libdict_snowball.la
${PG_SUBPREFIX}lib/postgresql/plpgsql.la
${PG_SUBPREFIX}lib/postgresql/utf8_and_ascii.la
${PG_SUBPREFIX}lib/postgresql/utf8_and_big5.la

4
databases/postgresql83/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.9 2009/12/16 14:23:13 adam Exp $
$NetBSD: distinfo,v 1.10 2010/01/21 12:45:28 adam Exp $
SHA1 (postgresql-8.3.9.tar.bz2) = 5403f13bb14fe568e2b46a3350d6e28808d93a2c
RMD160 (postgresql-8.3.9.tar.bz2) = 0069606033d9572d7848a5914a274cabaed24007
@ -12,5 +12,5 @@ SHA1 (patch-af) = fcb43276c1f3349f62acfc37ac0bd6ccaae96f29
SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841
SHA1 (patch-aj) = 8fa23bf8e3aebe86025d4d17bb484d30166f4bd5
SHA1 (patch-aj) = c389f9b8f39ddb61e58b5fe87ffabb789c71d4e0
SHA1 (patch-an) = a1e7f421a101cf9ccddcaf3ce17aa1847cf76310

23
databases/postgresql83/files/Makefile.libtool
View file

@ -4,7 +4,7 @@
# Common rules for buildling libtool archives
#
# IDENTIFICATION
# $NetBSD: Makefile.libtool,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
# $NetBSD: Makefile.libtool,v 1.2 2010/01/21 12:45:28 adam Exp $
#
#-------------------------------------------------------------------------
@ -18,6 +18,9 @@
ifneq (,$(findstring src/backend/utils/mb/conversion_procs/,$(subdir)))
shmodule = yes
else
ifneq (,$(findstring src/backend/snowball,$(subdir)))
shmodule = yes
else
ifneq (,$(findstring src/pl/,$(subdir)))
shmodule = yes
else
@ -28,6 +31,7 @@ shmodule = no
endif
endif
endif
endif
# Fix dependencies in some makefiles that assume the target matches
# %.o so that when built for libtool, the target matches the corresponding
@ -42,7 +46,7 @@ fe-connect.lo: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
endif
ifeq ($(subdir), src/pl/plpgsql/src)
pl_gram.lo pl_handler.lo pl_comp.lo pl_exec.lo pl_funcs.lo: plpgsql.h $(srcdir)/pl.tab.h
pl_gram.lo pl_handler.lo pl_comp.lo pl_exec.lo pl_funcs.lo: plpgsql.h
pl_gram.lo: $(srcdir)/pl_scan.c
endif
@ -64,6 +68,8 @@ ltmodule =
endif
DLSUFFIX = .la
SO_MAJOR_VERSION?=0
SO_MINOR_VERSION?=0
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS)
LTLINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(ltmodule) -rpath $(rpathdir) -version-info $(SO_MAJOR_VERSION):$(SO_MINOR_VERSION)
@ -99,11 +105,22 @@ $(ltlib): $(LTOBJS)
## INSTALL
##
.PHONY: install-lib install-lib-static install-lib-shared install-lib-la
.PHONY: install-lib install-lib-static install-lib-shared installdirs-lib install-lib-la
install-lib install-static-lib install-shared-lib: install-lib-la
install-lib-la: $(ltlib)
ifeq ($(shmodule),yes)
$(INSTALL_LTLIB) $< $(DESTDIR)$(pkglibdir)/$(shlib)
else
$(INSTALL_LTLIB) $< $(DESTDIR)$(libdir)/$(ltlib)
endif
installdirs-lib:
ifeq ($(shmodule),yes)
$(mkinstalldirs) '$(DESTDIR)$(pkglibdir)'
else
$(mkinstalldirs) '$(DESTDIR)$(libdir)'
endif
##

76
databases/postgresql83/patches/patch-aj
View file

@ -1,18 +1,66 @@
$NetBSD: patch-aj,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
$NetBSD: patch-aj,v 1.2 2010/01/21 12:45:28 adam Exp $
--- src/backend/snowball/snowball_func.sql.in.orig 2008-03-04 10:04:17.000000000 +0100
+++ src/backend/snowball/snowball_func.sql.in
@@ -3,11 +3,11 @@
SET search_path = pg_catalog;
--- src/makefiles/pgxs.mk 2010-01-21 12:58:01.000000000 +0100
+++ src/makefiles/pgxs.mk.orig 2010-01-18 10:08:33.000000000 +0100
@@ -121,9 +117,6 @@
ifdef PROGRAM
$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
endif # PROGRAM
-ifdef MODULE_big
- $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)'
-endif # MODULE_big
ifdef SCRIPTS
@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
@@ -137,6 +130,10 @@
done
endif # SCRIPTS_built
CREATE FUNCTION dsnowball_init(INTERNAL)
- RETURNS INTERNAL AS '$libdir/dict_snowball', 'dsnowball_init'
+ RETURNS INTERNAL AS '$libdir/libdict_snowball', 'dsnowball_init'
LANGUAGE C STRICT;
+ifdef MODULE_big
+install: install-lib
+endif # MODULE_big
+
CREATE FUNCTION dsnowball_lexize(INTERNAL, INTERNAL, INTERNAL, INTERNAL)
- RETURNS INTERNAL AS '$libdir/dict_snowball', 'dsnowball_lexize'
+ RETURNS INTERNAL AS '$libdir/libdict_snowball', 'dsnowball_lexize'
LANGUAGE C STRICT;
installdirs:
ifneq (,$(DATA)$(DATA_built))
@@ -145,7 +142,7 @@
ifneq (,$(DATA_TSEARCH))
$(mkinstalldirs) '$(DESTDIR)$(datadir)/tsearch_data'
endif
-ifneq (,$(MODULES)$(MODULE_big))
+ifneq (,$(MODULES))
$(mkinstalldirs) '$(DESTDIR)$(pkglibdir)'
endif
ifdef DOCS
@@ -157,6 +154,10 @@
$(mkinstalldirs) '$(DESTDIR)$(bindir)'
endif
CREATE TEXT SEARCH TEMPLATE snowball
+ifdef MODULE_big
+installdirs: installdirs-lib
+endif # MODULE_big
+
uninstall:
ifneq (,$(DATA)$(DATA_built))
@@ -174,9 +175,6 @@
ifdef PROGRAM
rm -f '$(DESTDIR)$(bindir)/$(PROGRAM)$(X)'
endif
-ifdef MODULE_big
- rm -f '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)'
-endif
ifdef SCRIPTS
rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS))
endif
@@ -184,6 +182,10 @@
rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS_built))
endif
+ifdef MODULE_big
+uninstall: uninstall-lib
+endif # MODULE_big
+
clean:
ifdef MODULES