From owner-svn-ports-all@FreeBSD.ORG  Fri Jun 28 21:35:15 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 951FEDB;
 Fri, 28 Jun 2013 21:35:15 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 876AF17BA;
 Fri, 28 Jun 2013 21:35:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SLZFnp005557;
 Fri, 28 Jun 2013 21:35:15 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5SLZEhM005555;
 Fri, 28 Jun 2013 21:35:14 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201306282135.r5SLZEhM005555@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 28 Jun 2013 21:35:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321990 - in head/lang: ocaml ocaml-nox11
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jun 2013 21:35:15 -0000

Author: antoine
Date: Fri Jun 28 21:35:14 2013
New Revision: 321990
URL: http://svnweb.freebsd.org/changeset/ports/321990

Log:
  Unbreak ocaml-nox11 after PORT_OPTIONS conversion

Modified:
  head/lang/ocaml-nox11/Makefile
  head/lang/ocaml/pkg-plist   (contents, props changed)

Modified: head/lang/ocaml-nox11/Makefile
==============================================================================
--- head/lang/ocaml-nox11/Makefile	Fri Jun 28 21:24:04 2013	(r321989)
+++ head/lang/ocaml-nox11/Makefile	Fri Jun 28 21:35:14 2013	(r321990)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ocaml-nox11
-# Date created:		2004-02-03
-# Whom:			Eugene Ossintsev
-#
+# Created by: Eugene Ossintsev
 # $FreeBSD$
-#
 
 PORTNAME=	ocaml-nox11
 CATEGORIES=	lang
@@ -15,6 +11,6 @@ MASTERDIR=	${.CURDIR}/../ocaml
 
 CONFLICTS=	metaocaml-[0-9]* ocaml-[0-9]* ocaml-notk-[0-9]*
 
-WITHOUT_X11=	yes
+OPTIONS_EXCLUDE=TK X11
 
 .include "${MASTERDIR}/Makefile"

Modified: head/lang/ocaml/pkg-plist
==============================================================================
--- head/lang/ocaml/pkg-plist	Fri Jun 28 21:24:04 2013	(r321989)
+++ head/lang/ocaml/pkg-plist	Fri Jun 28 21:35:14 2013	(r321990)
@@ -988,7 +988,7 @@ lib/ocaml/weak.mli
 %%TK%%@dirrm %%EXAMPLESDIR%%/examples_labltk
 %%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk/images
 %%TK%%@dirrm %%EXAMPLESDIR%%/examples_camltk
-@dirrmtry %%EXAMPLESDIR%%
+%%TK%%@dirrmtry %%EXAMPLESDIR%%
 @dirrm lib/ocaml/vmthreads
 %%THREADS%%@dirrm lib/ocaml/threads
 @dirrmtry lib/ocaml/stublibs