Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id D0D227A13F for ; Wed, 13 Jul 2016 15:01:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3F18985E88; Wed, 13 Jul 2016 15:01:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C496685E84 for ; Wed, 13 Jul 2016 15:01:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id m6J4zGOy-_Gp for ; Wed, 13 Jul 2016 15:01:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2AFFE84CE5 for ; Wed, 13 Jul 2016 15:01:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 262FAFBB5; Wed, 13 Jul 2016 15:01:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1468422103244060" MIME-Version: 1.0 Date: Wed, 13 Jul 2016 15:01:43 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/ocaml To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20160713150143.262FAFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1468422103244060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed Jul 13 15:01:43 UTC 2016 Modified Files: pkgsrc/lang/ocaml: Makefile distinfo pkgsrc/lang/ocaml/patches: patch-configure Log Message: Don't use GNU ld flags on x86_64 SunOS. Fixes various dependencies. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 pkgsrc/lang/ocaml/Makefile cvs rdiff -u -r1.97 -r1.98 pkgsrc/lang/ocaml/distinfo cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/ocaml/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1468422103244060 Content-Disposition: inline Content-Length: 5137 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ocaml/Makefile diff -u pkgsrc/lang/ocaml/Makefile:1.104 pkgsrc/lang/ocaml/Makefile:1.105 --- pkgsrc/lang/ocaml/Makefile:1.104 Thu Jul 7 12:15:36 2016 +++ pkgsrc/lang/ocaml/Makefile Wed Jul 13 15:01:42 2016 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.104 2016/07/07 12:15:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.105 2016/07/13 15:01:42 jperkin Exp $ .include "Makefile.common" -PKGREVISION= 1 +PKGREVISION= 2 #CONFIGURE_ARGS+= -no-tk #CONFIGURE_ARGS+= -cc ${CC} Index: pkgsrc/lang/ocaml/distinfo diff -u pkgsrc/lang/ocaml/distinfo:1.97 pkgsrc/lang/ocaml/distinfo:1.98 --- pkgsrc/lang/ocaml/distinfo:1.97 Wed Jul 13 13:36:01 2016 +++ pkgsrc/lang/ocaml/distinfo Wed Jul 13 15:01:42 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.97 2016/07/13 13:36:01 jperkin Exp $ +$NetBSD: distinfo,v 1.98 2016/07/13 15:01:42 jperkin Exp $ SHA1 (ocaml-4.03.0.tar.gz) = 28773fd89507dbc400a366b886425436569e70d8 RMD160 (ocaml-4.03.0.tar.gz) = 774934e72746cd8b94ac732abdd47d7f06344fda @@ -9,7 +9,7 @@ SHA1 (patch-asmcomp_asmlink.ml) = db2b38 SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c SHA1 (patch-asmrun_signals_osdep.h) = 0e72ee5595b937384284c884c2dd2a8be32e824c SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1 -SHA1 (patch-configure) = df807880779a39b0ec28748542921cb6bda6e41a +SHA1 (patch-configure) = cb7eee978dcf26d003cb041e7c2694f89065d7fd SHA1 (patch-debugger_Makefile.shared) = f0aac2e10b7ccf2e8e43bbbd3fd3e59e4dc4eeae SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991 Index: pkgsrc/lang/ocaml/patches/patch-configure diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.16 pkgsrc/lang/ocaml/patches/patch-configure:1.17 --- pkgsrc/lang/ocaml/patches/patch-configure:1.16 Wed Jul 13 13:36:01 2016 +++ pkgsrc/lang/ocaml/patches/patch-configure Wed Jul 13 15:01:42 2016 @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.16 2016/07/13 13:36:01 jperkin Exp $ +$NetBSD: patch-configure,v 1.17 2016/07/13 15:01:42 jperkin Exp $ Several configure changes to work on and detect NetBSD (and some other OSes) - See also: + --- configure.orig 2016-04-25 13:36:01.000000000 +0000 +++ configure @@ -671,7 +671,7 @@ if test $with_sharedlibs = "yes"; then @@ -90,7 +90,15 @@ See also: /dev/null; then x11_include=`pkg-config --cflags x11` -@@ -1551,6 +1561,7 @@ if test "$x11_include" = "not found"; th +@@ -1551,6 +1560,7 @@ if test "$x11_include" = "not found"; th /usr/XFree86/include/X11 \ \ /usr/include \ @@ -124,7 +132,7 @@ See also: