Index: graphics/imlib/Makefile
===================================================================
RCS file: /cvs/ports/graphics/imlib/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- graphics/imlib/Makefile	2006/08/03 12:43:20	1.53
+++ graphics/imlib/Makefile	2006/10/10 01:50:30
@@ -6,14 +6,12 @@
 V=		1.9.14
 DISTNAME=	imlib-${V}
 PKGNAME=	imlib-${V}p4
-SHARED_LIBS=	Imlib		19.14	\
-		gdk_imlib	19.14
+SHARED_LIBS=	Imlib		19.14
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 
 MODULES=	devel/gettext
-LIB_DEPENDS= 	gtk.>=1.2,gdk.>=1.2::x11/gtk+ \
-		jpeg.>=62::graphics/jpeg \
+LIB_DEPENDS= 	jpeg.>=62::graphics/jpeg \
 		ungif.>=5::graphics/libungif \
 		png.>=2::graphics/png \
 		tiff.>=35::graphics/tiff
@@ -23,19 +21,31 @@
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xext Xi c glib gmodule m z
+WANTLIB=		ICE SM X11 Xext Xi c m z
 
 VMEM_WARNING=	Yes
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
-SEPARATE_BUILD=	concurrent
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --disable-modules
+#CONFIGURE_STYLE= gnu
+AUTOCONF_VERSION= 2.13
+
+CONFIGURE_STYLE= autoconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
+CONFIGURE_ARGS+=	--disable-modules
+
+FLAVORS=        no_gtk
+FLAVOR?=
+
+.if ${FLAVOR:L:Mno_gtk}
+CONFIGURE_ARGS+=	--disable-gtk
+.else
+LIB_DEPENDS +=		gtk.>=1.2,gdk.>=1.2::x11/gtk+
+WANTLIB += 	glib gmodule
+.endif
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
Index: graphics/imlib/patches/patch-configure_in
===================================================================
RCS file: patch-configure_in
diff -N patch-configure_in
--- /dev/null	Sat Aug 30 18:16:59 1997
+++ graphics/imlib/patches/patch-configure_in	Tue Oct 10 01:50:30 2006
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- configure.in.orig	Mon Oct  9 21:18:08 2006
++++ configure.in	Mon Oct  9 21:20:51 2006
+@@ -17,10 +17,20 @@ dnl Give the user an option to compile w
+ dnl incase it is broken for example.
+ AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes")
+ 
++AC_ARG_ENABLE(gtk, [  --disable-gtk           Disables gtk],[
++	if test x$withval = xyes; then 
++	    with_gtk=yes
++        else
++            with_gtk=no
++	fi
++])
++
++if test x$with_gtk = xyes; then
+ AM_PATH_GTK(1.2.1,[
+   GDK_IMLIB="gdk_imlib utils"],[
+   GDK_IMLIB="" 
+   AC_MSG_WARN([*** gdk_imlib will not be built ***])])
++fi
+ 
+ AC_MSG_CHECKING(whether to build gmodulized imlib)
+ 
Index: graphics/imlib/pkg/PFRAG.no-no_gtk
===================================================================
RCS file: PFRAG.no-no_gtk
diff -N PFRAG.no-no_gtk
--- /dev/null	Sat Aug 30 18:16:59 1997
+++ graphics/imlib/pkg/PFRAG.no-no_gtk	Tue Oct 10 01:50:30 2006
@@ -0,0 +1,8 @@
+@comment $OpenBSD$
+@lib lib/libgdk_imlib.so.${LIBgdk_imlib_VERSION}
+bin/imlib_config
+include/gdk_imlib.h
+include/gdk_imlib_private.h
+include/gdk_imlib_types.h
+lib/libgdk_imlib.a
+lib/libgdk_imlib.la
Index: graphics/imlib/pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/graphics/imlib/pkg/PFRAG.shared,v
retrieving revision 1.7
diff -u -r1.7 PFRAG.shared
--- graphics/imlib/pkg/PFRAG.shared	2005/12/26 14:23:14	1.7
+++ graphics/imlib/pkg/PFRAG.shared	2006/10/10 01:50:30
@@ -1,3 +1,2 @@
 @comment $OpenBSD: PFRAG.shared,v 1.7 2005/12/26 14:23:14 steven Exp $
 @lib lib/libImlib.so.${LIBImlib_VERSION}
-@lib lib/libgdk_imlib.so.${LIBgdk_imlib_VERSION}
Index: graphics/imlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/imlib/pkg/PLIST,v
retrieving revision 1.12
diff -u -r1.12 PLIST
--- graphics/imlib/pkg/PLIST	2004/08/11 10:42:55	1.12
+++ graphics/imlib/pkg/PLIST	2006/10/10 01:50:30
@@ -1,21 +1,14 @@
 @comment $OpenBSD: PLIST,v 1.12 2004/08/11 10:42:55 espie Exp $
 bin/imlib-config
-bin/imlib_config
 include/Imlib.h
 include/Imlib_private.h
 include/Imlib_types.h
-include/gdk_imlib.h
-include/gdk_imlib_private.h
-include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.la
-lib/libgdk_imlib.a
-lib/libgdk_imlib.la
 lib/pkgconfig/
 lib/pkgconfig/imlib.pc
 lib/pkgconfig/imlibgdk.pc
 @man man/man1/imlib-config.1
-@man man/man1/imlib_config.1
 share/aclocal/imlib.m4
 @sample ${SYSCONFDIR}/imlib/
 share/examples/imlib/