From aeca8f4bb7c2064dab95860a7d1901b4be9df1e7 Mon Sep 17 00:00:00 2001 From: naddy Date: Sun, 23 Jan 2005 21:42:49 +0000 Subject: [PATCH] update to 1.2.2; based on a submission by Christian.Kellermann@nefkom.net --- audio/lopster/Makefile | 15 +++++----- audio/lopster/distinfo | 7 +++-- audio/lopster/patches/patch-configure | 19 ++++++------- audio/lopster/patches/patch-src_Makefile_in | 11 ++++---- audio/lopster/patches/patch-src_transfer_c | 31 --------------------- audio/lopster/pkg/PLIST | 6 +++- 6 files changed, 31 insertions(+), 58 deletions(-) delete mode 100644 audio/lopster/patches/patch-src_transfer_c diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile index b7aa16c8e54..c17fc5b7809 100644 --- a/audio/lopster/Makefile +++ b/audio/lopster/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.27 2004/11/21 17:51:45 espie Exp $ +# $OpenBSD: Makefile,v 1.28 2005/01/23 21:42:49 naddy Exp $ COMMENT= "full featured GTK Napster client" -DISTNAME= lopster-1.2.0 -PKGNAME= ${DISTNAME}p2 +DISTNAME= lopster-1.2.2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lopster/} @@ -13,18 +12,20 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext Xi c glib gmodule m z + +WANTLIB= X11 Xext Xi c glib gmodule m pthread z MODULES= devel/gettext -LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \ - ogg.4::audio/libogg +LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \ + gthread.1.2::devel/glib \ + ogg.4::audio/libogg \ + FLAC.5::audio/flac USE_GMAKE= Yes USE_X11= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=--with-zlib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/lopster/distinfo b/audio/lopster/distinfo index 3168ea3e34f..18b3a540c8c 100644 --- a/audio/lopster/distinfo +++ b/audio/lopster/distinfo @@ -1,4 +1,5 @@ -MD5 (lopster-1.2.0.tar.gz) = fedbe6b5c7944a4a21bc4554358a057d -RMD160 (lopster-1.2.0.tar.gz) = cbe281edd5c749b907a60b508d46bcd9feb39e4b -SHA1 (lopster-1.2.0.tar.gz) = 055ba228f37e0da3bb95fe512625be455491fc75 +MD5 (lopster-1.2.2.tar.gz) = ae857116eddd01f1f7d2769908a142c0 +RMD160 (lopster-1.2.2.tar.gz) = 60b236962d3b3cf998a56aa7b087381349b9e610 +SHA1 (lopster-1.2.2.tar.gz) = 27655baa659e748406326bcac4e6b94b8982f258 +SIZE (lopster-1.2.2.tar.gz) = 630325 SIZE (lopster-1.2.0.tar.gz) = 606295 diff --git a/audio/lopster/patches/patch-configure b/audio/lopster/patches/patch-configure index 2ee555d6e4d..e50a5787e89 100644 --- a/audio/lopster/patches/patch-configure +++ b/audio/lopster/patches/patch-configure @@ -1,15 +1,14 @@ -$OpenBSD: patch-configure,v 1.1 2003/06/22 02:45:31 jolan Exp $ ---- configure.orig Tue Mar 4 14:09:14 2003 -+++ configure Sat Jun 14 22:29:21 2003 -@@ -2162,14 +2162,14 @@ fi +--- configure.orig Sun Aug 29 20:38:43 2004 ++++ configure Thu Jan 20 11:58:08 2005 +@@ -2245,14 +2245,14 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 -- echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 --echo "configure:2167: checking for main in -lpthread" >&5 -+ echo $ac_n "checking for main in -pthread""... $ac_c" 1>&6 -+echo "configure:2167: checking for main in -pthread" >&5 - ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 +-echo "configure:2250: checking for pthread_attr_init in -lpthread" >&5 ++ echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6 ++echo "configure:2250: checking for pthread_attr_init in -pthread" >&5 + ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17,5 +16,5 @@ $OpenBSD: patch-configure,v 1.1 2003/06/22 02:45:31 jolan Exp $ -LIBS="-lpthread $LIBS" +LIBS="-pthread $LIBS" cat > conftest.$ac_ext <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); - } diff --git a/audio/lopster/pkg/PLIST b/audio/lopster/pkg/PLIST index f797ed8fb6c..10f27f80611 100644 --- a/audio/lopster/pkg/PLIST +++ b/audio/lopster/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2004/09/14 23:16:54 espie Exp $ +@comment $OpenBSD: PLIST,v 1.10 2005/01/23 21:42:49 naddy Exp $ bin/lopster share/lopster/ share/lopster/pixmaps/ @@ -29,6 +29,10 @@ share/lopster/pixmaps/project.xpm share/lopster/pixmaps/search.xpm share/lopster/pixmaps/server.xpm share/lopster/pixmaps/server_con.xpm +share/lopster/pixmaps/server_deact.xpm +share/lopster/pixmaps/server_napi.xpm +share/lopster/pixmaps/server_nnapi.xpm +share/lopster/pixmaps/server_perm.xpm share/lopster/pixmaps/share_all.xpm share/lopster/pixmaps/share_none.xpm share/lopster/pixmaps/share_part.xpm