When linking with X11 add an rpath to X11 libdir.

Bump PKGREVISION

lang/ocaml/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2012/03/12 12:28:04 fhajny Exp $
+$NetBSD: distinfo,v 1.62 2012/06/22 11:39:45 sbd Exp $
 
 SHA1 (ocaml-3.12.1.tar.bz2) = 29b44117b116b1a5bc54a8b4514af483793a769f
 RMD160 (ocaml-3.12.1.tar.bz2) = 61d38c0785491c8790ac02ab78fb2f26ea490fc1
@@ -11,7 +11,7 @@ SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
 SHA1 (patch-aj) = 6fd989f1e5dd1263890c14459dd4ab85d75e86cd
 SHA1 (patch-an) = 8fb8efecd2b3f0ec6f913a0840f4cfebcbb6161e
-SHA1 (patch-at) = 9f83f88ae5d249cf2060f87741a20066a7033225
+SHA1 (patch-at) = 5925e7705e94ad3541d1ebbc568116e192ec50e5
 SHA1 (patch-au) = 1e36bcdf39d40e781273ea51df213db05ff46c89
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
 SHA1 (patch-aw) = cf66a2296cb86adfc0945e0009a6ed2805b57eed

lang/ocaml/patches/patch-at

@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.26 2012/03/12 12:28:04 fhajny Exp $
+$NetBSD: patch-at,v 1.27 2012/06/22 11:39:45 sbd Exp $
 
 . Include CFLAGS in bytecccompopts and LDFLAGS in bytecclinkopts.
 . Add cases for dragonfly support.
@@ -14,6 +14,7 @@ $NetBSD: patch-at,v 1.26 2012/03/12 12:28:04 fhajny Exp $
 . Enable suport for x86_64-DragonFly
 . Enable profiling and native dynamic loading for all DragonFly platforms
 . Add pkgsrc X11 checks in case X11 support is enabled in the future
+. When linking with X11 add an rpath to X11 libdir.
 . Fix SunOS linker and as args
 
 --- configure.orig	2011-07-04 21:15:01.000000000 +0000
@@ -167,7 +168,21 @@ $NetBSD: patch-at,v 1.26 2012/03/12 12:28:04 fhajny Exp $
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1402,31 +1420,8 @@ dbm_include="not found"
+@@ -1368,11 +1386,8 @@ do
+     if test $dir = /usr/lib; then
+       x11_link="-lX11"
+     else
+-      x11_libs="-L$dir"
+-      case "$host" in
+-        *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+-        *) x11_link="-L$dir -lX11";;
+-      esac
++      x11_libs="-L$dir ${COMPILER_RPATH_FLAG}$dir"
++      x11_link="-L$dir ${COMPILER_RPATH_FLAG}$dir -lX11"
+     fi
+     break
+   fi
+@@ -1402,31 +1417,8 @@ dbm_include="not found"
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -201,7 +216,7 @@ $NetBSD: patch-at,v 1.26 2012/03/12 12:28:04 fhajny Exp $
  if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
    echo "NDBM not found, the \"dbm\" library will not be supported."
  else
-@@ -1436,8 +1431,8 @@ else
+@@ -1436,8 +1428,8 @@ else
    else
      dbm_include="-I$dbm_include"
    fi

x11/ocaml-graphics/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/12/13 06:17:35 marino Exp $
+# $NetBSD: Makefile,v 1.16 2012/06/22 11:39:44 sbd Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo
 PATCHDIR= ${PKGDIR}/../../lang/ocaml/patches
 
 PKGNAME=		${DISTNAME:S/ocaml/ocaml-graphics/}
-PKGREVISION=		5
+PKGREVISION=		6
 
 COMMENT+=		(graphics library)