From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 6 21:30:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B50816A4DA for ; Sun, 6 Aug 2006 21:30:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 812B143D55 for ; Sun, 6 Aug 2006 21:30:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k76LUEPU032960 for ; Sun, 6 Aug 2006 21:30:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k76LUEf4032954; Sun, 6 Aug 2006 21:30:14 GMT (envelope-from gnats) Resent-Date: Sun, 6 Aug 2006 21:30:14 GMT Resent-Message-Id: <200608062130.k76LUEf4032954@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Brazhnikov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DE5616A4DF for ; Sun, 6 Aug 2006 21:29:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2632243D45 for ; Sun, 6 Aug 2006 21:29:31 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k76LTUf4058625 for ; Sun, 6 Aug 2006 21:29:30 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k76LTUIe058624; Sun, 6 Aug 2006 21:29:30 GMT (envelope-from nobody) Message-Id: <200608062129.k76LTUIe058624@www.freebsd.org> Date: Sun, 6 Aug 2006 21:29:30 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/101530: update port: multimedia/gxine X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2006 21:30:15 -0000 >Number: 101530 >Category: ports >Synopsis: update port: multimedia/gxine >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 06 21:30:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: FreeBSD luna.zuzino.mipt.ru 6.1-STABLE FreeBSD 6.1-STABLE #0: Mon Jun 5 18:46:21 MSD 2006 makc@luna.zuzino.mipt.ru:/usr/obj/usr/src/sys/LUNA i386 >Description: Update gxine from 0.3.3 to 0.5.7. Added WITHOUT_NLS Replaced PREFIX with TARGETDIR it seems that maintainer drops support. I can maintain this port if nobody wants to do it. >How-To-Repeat: >Fix: diff -urN gxine.orig/Makefile gxine/Makefile --- gxine.orig/Makefile Sat Jun 24 02:04:39 2006 +++ gxine/Makefile Sun Aug 6 23:16:19 2006 @@ -6,8 +6,7 @@ # PORTNAME= gxine -PORTVERSION= 0.3.3 -PORTREVISION= 16 +PORTVERSION= 0.5.7 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xine @@ -17,29 +16,46 @@ LIB_DEPENDS= xine.15:${PORTSDIR}/multimedia/libxine +USE_BZIP2= yes USE_X_PREFIX= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk20 gnomehier +USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib" +CONFIGURE_ARGS= --mandir=${TARGETDIR}/man +INSTALLS_ICONS= yes MANLANG= "" de -MAN1= gxine.1 +MAN1= gxine.1 gxine_client.1 +MANCOMPRESSED= no OPTIONS= MOZILLA_PLUGIN "Install Mozilla plugin" on .include +.if defined(WITHOUT_NLS) +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.endif .if defined(WITHOUT_MOZILLA_PLUGIN) +LIB_DEPENDS+= js.1:${PORTSDIR}/lang/spidermonkey +CONFIGURE_ARGS+=--without-browser-plugin PLIST_SUB+= MOZILLA_PLUGIN="@comment " .else +USE_GECKO= firefox mozilla seamonkey xulrunner firefox-devel +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" +CONFIGURE_ARGS+=--disable-libjs PLIST_SUB+= MOZILLA_PLUGIN="" .endif post-install: .if !defined(WITHOUT_MOZILLA_PLUGIN) - @${MKDIR} ${PREFIX}/lib/browser_plugins - @${LN} -sf ${PREFIX}/lib/gxine/gxineplugin.so ${PREFIX}/lib/browser_plugins + @${MKDIR} ${TARGETDIR}/lib/browser_plugins + @${LN} -sf ${TARGETDIR}/lib/gxine/gxineplugin.so ${TARGETDIR}/lib/browser_plugins .endif .include diff -urN gxine.orig/distinfo gxine/distinfo --- gxine.orig/distinfo Mon Jan 23 00:19:38 2006 +++ gxine/distinfo Sun Aug 6 14:35:39 2006 @@ -1,3 +1,3 @@ -MD5 (gxine-0.3.3.tar.gz) = d54af2f901065555348a77fa3b61581e -SHA256 (gxine-0.3.3.tar.gz) = 1edc1776001e980ffbadcb66917f144ef2fca8f9eba10e73f6dfc79eaac18110 -SIZE (gxine-0.3.3.tar.gz) = 1038778 +MD5 (gxine-0.5.7.tar.bz2) = 61585b08f699a33528749be101fe8a87 +SHA256 (gxine-0.5.7.tar.bz2) = 08f9da823bf87ce9a7beae6938ab2e5405004bb85f97ba49e3a2a1738ec0520c +SIZE (gxine-0.5.7.tar.bz2) = 964963 diff -urN gxine.orig/files/patch-browser-plugin::plugin.c gxine/files/patch-browser-plugin::plugin.c --- gxine.orig/files/patch-browser-plugin::plugin.c Mon May 12 13:19:32 2003 +++ gxine/files/patch-browser-plugin::plugin.c Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- browser-plugin/plugin.c.orig Tue May 6 14:20:32 2003 -+++ browser-plugin/plugin.c Tue May 6 14:20:50 2003 -@@ -47,6 +47,7 @@ - - #include - #include -+#include - - - diff -urN gxine.orig/files/patch-src::desktop_integration.c gxine/files/patch-src::desktop_integration.c --- gxine.orig/files/patch-src::desktop_integration.c Sat Apr 19 22:34:23 2003 +++ gxine/files/patch-src::desktop_integration.c Sun Aug 6 14:35:39 2006 @@ -1,10 +1,10 @@ ---- src/desktop_integration.c.orig Sat Apr 19 02:23:31 2003 -+++ src/desktop_integration.c Sat Apr 19 02:23:39 2003 -@@ -30,7 +30,6 @@ +--- src/desktop_integration.c.orig Thu Jun 8 18:15:59 2006 ++++ src/desktop_integration.c Tue Jul 11 00:35:11 2006 +@@ -31,7 +31,6 @@ #include #include #include -#include #include - - #include "globals.h" + #include + #include diff -urN gxine.orig/files/patch-src::engine.c gxine/files/patch-src::engine.c --- gxine.orig/files/patch-src::engine.c Thu Jan 1 03:00:00 1970 +++ gxine/files/patch-src::engine.c Sun Aug 6 14:35:39 2006 @@ -0,0 +1,11 @@ +--- src/engine.c.orig Fri Jun 30 18:56:00 2006 ++++ src/engine.c Tue Jul 11 01:36:59 2006 +@@ -36,7 +36,7 @@ + + se_t *gse; /* global script engine */ + xine_t *xine; /* global xine instance */ +-pthread_mutex_t engine_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++pthread_mutex_t engine_lock = PTHREAD_MUTEX_INITIALIZER; + + gboolean initialised = FALSE; + diff -urN gxine.orig/files/patch-src::globals.h gxine/files/patch-src::globals.h --- gxine.orig/files/patch-src::globals.h Sat Apr 19 22:34:23 2003 +++ gxine/files/patch-src::globals.h Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- src/globals.h.orig Sat Apr 19 02:18:27 2003 -+++ src/globals.h Sat Apr 19 02:20:42 2003 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "infobar.h" - diff -urN gxine.orig/files/patch-src::gtkxine.h gxine/files/patch-src::gtkxine.h --- gxine.orig/files/patch-src::gtkxine.h Sat Apr 19 22:34:23 2003 +++ gxine/files/patch-src::gtkxine.h Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- src/gtkxine.h.orig Sat Apr 19 02:24:55 2003 -+++ src/gtkxine.h Sat Apr 19 02:25:07 2003 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include "globals.h" - - #ifdef __cplusplus - extern "C" { diff -urN gxine.orig/files/patch-src::http.c gxine/files/patch-src::http.c --- gxine.orig/files/patch-src::http.c Sat Apr 19 22:34:23 2003 +++ gxine/files/patch-src::http.c Sun Aug 6 14:35:39 2006 @@ -1,12 +1,12 @@ ---- src/http.c.orig Sat Apr 19 02:22:23 2003 -+++ src/http.c Sat Apr 19 02:22:34 2003 +--- src/http.c.orig Thu Jun 29 04:35:39 2006 ++++ src/http.c Tue Jul 11 00:54:35 2006 @@ -35,6 +35,9 @@ - #include #include #include + +#include +#include +#define IPPROTO_TCP 6 - #include "http.h" + #include "utils.h" diff -urN gxine.orig/files/patch-src::script_engine.c gxine/files/patch-src::script_engine.c --- gxine.orig/files/patch-src::script_engine.c Thu Jan 1 03:00:00 1970 +++ gxine/files/patch-src::script_engine.c Sun Aug 6 14:35:39 2006 @@ -0,0 +1,11 @@ +--- src/script_engine.c.orig Thu Jun 15 17:13:25 2006 ++++ src/script_engine.c Tue Jul 11 00:38:49 2006 +@@ -1554,7 +1554,7 @@ + + pthread_mutexattr_t attr; + pthread_mutexattr_init (&attr); +- pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); ++ pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init (&se->lock, &attr); + pthread_mutexattr_destroy (&attr); + diff -urN gxine.orig/files/patch-src::spidermonkey::jsprf.c gxine/files/patch-src::spidermonkey::jsprf.c --- gxine.orig/files/patch-src::spidermonkey::jsprf.c Wed Sep 21 22:26:09 2005 +++ gxine/files/patch-src::spidermonkey::jsprf.c Thu Jan 1 03:00:00 1970 @@ -1,16 +0,0 @@ ---- src/spidermonkey/jsprf.c.orig Fri Mar 7 02:14:11 2003 -+++ src/spidermonkey/jsprf.c Wed Sep 21 20:20:45 2005 -@@ -57,7 +57,12 @@ - #define VARARGS_ASSIGN(foo, bar) (foo) = (bar) - #endif - */ --#define VARARGS_ASSIGN(foo, bar) __va_copy(foo, bar) -+#include -+#if __FreeBSD_version >= 500000 -+#define VARARGS_ASSIGN(foo, bar) va_copy(foo, bar) -+#else -+#define VARARGS_ASSIGN(foo, bar) (foo) = (bar) -+#endif - - /* - ** WARNING: This code may *NOT* call JS_LOG (because JS_LOG calls it) diff -urN gxine.orig/pkg-plist gxine/pkg-plist --- gxine.orig/pkg-plist Sat Jun 24 02:04:39 2006 +++ gxine/pkg-plist Sun Aug 6 19:30:48 2006 @@ -1,17 +1,54 @@ bin/gxine bin/gxine_client +etc/gxine/gtkrc +etc/gxine/keypad.xml +etc/gxine/startup +etc/gxine/toolbar-fullscreen.xml +etc/gxine/toolbar-window.xml +%%MOZILLA_PLUGIN%%lib/browser_plugins/gxineplugin.so +%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.a +%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.la +%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.so +share/applications/gxine.desktop %%DATADIR%%/logo.mpv -%%DATADIR%%/pixmaps/gxine-logo.png +%%DATADIR%%/mediamarks %%DATADIR%%/pixmaps/gxine-icon.xpm -%%DATADIR%%/pixmaps/wizards.png +%%DATADIR%%/pixmaps/nospeaker.png +%%DATADIR%%/pixmaps/set-brightness.svg +%%DATADIR%%/pixmaps/set-contrast.svg +%%DATADIR%%/pixmaps/set-saturation.svg +%%DATADIR%%/pixmaps/set-volume.svg +%%DATADIR%%/pixmaps/speaker.png %%DATADIR%%/pixmaps/splash.png -%%DATADIR%%/mediamarks -share/gnome/apps/Multimedia/gxine.desktop -lib/gxine/gxineplugin.a -lib/gxine/gxineplugin.la -lib/gxine/gxineplugin.so -%%MOZILLA_PLUGIN%%lib/browser_plugins/gxineplugin.so +share/icons/hicolor/48x48/apps/gxine.png +%%NLS%%share/locale/cs/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/cs/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/de/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/de/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/fr/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/fr/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/it/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/it/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/pl/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/pl/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/ru/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/ru/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/sv/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/sv/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/uk/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/uk/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/gxine.theme.mo +share/pixmaps/gxine.png +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% +@dirrmtry share/applications +@dirrmtry man/de/man1 +@dirrmtry man/de @dirrm lib/gxine %%MOZILLA_PLUGIN%%@dirrmtry lib/browser_plugins +@dirrm etc/gxine >Release-Note: >Audit-Trail: >Unformatted: