3 files changed, 4 insertions, 154 deletions

diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index f60a7d741874..9e18cd5f2c9e 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	librcc
-PORTVERSION=	0.2.5
+PORTVERSION=	0.2.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rusxmms
@@ -23,10 +23,6 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:261 autoconf:261 libtool:15
-ACLOCAL_ARGS=	--force
-AUTOMAKE_ARGS=	-a
-
 CONFIGURE_ARGS=--disable-bdb --disable-gtk2 --disable-glib2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
diff --git a/devel/librcc/distinfo b/devel/librcc/distinfo
index 4b6a5fa41870..d4240fb14d22 100644
--- a/devel/librcc/distinfo
+++ b/devel/librcc/distinfo
@@ -1,3 +1,3 @@
-MD5 (librcc-0.2.5.tar.bz2) = 8dc5e08bf5ae1e029dc464cd74c17f3f
-SHA256 (librcc-0.2.5.tar.bz2) = d46b1bfc8b95ea73b12d9230f4103d18a6c3e2560f5c1d80073f62308b70307e
-SIZE (librcc-0.2.5.tar.bz2) = 494855
+MD5 (librcc-0.2.6.tar.bz2) = 9bbf248c7312c73c0b6ca19b9c5a2af1
+SHA256 (librcc-0.2.6.tar.bz2) = 0e736b170d396a775e7dc18587fc38228907e630eae50098c98269aa3e405abc
+SIZE (librcc-0.2.6.tar.bz2) = 505076
diff --git a/devel/librcc/files/patch-configure.in b/devel/librcc/files/patch-configure.in
deleted file mode 100644
index 70135b30327a..000000000000
--- a/devel/librcc/files/patch-configure.in
+++ /dev/null
@@ -1,146 +0,0 @@
---- configure.in.orig	2007-06-26 21:50:57.000000000 +0200
-+++ configure.in	2007-12-30 13:45:21.995543476 +0100
-@@ -60,8 +60,8 @@
- 
- CFLAGS="$CFLAGS -Wall -Wpointer-arith"
- if test ! -f /usr/include/iconv.h  -a -f /usr/local/include/iconv.h ; then
--    CFLAGS+=" -I/usr/local/include"
--    LIBS+=" -L/usr/local/lib"
-+    CFLAGS="$CFLAGS -I/usr/local/include"
-+    LIBS="$LIBS -L/usr/local/lib"
- fi
- 
- dnl Checks for programs.
-@@ -103,7 +103,33 @@
- AC_SUBST(GTK1_LIBS)
- AC_SUBST(GTK1_INCLUDES)
- 
--PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, HAVE_GTK2=yes, HAVE_GTK2=no)
-+dnl ***
-+dnl *** GLIB 2.0
-+dnl ***
-+AC_ARG_ENABLE(glib2,
-+	      [  --disable-glib2        disable glib2 [default=enabled]],,
-+	      enable_glib2="yes")
-+
-+if test "x$enable_glib2" = "xyes"; then
-+	PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.0.0, HAVE_GLIB2=yes, HAVE_GLIB2=no)
-+else
-+        HAVE_GLIB2=no
-+fi
-+AM_CONDITIONAL(HAVE_GLIB2, [ test $HAVE_GLIB2 = yes ])
-+
-+
-+dnl ***
-+dnl *** GTK 2.0
-+dnl ***
-+AC_ARG_ENABLE(gtk2,
-+	      [  --disable-gtk2        disable gtk2 [default=enabled]],,
-+	      enable_gtk2="yes")
-+
-+if test "x$enable_gtk2" = "xyes"; then
-+	PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, HAVE_GTK2=yes, HAVE_GTK2=no)
-+else
-+        HAVE_GTK2=no
-+fi
- AM_CONDITIONAL(HAVE_GTK2, [ test $HAVE_GTK2 = yes ])
- 
- AC_CHECK_HEADER(dlfcn.h, [AC_CHECK_LIB(dl, dlopen, [
-@@ -130,12 +156,12 @@
- if test "x$enable_force_system_iconv" != "xyes"; then
- AC_CHECK_LIB(iconv, iconv_open, [
-     EXTERNAL_ICONV=yes
--    EXTRA_LIBS+=" -liconv"
-+    EXTRA_LIBS="$EXTRA_LIBS -liconv"
- ])
- AC_CHECK_HEADER(libcharset.h, [AC_CHECK_LIB(charset, locale_charset, [
- 	AC_DEFINE(HAVE_LIBCHARSET,1,[Defines if libRCD is available])
- 	HAVE_LIBCHARSET=yes
--	EXTRA_LIBS+=" -lcharset"
-+	EXTRA_LIBS="$EXTRA_LIBS -lcharset"
- ])])
- fi
- AM_CONDITIONAL(HAVE_LIBCHARSET, [ test "x$HAVE_LIBCHARSET" = "xyes" ])
-@@ -210,23 +236,20 @@
-     BDB_INCLUDES=""
-     HAVE_BDB=no
- else
--    AX_PATH_BDB([4],[
--	BDB_LIBS="$BDB_LDFLAGS $BDB_LIBS"
--	BDB_INCLUDES="$BDB_CPPFLAGS"
--	HAVE_BDB=yes
--    ],[
--	BDB_LIBS=""
--	BDB_INCLUDES=""
--	HAVE_BDB=no
--    ])
-+# Not working on FreeBSD either
-+#    AX_PATH_BDB([4],[
-+#	BDB_LIBS="$BDB_LDFLAGS $BDB_LIBS"
-+#	BDB_INCLUDES="$BDB_CPPFLAGS"
-+#	HAVE_BDB=yes
-+#    ],[
-+#	BDB_LIBS=""
-+#	BDB_INCLUDES=""
-+#	HAVE_BDB=no
-+#    ])
- fi
- AC_SUBST(BDB_LIBS)
- AC_SUBST(BDB_INCLUDES)
- 
--PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.0.0, HAVE_GLIB2=yes, HAVE_GLIB2=no)
--AM_CONDITIONAL(HAVE_GLIB2, [ test $HAVE_GLIB2 = yes ])
--
--
- if test "x$disable_libtranslate" != "xyes"; then
-     HAVE_LIBTRANSLATE=no
-     HAVE_LIBTRANSLATE_TIMED_TRANSLATE=no
-@@ -254,15 +277,25 @@
- fi
- fi
- 
--AM_PATH_ASPELL([
--    AC_DEFINE(HAVE_ASPELL,1,[Defines if aspell is available])
--    HAVE_ASPELL=yes
--],[
-+# Not available on FreeBSD? breaks autom4te run
-+#AM_PATH_ASPELL([
-+#    AC_DEFINE(HAVE_ASPELL,1,[Defines if aspell is available])
-+#    HAVE_ASPELL=yes
-+#],[
-     HAVE_ASPELL=no
--])
-+    AC_SUBST(ASPELL_CFLAGS)
-+    AC_SUBST(ASPELL_LIBS)
-+#])
- 
- 
--PTHREAD_LIBS=error
-+AC_MSG_CHECKING([for PTHREAD_LIBS])
-+if test "x$PTHREAD_LIBS" = "x"; then
-+  PTHREAD_LIBS=error
-+else
-+  AC_MSG_RESULT([$PTHREAD_LIBS])
-+fi
-+
-+if test "x$PTHREAD_LIBS" = "xerror"; then
- AC_EGREP_CPP(yes,[
- #if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
- 	  yes
-@@ -271,6 +304,7 @@
- 	PTHREAD_CFLAGS="-D_THREAD_SAFE" 
- 	PTHREAD_LIBS="-pthread"
- )
-+fi
- if test "x$PTHREAD_LIBS" = "xerror"; then
- 	AC_CHECK_LIB(pthread, pthread_mutex_lock, PTHREAD_LIBS="-lpthread")
- fi
-@@ -309,7 +343,7 @@
- AC_OUTPUT(src/Makefile engines/Makefile external/Makefile ui/Makefile examples/Makefile Makefile librcc.spec)
- 
- rccdir=${pkgdatadir}
--while expr ${rccdir:0:1} == '$' &>/dev/null; do
-+while expr "${rccdir}" : "\\\$" >/dev/null; do
-     rccdir=`eval echo $rccdir`
- done
-