From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 27 20:03:57 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AEAC1BB9;
 Sat, 27 Oct 2012 20:03:57 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 942B28FC0C;
 Sat, 27 Oct 2012 20:03:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9RK3v2c048552;
 Sat, 27 Oct 2012 20:03:57 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RK3v1Q048550;
 Sat, 27 Oct 2012 20:03:57 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201210272003.q9RK3v1Q048550@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 27 Oct 2012 20:03:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306528 - head/graphics/ocaml-images
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: Sat, 27 Oct 2012 20:03:57 -0000

Author: bapt
Date: Sat Oct 27 20:03:57 2012
New Revision: 306528
URL: http://svn.freebsd.org/changeset/ports/306528

Log:
  Disable gtk1 support which depends on ocaml-lablgtk which is expired
  
  Feature safe:	yes

Modified:
  head/graphics/ocaml-images/Makefile

Modified: head/graphics/ocaml-images/Makefile
==============================================================================
--- head/graphics/ocaml-images/Makefile	Sat Oct 27 19:57:57 2012	(r306527)
+++ head/graphics/ocaml-images/Makefile	Sat Oct 27 20:03:57 2012	(r306528)
@@ -36,6 +36,7 @@ USE_OCAML_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--without-lablgtk
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS=	PNG "Enable PNG support" on \
@@ -45,8 +46,7 @@ OPTIONS=	PNG "Enable PNG support" on \
 		GIF "Enable GIF support" on \
 		FREETYPE "Enable text rendering via freetype" on \
 		GS "Enable PostScript support via Ghostscript" on \
-		GTK1 "Enable LablGTK1 support" off \
-		GTK2 "Enable LablGTK2 support (conflicts with LablGTK1)" off
+		GTK2 "Enable LablGTK2 support" off
 
 .include <bsd.port.options.mk>
 
@@ -99,18 +99,6 @@ CONFIGURE_ARGS+=	--with-gs
 CONFIGURE_ARGS+=	--without-gs
 .endif
 
-.if defined(WITH_GTK1) && defined(WITH_GTK2)
-IGNORE=	you should select either LablGTK1 or LablGTK2, but not both
-.endif
-
-.if defined(WITH_GTK1)
-CONFIGURE_ARGS+=	--with-lablgtk
-BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
-RUN_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk
-.else
-CONFIGURE_ARGS+=	--without-lablgtk
-.endif
-
 .if defined(WITH_GTK2)
 CONFIGURE_ARGS+=	--with-lablgtk2
 BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2