Update to 1.2.0

PR:		49960
Submitted by:	Oliver Lehmann <lehmann@ans-netz.de>
Approved by:	maintainer

8 files changed, 17 insertions, 61 deletions

diff --git a/net-p2p/lopster/Makefile b/net-p2p/lopster/Makefile
index 77bb5179444..26a4c45b65c 100644
--- a/net-p2p/lopster/Makefile
+++ b/net-p2p/lopster/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	lopster
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.2.0
+PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +21,11 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+CONFIGURE_ARGS=	--with-pthread=yes --with-zlib=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/net-p2p/lopster/distinfo b/net-p2p/lopster/distinfo
index 460eb158cbe..425fcc2f8b5 100644
--- a/net-p2p/lopster/distinfo
+++ b/net-p2p/lopster/distinfo
@@ -1 +1 @@
-MD5 (lopster-1.0.1.tar.gz) = 536e31b0864e0f5af2fe50807225e797
+MD5 (lopster-1.2.0.tar.gz) = fedbe6b5c7944a4a21bc4554358a057d
diff --git a/net-p2p/lopster/files/patch-configure b/net-p2p/lopster/files/patch-configure
deleted file mode 100644
index 02a20be5228..00000000000
--- a/net-p2p/lopster/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue May 29 20:42:56 2001
-+++ configure	Tue May 29 20:44:40 2001
-@@ -2826,7 +2826,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
diff --git a/net-p2p/lopster/files/patch-src::global.c b/net-p2p/lopster/files/patch-src::global.c
index 3ad87740d57..fd597f7a2db 100644
--- a/net-p2p/lopster/files/patch-src::global.c
+++ b/net-p2p/lopster/files/patch-src::global.c
@@ -1,25 +1,9 @@
 --- src/global.c.orig	Sun Nov  4 13:30:19 2001
 +++ src/global.c	Sat Jan 26 22:15:50 2002
-@@ -1333,7 +1333,6 @@
-   
-   return NULL;
- }
--*/
+@@ -3096,7 +3096,7 @@
+   global.allowed_ports = NULL;
  
- char *strcasestr(char *str, char *sub)
- {
-@@ -1361,6 +1360,7 @@
- 
-   return NULL;
- }
-+*/
- 
- int idle_function(gpointer data ATTR_UNUSED)
- {
-@@ -3597,7 +3597,7 @@
    global.auto_save = NULL;
-   global.execs = NULL;
-   global.pings = NULL;
 -  global.ping_command = l_strdup("/bin/ping -c 3 $IP");
 +  global.ping_command = l_strdup("/sbin/ping -c 3 $IP");
  
diff --git a/net-p2p/lopster/files/patch-src::global.h b/net-p2p/lopster/files/patch-src::global.h
deleted file mode 100644
index 3837a2ce9da..00000000000
--- a/net-p2p/lopster/files/patch-src::global.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/global.h.orig	Wed Oct 17 20:54:36 2001
-+++ src/global.h	Sat Jan 26 22:09:13 2002
-@@ -98,7 +98,7 @@
- void create_dir(char *dir);
- 
- void update_status_line(int highlight);
--char *strcasestr(char *str, char *sub);
-+// char *strcasestr(char *str, char *sub);
diff --git a/net-p2p/lopster/files/patch-src::transfer.c b/net-p2p/lopster/files/patch-src::transfer.c
deleted file mode 100644
index ffc51a29a38..00000000000
--- a/net-p2p/lopster/files/patch-src::transfer.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/transfer.c.orig	Sun Nov  4 20:30:19 2001
-+++ src/transfer.c	Mon Nov 18 11:09:25 2002
-@@ -1827,8 +1827,10 @@
-     printf("set offset to %ld %d\n", transfer->progress, cnt);
- #endif
-     transfer->resume_check = l_malloc(cnt * sizeof(char));
--    transfer->check_length = read(fileno(transfer->file),
--				  transfer->resume_check, cnt);
-+    transfer->check_length = fread(transfer->resume_check, 
-+                                  sizeof(char),
-+                                  cnt,
-+                                  transfer->file);
-     fclose(transfer->file);
- 
-     if (transfer->check_length != cnt) {
diff --git a/net-p2p/lopster/pkg-descr b/net-p2p/lopster/pkg-descr
index ae315c663e9..d024aa17d79 100644
--- a/net-p2p/lopster/pkg-descr
+++ b/net-p2p/lopster/pkg-descr
@@ -1,4 +1,5 @@
-Lopster is a Napster client for Linux/Unix written in C and based on GTK.
+Lopster is a Napster client with Multiserver and Multisource support
+for Linux/Unix written in C and based on GTK.
 
 WWW: http://lopster.sourceforge.net/
 
diff --git a/net-p2p/lopster/pkg-plist b/net-p2p/lopster/pkg-plist
index e92fd25c8fe..5192556d21e 100644
--- a/net-p2p/lopster/pkg-plist
+++ b/net-p2p/lopster/pkg-plist
@@ -1,14 +1,11 @@
 bin/lopster
-share/locale/de/LC_MESSAGES/lopster.mo
-share/locale/fr/LC_MESSAGES/lopster.mo
 share/lopster/pixmaps/arrowd.xpm
 share/lopster/pixmaps/arrowl.xpm
 share/lopster/pixmaps/arrowr.xpm
 share/lopster/pixmaps/arrowu.xpm
-share/lopster/pixmaps/book1.xpm
-share/lopster/pixmaps/book2.xpm
 share/lopster/pixmaps/bug.xpm
 share/lopster/pixmaps/chat.xpm
+share/lopster/pixmaps/close.xpm
 share/lopster/pixmaps/d16x16.xpm
 share/lopster/pixmaps/download.xpm
 share/lopster/pixmaps/email.xpm
@@ -23,12 +20,15 @@ share/lopster/pixmaps/hotlist.xpm
 share/lopster/pixmaps/ignore.xpm
 share/lopster/pixmaps/info.xpm
 share/lopster/pixmaps/library.xpm
-share/lopster/pixmaps/logo.xpm
 share/lopster/pixmaps/logo1.xpm
 share/lopster/pixmaps/mini-folder.xpm
 share/lopster/pixmaps/project.xpm
 share/lopster/pixmaps/search.xpm
 share/lopster/pixmaps/server.xpm
+share/lopster/pixmaps/server_con.xpm
+share/lopster/pixmaps/share_all.xpm
+share/lopster/pixmaps/share_none.xpm
+share/lopster/pixmaps/share_part.xpm
 share/lopster/pixmaps/speedgray.xpm
 share/lopster/pixmaps/speedgreen.xpm
 share/lopster/pixmaps/speedred.xpm