svn commit: r306528 - head/graphics/ocaml-images
Baptiste Daroussin
bapt at FreeBSD.org
Sat Oct 27 20:03:57 UTC 2012
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
More information about the svn-ports-all
mailing list