Enable to build with X-less imlib2.

4 files changed, 33 insertions, 10 deletions

diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 2bba55f1665..0a029b827fe 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/04/01 01:58:38 obache Exp $
+# $NetBSD: Makefile,v 1.6 2007/11/17 01:47:02 obache Exp $
 #
 
 DISTNAME=	zphoto-1.2
@@ -17,17 +17,11 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake perl
 USE_LANGUAGES=		c c++
 
-CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv:Q}
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext-lib:Q}
 
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../multimedia/ming/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/zphoto/distinfo b/graphics/zphoto/distinfo
index 578378624be..b52b7dabea0 100644
--- a/graphics/zphoto/distinfo
+++ b/graphics/zphoto/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/08/22 15:19:44 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/11/17 01:47:02 obache Exp $
 
 SHA1 (zphoto-1.2.tar.gz) = 2d45c5df2f2a00db0d8170f18ea5ed399fb9d611
 RMD160 (zphoto-1.2.tar.gz) = 54a93da3c8303ebbf9c505891e9fa8fb32bd6a64
 Size (zphoto-1.2.tar.gz) = 414079 bytes
 SHA1 (patch-aa) = 4c15d45ecfbefadc4b9b2195e00d005e3ed2a936
 SHA1 (patch-ab) = d365aeba430374b3ba6b4f1f88731f3b809fca31
+SHA1 (patch-ac) = b810ce437c8bc7be796e7206f99300422fb9467c
diff --git a/graphics/zphoto/options.mk b/graphics/zphoto/options.mk
index 3fcb06fc6bf..5d46274b572 100644
--- a/graphics/zphoto/options.mk
+++ b/graphics/zphoto/options.mk
@@ -1,16 +1,24 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/08/12 16:20:35 xtraeme Exp $
+# $NetBSD: options.mk,v 1.2 2007/11/17 01:47:02 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.zphoto
 PKG_SUPPORTED_OPTIONS=	zip wx
 PKG_OPTIONS_REQUIRED_GROUPS=	graphics
-PKG_OPTIONS_GROUP.graphics=	imlib2 magick
+PKG_OPTIONS_GROUP.graphics=	imlib2 imagemagick
 PKG_SUGGESTED_OPTIONS=	imlib2
+PKG_OPTIONS_LEGACY_OPTS+=	magick:imagemagick
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mimlib2)
 .  include "../../graphics/imlib2/buildlink3.mk"
 CONFIGURE_ARGS+=	--disable-magick
+.  if !empty(PKG_BUILD_OPTIONS.imlib2:Mx11)
+CONFIGURE_ARGS+=	--with-x
+BUILDLINK_DEPMETHOD.libXt?=	build
+.include "../../x11/libXt/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=	--without-x
+.  endif
 .elif !empty(PKG_OPTIONS:Mmagick)
 .  include "../../graphics/ImageMagick/buildlink3.mk"
 CONFIGURE_ARGS+=	--disable-imlib2
diff --git a/graphics/zphoto/patches/patch-ac b/graphics/zphoto/patches/patch-ac
new file mode 100644
index 00000000000..7802785094f
--- /dev/null
+++ b/graphics/zphoto/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 2007/11/17 01:47:02 obache Exp $
+
+--- image.cpp.orig	2004-07-20 16:48:11.000000000 +0000
++++ image.cpp
+@@ -50,7 +50,6 @@ static void	get_new_image_size (ZphotoIm
+ 
+ #include <avifile.h>
+ #include <avm_output.h>
+-#include <X11/Xlib.h>
+ #include <Imlib2.h>
+ 
+ typedef struct {
+@@ -315,7 +314,6 @@ zphoto_image_get_bitmap (const char* fil
+  */
+ #ifdef HAVE_IMLIB2
+ 
+-#include <X11/Xlib.h>
+ #include <Imlib2.h>
+ 
+ static Imlib_Image