svn commit: r418967 - in head: . devel devel/omake devel/omake/files games games/freetennis graphics graphics/ocaml-images

Sat Jul 23 14:19:09 UTC 2016

Author: rene
Date: Sat Jul 23 14:19:05 2016
New Revision: 418967
URL: https://svnweb.freebsd.org/changeset/ports/418967

Log:
  Ressurect devel/omake, graphics/ocaml-images and games/freetennis [1]
  
  - devel/omake:
    - add new MASTER_SITES
    - regenerate patches [1]
  - graphics/ocaml-images:
    - add missing LIB_DEPENDS
    - pet portlint
    - bump PORTREVISION
  - games/freetennis:
    - add missing indirect depedencies [2]
    - bump PORTREVISION
  PR:		210853 [1]
  Submitted by:	lightside at gmx.com [1]
  Reported by:	poudriere testport [2]

Added:
  head/devel/omake/
     - copied from r418100, head/devel/omake/
  head/games/freetennis/
     - copied from r418100, head/games/freetennis/
  head/graphics/ocaml-images/
     - copied from r418100, head/graphics/ocaml-images/
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/omake/Makefile
  head/devel/omake/files/patch-OMakefile
  head/devel/omake/files/patch-lib_build_OCaml.om
  head/devel/omake/files/patch-src_build_omake_rule.ml
  head/devel/omake/files/patch-src_builtin_omake__builtin__target.ml
  head/devel/omake/files/patch-src_clib_omake__shell__sys.c
  head/devel/omake/files/patch-src_clib_readline.c
  head/devel/omake/files/patch-src_env_omake__env.ml
  head/devel/omake/files/patch-src_ir_omake__value__type.ml
  head/devel/omake/files/patch-src_libmojave-external_cutil_fam__pseudo.h
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__channel.c
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__ctype.c
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__notify.c
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__printf.c
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__terminfo.c
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__termsize.c
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__uname__ext.c
  head/devel/omake/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c
  head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__debug.ml
  head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__string__util.ml
  head/devel/omake/files/patch-src_libmojave-external_unix_lm__notify.ml
  head/devel/omake/files/patch-src_libmojave-external_util_lm__channel.ml
  head/devel/omake/files/patch-src_libmojave-external_util_lm__filename__util.ml
  head/devel/omake/files/patch-src_libmojave-external_util_lm__glob.ml
  head/devel/omake/files/patch-src_libmojave-external_util_lm__lexer.ml
  head/devel/omake/files/patch-src_libmojave-external_util_lm__parser.ml
  head/games/Makefile
  head/games/freetennis/Makefile
  head/graphics/Makefile
  head/graphics/ocaml-images/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Sat Jul 23 13:44:52 2016	(r418966)
+++ head/MOVED	Sat Jul 23 14:19:05 2016	(r418967)
@@ -8594,9 +8594,6 @@ ftp/fget||2016-07-04|Has expired: Broken
 net-mgmt/netmond||2016-07-04|Has expired: Broken for more than 6 months
 net-mgmt/ipfm||2016-07-04|Has expired: Broken for more than 6 months
 textproc/py-dbf|databases/py-dbf|2016-07-05|Duplicate port deleted
-games/freetennis||2016-07-05|Depends on expired graphics/ocaml-images
-graphics/ocaml-images||2016-07-05|Has expired: Depends on expiring devel/omake
-devel/omake||2016-07-05|Has expired: Broken for more than 6 months
 www/yahoo-ui||2016-07-05|Has expired: Broken for more than 6 months
 sysutils/moosefs-cgi|sysutils/moosefs2-cgi|2016-07-07|Moved to a numbered port name
 sysutils/moosefs-cgiserv|sysutils/moosefs2-cgiserv|2016-07-07|Moved to a numbered port name

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Jul 23 13:44:52 2016	(r418966)
+++ head/devel/Makefile	Sat Jul 23 14:19:05 2016	(r418967)
@@ -1608,6 +1608,7 @@
     SUBDIR += ode
     SUBDIR += ois
     SUBDIR += okteta
+    SUBDIR += omake
     SUBDIR += omniNotify
     SUBDIR += omniORB
     SUBDIR += omniORB-4.1

Modified: head/devel/omake/Makefile
==============================================================================
--- head/devel/omake/Makefile	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/Makefile	Sat Jul 23 14:19:05 2016	(r418967)
@@ -5,15 +5,12 @@ PORTNAME=	omake
 DISTVERSION=	0.9.8.6-0.rc1
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://main.metaprl.org/download/omake/
+MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/omake-0.9.8.6-0.rc1.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/ \
+		http://download.camlcity.org/download/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Flexible build system
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C|-.*||}
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=yes

Modified: head/devel/omake/files/patch-OMakefile
==============================================================================
--- head/devel/omake/files/patch-OMakefile	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-OMakefile	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-aa,v 1.2 2010/12/17 09:40
 
 From upstream SVN.
 
---- OMakefile.orig	2010-10-27 00:42:37.000000000 +0000
+--- OMakefile.orig	2010-10-27 00:42:37 UTC
 +++ OMakefile
 @@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB))
  #

Modified: head/devel/omake/files/patch-lib_build_OCaml.om
==============================================================================
--- head/devel/omake/files/patch-lib_build_OCaml.om	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-lib_build_OCaml.om	Sat Jul 23 14:19:05 2016	(r418967)
@@ -6,7 +6,7 @@ are warned about in gcc 4.7, and the alt
 warn-error flag is to remove all these unreferenced functions and
 constants via patches.
 
---- lib/build/OCaml.om.orig	2008-03-05 01:07:25.000000000 +0000
+--- lib/build/OCaml.om.orig	2008-03-05 01:07:25 UTC
 +++ lib/build/OCaml.om
 @@ -176,7 +176,7 @@ public.PREFIXED_OCAMLPACKS =\
  #

Modified: head/devel/omake/files/patch-src_build_omake_rule.ml
==============================================================================
--- head/devel/omake/files/patch-src_build_omake_rule.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_build_omake_rule.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ac,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/build/omake_rule.ml.orig	2010-10-07 19:59:08.000000000 +0000
+--- src/build/omake_rule.ml.orig	2010-10-07 19:59:08 UTC
 +++ src/build/omake_rule.ml
 @@ -768,7 +768,7 @@ let lazy_command venv pos command =
           let fv = free_vars_exp_list el in

Modified: head/devel/omake/files/patch-src_builtin_omake__builtin__target.ml
==============================================================================
--- head/devel/omake/files/patch-src_builtin_omake__builtin__target.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_builtin_omake__builtin__target.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ad,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/builtin/omake_builtin_target.ml.orig	2008-01-15 19:57:00.000000000 +0000
+--- src/builtin/omake_builtin_target.ml.orig	2008-01-15 19:57:00 UTC
 +++ src/builtin/omake_builtin_target.ml
 @@ -221,8 +221,8 @@ let split_command venv (values1, lines1)
                 match line with

