Wed Oct 12 19:44:51 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.15 -r1.16 pkgsrc/databases/postgresql84/Makefile.common
diff -r1.14 -r1.15 pkgsrc/databases/postgresql84/distinfo
diff -r0 -r1.1 pkgsrc/databases/postgresql84/patches/patch-src_pl_plperl_plperl.h
cvs diff -r1.15 -r1.16 pkgsrc/databases/postgresql84/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/postgresql84/Attic/Makefile.common 2011/09/27 11:04:30 1.15
+++ pkgsrc/databases/postgresql84/Attic/Makefile.common 2011/10/12 19:44:51 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.15 2011/09/27 11:04:30 adam Exp $ 1# $NetBSD: Makefile.common,v 1.16 2011/10/12 19:44:51 hans Exp $
2# 2#
3# used by databases/postgresql84-adminpack/Makefile 3# used by databases/postgresql84-adminpack/Makefile
4# used by databases/postgresql84-client/Makefile 4# used by databases/postgresql84-client/Makefile
5# used by databases/postgresql84-dblink/Makefile 5# used by databases/postgresql84-dblink/Makefile
6# used by databases/postgresql84-pgcrypto/Makefile 6# used by databases/postgresql84-pgcrypto/Makefile
7# used by databases/postgresql84-plperl/Makefile 7# used by databases/postgresql84-plperl/Makefile
8# used by databases/postgresql84-plpython/Makefile 8# used by databases/postgresql84-plpython/Makefile
9# used by databases/postgresql84-pltcl/Makefile 9# used by databases/postgresql84-pltcl/Makefile
10# used by databases/postgresql84-server/Makefile 10# used by databases/postgresql84-server/Makefile
11# 11#
12# This Makefile fragment is included by all PostgreSQL packages built from 12# This Makefile fragment is included by all PostgreSQL packages built from
13# the main sources of the PostgreSQL distribution except jdbc-postgresql. 13# the main sources of the PostgreSQL distribution except jdbc-postgresql.
14# 14#
@@ -72,26 +72,27 @@ CONFIGURE_ARGS+= --with-blocksize=${PGSQ @@ -72,26 +72,27 @@ CONFIGURE_ARGS+= --with-blocksize=${PGSQ
72.endif 72.endif
73 73
74# PostgreSQL explicitly forbids any use of -ffast-math 74# PostgreSQL explicitly forbids any use of -ffast-math
75BUILDLINK_TRANSFORM+= rm:-ffast-math 75BUILDLINK_TRANSFORM+= rm:-ffast-math
76 76
77# USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl 77# USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl
78# to provide "dlopen" functionality for the PostgreSQL backend. 78# to provide "dlopen" functionality for the PostgreSQL backend.
79.if ${OPSYS} == "Interix" 79.if ${OPSYS} == "Interix"
80USE_LIBLTDL?= yes 80USE_LIBLTDL?= yes
81.endif 81.endif
82USE_LIBLTDL?= no 82USE_LIBLTDL?= no
83 83
84.include "../../devel/gettext-lib/buildlink3.mk" 84.include "../../devel/gettext-lib/buildlink3.mk"
 85LIBS.SunOS+= -lintl
85 86
86.if !defined(META_PACKAGE) 87.if !defined(META_PACKAGE)
87post-extract: 88post-extract:
88. if !empty(USE_LIBLTDL:M[yY][eE][sS]) 89. if !empty(USE_LIBLTDL:M[yY][eE][sS])
89 cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \ 90 cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
90 ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h 91 ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h
91 ${ECHO} "static int dummy = 0;" \ 92 ${ECHO} "static int dummy = 0;" \
92 > ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c 93 > ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c
93. endif 94. endif
94 touch ${WRKSRC}/src/template/dragonfly 95 touch ${WRKSRC}/src/template/dragonfly
95 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ 96 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
96 ${WRKSRC}/src/backend/port/dynloader/dragonfly.c 97 ${WRKSRC}/src/backend/port/dynloader/dragonfly.c
97 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ 98 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
cvs diff -r1.14 -r1.15 pkgsrc/databases/postgresql84/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/postgresql84/Attic/distinfo 2011/09/27 11:04:30 1.14
+++ pkgsrc/databases/postgresql84/Attic/distinfo 2011/10/12 19:44:51 1.15
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.14 2011/09/27 11:04:30 adam Exp $ 1$NetBSD: distinfo,v 1.15 2011/10/12 19:44:51 hans Exp $
2 2
3SHA1 (postgresql-8.4.9.tar.bz2) = 7b6bbd72db0f63ea55890427ab6c7a40e7c7ff1b 3SHA1 (postgresql-8.4.9.tar.bz2) = 7b6bbd72db0f63ea55890427ab6c7a40e7c7ff1b
4RMD160 (postgresql-8.4.9.tar.bz2) = 469acc1d1358c48334896fb8fa84de1d287183d5 4RMD160 (postgresql-8.4.9.tar.bz2) = 469acc1d1358c48334896fb8fa84de1d287183d5
5Size (postgresql-8.4.9.tar.bz2) = 14275979 bytes 5Size (postgresql-8.4.9.tar.bz2) = 14275979 bytes
6SHA1 (patch-aa) = 72437773d67939c8d8c8e9a99caf430590fd726f 6SHA1 (patch-aa) = 72437773d67939c8d8c8e9a99caf430590fd726f
7SHA1 (patch-ab) = aa46d88c8a72edaf95880de48474ea484d6d2bf5 7SHA1 (patch-ab) = aa46d88c8a72edaf95880de48474ea484d6d2bf5
8SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb 8SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
9SHA1 (patch-ad) = fb75df841bbcc25e840ed9c2fed59232d7189200 9SHA1 (patch-ad) = fb75df841bbcc25e840ed9c2fed59232d7189200
10SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936 10SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
11SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214 11SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
12SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64 12SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
13SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc 13SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
14SHA1 (patch-ao) = b098032408fc951865966710554667a249db6320 14SHA1 (patch-ao) = b098032408fc951865966710554667a249db6320
15SHA1 (patch-ba) = 2cc374fdf4351a4c03ecad30fb99d2aff2cf0bdf 15SHA1 (patch-ba) = 2cc374fdf4351a4c03ecad30fb99d2aff2cf0bdf
16SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1 16SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1
 17SHA1 (patch-src_pl_plperl_plperl.h) = 8d448cc8e0e0dbc4d15dad369d3ca7a796874ac2
File Added: pkgsrc/databases/postgresql84/patches/Attic/patch-src_pl_plperl_plperl.h
$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_