USE_X_PREFIX -> USE_XLIB, bump the PORTREVISION.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6788 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 195 insertions, 0 deletions

diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
new file mode 100644
index 000000000..10dc4b399
--- /dev/null
+++ b/audio/gnomoradio/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	gnomoradio
+# Date created:			23 Oct 2004
+# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
+#
+# $FreeBSD$
+#
+
+PORTNAME=		gnomoradio
+PORTVERSION=		0.15.1
+PORTREVISION=		5
+CATEGORIES=		audio net
+MASTER_SITES=		${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=		jylefort@FreeBSD.org
+COMMENT=		A program for finding and playing free music from the Internet
+
+LIB_DEPENDS=		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
+			gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
+			gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
+			xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
+			vorbis:${PORTSDIR}/audio/libvorbis \
+			ao:${PORTSDIR}/audio/libao
+
+USE_XLIB=		yes
+USE_GCC=		3.4+
+USE_GNOME=		gnomehack gnomeprefix
+INSTALLS_SHLIB=		yes
+USE_AUTOTOOLS=		libtool:15
+LIBTOOLFLAGS=		--tag=CXX
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \
+		s|-lpthread|${PTHREAD_LIBS}|' \
+		${WRKSRC}/roboradio/mp3/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/audio/gnomoradio/distinfo b/audio/gnomoradio/distinfo
new file mode 100644
index 000000000..e79e1adca
--- /dev/null
+++ b/audio/gnomoradio/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnomoradio-0.15.1.tar.gz) = 1ca31f4e9fb77adb5e7261e190ecb20a
+SHA256 (gnomoradio-0.15.1.tar.gz) = de840fdc233396c277b432fe5e82bc4e14a5505d60bcea1975924e295e2447e1
+SIZE (gnomoradio-0.15.1.tar.gz) = 482339
diff --git a/audio/gnomoradio/files/patch-rainbow::license.cc b/audio/gnomoradio/files/patch-rainbow::license.cc
new file mode 100644
index 000000000..0a77cd7e3
--- /dev/null
+++ b/audio/gnomoradio/files/patch-rainbow::license.cc
@@ -0,0 +1,11 @@
+--- rainbow/license.cc.orig	Wed Dec 22 11:05:36 2004
++++ rainbow/license.cc	Wed Dec 22 11:06:49 2004
+@@ -54,7 +54,7 @@
+ 	}
+ 	
+ 	if (done) {
+-		signal<void,ref_ptr<License> > sig;
++		sigc::signal<void,ref_ptr<License> > sig;
+ 		sig.connect(slot);
+ 		sig(license);
+ 	} else {
diff --git a/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc b/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc
new file mode 100644
index 000000000..59e878ff7
--- /dev/null
+++ b/audio/gnomoradio/files/patch-rainbow::rdf-resource.cc
@@ -0,0 +1,55 @@
+--- rainbow/rdf-resource.cc.orig	Wed Dec 22 11:07:54 2004
++++ rainbow/rdf-resource.cc	Wed Dec 22 11:09:33 2004
+@@ -35,7 +35,7 @@
+ 		resource = ref_ptr<RdfResource>(p->second);
+ 		if (resource->downloaded) { // already downloaded
+ 			map<Glib::ustring,xmlpp::Element*>::iterator el = resource->id_map.find(id);
+-			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
++			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ 			sig.connect(slot);
+ 			sig(el != resource->id_map.end() ? el->second : 0, resource);
+ 			return;
+@@ -47,7 +47,7 @@
+ 		Glib::ustring host, file;
+ 		unsigned short port;
+ 		if (!HttpClient::parse_url(uri, host, port, file)) {
+-			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
++			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ 			sig.connect(slot);
+ 			sig(0, resource);
+ 			return;
+@@ -55,14 +55,14 @@
+ 	}
+ 
+ 	// connect mem_fun to appropriate signal
+-	map<Glib::ustring,signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
+ 	sig = resource->signal_map.find(id);
+ 	if (sig != resource->signal_map.end()) {
+ 		// found existing signal for id
+ 		sig->second->connect(slot);
+ 	} else {
+ 		// need to create new signal to handle id
+-		signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
++		sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
+ 		signal_->connect(slot);
+ 		resource->signal_map.insert(make_pair(id, signal_));
+ 	}
+@@ -190,7 +190,7 @@
+ 
+  error:
+ 	// call all signals
+-	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
+ 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) {
+ 		map<Glib::ustring,xmlpp::Element*>::iterator el = id_map.find(signal->first);
+ 		signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr<RdfResource>(this));
+@@ -204,7 +204,7 @@
+ 
+ void Rainbow::RdfResource::clear_signal_map ()
+ {
+-	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
+ 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
+ 		delete signal->second;
+ 	signal_map.clear();
diff --git a/audio/gnomoradio/files/patch-rainbow_sha1.h b/audio/gnomoradio/files/patch-rainbow_sha1.h
new file mode 100644
index 000000000..293864cca
--- /dev/null
+++ b/audio/gnomoradio/files/patch-rainbow_sha1.h
@@ -0,0 +1,20 @@
+--- rainbow/sha1.h.orig	Tue Aug 16 17:32:22 2005
++++ rainbow/sha1.h	Tue Aug 16 17:33:26 2005
+@@ -22,7 +22,7 @@
+ #ifndef _SHA1_H_
+ #define _SHA1_H_
+ 
+-#include <stdint.h>
++#include <unistd.h>
+ /*
+  * If you do not have the ISO standard stdint.h header file, then you
+  * must typdef the following:
+@@ -57,7 +57,7 @@
+     uint32_t Length_High;           /* Message length in bits      */
+ 
+                                /* Index into message block array   */
+-    int_least16_t Message_Block_Index;
++    int16_t Message_Block_Index;
+     uint8_t Message_Block[64];      /* 512-bit message blocks      */
+ 
+     int Computed;               /* Is the digest computed?         */
diff --git a/audio/gnomoradio/pkg-descr b/audio/gnomoradio/pkg-descr
new file mode 100644
index 000000000..18681a8e3
--- /dev/null
+++ b/audio/gnomoradio/pkg-descr
@@ -0,0 +1,17 @@
+Gnomoradio is quickly becoming a fully-featured music player and peer
+to peer file sharing system. Here is a quick outline of its current
+features that more or less work:
+
+	* Finds and plays mp3's and ogg's that are located on the
+	  user's hard drive
+	* Sorts songs in playlists, including search playlists for
+	  songs that match a given criteria
+	* Searches for, downloads and shares songs that are available
+	  under a Creative Commons license
+	* Recommends songs based on a user's listening preferences,
+	  almost like a totally personalized radio broadcast
+
+WWW: http://www.gnomoradio.org/
+
+- Jean-Yves Lefort
+jylefort@FreeBSD.org
diff --git a/audio/gnomoradio/pkg-plist b/audio/gnomoradio/pkg-plist
new file mode 100644
index 000000000..c8af2c511
--- /dev/null
+++ b/audio/gnomoradio/pkg-plist
@@ -0,0 +1,50 @@
+bin/gnomoradio
+bin/rainbow-get
+include/rainbow/alarm.h
+include/rainbow/http-client.h
+include/rainbow/http-server.h
+include/rainbow/hub-client.h
+include/rainbow/init.h
+include/rainbow/license.h
+include/rainbow/rdf-resource.h
+include/rainbow/util.h
+include/roboradio/init.h
+include/roboradio/player.h
+include/roboradio/recommendation.h
+include/roboradio/song-list-automatic.h
+include/roboradio/song-list-cache.h
+include/roboradio/song-list-history.h
+include/roboradio/song-list-library.h
+include/roboradio/song-list-radio.h
+include/roboradio/song-list-search.h
+include/roboradio/song-list.h
+include/roboradio/song-local.h
+include/roboradio/song-rainbow.h
+include/roboradio/song.h
+include/roboradio/sort-songs.h
+include/roboradio/state.h
+include/roboradio/xspf.h
+lib/librainbow.a
+lib/librainbow.la
+lib/librainbow.so
+lib/librainbow.so.0
+lib/libroboradio-audio.a
+lib/libroboradio-audio.la
+lib/libroboradio-audio.so
+lib/libroboradio-audio.so.0
+lib/libroboradio-mp3.a
+lib/libroboradio-mp3.la
+lib/libroboradio-mp3.so
+lib/libroboradio-mp3.so.0
+lib/libroboradio.a
+lib/libroboradio.la
+lib/libroboradio.so
+lib/libroboradio.so.0
+sbin/rainbow-hub
+share/gnome/applications/gnomoradio.desktop
+share/gnome/pixmaps/gnomoradio.png
+share/gnome/pixmaps/gnomoradio/gnomoradio-heart.png
+@dirrm include/rainbow
+@dirrm include/roboradio
+@dirrm share/gnome/pixmaps/gnomoradio
+@dirrmtry sbin