Update to 0.94. Add 'gnome' FLAVOR, simplify LIB_DEPENDS.

MAINTAINER timeout

graphics/dia/Makefile

@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.27 2004/11/30 01:06:33 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2004/12/22 06:01:23 marcm Exp $
 
 COMMENT=	"technical diagrams drawing tool"
 
-DISTNAME=	dia-0.92.2
+DISTNAME=	dia-0.94
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.gnome.org/projects/dia/
 
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.92/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.94/}
 
 MAINTAINER=	Margarida Sequeira <margarida@openbsd.org>
 
@@ -26,17 +26,23 @@ BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
 LIB_DEPENDS=	gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
 		art_lgpl_2.5::graphics/libart \
 		popt::devel/popt \
-		xslt.1::textproc/libxslt \
-		xml2.6::textproc/libxml \
-		unicode.0::devel/libunicode
+		xslt.1::textproc/libxslt
 
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
-CONFIGURE_ARGS+=	--disable-static --disable-gnome
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng \
 			-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+FLAVORS=		gnome
+FLAVOR?=
+
+.if ${FLAVOR:L:Mgnome}
+CONFIGURE_ARGS+=	--enable-gnome
+LIB_DEPENDS+=		gnomeui-2::x11/gnome/libgnomeui
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+.endif
+
 .include <bsd.port.mk>

graphics/dia/distinfo

@@ -1,3 +1,3 @@
-MD5 (dia-0.92.2.tar.gz) = adc4d4ebf272527887f622aa818cd24d
-RMD160 (dia-0.92.2.tar.gz) = 13135340b17cd001c49b94c4c12bc5f2b7b1eff9
-SHA1 (dia-0.92.2.tar.gz) = cba2fc2f81be55c903b7404617d1619c6a99b9d9
+MD5 (dia-0.94.tar.gz) = d2afdc10f55df29314250d98dbfd7a79
+RMD160 (dia-0.94.tar.gz) = f7e20b294b7b739d5f408c34e0fbc533def5e3b9
+SHA1 (dia-0.94.tar.gz) = a55128bd56e76295c9bc8217f25b6ec079727e25

graphics/dia/patches/patch-configure

@@ -1,13 +1,12 @@
-$OpenBSD: patch-configure,v 1.7 2004/11/07 16:16:31 naddy Exp $
---- configure.orig	Sun Nov  7 16:26:41 2004
-+++ configure	Sun Nov  7 16:27:51 2004
-@@ -20120,7 +20120,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
- #error Freetype version too low.
- #endif
+$OpenBSD: patch-configure,v 1.8 2004/12/22 06:01:23 marcm Exp $
+--- configure.orig	Tue Nov  9 20:12:16 2004
++++ configure	Tue Nov  9 20:12:46 2004
+@@ -7998,7 +7998,7 @@ nto-qnx*)
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+-  need_version=yes
++  need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH

graphics/dia/patches/patch-po_Makefile_in_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.1 2003/12/08 01:09:15 margarida Exp $
---- po/Makefile.in.in.orig	Mon Jun 23 01:39:47 2003
-+++ po/Makefile.in.in	Mon Jun 23 01:40:13 2003
-@@ -28,7 +28,7 @@ prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
- libdir = @libdir@
--localedir = $(libdir)/locale
-+localedir = $(datadir)/locale
- gnulocaledir = $(datadir)/locale
- gettextsrcdir = $(datadir)/glib-2.0/gettext/po
- subdir = po

graphics/dia/pkg/PFRAG.shared

@@ -1,5 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2003/12/08 01:09:15 margarida Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.5 2004/12/22 06:01:23 marcm Exp $
 lib/dia/libbondgraph_objects.so
+lib/dia/libcairo_filter.so
 lib/dia/libcgm_filter.so
 lib/dia/libchronogram_objects.so
 lib/dia/libcustom_objects.so
@@ -10,6 +11,9 @@ lib/dia/libflowchart_objects.so
 lib/dia/libfs_objects.so
 lib/dia/libgrafcet_objects.so
 lib/dia/libhpgl_filter.so
+lib/dia/libistar_objects.so
+lib/dia/libjackson_objects.so
+lib/dia/libkaos_objects.so
 lib/dia/libmetapost_filter.so
 lib/dia/libmisc_objects.so
 lib/dia/libnetwork_objects.so