Wed Oct 12 19:43:27 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.19 -r1.20 pkgsrc/databases/postgresql83/Makefile.common
diff -r1.18 -r1.19 pkgsrc/databases/postgresql83/distinfo
diff -r0 -r1.1 pkgsrc/databases/postgresql83/patches/patch-src_makefiles_Makefile.solaris
diff -r0 -r1.1 pkgsrc/databases/postgresql83/patches/patch-src_pl_plperl_plperl.h
cvs diff -r1.19 -r1.20 pkgsrc/databases/postgresql83/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/postgresql83/Attic/Makefile.common 2011/09/27 11:03:59 1.19
+++ pkgsrc/databases/postgresql83/Attic/Makefile.common 2011/10/12 19:43:26 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.19 2011/09/27 11:03:59 adam Exp $ 1# $NetBSD: Makefile.common,v 1.20 2011/10/12 19:43:26 hans Exp $
2# 2#
3# used by databases/postgresql83-adminpack/Makefile 3# used by databases/postgresql83-adminpack/Makefile
4# used by databases/postgresql83-client/Makefile 4# used by databases/postgresql83-client/Makefile
5# used by databases/postgresql83-plperl/Makefile 5# used by databases/postgresql83-plperl/Makefile
6# used by databases/postgresql83-plpython/Makefile 6# used by databases/postgresql83-plpython/Makefile
7# used by databases/postgresql83-pltcl/Makefile 7# used by databases/postgresql83-pltcl/Makefile
8# used by databases/postgresql83-server/Makefile 8# used by databases/postgresql83-server/Makefile
9# 9#
10# This Makefile fragment is included by all PostgreSQL packages built from 10# This Makefile fragment is included by all PostgreSQL packages built from
11# the main sources of the PostgreSQL distribution except jdbc-postgresql. 11# the main sources of the PostgreSQL distribution except jdbc-postgresql.
12# 12#
13# The PostgreSQL package naming scheme, aside from the obvious piecewise 13# The PostgreSQL package naming scheme, aside from the obvious piecewise
14# packages, is as follows: 14# packages, is as follows:
@@ -37,50 +37,53 @@ PATCHDIR?= ${.CURDIR}/../postgresql83/p @@ -37,50 +37,53 @@ PATCHDIR?= ${.CURDIR}/../postgresql83/p
37 37
38USE_PKGLOCALEDIR= yes 38USE_PKGLOCALEDIR= yes
39USE_TOOLS+= bison gmake lex msgfmt 39USE_TOOLS+= bison gmake lex msgfmt
40PKG_SYSCONFSUBDIR= postgresql 40PKG_SYSCONFSUBDIR= postgresql
41 41
42.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
43 43
44PG_TEMPLATE.SunOS= solaris 44PG_TEMPLATE.SunOS= solaris
45PG_TEMPLATE.IRIX= irix5 45PG_TEMPLATE.IRIX= irix5
46.if !defined(PG_TEMPLATE.${OPSYS}) 46.if !defined(PG_TEMPLATE.${OPSYS})
47PG_TEMPLATE.${OPSYS}= ${LOWER_OPSYS} 47PG_TEMPLATE.${OPSYS}= ${LOWER_OPSYS}
48.endif 48.endif
49 49
 50PKGLOCALEDIR= share
 51
50GNU_CONFIGURE= yes 52GNU_CONFIGURE= yes
51CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 53CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
52CONFIGURE_ARGS+= --datadir=${PREFIX}/share/postgresql 54CONFIGURE_ARGS+= --datadir=${PREFIX}/share/postgresql
53CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/postgresql 55CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/postgresql
54CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}} 56CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}}
55 57
56CONFIGURE_ARGS+= --enable-nls 58CONFIGURE_ARGS+= --enable-nls
57CONFIGURE_ARGS+= --without-perl 59CONFIGURE_ARGS+= --without-perl
58CONFIGURE_ARGS+= --without-python 60CONFIGURE_ARGS+= --without-python
59CONFIGURE_ARGS+= --without-readline 61CONFIGURE_ARGS+= --without-readline
60CONFIGURE_ARGS+= --without-tcl 62CONFIGURE_ARGS+= --without-tcl
61CONFIGURE_ARGS+= --without-zlib 63CONFIGURE_ARGS+= --without-zlib
62 64
63# PostgreSQL explicitly forbids any use of -ffast-math 65# PostgreSQL explicitly forbids any use of -ffast-math
64BUILDLINK_TRANSFORM+= rm:-ffast-math 66BUILDLINK_TRANSFORM+= rm:-ffast-math
65 67
66# USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl 68# USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl
67# to provide "dlopen" functionality for the PostgreSQL backend. 69# to provide "dlopen" functionality for the PostgreSQL backend.
68.if ${OPSYS} == "Interix" 70.if ${OPSYS} == "Interix"
69USE_LIBLTDL?= yes 71USE_LIBLTDL?= yes
70.endif 72.endif
71USE_LIBLTDL?= no 73USE_LIBLTDL?= no
72 74
73.include "../../devel/gettext-lib/buildlink3.mk" 75.include "../../devel/gettext-lib/buildlink3.mk"
 76LIBS.SunOS+= -lintl
