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.

7 files changed, 101 insertions, 6 deletions

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 */
+