Upgrade to 0.4.0. The PR contained an upgrade to the then latest 0.3.6

(by Bjarne), and an uuencoded update to 0.4.0 by Jonathan -- the port
maintainer. This commit is based on the later, with some modifications
(perl vs. patches, mostly).

PR:		ports/34817
Submitted by:	Bjarne Wichmann Petersen, Jonathan Belson

8 files changed, 18 insertions, 106 deletions

diff --git a/net-p2p/qtella/Makefile b/net-p2p/qtella/Makefile
index 059f301f9586..957408d3c4e9 100644
--- a/net-p2p/qtella/Makefile
+++ b/net-p2p/qtella/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		qtella
-PORTVERSION=		0.2.1
+PORTVERSION=		0.4.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qtella
@@ -17,13 +17,12 @@ USE_KDELIBS_VER=	2
 HAS_CONFIGURE=		yes
 USE_GMAKE=		yes
 CONFIGURE_ARGS+=	--with-qt-dir=${X11BASE} --with-qt-moc=${X11BASE}/bin
+CONFIGURE_ENV+=		LDFLAGS=-pthread CXXFLAGS="${CXXFLAGS} -pthread"
 MAKE_ENV+=		MOC=${X11BASE}/bin/moc2
+MAKE_ARGS+=		-j2
 
 pre-patch:
-	@${PERL} -pi -e 's|stdint.h|inttypes.h|g' ${WRKSRC}/include/* ${WRKSRC}/src/Servent.cc \
-			${WRKSRC}/src/SearchViewItem.cc ${WRKSRC}/src/SharedViewItem.cc
-
-post-install:
-	strip ${PREFIX}/bin/qtella
+	@${PERL} -pi.orig -e 's|/moc(\W)|/moc2\1|g' \
+		${WRKSRC}/configure ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net-p2p/qtella/distinfo b/net-p2p/qtella/distinfo
index 54d4c7df1a31..ee960277294c 100644
--- a/net-p2p/qtella/distinfo
+++ b/net-p2p/qtella/distinfo
@@ -1 +1 @@
-MD5 (qtella-0.2.1.tar.gz) = 38f82a540d1b64eb12c4978c2a61b058
+MD5 (qtella-0.4.0.tar.gz) = 6ec61dd266b28dede80143a83112a670
diff --git a/net-p2p/qtella/files/patch-configure b/net-p2p/qtella/files/patch-configure
deleted file mode 100644
index 5c52977c5aad..000000000000
--- a/net-p2p/qtella/files/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.orig	Mon Sep  3 19:43:07 2001
-+++ configure	Mon Sep  3 19:43:44 2001
-@@ -1099,13 +1099,13 @@
- 
- 	for dir in $with_qt_moc $with_qt_dir $QTDIR /usr/local/qt /usr/lib/qt /usr/bin /bin /usr/local
- 	do
--		if test -f $dir/moc
-+		if test -f $dir/moc2
- 		then
- 			QTMOCDIR=$dir
- 			echo "found in $QTMOCDIR"
- 			break
- 		else
--			if test -f $dir/bin/moc
-+			if test -f $dir/bin/moc2
- 			then
- 				QTMOCDIR=$dir/bin
- 				echo "found in $QTMOCDIR"
-@@ -1159,13 +1159,13 @@
- 
- 	for dir in $with_qt_libs $with_qt_dir $QTDIR /usr/local/qt /usr/lib/qt /usr/lib /usr/local/lib
- 	do
--		if test -f $dir/libqt.so
-+		if test -f $dir/libqt2.so
- 		then
- 			QTLIBDIR=$dir
- 			echo "found in $QTLIBDIR"
- 			break
- 		else
--			if test -f $dir/lib/libqt.so
-+			if test -f $dir/lib/libqt2.so
- 			then
- 				QTLIBDIR=$dir/lib
- 				echo "found in $QTLIBDIR"
diff --git a/net-p2p/qtella/files/patch-configure.in b/net-p2p/qtella/files/patch-configure.in
deleted file mode 100644
index af1a4112941a..000000000000
--- a/net-p2p/qtella/files/patch-configure.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.in.orig	Sun Aug 26 16:59:47 2001
-+++ configure.in	Sun Sep  2 19:56:27 2001
-@@ -12,13 +12,13 @@
- 
- 	for dir in $1
- 	do
--		if test -f $dir/moc
-+		if test -f $dir/moc2
- 		then
- 			QTMOCDIR=$dir
- 			echo "found in $QTMOCDIR"
- 			break
- 		else
--			if test -f $dir/bin/moc
-+			if test -f $dir/bin/moc2
- 			then
- 				QTMOCDIR=$dir/bin
- 				echo "found in $QTMOCDIR"
-@@ -54,13 +54,13 @@
- 
- 	for dir in $1
- 	do
--		if test -f $dir/libqt.so
-+		if test -f $dir/libqt2.so
- 		then
- 			QTLIBDIR=$dir
- 			echo "found in $QTLIBDIR"
- 			break
- 		else
--			if test -f $dir/lib/libqt.so
-+			if test -f $dir/lib/libqt2.so
- 			then
- 				QTLIBDIR=$dir/lib
- 				echo "found in $QTLIBDIR"
diff --git a/net-p2p/qtella/files/patch-include::Servent.h b/net-p2p/qtella/files/patch-include::Servent.h
deleted file mode 100644
index 03c407efd2d2..000000000000
--- a/net-p2p/qtella/files/patch-include::Servent.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/Servent.h.orig	Sun Sep  2 20:38:03 2001
-+++ include/Servent.h	Sun Sep  2 20:38:14 2001
-@@ -7,6 +7,7 @@
- #include <string>
- #include <list>
- #include <set>
-+#include <time.h>
- 
- #include "Gnutella.h"
- #include "Address.h"
diff --git a/net-p2p/qtella/files/patch-src::Makefile.in b/net-p2p/qtella/files/patch-src::Makefile.in
deleted file mode 100644
index d72c152fd9be..000000000000
--- a/net-p2p/qtella/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig	Sun Aug 26 16:59:48 2001
-+++ src/Makefile.in	Sun Sep  2 20:44:24 2001
-@@ -78,7 +78,7 @@
- 
- 
- CXXFLAGS = -O1 $(DESKTOPFLAG) $(QTELLACXXFLAGS)
--qtella_LDADD = -lqt-mt $(KDELIBS) $(QTELLALDFLAGS)
-+qtella_LDADD = -pthread -lqt2-mt $(KDELIBS) $(QTELLALDFLAGS)
- qtella_LDFLAGS = $(QTLIBDIR) $(LDFLAGS) $(KDELIBDIR)
- INCLUDES = -DQT_THREAD_SUPPORT -I../include $(QTINCDIR) $(all_includes) $(KDEINCDIR)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -381,7 +381,7 @@
- 	$(QTUICDIR)/uic -o Qtella.cc -i ../include/Qtella.h ../ui/Qtella.ui
- 
- %_moc.cc: ../include/%.h
--	$(QTMOCDIR)/moc -o $@ $<
-+	$(MOC) -o $@ $<
- 
- clean:
- 	rm -f *moc*
diff --git a/net-p2p/qtella/pkg-descr b/net-p2p/qtella/pkg-descr
index bf73bdd884c2..5ac1b1bc7732 100644
--- a/net-p2p/qtella/pkg-descr
+++ b/net-p2p/qtella/pkg-descr
@@ -1,6 +1,6 @@
 A Gnutella client using Qt.
 
-WWW: http://www.gnutella.net/
+WWW: http://qtella.sourceforge.net
 
 - Jon Belson
 jon@witchspace.com
diff --git a/net-p2p/qtella/pkg-plist b/net-p2p/qtella/pkg-plist
index 44429a75f0c5..799a16690dba 100644
--- a/net-p2p/qtella/pkg-plist
+++ b/net-p2p/qtella/pkg-plist
@@ -1 +1,12 @@
 bin/qtella
+share/qtella/pixmaps/remove.xpm
+share/qtella/pixmaps/ball_g.xpm
+share/qtella/pixmaps/ball_r.xpm
+share/qtella/pixmaps/ball_y.xpm
+share/qtella/pixmaps/smile.xpm
+share/qtella/pixmaps/ball_d.xpm
+share/qtella/pixmaps/gsmile.xpm
+share/qtella/pixmaps/research.xpm
+share/qtella/pixmaps/removeresearch.xpm
+@dirrm share/qtella/pixmaps
+@dirrm share/qtella