Index: Makefile
===================================================================
--- Makefile	(revision 375774)
+++ Makefile	(working copy)
@@ -15,10 +15,20 @@
 
 CONFLICTS=	gimp-print-[0-9]*
 
+.if !defined(GUT_SLAVE)
+OPTIONS_DEFINE=	GTK2
+OPTIONS_DEFAULT=GTK2
+OPTIONS_SUB=	yes
+.endif
+
+GTK2_CONFIGURE_ENABLE=	libgutenprintui2
+GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
+
+.include <bsd.port.options.mk>
+
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
-USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
+CONFIGURE_ARGS+=--without-gimp --without-gimp2
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
@@ -27,21 +37,23 @@
 .include <bsd.port.pre.mk>
 
 .if ${SLAVE_PORT}=="yes"
-LIB_DEPENDS+=	libgutenprintui2.so:${PORTSDIR}/print/gutenprint-base
+LIB_DEPENDS+=	libgutenprint.so:${PORTSDIR}/print/gutenprint-base
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
-GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
+GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprint`
 .else
 MAN1+=		escputil.1
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
+BASE_GTK2_OPTION_UNSET!=${GREP} GTK2 ${PORT_DBDIR}/print_gutenprint-base/options|grep -c UNSET
+.if ${BASE_GTK2_OPTION_UNSET}!=0
+. error "GTK2 support must be set in print/gutenprint-base"
+.endif
 LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
-		libgutenprint.so:${PORTSDIR}/print/gutenprint-base
-CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
+		libgutenprintui2.so:${PORTSDIR}/print/gutenprint-base
+CONFIGURE_ARGS+=--with-gimp2=yes # Override CONFIGURE_ARGS
 BUILD_WRKSRC=	${WRKSRC}/src/gimp2
 INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
-.else
-CONFIGURE_ARGS+=--without-gimp2
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 375774)
+++ pkg-plist	(working copy)
@@ -23,20 +23,20 @@
 include/gutenprint/vars.h
 include/gutenprint/weave.h
 include/gutenprint/xml.h
-include/gutenprintui2/curve.h
-include/gutenprintui2/gammacurve.h
-include/gutenprintui2/gutenprintui.h
-include/gutenprintui2/typebuiltins.h
+%%GTK2%%include/gutenprintui2/curve.h
+%%GTK2%%include/gutenprintui2/gammacurve.h
+%%GTK2%%include/gutenprintui2/gutenprintui.h
+%%GTK2%%include/gutenprintui2/typebuiltins.h
 lib/libgutenprint.so.2
 lib/libgutenprint.so.2.3.0
-lib/libgutenprintui2.so.1.0.0
+%%GTK2%%lib/libgutenprintui2.so.1.0.0
 lib/libgutenprint.a
 lib/libgutenprint.so
-lib/libgutenprintui2.a
-lib/libgutenprintui2.so
-lib/libgutenprintui2.so.1
+%%GTK2%%lib/libgutenprintui2.a
+%%GTK2%%lib/libgutenprintui2.so
+%%GTK2%%lib/libgutenprintui2.so.1
 libdata/pkgconfig/gutenprint.pc
-libdata/pkgconfig/gutenprintui2.pc
+%%GTK2%%libdata/pkgconfig/gutenprintui2.pc
 man/man1/escputil.1.gz
 %%DATADIR%%/5.2/xml/dither-matrix-1x1.xml
 %%DATADIR%%/5.2/xml/dither-matrix-2x1.xml