Fix build on SunOS.

4 files changed, 41 insertions, 2 deletions

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