Fix build on SunOS.

4 files changed, 42 insertions, 2 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_