From owner-svn-ports-head@FreeBSD.ORG Sat Oct 25 16:38:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CE769E4; Sat, 25 Oct 2014 16:38:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 269A9BBF; Sat, 25 Oct 2014 16:38:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9PGcUg9097072; Sat, 25 Oct 2014 16:38:30 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9PGcRTL097058; Sat, 25 Oct 2014 16:38:27 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201410251638.s9PGcRTL097058@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 25 Oct 2014 16:38:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371488 - in head: multimedia/gmtk multimedia/gnome-mplayer www/gecko-mediaplayer www/gecko-mediaplayer/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Oct 2014 16:38:30 -0000 Author: riggs Date: Sat Oct 25 16:38:26 2014 New Revision: 371488 URL: https://svnweb.freebsd.org/changeset/ports/371488 QAT: https://qat.redports.org/buildarchive/r371488/ Log: - Update to version 1.0.9 [1] - Simplify Makefiles [1] - Fix build problem in gecko-mediaplayer with xulrunner>=30 [2] PR: 194498 Submitted by: tkato432@yahoo.com [1] Reviewed by: riggs [2] Added: head/www/gecko-mediaplayer/files/patch-src-npupp.h (contents, props changed) Modified: head/multimedia/gmtk/Makefile head/multimedia/gmtk/distinfo head/multimedia/gmtk/pkg-plist head/multimedia/gnome-mplayer/Makefile head/multimedia/gnome-mplayer/distinfo head/multimedia/gnome-mplayer/pkg-plist head/www/gecko-mediaplayer/Makefile head/www/gecko-mediaplayer/distinfo head/www/gecko-mediaplayer/pkg-plist Modified: head/multimedia/gmtk/Makefile ============================================================================== --- head/multimedia/gmtk/Makefile Sat Oct 25 15:16:24 2014 (r371487) +++ head/multimedia/gmtk/Makefile Sat Oct 25 16:38:26 2014 (r371488) @@ -1,83 +1,50 @@ # $FreeBSD$ PORTNAME= gmtk -PORTVERSION= 1.0.8 -PORTREVISION= 1 +PORTVERSION= 1.0.9 CATEGORIES= multimedia gnome devel -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE:S,/files/,/svn/packages/,} MAINTAINER= ports@FreeBSD.org COMMENT= Library for gnome-mplayer and gecko-mediaplayer LICENSE= GPLv2 -BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser +BUILD_DEPENDS= p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser +USES= gettext gmake libtool pathfix perl5 pkgconfig +USE_XORG= x11 +USE_GNOME= glib20 +USE_PERL5= build GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-silent-rules \ + --disable-gconf INSTALL_TARGET= install-strip -USES= gmake libtool pathfix perl5 pkgconfig -USE_GNOME= glib20 USE_LDCONFIG= yes -USE_PERL5= build -USE_XORG= x11 CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README +OPTIONS_DEFINE= ALSA DOCS GIO GTK3 PULSEAUDIO -OPTIONS_DEFINE= ALSA DOCS GCONF GIO GTK3 NLS PULSEAUDIO -GIO_DESC= Use GIO for file I/O +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +ALSA_CONFIGURE_WITH= alsa +GIO_DESC= Use GIO for file I/O +GIO_CONFIGURE_WITH= gio +GTK3_USE= gnome=gtk30 +GTK3_CONFIGURE_ENABLE= gtk3 +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_WITH= pulseaudio .include -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -CONFIGURE_ARGS+= --with-alsa -.else -CONFIGURE_ARGS+= --without-alsa -.endif - -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -CONFIGURE_ARGS+= --enable-gconf --enable-gsettings -.else -CONFIGURE_ARGS+= --disable-gconf --enable-keystore -.endif - -.if ${PORT_OPTIONS:MGIO} -CONFIGURE_ARGS+= --with-gio -.else -CONFIGURE_ARGS+= --without-gio -.endif - -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -CONFIGURE_ARGS+= --enable-gtk3 -.else +.if !${PORT_OPTIONS:MGTK3} USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --disable-gtk3 -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -CONFIGURE_ARGS+= --with-pulseaudio -.else -CONFIGURE_ARGS+= --without-pulseaudio .endif -.if empty(PORT_OPTIONS:MDOCS) post-patch: - @${REINPLACE_CMD} \ - -e 's/install-data-am: install-gmtkdocDATA/install-data-am:/' \ - ${WRKSRC}/Makefile.in -.endif + @${REINPLACE_CMD} -e \ + '/COPYING\\/d ; \ + /INSTALL\\/d' ${WRKSRC}/Makefile.in .include Modified: head/multimedia/gmtk/distinfo ============================================================================== --- head/multimedia/gmtk/distinfo Sat Oct 25 15:16:24 2014 (r371487) +++ head/multimedia/gmtk/distinfo Sat Oct 25 16:38:26 2014 (r371488) @@ -1,2 +1,2 @@ -SHA256 (gmtk-1.0.8.tar.gz) = 007fba85f4ba6af6b3fd9d5162e18a7e4059c848e112eb03b84b2c7aad008b0c -SIZE (gmtk-1.0.8.tar.gz) = 407790 +SHA256 (gmtk-1.0.9.tar.gz) = d633832ab3b223f9a669934d168c74574ab47a6a21f76d942c05ad78c56bf87a +SIZE (gmtk-1.0.9.tar.gz) = 411609 Modified: head/multimedia/gmtk/pkg-plist ============================================================================== --- head/multimedia/gmtk/pkg-plist Sat Oct 25 15:16:24 2014 (r371487) +++ head/multimedia/gmtk/pkg-plist Sat Oct 25 16:38:26 2014 (r371488) @@ -15,55 +15,56 @@ include/gmtk/gmtk_output_combo_box.h lib/libgmlib.a lib/libgmlib.so lib/libgmlib.so.1 -lib/libgmlib.so.1.0.8 +lib/libgmlib.so.1.0.9 lib/libgmtk.a lib/libgmtk.so lib/libgmtk.so.1 -lib/libgmtk.so.1.0.8 +lib/libgmtk.so.1.0.9 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README libdata/pkgconfig/gmlib.pc libdata/pkgconfig/gmtk.pc -%%NLS%%share/locale/ar/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/bg/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/ca/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/cs/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/da/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/de/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/el/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/en_GB/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/es/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/et/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/eu/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/fi/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/fo/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/fr/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/fy/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/gl/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/he/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/hr/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/hu/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/id/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/it/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/ja/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/ko/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/lt/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/nl/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/pl/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/pt/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/ro/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/ru/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/si/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/sr/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/sr@latin/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/sv/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/th/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/tr/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/ug/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/uk/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/vi/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/zh_HK/LC_MESSAGES/gmtk.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/gmtk.mo -%%NLS%%@dirrmtry share/locale/fy/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/fy -@dirrm include/gmtk +share/locale/ar/LC_MESSAGES/gmtk.mo +share/locale/bg/LC_MESSAGES/gmtk.mo +share/locale/ca/LC_MESSAGES/gmtk.mo +share/locale/cs/LC_MESSAGES/gmtk.mo +share/locale/da/LC_MESSAGES/gmtk.mo +share/locale/de/LC_MESSAGES/gmtk.mo +share/locale/el/LC_MESSAGES/gmtk.mo +share/locale/en_GB/LC_MESSAGES/gmtk.mo +share/locale/es/LC_MESSAGES/gmtk.mo +share/locale/et/LC_MESSAGES/gmtk.mo +share/locale/eu/LC_MESSAGES/gmtk.mo +share/locale/fi/LC_MESSAGES/gmtk.mo +share/locale/fo/LC_MESSAGES/gmtk.mo +share/locale/fr/LC_MESSAGES/gmtk.mo +share/locale/fy/LC_MESSAGES/gmtk.mo +share/locale/gl/LC_MESSAGES/gmtk.mo +share/locale/he/LC_MESSAGES/gmtk.mo +share/locale/hr/LC_MESSAGES/gmtk.mo +share/locale/hu/LC_MESSAGES/gmtk.mo +share/locale/id/LC_MESSAGES/gmtk.mo +share/locale/it/LC_MESSAGES/gmtk.mo +share/locale/ja/LC_MESSAGES/gmtk.mo +share/locale/ko/LC_MESSAGES/gmtk.mo +share/locale/lt/LC_MESSAGES/gmtk.mo +share/locale/nl/LC_MESSAGES/gmtk.mo +share/locale/pl/LC_MESSAGES/gmtk.mo +share/locale/pt/LC_MESSAGES/gmtk.mo +share/locale/pt_BR/LC_MESSAGES/gmtk.mo +share/locale/ro/LC_MESSAGES/gmtk.mo +share/locale/ru/LC_MESSAGES/gmtk.mo +share/locale/si/LC_MESSAGES/gmtk.mo +share/locale/sr/LC_MESSAGES/gmtk.mo +share/locale/sr@latin/LC_MESSAGES/gmtk.mo +share/locale/sv/LC_MESSAGES/gmtk.mo +share/locale/th/LC_MESSAGES/gmtk.mo +share/locale/tr/LC_MESSAGES/gmtk.mo +share/locale/ug/LC_MESSAGES/gmtk.mo +share/locale/uk/LC_MESSAGES/gmtk.mo +share/locale/vi/LC_MESSAGES/gmtk.mo +share/locale/zh_CN/LC_MESSAGES/gmtk.mo +share/locale/zh_HK/LC_MESSAGES/gmtk.mo +share/locale/zh_TW/LC_MESSAGES/gmtk.mo Modified: head/multimedia/gnome-mplayer/Makefile ============================================================================== --- head/multimedia/gnome-mplayer/Makefile Sat Oct 25 15:16:24 2014 (r371487) +++ head/multimedia/gnome-mplayer/Makefile Sat Oct 25 16:38:26 2014 (r371488) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= gnome-mplayer -PORTVERSION= 1.0.8 -PORTREVISION= 4 +PORTVERSION= 1.0.9 CATEGORIES= multimedia gnome -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE:S,/files/,/svn/packages/,} MAINTAINER= ports@FreeBSD.org COMMENT= GNOME frontend for MPlayer @@ -16,86 +15,55 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDI libgmtk.so:${PORTSDIR}/multimedia/gmtk RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -OPTIONS_DEFINE= ALSA BRAINZ3 DOCS GIO GPOD GTK3 NLS NOTIFY PULSEAUDIO -BRAINZ3_DESC= Add support for libmusicbrainz -GIO_DESC= Use GIO for file I/O -GPOD_DESC= Add support for libgpod - USES= desktop-file-utils gettext gmake pkgconfig -GNU_CONFIGURE= yes -USE_GNOME= glib20 USE_XORG= x11 xscrnsaver +USE_GNOME= glib20 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-silent-rules \ + --disable-nautilus \ + --disable-nemo \ + --disable-schemas-install \ + --without-libgda INSTALLS_ICONS= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lintl -CONFIGURE_ARGS= --disable-nautilus -PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ - dbus.txt keyboard_shortcuts.txt plugin-interaction.txt +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lintl -#GLIB_SCHEMAS= apps.gecko-mediaplayer.preferences.gschema.xml \ -# apps.gnome-mplayer.preferences.enums.xml \ -# apps.gnome-mplayer.preferences.gschema.xml +GLIB_SCHEMAS= apps.gecko-mediaplayer.preferences.gschema.xml \ + apps.gnome-mplayer.preferences.enums.xml \ + apps.gnome-mplayer.preferences.gschema.xml + +OPTIONS_DEFINE= ALSA BRAINZ3 DOCS GIO GPOD GTK3 NOTIFY PULSEAUDIO + +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +ALSA_RUN_DEPENDS= alsa-plugins>0:${PORTSDIR}/audio/alsa-plugins +ALSA_CONFIGURE_WITH= alsa +BRAINZ3_DESC= Add support for libmusicbrainz +BRAINZ3_LIB_DEPENDS= libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \ + libcurl.so:${PORTSDIR}/ftp/curl +BRAINZ3_CONFIGURE_WITH= libmusicbrainz3 +GIO_DESC= Use GIO for file I/O +GIO_CONFIGURE_WITH= gio +GPOD_DESC= Add support for libgpod +GPOD_LIB_DEPENDS= libgpod.so:${PORTSDIR}/audio/libgpod +GPOD_CONFIGURE_WITH= libgpod +GTK3_USE= gnome=gtk30 +GTK3_CONFIGURE_ENABLE= gtk3 +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify +NOTIFY_RUN_DEPENDS= notification-daemon>0:${PORTSDIR}/deskutils/notification-daemon +NOTIFY_CONFIGURE_WITH= libnotify +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_WITH= pulseaudio .include -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins -CONFIGURE_ARGS+= --with-alsa -.else -CONFIGURE_ARGS+= --without-alsa -.endif - -.if ${PORT_OPTIONS:MBRAINZ3} -LIB_DEPENDS+= libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \ - libcurl.so:${PORTSDIR}/ftp/curl -CONFIGURE_ARGS+= --with-libmusicbrainz3 -.else -CONFIGURE_ARGS+= --without-libmusicbrainz3 -.endif - -.if ${PORT_OPTIONS:MGIO} -CONFIGURE_ARGS+= --with-gio -.else -CONFIGURE_ARGS+= --without-gio -.endif - -.if ${PORT_OPTIONS:MGPOD} -LIB_DEPENDS+= libgpod.so:${PORTSDIR}/audio/libgpod -CONFIGURE_ARGS+= --with-libgpod -.else -CONFIGURE_ARGS+= --without-libgpod -.endif - -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -CONFIGURE_ARGS+= --enable-gtk3 -.else +.if !${PORT_OPTIONS:MGTK3} USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --disable-gtk3 -.endif - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify -RUN_DEPENDS+= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon -CONFIGURE_ARGS+= --with-libnotify -.else -CONFIGURE_ARGS+= --without-libnotify -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -CONFIGURE_ARGS+= --with-pulseaudio -.else -CONFIGURE_ARGS+= --without-pulseaudio .endif post-patch: -.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e \ - 's/install-desktopDATA install-gnome_mplayerdocDATA/install-desktopDATA/' \ - ${WRKSRC}/Makefile.in -.endif + '/COPYING\\/d ; \ + /INSTALL\\/d' ${WRKSRC}/Makefile.in .include Modified: head/multimedia/gnome-mplayer/distinfo ============================================================================== --- head/multimedia/gnome-mplayer/distinfo Sat Oct 25 15:16:24 2014 (r371487) +++ head/multimedia/gnome-mplayer/distinfo Sat Oct 25 16:38:26 2014 (r371488) @@ -1,2 +1,2 @@ -SHA256 (gnome-mplayer-1.0.8.tar.gz) = bbd914ab620341e0c074374d2079c335eaea3c93cde746ebc7357577e7b00414 -SIZE (gnome-mplayer-1.0.8.tar.gz) = 1062691 +SHA256 (gnome-mplayer-1.0.9.tar.gz) = e43ca4929e7dc591256a16a793c7cce2678e07e948ee8ef11ed46cce2b3d81db +SIZE (gnome-mplayer-1.0.9.tar.gz) = 1082199 Modified: head/multimedia/gnome-mplayer/pkg-plist ============================================================================== --- head/multimedia/gnome-mplayer/pkg-plist Sat Oct 25 15:16:24 2014 (r371487) +++ head/multimedia/gnome-mplayer/pkg-plist Sat Oct 25 16:38:26 2014 (r371488) @@ -1,6 +1,13 @@ bin/gnome-mplayer man/man1/gnome-mplayer.1.gz share/applications/gnome-mplayer.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/dbus.txt +%%PORTDOCS%%%%DOCSDIR%%/keyboard_shortcuts.txt +%%PORTDOCS%%%%DOCSDIR%%/plugin-interaction.txt share/gnome-control-center/default-apps/gnome-mplayer.xml share/icons/hicolor/16x16/apps/gnome-mplayer.png share/icons/hicolor/22x22/apps/gnome-mplayer.png @@ -51,19 +58,3 @@ share/locale/vi/LC_MESSAGES/gnome-mplaye share/locale/zh_CN/LC_MESSAGES/gnome-mplayer.mo share/locale/zh_HK/LC_MESSAGES/gnome-mplayer.mo share/locale/zh_TW/LC_MESSAGES/gnome-mplayer.mo -@dirrmtry share/gnome-control-center/default-apps -@dirrmtry share/gnome-control-center -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/ug/LC_MESSAGES -@dirrmtry share/locale/ug -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/kk/LC_MESSAGES -@dirrmtry share/locale/kk -@dirrmtry share/locale/fy/LC_MESSAGES -@dirrmtry share/locale/fy -@dirrmtry share/locale/fo/LC_MESSAGES -@dirrmtry share/locale/fo Modified: head/www/gecko-mediaplayer/Makefile ============================================================================== --- head/www/gecko-mediaplayer/Makefile Sat Oct 25 15:16:24 2014 (r371487) +++ head/www/gecko-mediaplayer/Makefile Sat Oct 25 16:38:26 2014 (r371488) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= gecko-mediaplayer -DISTVERSION= 1.0.9a -PORTREVISION= 3 +PORTVERSION= 1.0.9 CATEGORIES= www multimedia gnome -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE:S,/files/,/svn/packages/,} MAINTAINER= ports@FreeBSD.org COMMENT= Multimedia browser plugin for Gecko based browsers @@ -18,53 +17,38 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDI libgmlib.so:${PORTSDIR}/multimedia/gmtk RUN_DEPENDS= gnome-mplayer:${PORTSDIR}/multimedia/gnome-mplayer -OPTIONS_DEFINE= CACHE DOCS NLS -OPTIONS_DEFAULT=CACHE -CACHE_DESC= Enable caching of remote media to local storage - -GNU_CONFIGURE= yes -USES= compiler:c++11-lang pkgconfig gecko webplugin:native +USES= compiler:c++11-lang gecko gettext pkgconfig webplugin:native USE_GNOME= glib20 - -WEBPLUGIN_FILES= ${PORTNAME}.so -.for p in dvx rm qt wmp -WEBPLUGIN_FILES+= ${PORTNAME}-${p}.so -.endfor +USE_CXXSTD= c++11 +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-silent-rules \ + --disable-schemas-install \ + --with-plugin_dir="${WEBPLUGIN_DIR}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+=--with-plugin_dir="${WEBPLUGIN_DIR}" -PORTDOCS= README COPYING AUTHORS ChangeLog INSTALL NEWS javascript.txt +OPTIONS_DEFINE= CACHE DOCS +OPTIONS_DEFAULT= CACHE -.include +CACHE_DESC= Enable caching of remote media to local storage +CACHE_CONFIGURE_ENABLE= caching -.if ${PORT_OPTIONS:MCACHE} -CONFIGURE_ARGS+= --enable-caching -.else -CONFIGURE_ARGS+= --disable-caching -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB= NLS="" -.else -USES+= gettext:build -PLIST_SUB= NLS="@comment " -.endif +WEBPLUGIN_FILES= ${PORTNAME}.so +.for p in dvx rm qt wmp +WEBPLUGIN_FILES+= ${PORTNAME}-${p}.so +.endfor post-patch: - @${REINPLACE_CMD} -e 's|-ldl||' \ - ${WRKSRC}/configure \ - ${WRKSRC}/src/Makefile.in -.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e \ - 's|install-gecko_mediaplayerdocDATA install-schemaDATA|install-schemaDATA|' \ - ${WRKSRC}/Makefile.in -.endif -.if empty(PORT_OPTIONS:MNLS) - @${REINPLACE_CMD} -e 's/^ALL_LINGUAS=".*"/ALL_LINGUAS=""/' \ - ${WRKSRC}/configure -.endif + 's|-std=c++11|| ; \ + s|-ldl||' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/COPYING\\/d ; \ + /INSTALL\\/d' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|-ldl||' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e \ + "s|= (char) NULL;|= '\0';|" ${WRKSRC}/src/plugin_list.cpp .include Modified: head/www/gecko-mediaplayer/distinfo ============================================================================== --- head/www/gecko-mediaplayer/distinfo Sat Oct 25 15:16:24 2014 (r371487) +++ head/www/gecko-mediaplayer/distinfo Sat Oct 25 16:38:26 2014 (r371488) @@ -1,2 +1,2 @@ -SHA256 (gecko-mediaplayer-1.0.9a.tar.gz) = a80ee5c432a0f5884f209c90965d16f0a9b261ddd9d876f6e981020d20a9e2eb -SIZE (gecko-mediaplayer-1.0.9a.tar.gz) = 270183 +SHA256 (gecko-mediaplayer-1.0.9.tar.gz) = 212a0a87e35da9ed944f5fb827552e9978fd3ea051da89554da5ef3934d4c2a5 +SIZE (gecko-mediaplayer-1.0.9.tar.gz) = 271917 Added: head/www/gecko-mediaplayer/files/patch-src-npupp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/gecko-mediaplayer/files/patch-src-npupp.h Sat Oct 25 16:38:26 2014 (r371488) @@ -0,0 +1,12 @@ +--- src/npupp.h.orig 2014-01-03 17:14:34.000000000 +0100 ++++ src/npupp.h 2014-10-25 18:16:23.746171118 +0200 +@@ -63,6 +63,9 @@ + + #include "npruntime.h" + ++#ifndef NP_LOADDS ++#define NP_LOADDS ++#endif + + /****************************************************************************************** + plug-in function table macros Modified: head/www/gecko-mediaplayer/pkg-plist ============================================================================== --- head/www/gecko-mediaplayer/pkg-plist Sat Oct 25 15:16:24 2014 (r371487) +++ head/www/gecko-mediaplayer/pkg-plist Sat Oct 25 16:38:26 2014 (r371488) @@ -1,17 +1,21 @@ +%%WEBPLUGIN_DIR%%/gecko-mediaplayer.so %%WEBPLUGIN_DIR%%/gecko-mediaplayer-dvx.so %%WEBPLUGIN_DIR%%/gecko-mediaplayer-qt.so %%WEBPLUGIN_DIR%%/gecko-mediaplayer-rm.so %%WEBPLUGIN_DIR%%/gecko-mediaplayer-wmp.so -%%WEBPLUGIN_DIR%%/gecko-mediaplayer.so -%%NLS%%share/locale/cs/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/de/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/es/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/fr/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/it/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/ja/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/nl/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/pl/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/pt/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/gecko-mediaplayer.mo -%%NLS%%share/locale/tr/LC_MESSAGES/gecko-mediaplayer.mo -@dirrmtry %%WEBPLUGIN_DIR%% +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/javascript.txt +share/locale/cs/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/de/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/es/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/fr/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/it/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/ja/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/nl/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/pl/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/pt/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/pt_BR/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/tr/LC_MESSAGES/gecko-mediaplayer.mo