Modified: head/devel/omake/files/patch-src_clib_omake__shell__sys.c
==============================================================================
--- head/devel/omake/files/patch-src_clib_omake__shell__sys.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_clib_omake__shell__sys.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ae,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/clib/omake_shell_sys.c.orig	2007-12-01 21:32:13.000000000 +0000
+--- src/clib/omake_shell_sys.c.orig	2007-12-01 21:32:13 UTC
 +++ src/clib/omake_shell_sys.c
 @@ -551,7 +551,7 @@ value omake_shell_sys_suspend(value v_pg
      fflush(stderr);

Modified: head/devel/omake/files/patch-src_clib_readline.c
==============================================================================
--- head/devel/omake/files/patch-src_clib_readline.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_clib_readline.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-af,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/clib/readline.c.orig	2007-05-15 19:03:03.000000000 +0000
+--- src/clib/readline.c.orig	2007-05-15 19:03:03 UTC
 +++ src/clib/readline.c
 @@ -134,7 +134,7 @@ static char **readline_completion(char *
          CAMLreturnT(char **, 0);

Modified: head/devel/omake/files/patch-src_env_omake__env.ml
==============================================================================
--- head/devel/omake/files/patch-src_env_omake__env.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_env_omake__env.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ag,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/env/omake_env.ml.orig	2008-01-15 19:57:00.000000000 +0000
+--- src/env/omake_env.ml.orig	2008-01-15 19:57:00 UTC
 +++ src/env/omake_env.ml
 @@ -404,8 +404,8 @@ let rec pp_print_command buf command =
     match command with

Modified: head/devel/omake/files/patch-src_ir_omake__value__type.ml
==============================================================================
--- head/devel/omake/files/patch-src_ir_omake__value__type.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_ir_omake__value__type.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ah,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/ir/omake_value_type.ml.orig	2010-10-07 19:59:08.000000000 +0000
+--- src/ir/omake_value_type.ml.orig	2010-10-07 19:59:08 UTC
 +++ src/ir/omake_value_type.ml
 @@ -162,7 +162,7 @@ type path =
   *)

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_fam__pseudo.h
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_fam__pseudo.h	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_fam__pseudo.h	Sat Jul 23 14:19:05 2016	(r418967)
@@ -1,6 +1,6 @@
 $NetBSD: patch-src_libmojave-external_cutil_fam__pseudo.h,v 1.1 2012/11/16 00:46:04 joerg Exp $
 
---- src/libmojave-external/cutil/fam_pseudo.h.orig	2012-11-08 22:16:13.000000000 +0000
+--- src/libmojave-external/cutil/fam_pseudo.h.orig	2006-07-15 17:23:37 UTC
 +++ src/libmojave-external/cutil/fam_pseudo.h
 @@ -43,7 +43,10 @@
  /*

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__channel.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__channel.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__channel.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ai,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_channel.c.orig	2006-07-15 17:23:37.000000000 +0000
+--- src/libmojave-external/cutil/lm_channel.c.orig	2006-07-15 17:23:37 UTC
 +++ src/libmojave-external/cutil/lm_channel.c
 @@ -57,7 +57,7 @@ value omake_shell_peek_pipe(value v_fd)
                             &total,              // Total number of bytes available

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__ctype.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__ctype.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__ctype.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-aj,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_ctype.c.orig	2006-12-01 21:13:14.000000000 +0000
+--- src/libmojave-external/cutil/lm_ctype.c.orig	2006-12-01 21:13:14 UTC
 +++ src/libmojave-external/cutil/lm_ctype.c
 @@ -59,7 +59,7 @@ static value get_chars(int (*f)(int))
          if(f(i))

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__notify.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__notify.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__notify.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ak,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_notify.c.orig	2007-07-27 17:58:13.000000000 +0000
+--- src/libmojave-external/cutil/lm_notify.c.orig	2007-07-27 17:58:13 UTC
 +++ src/libmojave-external/cutil/lm_notify.c
 @@ -74,13 +74,13 @@ typedef struct {
  

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__printf.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__printf.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__printf.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-al,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_printf.c.orig	2009-02-06 16:41:21.000000000 +0000
+--- src/libmojave-external/cutil/lm_printf.c.orig	2009-02-06 16:41:21 UTC
 +++ src/libmojave-external/cutil/lm_printf.c
 @@ -61,12 +61,12 @@ value ml_print_char(value v_fmt, value v
      char c = (char) Int_val(v_char);

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__terminfo.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__terminfo.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__terminfo.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-am,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_terminfo.c.orig	2007-05-15 19:03:32.000000000 +0000
+--- src/libmojave-external/cutil/lm_terminfo.c.orig	2007-05-15 19:03:32 UTC
 +++ src/libmojave-external/cutil/lm_terminfo.c
 @@ -75,9 +75,9 @@ value caml_tgetstr(value id) {
  

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__termsize.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__termsize.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__termsize.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-an,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_termsize.c.orig	2008-03-19 00:44:12.000000000 +0000
+--- src/libmojave-external/cutil/lm_termsize.c.orig	2008-03-19 00:44:12 UTC
 +++ src/libmojave-external/cutil/lm_termsize.c
 @@ -45,7 +45,7 @@ value caml_term_size(value arg)
      CAMLlocal1(buf);

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__uname__ext.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__uname__ext.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__uname__ext.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ao,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_uname_ext.c.orig	2006-12-08 19:21:40.000000000 +0000
+--- src/libmojave-external/cutil/lm_uname_ext.c.orig	2006-12-08 19:21:40 UTC
 +++ src/libmojave-external/cutil/lm_uname_ext.c
 @@ -147,21 +147,21 @@ value lm_uname(value x)
  

Modified: head/devel/omake/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ap,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/cutil/lm_unix_cutil.c.orig	2007-07-18 17:42:32.000000000 +0000
+--- src/libmojave-external/cutil/lm_unix_cutil.c.orig	2007-07-18 17:42:32 UTC
 +++ src/libmojave-external/cutil/lm_unix_cutil.c
 @@ -87,9 +87,9 @@ value home_win32(value v_unit)
      TCHAR path[MAX_PATH];

Modified: head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__debug.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__debug.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__debug.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-aq,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/stdlib/lm_debug.ml.orig	2006-08-03 22:51:52.000000000 +0000
+--- src/libmojave-external/stdlib/lm_debug.ml.orig	2006-08-03 22:51:52 UTC
 +++ src/libmojave-external/stdlib/lm_debug.ml
 @@ -173,11 +173,10 @@ let create_debug
   *)

Modified: head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__string__util.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__string__util.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_stdlib_lm__string__util.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ar,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/stdlib/lm_string_util.ml.orig	2008-06-28 01:21:34.000000000 +0000
+--- src/libmojave-external/stdlib/lm_string_util.ml.orig	2008-06-28 01:21:34 UTC
 +++ src/libmojave-external/stdlib/lm_string_util.ml
 @@ -613,18 +613,13 @@ let tokens_create wrap group =
   * Get the tokens list.

Modified: head/devel/omake/files/patch-src_libmojave-external_unix_lm__notify.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_unix_lm__notify.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_unix_lm__notify.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-as,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/unix/lm_notify.ml.orig	2007-07-19 21:06:05.000000000 +0000
+--- src/libmojave-external/unix/lm_notify.ml.orig	2007-07-19 21:06:05 UTC
 +++ src/libmojave-external/unix/lm_notify.ml
 @@ -153,10 +153,8 @@ let is_path_prefix (root1, path1) (root2
  let is_monitored_name requests name =

Modified: head/devel/omake/files/patch-src_libmojave-external_util_lm__channel.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_util_lm__channel.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_util_lm__channel.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-at,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/util/lm_channel.ml.orig	2007-07-16 21:10:43.000000000 +0000
+--- src/libmojave-external/util/lm_channel.ml.orig	2007-07-16 21:10:43 UTC
 +++ src/libmojave-external/util/lm_channel.ml
 @@ -337,12 +337,10 @@ let of_string s =
     of_string string_sym 1 0 (String.copy s)

Modified: head/devel/omake/files/patch-src_libmojave-external_util_lm__filename__util.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_util_lm__filename__util.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_util_lm__filename__util.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-au,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/util/lm_filename_util.ml.orig	2007-01-29 20:14:42.000000000 +0000
+--- src/libmojave-external/util/lm_filename_util.ml.orig	2007-01-29 20:14:42 UTC
 +++ src/libmojave-external/util/lm_filename_util.ml
 @@ -48,12 +48,11 @@ let groups =
  let unix_is_executable s =

Modified: head/devel/omake/files/patch-src_libmojave-external_util_lm__glob.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_util_lm__glob.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_util_lm__glob.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-av,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/util/lm_glob.ml.orig	2007-09-04 16:12:33.000000000 +0000
+--- src/libmojave-external/util/lm_glob.ml.orig	2007-09-04 16:12:33 UTC
 +++ src/libmojave-external/util/lm_glob.ml
 @@ -157,11 +157,8 @@ let home_dir =
  let getusers () =

Modified: head/devel/omake/files/patch-src_libmojave-external_util_lm__lexer.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_util_lm__lexer.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_util_lm__lexer.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-aw,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/util/lm_lexer.ml.orig	2007-01-25 18:31:18.000000000 +0000
+--- src/libmojave-external/util/lm_lexer.ml.orig	2007-01-25 18:31:18 UTC
 +++ src/libmojave-external/util/lm_lexer.ml
 @@ -1325,10 +1325,8 @@ struct
      * Expressions.

Modified: head/devel/omake/files/patch-src_libmojave-external_util_lm__parser.ml
==============================================================================
--- head/devel/omake/files/patch-src_libmojave-external_util_lm__parser.ml	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/devel/omake/files/patch-src_libmojave-external_util_lm__parser.ml	Sat Jul 23 14:19:05 2016	(r418967)
@@ -2,7 +2,7 @@ $NetBSD: patch-ax,v 1.1 2010/12/17 09:40
 
 From upstream SVN.
 
---- src/libmojave-external/util/lm_parser.ml.orig	2007-01-25 18:31:18.000000000 +0000
+--- src/libmojave-external/util/lm_parser.ml.orig	2007-01-25 18:31:18 UTC
 +++ src/libmojave-external/util/lm_parser.ml
 @@ -282,15 +282,11 @@ struct
        let debug = "ProdItem"

Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile	Sat Jul 23 13:44:52 2016	(r418966)
+++ head/games/Makefile	Sat Jul 23 14:19:05 2016	(r418967)
@@ -294,6 +294,7 @@
     SUBDIR += freera
     SUBDIR += freesweep
     SUBDIR += freesynd
+    SUBDIR += freetennis
     SUBDIR += fretsonfire
     SUBDIR += fretsonfire-data
     SUBDIR += frikqcc

Modified: head/games/freetennis/Makefile
==============================================================================
--- head/games/freetennis/Makefile	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/games/freetennis/Makefile	Sat Jul 23 14:19:05 2016	(r418967)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freetennis
 PORTVERSION=	0.4.8
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -14,12 +14,18 @@ BUILD_DEPENDS=	ocamlopt:lang/ocaml \
 		ocaml-images>3.0:graphics/ocaml-images \
 		${OCAML_DEPENDS}
 RUN_DEPENDS=	${OCAML_DEPENDS}
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 OCAML_DEPENDS=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/gtk.ml:x11-toolkits/ocaml-lablgtk2 \
 		${LOCALBASE}/lib/ocaml/lablGL/gl.ml:graphics/ocaml-lablgl \
 		${LOCALBASE}/lib/ocaml/site-lib/sdl/sdl.mli:devel/ocaml-sdl
 
-USES=		tar:bzip2
+USES=		gettext tar:bzip2
+USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
+USE_GL=		gl glu
+USE_SDL=	ttf mixer sdl
+USE_XORG=	x11 xext xmu
 
 PLIST_FILES=	bin/freetennis
 PORTDATA=	*

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sat Jul 23 13:44:52 2016	(r418966)
+++ head/graphics/Makefile	Sat Jul 23 14:19:05 2016	(r418967)
@@ -603,6 +603,7 @@
     SUBDIR += npretty
     SUBDIR += nurbs++
     SUBDIR += nvidia-texture-tools
+    SUBDIR += ocaml-images
     SUBDIR += ocaml-lablgl
     SUBDIR += ocrad
     SUBDIR += ocre

Modified: head/graphics/ocaml-images/Makefile
==============================================================================
--- head/graphics/ocaml-images/Makefile	Tue Jul  5 18:24:49 2016	(r418100)
+++ head/graphics/ocaml-images/Makefile	Sat Jul 23 14:19:05 2016	(r418967)
@@ -3,7 +3,7 @@
 
 PORTNAME=	images
 PORTVERSION=	4.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://bitbucket.org/camlspotter/camlimages/get/
@@ -14,9 +14,6 @@ DIST_SUBDIR=	ocaml-images
 MAINTAINER=	michael.grunewald at laposte.net
 COMMENT=	Objective Caml image processing library
 
-DEPRECATED=	Depends on expiring devel/omake
-EXPIRATION_DATE=	2016-07-04
-
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf
 BUILD_DEPENDS+=	omake:devel/omake
 
@@ -36,7 +33,7 @@ OMAKE=		omake 'PREFIX=${STAGEDIR}${PREFI
 OMARGS=		--dotomake .omake --force-dotomake
 WRKSRC=		${WRKDIR}/camlspotter-camlimages-c803efa9d5d3
 
-MAKE_JOBS_UNSAFE= yes
+MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT GTK2 DOCS
 OPTIONS_DEFAULT=PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT
@@ -57,9 +54,10 @@ GIF_CONFIGURE_WITH=	gif
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 
 FREETYPE_CONFIGURE_WITH=freetype
-FREETYPE_LIB_DEPENDS=	libttf.so:print/freetype
+FREETYPE_LIB_DEPENDS=	libttf.so:print/freetype \
+			libfreetype.so:print/freetype2
 
-GHOSTSCRIPT_CONFIGURE_WITH= gs
+GHOSTSCRIPT_CONFIGURE_WITH=	gs
 GHOSTSCRIPT_USES=	ghostscript
 
 GTK2_CONFIGURE_WITH=	liblgtk2
