Fix build on SunOS.

16 files changed, 157 insertions, 9 deletions

diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index cdd3e231357..ecd7c3e89ae 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2011/09/27 11:03:59 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2011/10/12 19:43:26 hans Exp $
 #
 # used by databases/postgresql83-adminpack/Makefile
 # used by databases/postgresql83-client/Makefile
@@ -47,6 +47,8 @@ PG_TEMPLATE.IRIX=	irix5
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
+PKGLOCALEDIR=		share
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/postgresql
@@ -71,6 +73,7 @@ USE_LIBLTDL?=		yes
 USE_LIBLTDL?=		no
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+LIBS.SunOS+=		-lintl
 
 .if !defined(META_PACKAGE)
 post-extract:
diff --git a/databases/postgresql83/distinfo b/databases/postgresql83/distinfo
index 05e78205885..867cf1239b8 100644
--- a/databases/postgresql83/distinfo
+++ b/databases/postgresql83/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2011/09/27 11:03:59 adam Exp $
+$NetBSD: distinfo,v 1.19 2011/10/12 19:43:26 hans Exp $
 
 SHA1 (postgresql-8.3.16.tar.bz2) = c8bda0f506c03d01054fac6dc2f1291cf7539c7e
 RMD160 (postgresql-8.3.16.tar.bz2) = 2e2c677defbb0631529a4b76a3adee006c288617
@@ -13,3 +13,5 @@ SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
 SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841
 SHA1 (patch-ba) = db6be7665f19d2b2b707ffcaa04cb92b44544d61
 SHA1 (patch-src_interfaces_ecpg_ecpglib_Makefile) = 9107a858d4066f0c1e7ece8332d4b32ded718af1
+SHA1 (patch-src_makefiles_Makefile.solaris) = 21fd5b1103e1c8aaf339ee6ef91e0d6dab5bea3a
+SHA1 (patch-src_pl_plperl_plperl.h) = a521489a0e233a8dbaa8c56dd8fe5c411b0639c5
diff --git a/databases/postgresql83/patches/patch-src_makefiles_Makefile.solaris b/databases/postgresql83/patches/patch-src_makefiles_Makefile.solaris
new file mode 100644
index 00000000000..4b908401441
--- /dev/null
+++ b/databases/postgresql83/patches/patch-src_makefiles_Makefile.solaris
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_makefiles_Makefile.solaris,v 1.1 2011/10/12 19:43:27 hans Exp $
+
+--- src/makefiles/Makefile.solaris.orig	2011-09-23 00:06:36.000000000 +0200
++++ src/makefiles/Makefile.solaris	2011-10-11 12:14:55.511535061 +0200
+@@ -18,5 +18,3 @@ endif
+ 
+ %.so: %.o
+ 	$(LD) -G -Bdynamic -o $@ $<
+-
+-sqlmansect = 5sql
diff --git a/databases/postgresql83/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql83/patches/patch-src_pl_plperl_plperl.h
new file mode 100644
index 00000000000..9f4c24fb808
--- /dev/null
+++ b/databases/postgresql83/patches/patch-src_pl_plperl_plperl.h
@@ -0,0 +1,25 @@
+--- src/pl/plperl/plperl.h.orig	2011-09-23 00:06:36.000000000 +0200
++++ src/pl/plperl/plperl.h	2011-10-12 20:45:49.478595625 +0200
+@@ -26,12 +26,22 @@
+ #endif
+ #endif
+ 
++#ifdef __sun
++#define list_head sun_list_head
++#define list_tail sun_list_tail
++#endif
++
+ /* required for perl API */
+ #include "EXTERN.h"
+ #include "perl.h"
+ #include "XSUB.h"
+ #include "ppport.h"
+ 
++#ifdef __sun
++#undef list_head
++#undef list_tail
++#endif
++
+ /* just in case these symbols aren't provided */
+ #ifndef pTHX_
+ #define pTHX_
diff --git a/databases/postgresql84-dblink/Makefile b/databases/postgresql84-dblink/Makefile
index 44bc613df4a..19f74ba0d6d 100644
--- a/databases/postgresql84-dblink/Makefile
+++ b/databases/postgresql84-dblink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/04/22 13:01:30 adam Exp $
+# $NetBSD: Makefile,v 1.5 2011/10/12 19:46:42 hans Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-dblink-/}
 COMMENT=	dblink module for remote database connections
@@ -11,6 +11,7 @@ DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-
 
 CONFIGURE_ARGS+=	--with-openssl
 BUILD_MAKE_FLAGS=	PGXS=1
+CFLAGS.SunOS+=		-D_POSIX_PTHREAD_SEMANTICS
 
 BUILD_DIRS=		src/interfaces/libpq
 BUILD_DIRS+=		contrib/dblink
diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common
index 752d00ac9a4..84dac2720c3 100644
--- a/databases/postgresql84/Makefile.common
+++ b/databases/postgresql84/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2011/09/27 11:04:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2011/10/12 19:44:51 hans Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
@@ -82,6 +82,7 @@ USE_LIBLTDL?=		yes
 USE_LIBLTDL?=		no
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+LIBS.SunOS+=		-lintl
 
 .if !defined(META_PACKAGE)
 post-extract:
diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo
index 6807d65b1a0..8e31218e607 100644
--- a/databases/postgresql84/distinfo
+++ b/databases/postgresql84/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2011/09/27 11:04:30 adam Exp $
+$NetBSD: distinfo,v 1.15 2011/10/12 19:44:51 hans Exp $
 
 SHA1 (postgresql-8.4.9.tar.bz2) = 7b6bbd72db0f63ea55890427ab6c7a40e7c7ff1b
 RMD160 (postgresql-8.4.9.tar.bz2) = 469acc1d1358c48334896fb8fa84de1d287183d5
@@ -14,3 +14,4 @@ SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
 SHA1 (patch-ao) = b098032408fc951865966710554667a249db6320
 SHA1 (patch-ba) = 2cc374fdf4351a4c03ecad30fb99d2aff2cf0bdf
 SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1
+SHA1 (patch-src_pl_plperl_plperl.h) = 8d448cc8e0e0dbc4d15dad369d3ca7a796874ac2
diff --git a/databases/postgresql84/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql84/patches/patch-src_pl_plperl_plperl.h
new file mode 100644
index 00000000000..5dc56d83646
--- /dev/null
+++ b/databases/postgresql84/patches/patch-src_pl_plperl_plperl.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2011/10/12 19:44:51 hans Exp $
+
+--- src/pl/plperl/plperl.h.orig	2011-09-23 00:03:52.000000000 +0200
++++ src/pl/plperl/plperl.h	2011-10-12 20:41:41.351787708 +0200
+@@ -26,12 +26,22 @@
+ #endif
+ #endif
+ 
++#ifdef __sun
++#define list_head sun_list_head
++#define list_tail sun_list_tail
++#endif
++
+ /* required for perl API */
+ #include "EXTERN.h"
+ #include "perl.h"
+ #include "XSUB.h"
+ #include "ppport.h"
+ 
++#ifdef __sun
++#undef list_head
++#undef list_tail
++#endif
++
+ /* just in case these symbols aren't provided */
+ #ifndef pTHX_
+ #define pTHX_
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index 915e2393380..b878980c6b3 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2011/09/27 11:04:42 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2011/10/12 19:45:25 hans Exp $
 #
 # used by databases/postgresql90-adminpack/Makefile
 # used by databases/postgresql90-client/Makefile
@@ -105,6 +105,7 @@ USE_LIBLTDL?=		yes
 USE_LIBLTDL?=		no
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+LIBS.SunOS+=		-lintl
 
 .if !defined(META_PACKAGE)
 post-extract:
diff --git a/databases/postgresql90/distinfo b/databases/postgresql90/distinfo
index 1ae84b8c616..dd5827efcee 100644
--- a/databases/postgresql90/distinfo
+++ b/databases/postgresql90/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/09/27 11:04:42 adam Exp $
+$NetBSD: distinfo,v 1.8 2011/10/12 19:45:25 hans Exp $
 
 SHA1 (postgresql-9.0.5.tar.bz2) = 1c71be5b1a7d519eff33bb60768776f47b44acf3
 RMD160 (postgresql-9.0.5.tar.bz2) = c5f4f37808f7e24d91a6c95d41fc89330624e26f
@@ -13,3 +13,5 @@ SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
 SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
 SHA1 (patch-ao) = 4d7c40d107d4c13c63ef2908d9a02be319863657
 SHA1 (patch-src_Makefile.shlib) = b5f66154482df3d14af5ecbb524eeff6c246d049
+SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
+SHA1 (patch-src_pl_plperl_plperl.h) = 8e2d954642cb68dc6c6fd08debd058d053566826
diff --git a/databases/postgresql90/patches/patch-src_makefiles_Makefile.solaris b/databases/postgresql90/patches/patch-src_makefiles_Makefile.solaris
new file mode 100644
index 00000000000..c09714685f6
--- /dev/null
+++ b/databases/postgresql90/patches/patch-src_makefiles_Makefile.solaris
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_makefiles_Makefile.solaris,v 1.1 2011/10/12 19:45:25 hans Exp $
+
+--- src/makefiles/Makefile.solaris.orig	2011-09-23 00:00:48.000000000 +0200
++++ src/makefiles/Makefile.solaris	2011-10-11 11:53:51.948565783 +0200
+@@ -23,5 +23,3 @@ ifeq ($(GCC), yes)
+ else
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $<
+ endif
+-
+-sqlmansect = 5sql
diff --git a/databases/postgresql90/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql90/patches/patch-src_pl_plperl_plperl.h
new file mode 100644
index 00000000000..df9b26efcb0
--- /dev/null
+++ b/databases/postgresql90/patches/patch-src_pl_plperl_plperl.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2011/10/12 19:45:25 hans Exp $
+
+--- ./src/pl/plperl/plperl.h.orig	2011-09-23 00:00:48.000000000 +0200
++++ ./src/pl/plperl/plperl.h	2011-10-12 20:27:46.998594412 +0200
+@@ -26,11 +26,21 @@
+ #endif
+ #endif
+ 
++#ifdef __sun
++#define list_head sun_list_head
++#define list_tail sun_list_tail
++#endif
++
+ /* required for perl API */
+ #include "EXTERN.h"
+ #include "perl.h"
+ #include "XSUB.h"
+ 
++#ifdef __sun
++#undef list_head
++#undef list_tail
++#endif
++
+ /* perl version and platform portability */
+ #define NEED_eval_pv
+ #define NEED_newRV_noinc
diff --git a/databases/postgresql91/Makefile.common b/databases/postgresql91/Makefile.common
index 3e6f44871e5..7d5ff7a9687 100644
--- a/databases/postgresql91/Makefile.common
+++ b/databases/postgresql91/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2011/09/27 11:04:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2011/10/12 19:45:57 hans Exp $
 #
 # used by databases/postgresql91-adminpack/Makefile
 # used by databases/postgresql91-client/Makefile
@@ -91,6 +91,7 @@ USE_LIBLTDL?=		yes
 USE_LIBLTDL?=		no
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+LIBS.SunOS+=		-lintl
 
 .if !defined(META_PACKAGE)
 post-extract:
diff --git a/databases/postgresql91/distinfo b/databases/postgresql91/distinfo
index 702aec0351b..f6b081cad9d 100644
--- a/databases/postgresql91/distinfo
+++ b/databases/postgresql91/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2011/09/27 11:04:49 adam Exp $
+$NetBSD: distinfo,v 1.3 2011/10/12 19:45:57 hans Exp $
 
 SHA1 (postgresql-9.1.1.tar.bz2) = 4df7b6f6b23acdac5ea198e3623796a2b62fc7a4
 RMD160 (postgresql-9.1.1.tar.bz2) = 294c0e04bebcf07fa88fb5d5e5837c99f736edd3
@@ -9,7 +9,9 @@ SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04
 SHA1 (patch-contrib_dblink_dblink.c) = 4d7c40d107d4c13c63ef2908d9a02be319863657
 SHA1 (patch-src_Makefile.shlib) = 39c9d8fa983658fd609a7879cbe46c95aabb8011
 SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
+SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6f8b7842f9e3016932f47b90ba6011a2015b8a05
+SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
 SHA1 (patch-src_timezone_localtime.c) = a73769cf05223d2ee06249c9e69c85038c2cd936
 SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64
diff --git a/databases/postgresql91/patches/patch-src_makefiles_Makefile.solaris b/databases/postgresql91/patches/patch-src_makefiles_Makefile.solaris
new file mode 100644
index 00000000000..4766ac86151
--- /dev/null
+++ b/databases/postgresql91/patches/patch-src_makefiles_Makefile.solaris
@@ -0,0 +1,10 @@
+$NetBSD: patch-src_makefiles_Makefile.solaris,v 1.1 2011/10/12 19:45:57 hans Exp $
+
+--- src/makefiles/Makefile.solaris.orig	2011-09-23 00:00:48.000000000 +0200
++++ src/makefiles/Makefile.solaris	2011-10-11 11:53:51.948565783 +0200
+@@ -23,5 +23,3 @@ ifeq ($(GCC), yes)
+ else
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $<
+ endif
+-
+-sqlmansect = 5sql
diff --git a/databases/postgresql91/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql91/patches/patch-src_pl_plperl_plperl.h
new file mode 100644
index 00000000000..5bd88471937
--- /dev/null
+++ b/databases/postgresql91/patches/patch-src_pl_plperl_plperl.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2011/10/12 19:45:57 hans Exp $
+
+--- src/pl/plperl/plperl.h.orig	2011-09-22 23:57:57.000000000 +0200
++++ src/pl/plperl/plperl.h	2011-10-12 20:36:11.783264869 +0200
+@@ -44,12 +44,21 @@
+ #undef vsnprintf
+ #endif
+ 
++#ifdef __sun
++#define list_head sun_list_head
++#define list_tail sun_list_tail
++#endif
+ 
+ /* required for perl API */
+ #include "EXTERN.h"
+ #include "perl.h"
+ #include "XSUB.h"
+ 
++#ifdef __sun
++#undef list_head
++#undef list_tail
++#endif
++
+ /* put back our snprintf and vsnprintf */
+ #ifdef USE_REPL_SNPRINTF
+ #ifdef snprintf