From owner-svn-ports-all@freebsd.org Mon Feb 20 16:39:07 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9F8FCE508F; Mon, 20 Feb 2017 16:39:07 +0000 (UTC) (envelope-from lme@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 mx1.freebsd.org (Postfix) with ESMTPS id 92099157F; Mon, 20 Feb 2017 16:39:07 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1KGd6YQ074966; Mon, 20 Feb 2017 16:39:06 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1KGd6nV074960; Mon, 20 Feb 2017 16:39:06 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201702201639.v1KGd6nV074960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Mon, 20 Feb 2017 16:39:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434474 - in head: . german german/mediathek german/mediathekview german/mediathekview/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-all@freebsd.org X-Mailman-Version: 2.1.23 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: Mon, 20 Feb 2017 16:39:07 -0000 Author: lme Date: Mon Feb 20 16:39:05 2017 New Revision: 434474 URL: https://svnweb.freebsd.org/changeset/ports/434474 Log: german/mediathek: - Rename the port to german/mediathekview to reflect upstream change (a long time ago) - Update to 13.0.1 - Use upstream's Java start parameters in mediathekview.in - Switch from .zip to .tar.gz distfile - Add an OPTION for multimedia/mpv as player / backend - Modernize OPTIONS Added: head/german/mediathekview/ - copied from r434473, head/german/mediathek/ head/german/mediathekview/files/mediathekview.in - copied, changed from r434473, head/german/mediathek/files/mediathek.in Deleted: head/german/mediathek/ head/german/mediathekview/files/mediathek.in Modified: head/MOVED head/german/Makefile head/german/mediathekview/Makefile head/german/mediathekview/distinfo head/german/mediathekview/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Mon Feb 20 16:23:32 2017 (r434473) +++ head/MOVED Mon Feb 20 16:39:05 2017 (r434474) @@ -9081,3 +9081,4 @@ www/webkit-qt5|www/qt5-webkit|2017-02-18 www/rt40|www/rt44|2017-02-18|Has expired: Upstream support EoL, please migrate to rt44 devel/m6811-binutils||2017-02-18|Has expired: multiple vulnerabilities, version is years behind upstream devel/libevent2|devel/libevent|2017-02-20|Rename as only libevent 2.x is supported +german/mediathek|german/mediathekview|2017-02-20|Project renamed Modified: head/german/Makefile ============================================================================== --- head/german/Makefile Mon Feb 20 16:23:32 2017 (r434473) +++ head/german/Makefile Mon Feb 20 16:39:05 2017 (r434474) @@ -20,7 +20,7 @@ SUBDIR += jdictionary-ger-hun SUBDIR += kde4-l10n SUBDIR += libreoffice - SUBDIR += mediathek + SUBDIR += mediathekview SUBDIR += mythes SUBDIR += phone SUBDIR += php_doc Modified: head/german/mediathekview/Makefile ============================================================================== --- head/german/mediathek/Makefile Mon Feb 20 16:23:32 2017 (r434473) +++ head/german/mediathekview/Makefile Mon Feb 20 16:39:05 2017 (r434474) @@ -1,11 +1,11 @@ # Created by: Lars Engels # $FreeBSD$ -PORTNAME= mediathek -PORTVERSION= 12 +PORTNAME= mediathekview +PORTVERSION= 13.0.1 CATEGORIES= german java -MASTER_SITES= SF/zdfmediathk/Mediathek/Mediathek%20${PORTVERSION} -DISTNAME= MediathekView_${PORTVERSION} +MASTER_SITES= https://download.mediathekview.de/stabil/ +DISTNAME= MediathekView-${PORTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Filme der oeff. rechtlichen Sender herunterladen und ansehen @@ -14,44 +14,33 @@ RUN_DEPENDS= ${LOCALBASE}/openjdk8/bin/j flvstreamer:multimedia/flvstreamer NO_BUILD= yes -USES= zip:infozip USE_JAVA= yes JAVA_VERSION= 1.8+ -SUB_FILES= mediathek +SUB_FILES= ${PORTNAME} INSTALLFILES= MediathekView.jar MediathekView.ico INSTALLDOCS= Kurzanleitung.pdf Instructions.pdf OPTIONS_DEFINE= DOCS OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= MPLAYER VLC +OPTIONS_MULTI_BACKEND= MPLAYER MPV VLC VLC_DESC= VLC support +MPV_DESC= VLC support OPTIONS_DEFAULT= VLC -.include - -.if ${PORT_OPTIONS:MMPLAYER} -RUN_DEPENDS+= mplayer:multimedia/mplayer -.endif - -.if ${PORT_OPTIONS:MVLC} -RUN_DEPENDS+= vlc:multimedia/vlc -.endif +MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer +MPV_RUN_DEPENDS= mpv:multimedia/mpv +VLC_RUN_DEPENDS= vlc:multimedia/vlc DESKTOP_ENTRIES="MediathekView" \ "Filme der oeff. rechtlichen Sender herunterladen und ansehen" \ "${DATADIR}/MediathekView.ico" \ - "mediathek" \ + "${PORTNAME}" \ "Video;AudioVideo;Java;" \ false -do-extract: - @${RM} -r ${WRKDIR} - @${MKDIR} ${WRKSRC} - @${UNZIP_CMD} -q -d ${WRKSRC} ${DISTDIR}/${EXTRACT_ONLY} - do-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/lib @@ -63,6 +52,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/Anleitung/${i} ${STAGEDIR}${DOCSDIR}/ .endfor (cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lib/) - ${INSTALL_SCRIPT} ${WRKDIR}/mediathek ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Modified: head/german/mediathekview/distinfo ============================================================================== --- head/german/mediathek/distinfo Mon Feb 20 16:23:32 2017 (r434473) +++ head/german/mediathekview/distinfo Mon Feb 20 16:39:05 2017 (r434474) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471200643 -SHA256 (MediathekView_12.zip) = 7a8767572657390831a39f0a1e6ce483cca589c56506a27c896f6fb39edd549a -SIZE (MediathekView_12.zip) = 39389109 +TIMESTAMP = 1487606056 +SHA256 (MediathekView-13.0.1.tar.gz) = a5a7187e2ab50617bf641ca058b05432f7dfb3934136884c3dcc9657cec0d912 +SIZE (MediathekView-13.0.1.tar.gz) = 27399095 Copied and modified: head/german/mediathekview/files/mediathekview.in (from r434473, head/german/mediathek/files/mediathek.in) ============================================================================== --- head/german/mediathek/files/mediathek.in Mon Feb 20 16:23:32 2017 (r434473, copy source) +++ head/german/mediathekview/files/mediathekview.in Mon Feb 20 16:39:05 2017 (r434474) @@ -2,5 +2,5 @@ cd %%DATADIR%% JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \ - -Xms128M -Xmx1G -jar MediathekView.jar "$@" + -jar MediathekView.jar "$@" Modified: head/german/mediathekview/pkg-plist ============================================================================== --- head/german/mediathek/pkg-plist Mon Feb 20 16:23:32 2017 (r434473) +++ head/german/mediathekview/pkg-plist Mon Feb 20 16:39:05 2017 (r434474) @@ -1,16 +1,17 @@ -bin/mediathek +bin/mediathekview %%PORTDOCS%%%%DOCSDIR%%/Instructions.pdf %%PORTDOCS%%%%DOCSDIR%%/Kurzanleitung.pdf %%DATADIR%%/MediathekView.ico %%DATADIR%%/MediathekView.jar -%%DATADIR%%/lib/MSearch.jar -%%DATADIR%%/lib/commons-compress-1.12.jar -%%DATADIR%%/lib/commons-lang3-3.4.jar +%%DATADIR%%/lib/MSearch-2.1.1.jar +%%DATADIR%%/lib/commons-io-1.3.1.jar +%%DATADIR%%/lib/commons-lang3-3.5.jar +%%DATADIR%%/lib/commons-logging-1.0.4.jar %%DATADIR%%/lib/jackson-core-2.7.0.jar -%%DATADIR%%/lib/jchart2d-3.2.2.jar -%%DATADIR%%/lib/jgoodies-common-1.8.0.jar -%%DATADIR%%/lib/jgoodies-forms-1.8.0.jar -%%DATADIR%%/lib/jide-oss-3.6.1.jar +%%DATADIR%%/lib/jchart2d-3.3.2.jar +%%DATADIR%%/lib/jgoodies-common-1.8.1.jar +%%DATADIR%%/lib/jgoodies-forms-1.9.0.jar +%%DATADIR%%/lib/jide-oss-3.6.16.jar %%DATADIR%%/lib/swingx-action-1.6.6-SNAPSHOT.jar %%DATADIR%%/lib/swingx-autocomplete-1.6.6-SNAPSHOT.jar %%DATADIR%%/lib/swingx-beaninfo-1.6.6-SNAPSHOT.jar @@ -19,4 +20,5 @@ bin/mediathek %%DATADIR%%/lib/swingx-graphics-1.6.6-SNAPSHOT.jar %%DATADIR%%/lib/swingx-painters-1.6.6-SNAPSHOT.jar %%DATADIR%%/lib/swingx-plaf-1.6.6-SNAPSHOT.jar -%%DATADIR%%/lib/xz.jar +%%DATADIR%%/lib/xmlgraphics-commons-1.3.1.jar +%%DATADIR%%/lib/xz-1.5.jar