Thu Jul 12 19:46:51 2012 UTC ()
databases/postgresql83-server: Fix rpath of plpgsql.so

Due to updated PKG_DEVELOPER checks, postgresql83-server started failing
with the following message:

ERROR: lib/postgresql/plpgsql.so: missing libintl.so.8

The plpgsql.so library had no rpath set other than what the base compiler
adds by default.  On DragonFly, the libintl.so library would likely have
been found anyway as /usr/pkg/lib is part of the LD_CONFIG hint file
search path, but that isn't a guarantee.

The new patch adds ${libdir} to the plpgsql.so rpath so it passes
PKG_DEVELOPER checks now.


(marino)
diff -r1.22 -r1.23 pkgsrc/databases/postgresql83/distinfo
diff -r1.19 -r1.20 pkgsrc/databases/postgresql83-server/Makefile
diff -r0 -r1.1 pkgsrc/databases/postgresql83/patches/patch-src_pl_plpgsql_src_Makefile
cvs diff -r1.22 -r1.23 pkgsrc/databases/postgresql83/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/postgresql83/Attic/distinfo 2012/07/01 19:19:42 1.22
+++ pkgsrc/databases/postgresql83/Attic/distinfo 2012/07/12 19:46:50 1.23
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.22 2012/07/01 19:19:42 morr Exp $ 1$NetBSD: distinfo,v 1.23 2012/07/12 19:46:50 marino Exp $
2 2
3SHA1 (postgresql-8.3.19.tar.bz2) = bd7fcb188f668d30029f02048b5b5b86b9d3d14e 3SHA1 (postgresql-8.3.19.tar.bz2) = bd7fcb188f668d30029f02048b5b5b86b9d3d14e
4RMD160 (postgresql-8.3.19.tar.bz2) = 1611a009386ba6984689fbbf8663c49d405f864c 4RMD160 (postgresql-8.3.19.tar.bz2) = 1611a009386ba6984689fbbf8663c49d405f864c
5Size (postgresql-8.3.19.tar.bz2) = 14570746 bytes 5Size (postgresql-8.3.19.tar.bz2) = 14570746 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 16SHA1 (patch-src_makefiles_Makefile.solaris) = 21fd5b1103e1c8aaf339ee6ef91e0d6dab5bea3a
17SHA1 (patch-src_pl_plperl_plperl.h) = a521489a0e233a8dbaa8c56dd8fe5c411b0639c5 17SHA1 (patch-src_pl_plperl_plperl.h) = a521489a0e233a8dbaa8c56dd8fe5c411b0639c5
 18SHA1 (patch-src_pl_plpgsql_src_Makefile) = 1d6a40da68d28c5080cbfd1738d6314e0de571ee
cvs diff -r1.19 -r1.20 pkgsrc/databases/postgresql83-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/postgresql83-server/Attic/Makefile 2012/07/01 19:21:14 1.19
+++ pkgsrc/databases/postgresql83-server/Attic/Makefile 2012/07/12 19:46:51 1.20
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.19 2012/07/01 19:21:14 morr Exp $ 1# $NetBSD: Makefile,v 1.20 2012/07/12 19:46:51 marino Exp $
2 2
3PKGNAME= ${DISTNAME:C/-/83-server-/} 3PKGNAME= ${DISTNAME:C/-/83-server-/}
 4PKGREVISION= 1
4COMMENT= PostgreSQL database server programs 5COMMENT= PostgreSQL database server programs
5 6
6PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
7 8
8# mips has no TAS implementation 9# mips has no TAS implementation
9NOT_FOR_PLATFORM= *-*-mips 10NOT_FOR_PLATFORM= *-*-mips
10 11
11.include "../../databases/postgresql83/Makefile.common" 12.include "../../databases/postgresql83/Makefile.common"
12 13
13CONFIGURE_ARGS+= --with-openssl 14CONFIGURE_ARGS+= --with-openssl
14 15
15INSTALL_DIRS= src/backend 16INSTALL_DIRS= src/backend
16INSTALL_DIRS+= src/backend/utils/mb/conversion_procs 17INSTALL_DIRS+= src/backend/utils/mb/conversion_procs
File Added: pkgsrc/databases/postgresql83/patches/Attic/patch-src_pl_plpgsql_src_Makefile
$NetBSD: patch-src_pl_plpgsql_src_Makefile,v 1.1 2012/07/12 19:46:51 marino Exp $

--- src/pl/plpgsql/src/Makefile.orig	2012-05-31 23:14:08.000000000 +0000
+++ src/pl/plpgsql/src/Makefile
@@ -17,7 +17,7 @@ SO_MINOR_VERSION= 0
 
 override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 SHLIB_LINK = $(filter -lintl, $(LIBS)) $(BE_DLLLIBS)
-rpath =
+rpath = $(COMPILER_RPATH_FLAG)$(libdir)
 
 OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o