diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-01 20:10:18 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-01 20:10:18 +0000 |
commit | ea2d8044cb691934c0cec8382844ac838e616d2b (patch) | |
tree | 85ba9622f35905bc6c7df2254138217e93ad3ed4 | |
parent | 15d1adc72936ce6ea53890c9738d036f85769367 (diff) | |
download | pkgsrc-ea2d8044cb691934c0cec8382844ac838e616d2b.tar.gz |
Make my life easier and push the tsearch2 patches out. The package itself
needs some more work though.
-rw-r--r-- | databases/postgresql81/distinfo | 6 | ||||
-rw-r--r-- | databases/postgresql81/files/Makefile.libtool | 6 | ||||
-rw-r--r-- | databases/postgresql81/patches/patch-aj | 30 | ||||
-rw-r--r-- | databases/postgresql81/patches/patch-ak | 30 | ||||
-rw-r--r-- | databases/postgresql81/patches/patch-al | 30 | ||||
-rw-r--r-- | databases/postgresql81/patches/patch-am | 38 |
6 files changed, 138 insertions, 2 deletions
diff --git a/databases/postgresql81/distinfo b/databases/postgresql81/distinfo index 9c994f6e20e..e40653d87f9 100644 --- a/databases/postgresql81/distinfo +++ b/databases/postgresql81/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2006/10/18 16:31:24 adam Exp $ +$NetBSD: distinfo,v 1.4 2006/12/01 20:10:18 joerg Exp $ SHA1 (postgresql-8.1.5.tar.bz2) = 6d819ad4e2344db1eac2aaab13f8034820ac8868 RMD160 (postgresql-8.1.5.tar.bz2) = 02a8aab23e424b5006b24bf884d6920c4818f907 @@ -12,3 +12,7 @@ SHA1 (patch-af) = 89cb9318946cb7c34ad79dbae107ce66bd1c5022 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d SHA1 (patch-ah) = 10ff8958ff2085fb03d1661a361e218ae5869b06 SHA1 (patch-ai) = 04820f37d7147576a6a9ab7d82e4682c61573330 +SHA1 (patch-aj) = 17c2efa6729801a2f524de68d885a98a8f1fc5f5 +SHA1 (patch-ak) = 3009e020dc5f9397846dd3339c2bdd15269bb332 +SHA1 (patch-al) = e0c66263910f302e5b92416d5103b701e8a4e87c +SHA1 (patch-am) = a857d1499ea39c5f999bb614c1d45bcea23f1cc9 diff --git a/databases/postgresql81/files/Makefile.libtool b/databases/postgresql81/files/Makefile.libtool index 014be1075a9..d7f048f08fa 100644 --- a/databases/postgresql81/files/Makefile.libtool +++ b/databases/postgresql81/files/Makefile.libtool @@ -4,7 +4,7 @@ # Common rules for buildling libtool archives # # IDENTIFICATION -# $NetBSD: Makefile.libtool,v 1.1.1.1 2006/03/20 14:45:49 uebayasi Exp $ +# $NetBSD: Makefile.libtool,v 1.2 2006/12/01 20:10:18 joerg Exp $ # #------------------------------------------------------------------------- @@ -21,9 +21,13 @@ else ifneq (,$(findstring src/pl/,$(subdir))) shmodule = yes else +ifneq (,$(findstring contrib/,$(subdir))) +shmodule = yes +else shmodule = no 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 diff --git a/databases/postgresql81/patches/patch-aj b/databases/postgresql81/patches/patch-aj new file mode 100644 index 00000000000..e0fda5a858f --- /dev/null +++ b/databases/postgresql81/patches/patch-aj @@ -0,0 +1,30 @@ +$NetBSD: patch-aj,v 1.1 2006/12/01 20:10:18 joerg Exp $ + +--- contrib/tsearch2/snowball/Makefile.orig 2005-10-18 01:30:48.000000000 +0000 ++++ contrib/tsearch2/snowball/Makefile +@@ -1,6 +1,6 @@ + # $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.8 2005/10/18 01:30:48 tgl Exp $ + +-SUBOBJS = english_stem.o api.o russian_stem.o utilities.o ++SUBOBJS = english_stem.lo api.lo russian_stem.lo utilities.lo + + EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) + +@@ -14,13 +14,14 @@ subdir = contrib/tsearch2/snowball + top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global + include $(top_srcdir)/contrib/contrib-global.mk ++include $(top_srcdir)/src/Makefile.shlib + endif + + override CFLAGS += $(CFLAGS_SL) + +-all: SUBSYS.o ++all: libSUBSYS.la + +-SUBSYS.o: $(SUBOBJS) +- $(LD) $(LDREL) $(LDOUT) $@ $^ ++libSUBSYS.la: $(SUBOBJS) ++ libtool --mode=link ${CC} -o libSUBSYS.la ${SUBOBJS} + + diff --git a/databases/postgresql81/patches/patch-ak b/databases/postgresql81/patches/patch-ak new file mode 100644 index 00000000000..94bbf91fe32 --- /dev/null +++ b/databases/postgresql81/patches/patch-ak @@ -0,0 +1,30 @@ +$NetBSD: patch-ak,v 1.1 2006/12/01 20:10:18 joerg Exp $ + +--- contrib/tsearch2/ispell/Makefile.orig 2006-10-25 12:46:42.000000000 +0000 ++++ contrib/tsearch2/ispell/Makefile +@@ -1,6 +1,6 @@ + # $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.9 2005/10/18 01:30:48 tgl Exp $ + +-SUBOBJS = spell.o regis.o ++SUBOBJS = spell.lo regis.lo + + EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) + +@@ -14,13 +14,12 @@ subdir = contrib/tsearch2/ispell + top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global + include $(top_srcdir)/contrib/contrib-global.mk ++include $(top_srcdir)/src/Makefile.shlib + endif + + override CFLAGS += $(CFLAGS_SL) + +-all: SUBSYS.o +- +-SUBSYS.o: $(SUBOBJS) +- $(LD) $(LDREL) $(LDOUT) $@ $^ +- ++all: libSUBSYS.la + ++libSUBSYS.la: $(SUBOBJS) ++ libtool --mode=link ${CC} -o libSUBSYS.la ${SUBOBJS} diff --git a/databases/postgresql81/patches/patch-al b/databases/postgresql81/patches/patch-al new file mode 100644 index 00000000000..a343b188f0a --- /dev/null +++ b/databases/postgresql81/patches/patch-al @@ -0,0 +1,30 @@ +$NetBSD: patch-al,v 1.1 2006/12/01 20:10:18 joerg Exp $ + +--- contrib/tsearch2/wordparser/Makefile.orig 2005-10-18 01:30:49.000000000 +0000 ++++ contrib/tsearch2/wordparser/Makefile +@@ -1,6 +1,6 @@ + # $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.8 2005/10/18 01:30:49 tgl Exp $ + +-SUBOBJS = parser.o deflex.o ++SUBOBJS = parser.lo deflex.lo + + EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c + +@@ -14,6 +14,7 @@ subdir = contrib/tsearch2/wordparser + top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global + include $(top_srcdir)/contrib/contrib-global.mk ++include $(top_srcdir)/src/Makefile.shlib + endif + + override CFLAGS += $(CFLAGS_SL) +@@ -27,7 +28,7 @@ else + @$(missing) flex $< $@ + endif + +-SUBSYS.o: $(SUBOBJS) +- $(LD) $(LDREL) $(LDOUT) $@ $^ ++libSUBSYS.la: $(SUBOBJS) ++ libtool --mode=link ${CC} -o libSUBSYS.la ${SUBOBJS} + + diff --git a/databases/postgresql81/patches/patch-am b/databases/postgresql81/patches/patch-am new file mode 100644 index 00000000000..d32bf5f0b18 --- /dev/null +++ b/databases/postgresql81/patches/patch-am @@ -0,0 +1,38 @@ +$NetBSD: patch-am,v 1.1 2006/12/01 20:10:18 joerg Exp $ + +--- contrib/tsearch2/Makefile.orig 2005-09-27 17:13:11.000000000 +0000 ++++ contrib/tsearch2/Makefile +@@ -8,7 +8,7 @@ OBJS = dict_ex.o dict.o snmap.o stopword + tsvector_op.o rank.o ts_stat.o + + SUBDIRS := snowball ispell wordparser +-SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o) ++SUBDIROBJS := $(SUBDIRS:%=%/libSUBSYS.la) + + OBJS += $(SUBDIROBJS) + +@@ -20,7 +20,7 @@ DOCS = README.tsearch2 + REGRESS = tsearch2 + + SHLIB_LINK += $(filter -lm, $(LIBS)) +- ++shmodule=yes + + ifdef USE_PGXS + PGXS := $(shell pg_config --pgxs) +@@ -30,13 +30,14 @@ subdir = contrib/tsearch2 + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + include $(top_srcdir)/contrib/contrib-global.mk ++include $(top_srcdir)/src/Makefile.shlib + endif + + + $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ; + + $(SUBDIRS:%=%-recursive): +- $(MAKE) -C $(subst -recursive,,$@) SUBSYS.o ++ $(MAKE) -C $(subst -recursive,,$@) libSUBSYS.la + + tsearch2.sql: tsearch.sql.in + sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >$@ |