From owner-svn-ports-all@FreeBSD.ORG Wed May 7 18:19:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7EEA4CC1; Wed, 7 May 2014 18:19:05 +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 60501AF4; Wed, 7 May 2014 18:19:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47IJ5nD011688; Wed, 7 May 2014 18:19:05 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47IJ53q011685; Wed, 7 May 2014 18:19:05 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405071819.s47IJ53q011685@svn.freebsd.org> From: John Marino Date: Wed, 7 May 2014 18:19:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353188 - in head/astro/planets: . 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: Wed, 07 May 2014 18:19:05 -0000 Author: marino Date: Wed May 7 18:19:04 2014 New Revision: 353188 URL: http://svnweb.freebsd.org/changeset/ports/353188 QAT: https://qat.redports.org/buildarchive/r353188/ Log: astro/planets: Unbreak after Ocaml 4.01 with Debian patch While using one of Debian's patches to fix this build, remove the hardcoded depends and replace with USE_OCAML instead. Also convert to USES+=tar while we are here. Added: head/astro/planets/files/ head/astro/planets/files/patch-options.ml (contents, props changed) Modified: head/astro/planets/Makefile Modified: head/astro/planets/Makefile ============================================================================== --- head/astro/planets/Makefile Wed May 7 18:07:59 2014 (r353187) +++ head/astro/planets/Makefile Wed May 7 18:19:04 2014 (r353188) @@ -3,19 +3,18 @@ PORTNAME= planets PORTVERSION= 0.1.13 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= GENTOO/distfiles \ http://planets.homedns.org/dist/ -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Orbital simulator LICENSE= GPLv2 -BUILD_DEPENDS= ocaml:${PORTSDIR}/lang/ocaml - -USES= gmake +USES= gmake tar:tgz +USE_OCAML= yes USE_XORG= x11 ALL_TARGET= ${PORTNAME} Added: head/astro/planets/files/patch-options.ml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/planets/files/patch-options.ml Wed May 7 18:19:04 2014 (r353188) @@ -0,0 +1,106 @@ +--- options.ml ++++ options.ml +@@ -93,7 +93,7 @@ end + (*********************************************************************) + (* 'a is the data type, 'b is the widget type *) + +-class virtual ['a,'b] option ?name ~text ~set:(set:'a->unit) ~get () = ++class virtual ['a,'b,'c] option ?name ~text ~set:(set:'a->unit) ~get () = + let name = (match name with + None -> random_name 10 + | Some name -> name ) in +@@ -104,7 +104,7 @@ object (self) + val name = name + val text = (text : string) + +- method virtual build_widget : live:bool -> 'b ++ method virtual build_widget : live:bool -> 'b + method display ~live parent = + ignore (self#build_widget ~live parent); + match widget with +@@ -126,9 +126,9 @@ end + + (*********************) + +-class ['b] toggle_option ?name ~text ~set ~get () = ++class ['b,'c] toggle_option ?name ~text ~set ~get () = + object (self) +- inherit [bool,'b] option ?name ~text ~set ~get () ++ inherit [bool,'b,'c] option ?name ~text ~set ~get () + + method set_tk bool = + Textvariable.set tk_var (if bool then "true" else "false") +@@ -153,9 +153,9 @@ end + + (*********************) + +-class ['b] int_scale_option ?name ~min ~max ~text ~set ~get () = ++class ['b,'c] int_scale_option ?name ~min ~max ~text ~set ~get () = + object (self) +- inherit [int,'b] option ?name ~text ~set ~get () ++ inherit [int,'b,'c] option ?name ~text ~set ~get () + val min = min + val max = max + +@@ -192,10 +192,10 @@ end + + (*******************************************************) + +-class ['b] float_scale_option ?name ~min ~max ?(resolution=1.0) ++class ['b, 'c] float_scale_option ?name ~min ~max ?(resolution=1.0) + ~text ~set ~get () = + object (self) +- inherit [float, 'b] option ?name ~text ~set ~get () ++ inherit [float, 'b, 'c] option ?name ~text ~set ~get () + val min = min + val max = max + +@@ -236,10 +236,10 @@ let string_of_float x = + then string ^ "0" + else string + +-class ['b] float_entry_option ?name ?(mult=1.1) ++class ['b, 'c] float_entry_option ?name ?(mult=1.1) + ~text ~set ~get () = + object (self) +- inherit [float, 'b] option ?name ~text ~set ~get () ++ inherit [float, 'b, 'c] option ?name ~text ~set ~get () + + val mutable entry = None + +@@ -303,9 +303,9 @@ end + + (*******************************************************) + +-class ['b] float_entry_display ?name ~text ~set ~get () = ++class ['b, 'c] float_entry_display ?name ~text ~set ~get () = + object (self) +- inherit [float, 'b] option ?name ~text ~set ~get () ++ inherit [float, 'b, 'c] option ?name ~text ~set ~get () + + val mutable display = None + +@@ -337,9 +337,9 @@ end + + (*******************************************************) + +-class ['b] int_entry_display ?name ~text ~set ~get () = ++class ['b, 'c] int_entry_display ?name ~text ~set ~get () = + object (self) +- inherit [int, 'b] option ?name ~text ~set ~get () ++ inherit [int, 'b, 'c] option ?name ~text ~set ~get () + + val mutable display = None + +@@ -371,9 +371,9 @@ end + + (*******************************************************) + +-class ['b] void_entry_display ?name ~text () = ++class ['b, 'c] void_entry_display ?name ~text () = + object (self) +- inherit [unit, 'b] option ?name ~text ++ inherit [unit, 'b, 'c] option ?name ~text + ~set:(fun x -> ()) ~get:(fun () -> ()) + () +