- Update librcc to 0.2.12 stable release

- Add GTK3 support

4 files changed, 43 insertions, 37 deletions

diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index e0f82e02e0f4..5c90c79283f2 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -2,21 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	librcc
-PORTVERSION=	0.2.9
-PORTREVISION=	6
+PORTVERSION=	0.2.12
 CATEGORIES=	devel
-#MASTER_SITES=	SF/rusxmms/Charset%20Conversion%20Library/${PORTVERSION} \
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://ns.ael.ru/~fluffy.khv/distfiles/ \
-		http://dside.dyndns.org/files/rusxmms/
-MASTER_SITE_SUBDIR=	fluffy
+MASTER_SITES=	http://dside.dyndns.org/files/rusxmms/ \
+		LOCAL/fluffy
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Library used by rusxmms for language autodetection
 
-LIB_DEPENDS=	rcd.1:${PORTSDIR}/devel/librcd \
-		enca.5:${PORTSDIR}/converters/enca \
-		aspell.16:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	librcd.so:${PORTSDIR}/devel/librcd \
+		libenca.so:${PORTSDIR}/converters/enca \
+		libaspell.so:${PORTSDIR}/textproc/aspell
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -30,14 +26,14 @@ LIBS=		-L${LOCALBASE}/lib
 
 CONFIGURE_ENV=	LIBS="${LIBS}"
 
-OPTIONS_DEFINE=	BDB TRANSLATE TOOLS GTK1 GTK2
+OPTIONS_DEFINE=	BDB TRANSLATE TOOLS GTK1 GTK2 GTK3
 BDB_DESC=	Translation database support
 TRANSLATE_DESC=	Online translation support
 TOOLS_DESC=	Recode configuration utility
 
-OPTIONS_DEFAULT=	TOOLS GTK1 GTK2
+OPTIONS_DEFAULT=	TOOLS GTK2
 
-NO_STAGE=	yes
+#NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB}
@@ -68,10 +64,26 @@ PLIST_SUB+=	WITH_GTK1="@comment "
 USE_GNOME+=	gtk20
 PLIST_SUB+=	WITH_GTK2=""
 .else
-CONFIGURE_ARGS+=--disable-glib2 --disable-gtk2
+CONFIGURE_ARGS+=--disable-gtk2
 PLIST_SUB+=	WITH_GTK2="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MGTK3}
+USE_GNOME+=	gtk30
+PLIST_SUB+=	WITH_GTK3=""
+.else
+CONFIGURE_ARGS+=--disable-gtk3
+PLIST_SUB+=	WITH_GTK3="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3}
+CONFIGURE_ARGS+=--enable-glib2
+PLIST_SUB+=	WITH_GLIB2=""
+.else
+CONFIGURE_ARGS+=--disable-glib2
+PLIST_SUB+=	WITH_GLIB2="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MTOOLS}
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-rcc-config
 PLIST_SUB+=	TOOLS=""
diff --git a/devel/librcc/distinfo b/devel/librcc/distinfo
index 8bf8cecd1d6a..f24339a2fa77 100644
--- a/devel/librcc/distinfo
+++ b/devel/librcc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (librcc-0.2.9.tar.bz2) = 8d3bd4083edfd54dcd866d5b9f3f3f2a4f63013c895eeabb00e3be79e44e3a43
-SIZE (librcc-0.2.9.tar.bz2) = 411294
+SHA256 (librcc-0.2.12.tar.bz2) = 207973fbb73e1e376dad7542af17fe428efece91ea7f92a4efbcee676d2cb74b
+SIZE (librcc-0.2.12.tar.bz2) = 466527
diff --git a/devel/librcc/files/extrapatch-rcc-config b/devel/librcc/files/extrapatch-rcc-config
index 80c7e5c3734c..057eafb26a38 100644
--- a/devel/librcc/files/extrapatch-rcc-config
+++ b/devel/librcc/files/extrapatch-rcc-config
@@ -1,23 +1,11 @@
---- Makefile.in.orig	2009-10-11 10:58:12.000000000 +1100
-+++ Makefile.in	2010-01-13 00:18:18.951041257 +1000
-@@ -223,7 +223,7 @@
+--- Makefile.in.orig	2013-11-25 13:56:47.000000000 +1100
++++ Makefile.in	2013-11-25 13:57:14.868607062 +1100
+@@ -251,7 +251,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
 -SUBDIRS = src engines external ui
 +SUBDIRS = src engines external ui examples
- EXTRA_DIST = librcd.spec
- ACLOCAL_AMFLAGS = -I m4
- all: config.h
---- examples/Makefile.in.orig	2009-10-11 10:58:12.000000000 +1100
-+++ examples/Makefile.in	2010-01-13 00:16:51.098228400 +1000
-@@ -31,8 +31,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = example1$(EXEEXT) example2$(EXEEXT) $(am__EXEEXT_1) \
--	$(am__EXEEXT_2)
-+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
- @HAVE_GTK_TRUE@am__append_1 = rcc-gtk-config
- @HAVE_GTK2_TRUE@am__append_2 = rcc-gtk2-config
- subdir = examples
+ DIST_SUBDIRS = ${SUBDIRS} examples
+ EXTRA_DIST = librcc.spec
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/devel/librcc/pkg-plist b/devel/librcc/pkg-plist
index c8e8406f4afa..c9c1ee66fdef 100644
--- a/devel/librcc/pkg-plist
+++ b/devel/librcc/pkg-plist
@@ -1,5 +1,6 @@
 %%TOOLS%%%%WITH_GTK1%%bin/rcc-gtk-config
 %%TOOLS%%%%WITH_GTK2%%bin/rcc-gtk2-config
+%%TOOLS%%%%WITH_GTK3%%bin/rcc-gtk3-config
 include/librcc.h
 include/librccui.h
 lib/librcc.a
@@ -14,6 +15,10 @@ lib/librcc.so.2
 %%WITH_GTK2%%lib/librccgtk2.la
 %%WITH_GTK2%%lib/librccgtk2.so
 %%WITH_GTK2%%lib/librccgtk2.so.2
+%%WITH_GTK3%%lib/librccgtk3.a
+%%WITH_GTK3%%lib/librccgtk3.la
+%%WITH_GTK3%%lib/librccgtk3.so
+%%WITH_GTK3%%lib/librccgtk3.so.2
 lib/librccui.a
 lib/librccui.la
 lib/librccui.so
@@ -24,6 +29,7 @@ lib/rcc/engines/librcd_engine.so
 lib/rcc/engines/western_engine.a
 lib/rcc/engines/western_engine.la
 lib/rcc/engines/western_engine.so
-%%WITH_GTK2%%lib/rcc/rccexternal
+%%WITH_GLIB2%%lib/rcc/rccexternal
+libdata/pkgconfig/librcc.pc
 @dirrm lib/rcc/engines
 @dirrm lib/rcc