svn commit: r321990 - in head/lang: ocaml ocaml-nox11

[Antoine Brodin]

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
- at dirrmtry %%EXAMPLESDIR%%
+%%TK%%@dirrmtry %%EXAMPLESDIR%%
 @dirrm lib/ocaml/vmthreads
 %%THREADS%%@dirrm lib/ocaml/threads
 @dirrmtry lib/ocaml/stublibs