ports/51718: [MAINTAINER UPDATE] Bugfix: audio/lopster

[Roman Shterenzon]

>Number:         51718
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] Bugfix: audio/lopster
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 03 07:30:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Roman Shterenzon
>Release:        FreeBSD 4.8-RC i386
>Organization:
>Environment:
System: FreeBSD alchemy.oven.org 4.8-RC FreeBSD 4.8-RC #0: Fri Mar 21 17:13:46 IST 2003 root at alchemy.oven.org:/local/src/sys/compile/ALCHEMY i386


>Description:
his fixes crash when being direct browsed.
Also, I made OGG support optional. Prior to it, it was used if present,
but LIB_DEPENDS wasn't updated.

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/lopster/Makefile lopster/Makefile
--- /usr/ports/audio/lopster/Makefile	Sat Apr 19 21:52:38 2003
+++ lopster/Makefile	Wed Apr 30 16:47:25 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	lopster
 PORTVERSION=	1.2.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +25,24 @@
 CONFIGURE_ARGS=	--with-pthread=yes --with-zlib=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+# Make ogg optional
+.if exists(${LOCALBASE}/lib/libogg.so.4)
+WITH_LIBOGG=     yes
+.endif
+
+.if defined(WITH_LIBOGG)
+LIB_DEPENDS+=   ogg.4:${PORTSDIR}/audio/libogg
+.endif
+
+.if defined(WITH_ARTS)
+.endif
+
+pre-everything:
+	@${ECHO_MSG} "You can specify WITH_LIBOGG to include Ogg support"
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/audio/lopster/files/patch-src::transfer.c lopster/files/patch-src::transfer.c
--- /usr/ports/audio/lopster/files/patch-src::transfer.c	Thu Jan  1 02:00:00 1970
+++ lopster/files/patch-src::transfer.c	Wed Apr 30 16:37:43 2003
@@ -0,0 +1,30 @@
+--- src/transfer.c.orig	Tue Mar  4 21:08:57 2003
++++ src/transfer.c	Wed Mar  5 23:23:53 2003
+@@ -5907,6 +5907,7 @@
+   GtkCList *clist;
+   socket_t *socket;
+   upload_t *upload;
++  share_t *share;
+   int i1;
+ 
+   if (!userinfo) return;
+@@ -5915,10 +5916,15 @@
+   gtk_clist_freeze(clist);
+   for (i1 = 0; i1 < clist->rows; i1++) {
+     socket = gtk_clist_get_row_data(clist, i1);
+-    upload = socket->data;
+-    if (upload->data->user_info != userinfo) continue;
+-
+-    upload_update(socket);
++    if (socket->type == S_UPLOAD) {
++      upload = socket->data;
++      if (upload->data->user_info != userinfo) continue;
++      upload_update(socket);
++    } else if (socket->type == S_SHARE) {
++      share = socket->data;
++      if (share->data->user_info != userinfo) continue;
++      share_update(socket);
++    }
+   }
+   gtk_clist_thaw(clist);
+ }
>Release-Note:
>Audit-Trail:
>Unformatted: