From owner-svn-ports-all@FreeBSD.ORG Tue Jun 10 23:40:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42F83325; Tue, 10 Jun 2014 23:40:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 244212FD7; Tue, 10 Jun 2014 23:40:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5ANebwV090360; Tue, 10 Jun 2014 23:40:37 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5ANeb1s090358; Tue, 10 Jun 2014 23:40:37 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406102340.s5ANeb1s090358@svn.freebsd.org> From: John Marino Date: Tue, 10 Jun 2014 23:40:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357402 - in head/lang/ocaml: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2014 23:40:38 -0000 Author: marino Date: Tue Jun 10 23:40:37 2014 New Revision: 357402 URL: http://svnweb.freebsd.org/changeset/ports/357402 QAT: https://qat.redports.org/buildarchive/r357402/ Log: lang/ocaml: Remove DEF_OPT option (non-default option) The option reacts poorly with ocamlp4, and phasing out DEF_OPT completely will prevent a lot of breakage with ports that also interact with ocamlp4. PR: 189176 Submitted by: Anil Madhavapeddy Prepared by: maintainer (Michael Gruenewald) Modified: head/lang/ocaml/Makefile head/lang/ocaml/files/patch-camlp4-man_Makefile Modified: head/lang/ocaml/Makefile ============================================================================== --- head/lang/ocaml/Makefile Tue Jun 10 23:22:44 2014 (r357401) +++ head/lang/ocaml/Makefile Tue Jun 10 23:40:37 2014 (r357402) @@ -4,7 +4,7 @@ # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated PORTNAME= ocaml PORTVERSION= 4.01.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \ ${MASTER_SITE_GENTOO} @@ -37,12 +37,10 @@ CONFIGURE_ARGS= -verbose -prefix "${PREF -aspp "${CC} -c" \ -partialld "${LD} -r" -OPTIONS_DEFINE= X11 TK THREADS OPT_DEF DOCS +OPTIONS_DEFINE= X11 TK THREADS DOCS OPTIONS_DEFAULT=X11 TK THREADS -OPT_DEF_DESC= Use system-optimized binaries by default TK_DESC= LablTk library (requires X11 support) CMP_LIB_DESC= Install compiler libraries -OPT_DEF_DESC= Use system-optimizes binaries by default PORTDOCS= htmlman ${DOCSDISTNAME}-refman.ps.gz \ ${DOCSDISTNAME}-refman.pdf @@ -200,17 +198,4 @@ post-install: # Fix permissions for ld.conf @${CHMOD} 644 ${STAGEDIR}${PREFIX}/lib/ocaml/ld.conf -# Do we want .opt version of tools to be the default ? -.if ${PORT_OPTIONS:MOPT_DEF} -. for module in ${MODOPT} -# First, we save bytecode version - ${MV} ${STAGEDIR}${PREFIX}/bin/${module} ${STAGEDIR}${PREFIX}/bin/${module}.byte - -# Next make .opt version be the default one (via link) - ${LN} ${STAGEDIR}${PREFIX}/bin/${module}.opt ${STAGEDIR}${PREFIX}/bin/${module} - @${ECHO_CMD} "bin/${module}.byte" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${LN} %D/${module}.opt %D/${module}" >> ${TMPPLIST} -. endfor -.endif - .include Modified: head/lang/ocaml/files/patch-camlp4-man_Makefile ============================================================================== --- head/lang/ocaml/files/patch-camlp4-man_Makefile Tue Jun 10 23:22:44 2014 (r357401) +++ head/lang/ocaml/files/patch-camlp4-man_Makefile Tue Jun 10 23:40:37 2014 (r357402) @@ -1,6 +1,6 @@ ---- camlp4/man/Makefile.orig 2010-11-04 21:04:51.000000000 +0800 -+++ camlp4/man/Makefile 2010-11-04 21:05:14.000000000 +0800 -@@ -3,7 +3,6 @@ +--- camlp4/man/Makefile.orig 2012-07-17 11:31:12.000000000 -0400 ++++ camlp4/man/Makefile 2013-11-21 03:16:26.000000000 -0500 +@@ -14,7 +14,6 @@ include ../config/Makefile.cnf TARGET=camlp4.1 @@ -8,7 +8,7 @@ include ../config/Makefile.base -@@ -11,10 +10,6 @@ +@@ -22,10 +21,6 @@ if test -n '$(MANDIR)'; then \ $(MKDIR) $(MANDIR)/man1 ; \ cp $(TARGET) $(MANDIR)/man1/. ; \