From owner-svn-ports-all@FreeBSD.ORG Fri Aug 3 20:25:40 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECBA71065670; Fri, 3 Aug 2012 20:25:39 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D792A8FC16; Fri, 3 Aug 2012 20:25:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q73KPdU8065288; Fri, 3 Aug 2012 20:25:39 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q73KPdQu065283; Fri, 3 Aug 2012 20:25:39 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201208032025.q73KPdQu065283@svn.freebsd.org> From: Lars Engels Date: Fri, 3 Aug 2012 20:25:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301969 - in head/german/mediathek: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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, 03 Aug 2012 20:25:40 -0000 Author: lme Date: Fri Aug 3 20:25:39 2012 New Revision: 301969 URL: http://svn.freebsd.org/changeset/ports/301969 Log: - Update to 3.0.0 - Convert to new OPTIONS framework Submitted by: Oliver Brandmueller (via private mail) Modified: head/german/mediathek/Makefile head/german/mediathek/distinfo head/german/mediathek/files/mediathek.in head/german/mediathek/pkg-plist Modified: head/german/mediathek/Makefile ============================================================================== --- head/german/mediathek/Makefile Fri Aug 3 18:56:44 2012 (r301968) +++ head/german/mediathek/Makefile Fri Aug 3 20:25:39 2012 (r301969) @@ -6,11 +6,10 @@ # PORTNAME= mediathek -PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTVERSION= 3.0.0 CATEGORIES= german java MASTER_SITES= SF/zdfmediathk/Mediathek/Mediathek%20${PORTVERSION} -DISTNAME= Mediathek_${PORTVERSION} +DISTNAME= MediathekView_${PORTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Filme der oeff. rechtlichen Sender herunterladen und ansehen @@ -23,27 +22,25 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ SUB_FILES= mediathek -OPTIONS= MPLAYER "mplayer zum Aufnehmen verwenden" on \ - VLC "VLC zum Abspielen verwenden" on +INSTALLFILES= MediathekView.jar +INSTALLDOCS= Anleitung.pdf +INSTALLLIBS= commons-compress-1.4.jar commons-lang3-3.1.jar \ + jdom-2.0.0.jar -INSTALLFILES= Mediathek.jar -INSTALLDOCS= make.txt releases.txt Kurzanleitung.pdf -INSTALLLIBS= commons-compress-1.1.jar commons-lang-2.5.jar \ - jdom.jar rome-1.0.jar - -.include - -pre-everything:: -.if !defined(WITH_MPLAYER) && !defined(WITH_VLC) - @${ECHO_MSG} "Es muss entweder mplayer oder VLC ausgewaehlt sein" - @${FALSE} -.endif +OPTIONS_MULTI= BACKEND +OPTIONS_MULTI_BACKEND= MPLAYER VLC + +VLC_DESC= VLC support + +OPTIONS_DEFAULT= VLC + +.include -.if defined(WITH_MPLAYER) +.if ${PORT_OPTIONS:MMPLAYER} RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer .endif -.if defined(WITH_VLC) +.if ${PORT_OPTIONS:MVLC} RUN_DEPENDS+= vlc:${PORTSDIR}/multimedia/vlc .endif @@ -61,7 +58,7 @@ do-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for i in ${INSTALLDOCS} - @${INSTALL_DATA} ${WRKSRC}/Anleitung/${i} ${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ .endfor .endif .for i in ${INSTALLLIBS} @@ -69,4 +66,4 @@ do-install: .endfor @${INSTALL_SCRIPT} ${WRKDIR}/mediathek ${PREFIX}/bin -.include +.include Modified: head/german/mediathek/distinfo ============================================================================== --- head/german/mediathek/distinfo Fri Aug 3 18:56:44 2012 (r301968) +++ head/german/mediathek/distinfo Fri Aug 3 20:25:39 2012 (r301969) @@ -1,2 +1,2 @@ -SHA256 (Mediathek_2.6.0.zip) = 7381aaa3e69059ff5ec1ae580b2a049c88e8a7a0cfdb5c643b8e59bd102ccd18 -SIZE (Mediathek_2.6.0.zip) = 1880966 +SHA256 (MediathekView_3.0.0.zip) = ea823797c62afc46d740425b703e3cf9515e48007708cada961fb6d97b19486e +SIZE (MediathekView_3.0.0.zip) = 2043758 Modified: head/german/mediathek/files/mediathek.in ============================================================================== --- head/german/mediathek/files/mediathek.in Fri Aug 3 18:56:44 2012 (r301968) +++ head/german/mediathek/files/mediathek.in Fri Aug 3 20:25:39 2012 (r301969) @@ -1,5 +1,5 @@ #!/bin/sh cd %%DATADIR%% -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar Mediathek.jar "$@" +JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar MediathekView.jar "$@" Modified: head/german/mediathek/pkg-plist ============================================================================== --- head/german/mediathek/pkg-plist Fri Aug 3 18:56:44 2012 (r301968) +++ head/german/mediathek/pkg-plist Fri Aug 3 20:25:39 2012 (r301969) @@ -1,12 +1,9 @@ bin/mediathek -%%PORTDOCS%%%%DOCSDIR%%/Kurzanleitung.pdf -%%PORTDOCS%%%%DOCSDIR%%/make.txt -%%PORTDOCS%%%%DOCSDIR%%/releases.txt -%%DATADIR%%/Mediathek.jar -%%DATADIR%%/lib/commons-compress-1.1.jar -%%DATADIR%%/lib/commons-lang-2.5.jar -%%DATADIR%%/lib/jdom.jar -%%DATADIR%%/lib/rome-1.0.jar +%%PORTDOCS%%%%DOCSDIR%%/Anleitung.pdf +%%DATADIR%%/MediathekView.jar +%%DATADIR%%/lib/commons-compress-1.4.jar +%%DATADIR%%/lib/commons-lang3-3.1.jar +%%DATADIR%%/lib/jdom-2.0.0.jar @dirrm %%DATADIR%%/lib @dirrm %%DATADIR%% @dirrm %%DOCSDIR%%