 @@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.101 2016/02/25 14:42:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.102 2016/02/29 13:53:58 jperkin Exp $
 .include "Makefile.common"
-PKGREVISION=		2
+PKGREVISION=		3
 #CONFIGURE_ARGS+=	-no-tk
 #CONFIGURE_ARGS+=	-cc ${CC}
 CONFIGURE_ENV+=		disable_x11=yes
 BUILD_TARGET=		world
 MAKE_JOBS_SAFE=		no
 UNLIMIT_RESOURCES=	stacksize
 USE_GCC_RUNTIME=	yes
 ###
 ### PLIST components
 @@ -41,27 +41,28 @@ PLIST_SRC+=	${PKGDIR}/PLIST.opt
       empty(MACHINE_PLATFORM:MNetBSD-*-arm) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
 PLIST_SRC+=	${PKGDIR}/PLIST.prof
 .  endif
 .endif
 # XXX This conditional is not complete.  It should match the
 # conditional in ocaml-x.y.z/configure.
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
 .  if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
       !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
       !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
       !empty(MACHINE_PLATFORM:MNetBSD-*-*) || \
-      !empty(MACHINE_PLATFORM:MDarwin-*-*)
+      !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
       !empty(MACHINE_PLATFORM:MSunOS-*-*)
 PLIST_SRC+=	${PKGDIR}/PLIST.natdynlink
 .  endif
 .endif
 # Common ocaml files.
 PLIST_SRC+=	${PKGDIR}/PLIST
 # This is needed because ${WRKSRC}/build/partial-install.sh uses
 # $PWD as part of its script.  However, with /bin/sh on SunOS
 # (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
 # set before the cd takes place and is then passed down.  So the end
 # result is when ./build/partial-install.sh is called, PWD is set
 # to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}.  /bin/ksh, which

 @@ -1,31 +1,31 @@
-$NetBSD: distinfo,v 1.92 2015/12/29 23:34:52 dholland Exp $
+$NetBSD: distinfo,v 1.93 2016/02/29 13:53:58 jperkin Exp $
 SHA1 (ocaml-4.02.3.tar.gz) = e68ffd2b5bb491a6345f46b27675e1361a49b274
 RMD160 (ocaml-4.02.3.tar.gz) = 3946204b9396a7fb81ae1042ce67a494579c151b
 SHA512 (ocaml-4.02.3.tar.gz) = be69e00abc2503582d7a07440a59db6bc992cce8ed2812bf02de07578760ead2858544013bb1a7a28a3c812b79c2f545cdaef11653b04a39c04a898510c36187
 Size (ocaml-4.02.3.tar.gz) = 3108892 bytes
 SHA1 (patch-Makefile) = ac116b05dcb4f3f15a9cd6b0e4ae954a9f2102ea
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmcomp_power_emit.mlp) = e734c85547c435954d3899a0975bcaf68e9b88f9
 SHA1 (patch-asmrun_Makefile) = ecc95df2e7d18f1e4051e365f47ddd53188f2b4f
 SHA1 (patch-asmrun_arm.S) = 4da63658cf7981ba954c24328806cc6dc7a592a0
 SHA1 (patch-asmrun_power-bsd.S) = e682b12e79b974ed460e2088a74566fea6c484ef
 SHA1 (patch-asmrun_signals_osdep.h) = cf2b316f7fc0cbc25c63776682c08f18861a3a0b
 SHA1 (patch-byterun_Makefile) = eb27cc004d099ce5a2bcf4aed341dd5a2b35967a
 SHA1 (patch-byterun_caml_mlvalues.h) = 310e49ecb718825395583ae4eacb91905118886b
 SHA1 (patch-config_auto__aux_gethostbyaddr.c) = 79159e1b9992ca11920832642b52c6c64717b567
 SHA1 (patch-config_auto__aux_gethostbyname.c) = dfb24714259938c59db0bf28a252d60f72abc421
-SHA1 (patch-configure) = d79689cf685827dd9ad2ce59ea3a8f63eb3c58a8
+SHA1 (patch-configure) = 2af864c6478404d33d5013d2035057474e56220e
 SHA1 (patch-debugger_Makefile.shared) = 2315c0f771ba2cb0d1f05d898db5023b5b44546b
 SHA1 (patch-driver_compenv.ml) = c011ba27c8d040c80408af6a4e6dcb5fc0a33902
 SHA1 (patch-driver_main.ml) = b843811b36277f5dea71953df74427394ceb2398
 SHA1 (patch-driver_main_args.ml) = c921664cb7ef1c44adf795ef33c0c9a6a72bfda7
 SHA1 (patch-driver_main_args.mli) = a70da17d932dda77793c12cdfffb406b24d76b4d
 SHA1 (patch-driver_optmain.ml) = dfdaee13dc02661fdebd88366462748e5faeae9b
 SHA1 (patch-man_Makefile) = f4fcde662061e7e7e664ec42617f1e37f1fcf214
 SHA1 (patch-ocamldoc_Makefile) = fe85a5ba0e9f9536ae4f80c0337a8cde9c542862
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
 SHA1 (patch-otherlibs_Makefile) = 839485e6576dcee53420a1bb75f49f7168b12427
 SHA1 (patch-otherlibs_Makefile.shared) = 517ef6024fe8ec3cff14e346216753f955189c86
 SHA1 (patch-otherlibs_dynlink_Makefile) = eea713c46848e97f8056e4874897be9d599a8e33
 SHA1 (patch-otherlibs_systhreads_Makefile) = 20cfdaa2a3f68a8ff18c7b50efb11c08555663eb

 @@ -1,18 +1,19 @@
-$NetBSD: patch-configure,v 1.12 2015/08/22 10:45:13 jaapb Exp $
+$NetBSD: patch-configure,v 1.13 2016/02/29 13:53:58 jperkin Exp $
 Several configure changes to work on and detect NetBSD (and some other OSes)
 See also: <http://caml.inria.fr/mantis/view.php?id=6900>
 --- configure.orig	2015-05-12 14:46:37.000000000 +0000
 +++ configure
 @@ -328,11 +328,11 @@ TOOLCHAIN="cc"
  case "$bytecc,$target" in
    cc,*-*-nextstep*)
      # GNU C extensions disabled, but __GNUC__ still defined!
 -    bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
 +    bytecccompopts="$gcc_warnings -U__GNUC__ -posix"
      bytecclinkopts="-posix";;
    *,*-*-rhapsody*)
      # Almost the same as NeXTStep
 -    bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
 +    bytecccompopts="$gcc_warnings -DSHRINKED_GNUC"
 @@ -103,120 +104,121 @@ See also:
 @@ -783,11 +783,7 @@ if test $with_sharedlibs = "yes"; then
      i[3456]86-*-linux*)           natdynlink=true;;
      i[3456]86-*-gnu*)             natdynlink=true;;
      x86_64-*-linux*)              natdynlink=true;;
 -    i[3456]86-*-darwin[89].*)     natdynlink=true;;
 -    i[3456]86-*-darwin*)
 -      if test $arch64 == true; then
 -        natdynlink=true
 -      fi;;
 +    i[3456]86-*-darwin*)          natdynlink=true;;
      x86_64-*-darwin*)             natdynlink=true;;
      powerpc*-*-linux*)            natdynlink=true;;
      sparc*-*-linux*)              natdynlink=true;;
-@@ -799,6 +795,8 @@ if test $with_sharedlibs = "yes"; then
+@@ -799,6 +795,9 @@ if test $with_sharedlibs = "yes"; then
      x86_64-*-openbsd*)            natdynlink=true;;
      i[3456]86-*-netbsd*)          natdynlink=true;;
      x86_64-*-netbsd*)             natdynlink=true;;
 +    i[3456]86-*-dragonfly*)       natdynlink=true;;
 +    x86_64-*-dragonfly*)          natdynlink=true;;
 +    *-*-solaris*)                 natdynlink=true;;
      i386-*-gnu0.3)                natdynlink=true;;
      i[3456]86-*-haiku*)           natdynlink=true;;
      arm*-*-linux*)                natdynlink=true;;
