From owner-svn-ports-all@freebsd.org Fri Sep 7 17:16:04 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0748FFFF19; Fri, 7 Sep 2018 17:16:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 967B071676; Fri, 7 Sep 2018 17:16:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90DA51ED12; Fri, 7 Sep 2018 17:16:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w87HG3xE045709; Fri, 7 Sep 2018 17:16:03 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w87HG35U045707; Fri, 7 Sep 2018 17:16:03 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201809071716.w87HG35U045707@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 7 Sep 2018 17:16:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479201 - head/multimedia/gxine X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/multimedia/gxine X-SVN-Commit-Revision: 479201 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2018 17:16:04 -0000 Author: tobik Date: Fri Sep 7 17:16:02 2018 New Revision: 479201 URL: https://svnweb.freebsd.org/changeset/ports/479201 Log: Cleanup multimedia/gxine - Add NLS option - Drop GNOME option which does not do anything anymore without gnome-screensaver which was removed in 2014 - Fix build of LIRC option Submitted by: ndowens@yahoo.com Reviewed by: mat, tobik Differential Revision: https://reviews.freebsd.org/D16978 Modified: head/multimedia/gxine/Makefile head/multimedia/gxine/pkg-plist Modified: head/multimedia/gxine/Makefile ============================================================================== --- head/multimedia/gxine/Makefile Fri Sep 7 17:14:41 2018 (r479200) +++ head/multimedia/gxine/Makefile Fri Sep 7 17:16:02 2018 (r479201) @@ -3,7 +3,7 @@ PORTNAME= gxine PORTVERSION= 0.5.910 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION} @@ -11,43 +11,37 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Alternative GUI for the Xine media player LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libnspr4.so:devel/nspr \ libmozjs185.so:lang/spidermonkey185 \ libxine.so:multimedia/libxine -USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz +USES= desktop-file-utils gmake gnome libtool pathfix pkgconfig tar:xz USE_GNOME= gtk30 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-hal --with-libintl-prefix=${LOCALBASE} --with-gtk3 -LLD_UNSAFE= yes +CONFIGURE_ARGS= --without-hal --with-libintl-prefix=${LOCALBASE} \ + --with-gtk3 --without-dbus --disable-integration-wizard INSTALLS_ICONS= yes +LLD_UNSAFE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lm +OPTIONS_DEFINE= LIRC NLS WEBPLUGIN +OPTIONS_SUB= yes -OPTIONS_DEFINE= GNOME LIRC WEBPLUGIN -OPTIONS_SUB= yes +WEBPLUGIN_DESC= Build and/or install Web browser plugins -GNOME_BUILD_DEPENDS= gnome-screensaver:x11/gnome-screensaver -GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib -GNOME_RUN_DEPENDS= gnome-screensaver:x11/gnome-screensaver -GNOME_CONFIGURE_ON= --with-dbus -GNOME_CONFIGURE_OFF= --disable-integration-wizard --without-dbus LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc -LIRC_CONFIGURE_ON= --enable-lirc -LIRC_CONFIGURE_OFF= --disable-lirc -WEBPLUGIN_DESC= Build and/or install Web browser plugins -WEBPLUGIN_USE= xorg=xaw -WEBPLUGIN_USES= webplugin:native -WEBPLUGIN_CONFIGURE_OFF= --without-browser-plugin +LIRC_CONFIGURE_ENABLE= lirc +LIRC_USES= localbase -.include +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext -.if ${PORT_OPTIONS:MWEBPLUGIN} -WEBPLUGIN_DIR= ${PREFIX}/lib/gxine -WEBPLUGIN_FILES=gxineplugin.so -.endif +WEBPLUGIN_USE= xorg=xaw +WEBPLUGIN_USES= webplugin:native +WEBPLUGIN_CONFIGURE_WITH= browser-plugin +WEBPLUGIN_DIR= ${PREFIX}/lib/gxine +WEBPLUGIN_FILES= gxineplugin.so post-patch: @${REINPLACE_CMD} -e \ @@ -58,10 +52,7 @@ post-patch: @${REINPLACE_CMD} -e \ 's|@MAKE_PNG_TRUE@|#|' ${WRKSRC}/pixmaps/Makefile.in -post-install: - ${CP} ${WRKSRC}/pixmaps/logo.mpv ${STAGEDIR}${PREFIX}/share/gxine -.if ${PORT_OPTIONS:MWEBPLUGIN} +post-install-WEBPLUGIN-on: @${STRIP_CMD} ${STAGEDIR}${WEBPLUGIN_DIR}/${WEBPLUGIN_FILES} -.endif .include Modified: head/multimedia/gxine/pkg-plist ============================================================================== --- head/multimedia/gxine/pkg-plist Fri Sep 7 17:14:41 2018 (r479200) +++ head/multimedia/gxine/pkg-plist Fri Sep 7 17:16:02 2018 (r479201) @@ -6,6 +6,7 @@ bin/gxine_client %%ETCDIR%%/startup %%ETCDIR%%/toolbar-fullscreen.xml %%ETCDIR%%/toolbar-window.xml +%%WEBPLUGIN%%%%WEBPLUGIN_DIR%%/gxineplugin.so man/de/man1/gxine.1.gz man/de/man1/gxine_client.1.gz man/es/man1/gxine.1.gz @@ -14,7 +15,6 @@ man/man1/gxine.1.gz man/man1/gxine_client.1.gz share/applications/gxine.desktop %%DATADIR%%/logo.jpg -%%DATADIR%%/logo.mpv %%DATADIR%%/mediamarks %%DATADIR%%/pixmaps/gxine-icon.xpm %%DATADIR%%/pixmaps/nospeaker.png @@ -30,28 +30,28 @@ share/applications/gxine.desktop %%DATADIR%%/pixmaps/splash.png %%DATADIR%%/pixmaps/subtitle.svg share/icons/hicolor/64x64/apps/gxine.png -share/locale/cs/LC_MESSAGES/gxine.mo -share/locale/cs/LC_MESSAGES/gxine.theme.mo -share/locale/de/LC_MESSAGES/gxine.mo -share/locale/de/LC_MESSAGES/gxine.theme.mo -share/locale/es/LC_MESSAGES/gxine.mo -share/locale/es/LC_MESSAGES/gxine.theme.mo -share/locale/fi/LC_MESSAGES/gxine.mo -share/locale/fi/LC_MESSAGES/gxine.theme.mo -share/locale/fr/LC_MESSAGES/gxine.mo -share/locale/fr/LC_MESSAGES/gxine.theme.mo -share/locale/it/LC_MESSAGES/gxine.mo -share/locale/it/LC_MESSAGES/gxine.theme.mo -share/locale/ja/LC_MESSAGES/gxine.mo -share/locale/ja/LC_MESSAGES/gxine.theme.mo -share/locale/pl/LC_MESSAGES/gxine.mo -share/locale/pl/LC_MESSAGES/gxine.theme.mo -share/locale/ru/LC_MESSAGES/gxine.mo -share/locale/ru/LC_MESSAGES/gxine.theme.mo -share/locale/sv/LC_MESSAGES/gxine.mo -share/locale/sv/LC_MESSAGES/gxine.theme.mo -share/locale/uk/LC_MESSAGES/gxine.mo -share/locale/uk/LC_MESSAGES/gxine.theme.mo -share/locale/zh_CN/LC_MESSAGES/gxine.mo -share/locale/zh_CN/LC_MESSAGES/gxine.theme.mo +%%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/es/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/es/LC_MESSAGES/gxine.theme.mo +%%NLS%%share/locale/fi/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/fi/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/ja/LC_MESSAGES/gxine.mo +%%NLS%%share/locale/ja/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