diff options
| author | joerg <joerg@pkgsrc.org> | 2006-04-30 17:03:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-04-30 17:03:19 +0000 |
| commit | a685ea62001fd0a21b1c6e1b3ec5505f6513ff0e (patch) | |
| tree | c951b63c45bc026aa33989661bce39fbbab7f4ee /lang/ocaml | |
| parent | a1fb8e316890e4950ca71ca394d2e3a0744c7b9f (diff) | |
| download | pkgsrc-a685ea62001fd0a21b1c6e1b3ec5505f6513ff0e.tar.gz | |
Add back a patch fragment which got lost during the update.
Bump revision, since the thread support was not built on DragonFly.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile | 4 | ||||
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-at | 28 |
3 files changed, 24 insertions, 12 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index f3b74b669c7..8ec0c7b581a 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.48 2006/04/25 04:58:32 hiramatsu Exp $ +# $NetBSD: Makefile,v 1.49 2006/04/30 17:03:19 joerg Exp $ .include "Makefile.common" +PKGREVISION= 1 + CONFIGURE_ARGS+= -no-tk CONFIGURE_ENV+= disable_x11=yes diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 983c6fc415e..762b9863af7 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2006/04/25 04:58:32 hiramatsu Exp $ +$NetBSD: distinfo,v 1.36 2006/04/30 17:03:20 joerg Exp $ SHA1 (ocaml-3.09.2.tar.bz2) = 578c66707532882782735352a3628b78193da5e7 RMD160 (ocaml-3.09.2.tar.bz2) = 45edae84e5787775a5beed29a1ad2881f4df8505 @@ -19,7 +19,7 @@ SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5 -SHA1 (patch-at) = 94b71bf6c79a875a12985852362ae939d73ca6b3 +SHA1 (patch-at) = 1aa07c552191d0f756b4d89bc8133e294b659cf6 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2 SHA1 (patch-aw) = a2dee7fa2181008fb9cc632032a9a07aec422afa diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at index 5cf49bfc5cf..f177f9c8183 100644 --- a/lang/ocaml/patches/patch-at +++ b/lang/ocaml/patches/patch-at @@ -1,6 +1,8 @@ ---- configure.orig 2006-04-21 09:38:39.000000000 +0900 -+++ configure 2006-04-21 09:49:07.000000000 +0900 -@@ -483,7 +483,7 @@ +$NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $ + +--- configure.orig 2006-03-30 10:00:19.000000000 +0000 ++++ configure +@@ -483,7 +483,7 @@ mksharedlibrpath='' if test $withsharedlibs = "yes"; then case "$host" in @@ -9,7 +11,7 @@ sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared -o" bytecclinkopts="$bytecclinkopts -Wl,-E" -@@ -573,10 +573,12 @@ +@@ -573,10 +573,12 @@ case "$host" 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`;; @@ -22,7 +24,7 @@ i[3456]86-*-darwin*) arch=i386; system=macosx;; i[3456]86-*-gnu*) arch=i386; system=gnu;; mips-*-irix6*) arch=mips; system=irix;; -@@ -672,6 +674,7 @@ +@@ -672,6 +674,7 @@ case "$arch,$model,$system" in case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; amd64,*,linux) profiling='prof';; amd64,*,gnu) profiling='prof';; @@ -30,7 +32,15 @@ *) profiling='noprof';; esac -@@ -1107,6 +1110,7 @@ +@@ -1060,6 +1063,7 @@ if test "$pthread_wanted" = "yes"; then + case "$host" in + *-*-solaris*) pthread_link="-lpthread -lposix4";; + *-*-freebsd*) pthread_link="-pthread";; ++ *-*-dragonfly*) pthread_link="-pthread";; + *-*-openbsd*) pthread_link="-pthread";; + *) pthread_link="-lpthread";; + esac +@@ -1107,6 +1111,7 @@ fi x11_include="not found" x11_link="not found" @@ -38,7 +48,7 @@ for dir in \ $x11_include_dir \ \ -@@ -1153,6 +1157,7 @@ +@@ -1153,6 +1158,7 @@ do break fi done @@ -46,7 +56,7 @@ if test "$x11_include" = "not found"; then x11_try_lib_dir='' -@@ -1242,31 +1247,8 @@ +@@ -1242,31 +1248,8 @@ dbm_include="not found" dbm_link="not found" use_gdbm_ndbm=no @@ -80,7 +90,7 @@ if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then echo "NDBM not found, the \"dbm\" library will not be supported." else -@@ -1278,8 +1260,8 @@ +@@ -1278,8 +1261,8 @@ else fi echo "DBM_INCLUDES=$dbm_include" >> Makefile echo "DBM_LINK=$dbm_link" >> Makefile |