-@@ -827,6 +825,7 @@ case "$target" in
+@@ -827,6 +826,7 @@ case "$target" in
    sparc*-*-gnu*)                arch=sparc; system=gnu;;
    i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
    i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
 +  i[3456]86-*-dragonfly*)       arch=i386; system=bsd_`sh ./runtest elf.c`;;
    i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
    i[3456]86-*-solaris*)         if $arch64; then
                                    arch=amd64; system=solaris
-@@ -836,6 +835,7 @@ case "$target" in
+@@ -836,6 +836,7 @@ case "$target" in
    i[3456]86-*-haiku*)           arch=i386; system=beos;;
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
 +  i[3456]86-*-interix3*)        arch=i386; system=interix3;;
    i[3456]86-*-darwin*)          if $arch64; then
                                    arch=amd64; system=macosx
                                  else
-@@ -849,6 +849,7 @@ case "$target" in
+@@ -849,6 +850,7 @@ case "$target" in
    powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
    powerpc-*-darwin*)            arch=power; system=rhapsody
                                  if $arch64;then model=ppc64;else model=ppc;fi;;
 +	arm*-*-netbsd)								arch=arm; system=netbsd;;
    armv6*-*-linux-gnueabihf)     arch=arm; model=armv6; system=linux_eabihf;;
    arm*-*-linux-gnueabihf)       arch=arm; system=linux_eabihf;;
    armv7*-*-linux-gnueabi)       arch=arm; model=armv7; system=linux_eabi;;
-@@ -864,6 +865,8 @@ case "$target" in
+@@ -864,6 +866,8 @@ case "$target" in
    x86_64-*-gnu*)                arch=amd64; system=gnu;;
    x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
    x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
 +  x86_64-*-dragonfly*)          arch=amd64; system=dragonfly;;
 +  x86_64-*-solaris*)            arch=amd64; system=solaris;;
    x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
    x86_64-*-darwin*)             arch=amd64; system=macosx;;
    x86_64-*-mingw*)              arch=amd64; system=mingw;;
-@@ -903,7 +906,7 @@ case "$arch,$nativecc,$system,$target" i
+@@ -903,7 +907,7 @@ case "$arch,$nativecc,$system,$target" i
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;
    *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
    amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
 -  amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
 +  amd64,gcc*,solaris,*) partialld="ld -r -64";;
    *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
  esac
-@@ -920,7 +923,7 @@ case "$arch,$system" in
+@@ -920,7 +924,7 @@ case "$arch,$system" in
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
    i386,solaris)   as="${TOOLPREF}as"
 -                  aspp="/usr/ccs/bin/${TOOLPREF}as -P";;
 +                  aspp="gcc -traditional -c";;
    power,elf)      as="${TOOLPREF}as -u -m ppc"
                    aspp="${TOOLPREF}gcc -c";;
    power,rhapsody) as="${TOOLPREF}as -arch $model"
-@@ -961,6 +964,7 @@ case "$arch,$system" in
+@@ -961,6 +965,7 @@ case "$arch,$system" in
    arm,linux*) profiling='prof';;
    power,elf) profiling='prof';;
    power,bsd*) profiling='prof';;
 +	*,*,dragonfly) profiling='prof';;
    *) profiling='noprof';;
  esac
-@@ -1475,6 +1479,8 @@ fi
+@@ -1475,6 +1480,8 @@ fi
  x11_include="not found"
  x11_link="not found"
 +if test "$disable_x11" != "yes"; then
++
  if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
    if pkg-config --exists x11 2>/dev/null; then
      x11_include=`pkg-config --cflags x11`
-@@ -1521,6 +1527,7 @@ if test "$x11_include" = "not found"; th
+@@ -1521,6 +1528,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
+                               \
      /usr/include              \
 +    /usr/pkg/include          \
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1578,6 +1585,7 @@ if test "$x11_include" = "not found"; th
+@@ -1578,6 +1586,7 @@ if test "$x11_include" = "not found"; th
+                           \
      /usr/lib64            \
      /usr/lib              \
 +    /usr/pkg/lib          \
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1599,18 +1607,16 @@ if test "$x11_include" = "not found"; th
+@@ -1599,18 +1608,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else
 -        x11_libs="-L$dir"
 -        case "$target" in
 -          *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
 -          *-*-*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