- devel/librcc: update to 0.2.9 release, add some optional components

- Grab maintainership for librcc and librcd by current maintainer's request

PR:		142470
Submitted by:	myself
Approved by:	Ulrich Spörlein (maintainer)
Approved by:	miwi, tabthorpe (mentors implicit)

4 files changed, 52 insertions, 27 deletions

diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 0c34a127e942..0441ff767152 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -6,26 +6,61 @@
 #
 
 PORTNAME=	librcc
-PORTVERSION=	0.2.6
-PORTREVISION=	1
+PORTVERSION=	0.2.9
 CATEGORIES=	devel
-MASTER_SITES=	SF/rusxmms/Charset%20Conversion%20Library/${PORTVERSION}
+MASTER_SITES=	SF/rusxmms/Charset%20Conversion%20Library/${PORTVERSION} \
+		http://dside.dyndns.org/files/rusxmms/
 
-MAINTAINER=	uspoerlein@gmail.com
+MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Library used by rusxmms for language autodetection
 
-LIB_DEPENDS=	rcd.1:${PORTSDIR}/devel/librcd
+LIB_DEPENDS=	rcd.1:${PORTSDIR}/devel/librcd \
+		enca.5:${PORTSDIR}/converters/enca \
+		aspell.16:${PORTSDIR}/textproc/aspell
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk12 libxml2
+USE_GNOME=	gnomehack lthack libxml2 glib12 gtk12
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	autoheader:262
 
-CONFIGURE_ARGS=--disable-bdb --disable-gtk2 --disable-glib2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+CPPFLAGS=	-I${LOCALBASE}/include
+LIBS=		-L${LOCALBASE}/lib
+
+OPTIONS=	BDB "Translation database support" on \
+		TRANSLATE "Online translation support" on \
+		GTK2 "Gtk+2 frontend" on
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_BDB)
+USE_BDB=	41+
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
+LIBS+=		-L${BDB_LIB_DIR}
+CONFIGURE_ARGS+=--enable-bdb
+.else
+CONFIGURE_ARGS+=--disable-bdb
+.endif
+
+.if defined(WITH_TRANSLATE)
+LIB_DEPENDS+=	translate.0:${PORTSDIR}/textproc/libtranslate
+CONFIGURE_ARGS+=--enable-libtranslate
+.else
+CONFIGURE_ARGS+=--disable-libtranslate
+.endif
+
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk20
+PLIST_SUB+=	WITH_GTK2=""
+.else
+CONFIGURE_ARGS+=--disable-glib1 --disable-gtk1
+PLIST_SUB+=	WITH_GTK2="@comment "
+.endif
+
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LIBS="${LIBS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .include <bsd.port.mk>
diff --git a/devel/librcc/distinfo b/devel/librcc/distinfo
index d4240fb14d22..d97ef6060045 100644
--- a/devel/librcc/distinfo
+++ b/devel/librcc/distinfo
@@ -1,3 +1,3 @@
-MD5 (librcc-0.2.6.tar.bz2) = 9bbf248c7312c73c0b6ca19b9c5a2af1
-SHA256 (librcc-0.2.6.tar.bz2) = 0e736b170d396a775e7dc18587fc38228907e630eae50098c98269aa3e405abc
-SIZE (librcc-0.2.6.tar.bz2) = 505076
+MD5 (librcc-0.2.9.tar.bz2) = 2a246bc6e9485b18c16fbe481ef6336d
+SHA256 (librcc-0.2.9.tar.bz2) = 8d3bd4083edfd54dcd866d5b9f3f3f2a4f63013c895eeabb00e3be79e44e3a43
+SIZE (librcc-0.2.9.tar.bz2) = 411294
diff --git a/devel/librcc/files/patch-src-rccstring.h b/devel/librcc/files/patch-src-rccstring.h
deleted file mode 100644
index 791e1008ad0a..000000000000
--- a/devel/librcc/files/patch-src-rccstring.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/rccstring.h.orig	2009-03-09 13:59:14.000000000 +0100
-+++ src/rccstring.h	2009-03-09 13:59:20.000000000 +0100
-@@ -18,11 +18,7 @@
- int rccStringFixID(rcc_string string, rcc_context ctx);
- int rccStringChangeID(rcc_string string, rcc_language_id language_id);
- 
--#ifdef HAVE_STRNLEN
--# ifndef strnlen
--int strnlen(const char *str, size_t size);
--# endif /* !strnlen */
--#else
-+#ifndef HAVE_STRNLEN
- int rccStrnlen(const char *str, size_t size);
- #endif /* HAVE_STRNLEN */
- int rccIsASCII(const char *str);
diff --git a/devel/librcc/pkg-plist b/devel/librcc/pkg-plist
index 387858292027..adba243a1cd8 100644
--- a/devel/librcc/pkg-plist
+++ b/devel/librcc/pkg-plist
@@ -8,6 +8,10 @@ lib/librccgtk.a
 lib/librccgtk.la
 lib/librccgtk.so
 lib/librccgtk.so.2
+%%WITH_GTK2%%lib/librccgtk2.a
+%%WITH_GTK2%%lib/librccgtk2.la
+%%WITH_GTK2%%lib/librccgtk2.so
+%%WITH_GTK2%%lib/librccgtk2.so.2
 lib/librccui.a
 lib/librccui.la
 lib/librccui.so
@@ -18,5 +22,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
 @dirrm lib/rcc/engines
 @dirrm lib/rcc