74 77
75.if !defined(META_PACKAGE) 78.if !defined(META_PACKAGE)
76post-extract: 79post-extract:
77. if !empty(USE_LIBLTDL:M[yY][eE][sS]) 80. if !empty(USE_LIBLTDL:M[yY][eE][sS])
78 cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \ 81 cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
79 ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h 82 ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h
80 ${ECHO} "static int dummy = 0;" \ 83 ${ECHO} "static int dummy = 0;" \
81 > ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c 84 > ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c
82. endif 85. endif
83 touch ${WRKSRC}/src/template/dragonfly 86 touch ${WRKSRC}/src/template/dragonfly
84 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ 87 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
85 ${WRKSRC}/src/backend/port/dynloader/dragonfly.c 88 ${WRKSRC}/src/backend/port/dynloader/dragonfly.c
86 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ 89 cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
cvs diff -r1.18 -r1.19 pkgsrc/databases/postgresql83/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/postgresql83/Attic/distinfo 2011/09/27 11:03:59 1.18
+++ pkgsrc/databases/postgresql83/Attic/distinfo 2011/10/12 19:43:26 1.19
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: distinfo,v 1.18 2011/09/27 11:03:59 adam Exp $ 1$NetBSD: distinfo,v 1.19 2011/10/12 19:43:26 hans Exp $
2 2
3SHA1 (postgresql-8.3.16.tar.bz2) = c8bda0f506c03d01054fac6dc2f1291cf7539c7e 3SHA1 (postgresql-8.3.16.tar.bz2) = c8bda0f506c03d01054fac6dc2f1291cf7539c7e
4RMD160 (postgresql-8.3.16.tar.bz2) = 2e2c677defbb0631529a4b76a3adee006c288617 4RMD160 (postgresql-8.3.16.tar.bz2) = 2e2c677defbb0631529a4b76a3adee006c288617
5Size (postgresql-8.3.16.tar.bz2) = 14348568 bytes 5Size (postgresql-8.3.16.tar.bz2) = 14348568 bytes
6SHA1 (patch-aa) = 6d5e9aa58975181d189060f8523c022aa6c82277 6SHA1 (patch-aa) = 6d5e9aa58975181d189060f8523c022aa6c82277
7SHA1 (patch-ab) = 1ba1bb53ca5a74d09fc2b7d07d98b0a0ffd57202 7SHA1 (patch-ab) = 1ba1bb53ca5a74d09fc2b7d07d98b0a0ffd57202
8SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279 8SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
9SHA1 (patch-ad) = bbafd1f18408f7a0f5d1a6608860bf1353a93769 9SHA1 (patch-ad) = bbafd1f18408f7a0f5d1a6608860bf1353a93769
10SHA1 (patch-af) = fcb43276c1f3349f62acfc37ac0bd6ccaae96f29 10SHA1 (patch-af) = fcb43276c1f3349f62acfc37ac0bd6ccaae96f29
11SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d 11SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
12SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b 12SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
13SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841 13SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841
14SHA1 (patch-ba) = db6be7665f19d2b2b707ffcaa04cb92b44544d61 14SHA1 (patch-ba) = db6be7665f19d2b2b707ffcaa04cb92b44544d61
15SHA1 (patch-src_interfaces_ecpg_ecpglib_Makefile) = 9107a858d4066f0c1e7ece8332d4b32ded718af1 15SHA1 (patch-src_interfaces_ecpg_ecpglib_Makefile) = 9107a858d4066f0c1e7ece8332d4b32ded718af1
 16SHA1 (patch-src_makefiles_Makefile.solaris) = 21fd5b1103e1c8aaf339ee6ef91e0d6dab5bea3a
 17SHA1 (patch-src_pl_plperl_plperl.h) = a521489a0e233a8dbaa8c56dd8fe5c411b0639c5
File Added: pkgsrc/databases/postgresql83/patches/Attic/patch-src_makefiles_Makefile.solaris
$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
File Added: pkgsrc/databases/postgresql83/patches/Attic/patch-src_pl_plperl_plperl.h
--- 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_