2 files changed, 22 insertions, 13 deletions

diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 89f07fda842e..20837fe6296f 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	librcc
 PORTVERSION=	0.2.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/rusxmms/Charset%20Conversion%20Library/${PORTVERSION} \
 		http://dside.dyndns.org/files/rusxmms/
@@ -21,7 +21,7 @@ LIB_DEPENDS=	rcd.1:${PORTSDIR}/devel/librcd \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack lthack libxml2 glib12 gtk12
+USE_GNOME=	gnomehack lthack libxml2
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
@@ -30,9 +30,14 @@ USE_AUTOTOOLS=	autoheader:267
 CPPFLAGS=	-I${LOCALBASE}/include
 LIBS=		-L${LOCALBASE}/lib
 
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LIBS="${LIBS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
 OPTIONS=	BDB "Translation database support" off \
 		TRANSLATE "Online translation support" off \
 		TOOLS "Install recode configuration utility" on \
+		GTK1 "Use Gtk1 library/frontend" on \
 		GTK2 "Use Gtk2 library/frontend" on
 
 .include <bsd.port.options.mk>
@@ -53,11 +58,19 @@ CONFIGURE_ARGS+=--enable-libtranslate
 CONFIGURE_ARGS+=--disable-libtranslate
 .endif
 
+.if defined(WITH_GTK1)
+USE_GNOME+=	glib12 gtk12
+PLIST_SUB+=	WITH_GTK1=""
+.else
+CONFIGURE_ENV+=	ac_cv_path_GTK_CONFIG=no GTK_CONFIG=no
+PLIST_SUB+=	WITH_GTK1="@comment "
+.endif
+
 .if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
 PLIST_SUB+=	WITH_GTK2=""
 .else
-CONFIGURE_ARGS+=--disable-glib1 --disable-gtk1
+CONFIGURE_ARGS+=--disable-glib2 --disable-gtk2
 PLIST_SUB+=	WITH_GTK2="@comment "
 .endif
 
@@ -68,10 +81,6 @@ PLIST_SUB+=	TOOLS=""
 PLIST_SUB+=	TOOLS="@comment "
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LIBS="${LIBS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-
 pre-everything::
 .if ${ARCH} == "i386"
 .if defined(WITH_BDB) || defined (WITH_TRANSLATE)
diff --git a/devel/librcc/pkg-plist b/devel/librcc/pkg-plist
index aea070e46f92..c8e8406f4afa 100644
--- a/devel/librcc/pkg-plist
+++ b/devel/librcc/pkg-plist
@@ -1,4 +1,4 @@
-%%TOOLS%%bin/rcc-gtk-config
+%%TOOLS%%%%WITH_GTK1%%bin/rcc-gtk-config
 %%TOOLS%%%%WITH_GTK2%%bin/rcc-gtk2-config
 include/librcc.h
 include/librccui.h
@@ -6,10 +6,10 @@ lib/librcc.a
 lib/librcc.la
 lib/librcc.so
 lib/librcc.so.2
-lib/librccgtk.a
-lib/librccgtk.la
-lib/librccgtk.so
-lib/librccgtk.so.2
+%%WITH_GTK1%%lib/librccgtk.a
+%%WITH_GTK1%%lib/librccgtk.la
+%%WITH_GTK1%%lib/librccgtk.so
+%%WITH_GTK1%%lib/librccgtk.so.2
 %%WITH_GTK2%%lib/librccgtk2.a
 %%WITH_GTK2%%lib/librccgtk2.la
 %%WITH_GTK2%%lib/librccgtk2.so
@@ -24,6 +24,6 @@ lib/rcc/engines/librcd_engine.so
 lib/rcc/engines/western_engine.a
 lib/rcc/engines/western_engine.la
 lib/rcc/engines/western_engine.so
-lib/rcc/rccexternal
+%%WITH_GTK2%%lib/rcc/rccexternal
 @dirrm lib/rcc/engines
 @dirrm lib/rcc