diff options
author | joerg <joerg> | 2005-11-08 16:40:38 +0000 |
---|---|---|
committer | joerg <joerg> | 2005-11-08 16:40:38 +0000 |
commit | ba1a03acfb294b2c5f45a802c1da42ca49f90d86 (patch) | |
tree | 33fca9b75f0bacc038e69c2f72099a487008f0be /databases/postgresql74 | |
parent | f277bebe1e2c913dab2dd045fadda78810e37ce4 (diff) | |
download | pkgsrc-ba1a03acfb294b2c5f45a802c1da42ca49f90d86.tar.gz |
Allow PostgreSQL 7.4 to build on DragonFly. Bump revision of -lib,
since the PLIST changed. Don't define errno manually in contrib/,
depend on errno.h to do so. Explicitly include errno.h in some places.
Diffstat (limited to 'databases/postgresql74')
-rw-r--r-- | databases/postgresql74/distinfo | 11 | ||||
-rw-r--r-- | databases/postgresql74/patches/patch-aa | 14 | ||||
-rw-r--r-- | databases/postgresql74/patches/patch-ac | 12 | ||||
-rw-r--r-- | databases/postgresql74/patches/patch-ah | 21 | ||||
-rw-r--r-- | databases/postgresql74/patches/patch-ai | 14 | ||||
-rw-r--r-- | databases/postgresql74/patches/patch-aj | 13 | ||||
-rw-r--r-- | databases/postgresql74/patches/patch-ak | 13 | ||||
-rw-r--r-- | databases/postgresql74/patches/patch-al | 20 |
8 files changed, 109 insertions, 9 deletions
diff --git a/databases/postgresql74/distinfo b/databases/postgresql74/distinfo index 22537e787c4..a079e4ebefa 100644 --- a/databases/postgresql74/distinfo +++ b/databases/postgresql74/distinfo @@ -1,12 +1,17 @@ -$NetBSD: distinfo,v 1.18 2005/06/30 01:50:10 wiz Exp $ +$NetBSD: distinfo,v 1.19 2005/11/08 16:40:38 joerg Exp $ SHA1 (postgresql-7.4.8.tar.bz2) = a565ff14e1a3b58a151b219bcffcf53dfc62ec41 RMD160 (postgresql-7.4.8.tar.bz2) = 3ee8c70e0506e2a49bae20bc2282391513ee9d65 Size (postgresql-7.4.8.tar.bz2) = 10235413 bytes -SHA1 (patch-aa) = 626b4b4bf0d47913072399535c55d413b90675a4 +SHA1 (patch-aa) = a7d3a63bbef3ae0ad5086fe6a8915be67731deb9 SHA1 (patch-ab) = f44a544c56452bad197a88cb827e88624c54656c -SHA1 (patch-ac) = 81ef677cc5d196762b6cc3c3e38dee4a37e75ac2 +SHA1 (patch-ac) = 8104ac7631dd8566eb455e479dd59da058b68c8f SHA1 (patch-ad) = fae5e82e0943ea982c9d3aace290b56c6a7629f9 SHA1 (patch-ae) = f0e0ad98ebdc972e7c40afd805fbb0d909d5ef3b SHA1 (patch-af) = 7373db75fda125b980f2ead990719798c0d22a48 SHA1 (patch-ag) = a983f23b5e47a4c2f31ba284ff3db51b53cf8414 +SHA1 (patch-ah) = 1a9b565bf3a004da5fa33081bc3675cb938e7e5f +SHA1 (patch-ai) = 158382638ee3380930d6c9fd9b6381e973ccedc2 +SHA1 (patch-aj) = 629e38a0ca475834fb0bf1e03cc4efdfca4fb6ce +SHA1 (patch-ak) = 12b4227149ebe4a3516b342c0931de78e3498b2e +SHA1 (patch-al) = 9c4b963c9f727c78c364f76e5146a4eeb1412638 diff --git a/databases/postgresql74/patches/patch-aa b/databases/postgresql74/patches/patch-aa index c9a08b53975..2bb40e263df 100644 --- a/databases/postgresql74/patches/patch-aa +++ b/databases/postgresql74/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/12/18 15:59:55 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $ --- src/Makefile.shlib.orig 2003-10-19 21:34:33.000000000 -0400 +++ src/Makefile.shlib @@ -11,16 +11,22 @@ $NetBSD: patch-aa,v 1.2 2004/12/18 15:59:55 jlam Exp $ LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) else shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -@@ -126,7 +126,7 @@ ifeq ($(PORTNAME), netbsd) +@@ -125,8 +125,13 @@ ifeq ($(PORTNAME), netbsd) + endif endif ++ifeq ($(PORTNAME), dragonfly) ++ shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ++ LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) ++endif ++ ifeq ($(PORTNAME), hpux) - shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) + shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LINK.shared = $(LD) +h $(soname) -b +b $(libdir) ifeq ($(GCC), yes) SHLIB_LINK += `$(CC) -print-libgcc-file-name` -@@ -134,7 +134,7 @@ ifeq ($(PORTNAME), hpux) +@@ -134,7 +139,7 @@ ifeq ($(PORTNAME), hpux) endif ifeq ($(PORTNAME), irix5) @@ -29,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 2004/12/18 15:59:55 jlam Exp $ LINK.shared = $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) endif -@@ -207,7 +207,7 @@ ifeq ($(PORTNAME), beos) +@@ -207,7 +212,7 @@ ifeq ($(PORTNAME), beos) SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86 endif diff --git a/databases/postgresql74/patches/patch-ac b/databases/postgresql74/patches/patch-ac index a06dbb42938..af161987721 100644 --- a/databases/postgresql74/patches/patch-ac +++ b/databases/postgresql74/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2004/12/18 16:36:29 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2005/11/08 16:40:38 joerg Exp $ --- configure.orig 2004-10-21 20:26:15.000000000 -0400 +++ configure @@ -11,7 +11,15 @@ $NetBSD: patch-ac,v 1.2 2004/12/18 16:36:29 jlam Exp $ mandir='${prefix}/man' ac_prev= -@@ -4351,9 +4351,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6 +@@ -1392,6 +1392,7 @@ case $host_os in + darwin*) template=darwin ;; + dgux*) template=dgux ;; + freebsd*) template=freebsd ;; ++ dragonfly*) template=dragonfly ;; + hpux*) template=hpux ;; + irix*) template=irix5 ;; + linux*) template=linux ;; +@@ -4351,9 +4352,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6 echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5 echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6 diff --git a/databases/postgresql74/patches/patch-ah b/databases/postgresql74/patches/patch-ah new file mode 100644 index 00000000000..d94262f0c33 --- /dev/null +++ b/databases/postgresql74/patches/patch-ah @@ -0,0 +1,21 @@ +$NetBSD: patch-ah,v 1.3 2005/11/08 16:40:38 joerg Exp $ + +--- contrib/cube/cubeparse.y.orig 2005-11-08 15:08:35.000000000 +0000 ++++ contrib/cube/cubeparse.y +@@ -6,6 +6,8 @@ + #define YYSTYPE char * + #define YYDEBUG 1 + ++#include <errno.h> ++ + #include "postgres.h" + + #include "cubedata.h" +@@ -14,7 +16,6 @@ + #define yylex cube_yylex /* wrong scanner when running inside the postgres backend */ + + extern int yylex(); /* defined as cube_yylex in cubescan.c */ +-extern int errno; + + static char *scanbuf; + static int scanbuflen; diff --git a/databases/postgresql74/patches/patch-ai b/databases/postgresql74/patches/patch-ai new file mode 100644 index 00000000000..999959dcc95 --- /dev/null +++ b/databases/postgresql74/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.1 2005/11/08 16:40:38 joerg Exp $ + +--- contrib/pg_dumplo/lo_export.c.orig 2005-11-08 15:14:44.000000000 +0000 ++++ contrib/pg_dumplo/lo_export.c +@@ -20,9 +20,6 @@ + + #include "pg_dumplo.h" + +-extern int errno; +- +- + void + load_lolist(LODumpMaster * pgLO) + { diff --git a/databases/postgresql74/patches/patch-aj b/databases/postgresql74/patches/patch-aj new file mode 100644 index 00000000000..0e7d16d4443 --- /dev/null +++ b/databases/postgresql74/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2005/11/08 16:40:38 joerg Exp $ + +--- contrib/pg_dumplo/lo_import.c.orig 2005-11-08 15:16:04.000000000 +0000 ++++ contrib/pg_dumplo/lo_import.c +@@ -20,8 +20,6 @@ + + #include "pg_dumplo.h" + +-extern int errno; +- + void + pglo_import(LODumpMaster * pgLO) + { diff --git a/databases/postgresql74/patches/patch-ak b/databases/postgresql74/patches/patch-ak new file mode 100644 index 00000000000..c9df1c4f819 --- /dev/null +++ b/databases/postgresql74/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2005/11/08 16:40:38 joerg Exp $ + +--- contrib/pg_dumplo/utils.c.orig 2005-11-08 15:17:25.000000000 +0000 ++++ contrib/pg_dumplo/utils.c +@@ -20,8 +20,6 @@ + + #include "pg_dumplo.h" + +-extern int errno; +- + static void Dummy_NoticeProcessor(void *arg, const char *message); + static void Default_NoticeProcessor(void *arg, const char *message); + diff --git a/databases/postgresql74/patches/patch-al b/databases/postgresql74/patches/patch-al new file mode 100644 index 00000000000..35459d7a8ec --- /dev/null +++ b/databases/postgresql74/patches/patch-al @@ -0,0 +1,20 @@ +$NetBSD: patch-al,v 1.1 2005/11/08 16:40:38 joerg Exp $ + +--- contrib/seg/segparse.y.orig 2005-11-08 15:18:52.000000000 +0000 ++++ contrib/seg/segparse.y +@@ -3,6 +3,7 @@ + + #include "postgres.h" + ++#include <errno.h> + #include <math.h> + + #include "segdata.h" +@@ -14,7 +15,6 @@ + #undef yylex /* falure to redefine yylex will result in calling the */ + #define yylex seg_yylex /* wrong scanner when running inside postgres backend */ + +- extern int errno; + extern int yylex(); /* defined as seg_yylex in segscan.c */ + extern int significant_digits( char *str ); /* defined in seg.c */ + |