From owner-svn-ports-head@FreeBSD.ORG Wed Jan 22 08:19:12 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F72C79F; Wed, 22 Jan 2014 08:19:12 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 61A431D38; Wed, 22 Jan 2014 08:19:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0M8JCUF032234; Wed, 22 Jan 2014 08:19:12 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0M8JAIc032222; Wed, 22 Jan 2014 08:19:10 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201401220819.s0M8JAIc032222@svn.freebsd.org> From: Max Brazhnikov Date: Wed, 22 Jan 2014 08:19:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340692 - in head/multimedia: phonon phonon-designerplugin phonon-gstreamer phonon-vlc 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.17 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: Wed, 22 Jan 2014 08:19:12 -0000 Author: makc Date: Wed Jan 22 08:19:10 2014 New Revision: 340692 URL: http://svnweb.freebsd.org/changeset/ports/340692 QAT: https://qat.redports.org/buildarchive/r340692/ Log: - Update Phonon ports to 4.7.1, vlc backend to 0.7.1 - Convert LIB_DEPENDS to new style - Drop ipv6 from CATEGORIES - Remove ancient CONFLICTS and now useless LATEST_LINK Modified: head/multimedia/phonon-designerplugin/Makefile head/multimedia/phonon-gstreamer/Makefile head/multimedia/phonon-gstreamer/distinfo (contents, props changed) head/multimedia/phonon-vlc/Makefile head/multimedia/phonon-vlc/distinfo head/multimedia/phonon/Makefile head/multimedia/phonon/distinfo (contents, props changed) head/multimedia/phonon/pkg-plist Modified: head/multimedia/phonon-designerplugin/Makefile ============================================================================== --- head/multimedia/phonon-designerplugin/Makefile Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon-designerplugin/Makefile Wed Jan 22 08:19:10 2014 (r340692) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.7.0 +PORTVERSION= 4.7.1 CATEGORIES= multimedia kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION} +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -designerplugin DIST_SUBDIR= KDE Modified: head/multimedia/phonon-gstreamer/Makefile ============================================================================== --- head/multimedia/phonon-gstreamer/Makefile Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon-gstreamer/Makefile Wed Jan 22 08:19:10 2014 (r340692) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.7.0 +PORTVERSION= 4.7.1 CATEGORIES= multimedia kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION} PKGNAMESUFFIX= -gstreamer DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= KDE @@ -13,13 +12,6 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= GStreamer backend for Phonon -# Required in order to avoid conflicts with multimedia/phonon's OPTIONS. -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - -CONFLICTS= qt4-phonon-gst-4* - -PHONON_BRANCH= stable - USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER= yes @@ -30,21 +22,11 @@ USE_XORG= x11 USE_XZ= yes USES= cmake pkgconfig -PLIST_SUB+= QT_PREFIX=${QT_PREFIX} +SUB_FILES= pkg-message OPTIONS_DEFINE= GST_PLUGINS - GST_PLUGINS_DESC= Install GStreamer plugins - -OPTIONS_DEFAULT= - -.include - -.if ${PORT_OPTIONS:MGST_PLUGINS} -RUN_DEPENDS+= gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all -.else -SUB_FILES= pkg-message -.endif +GST_PLUGINS_RUN_DEPENDS= gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all post-install: ${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend Modified: head/multimedia/phonon-gstreamer/distinfo ============================================================================== --- head/multimedia/phonon-gstreamer/distinfo Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon-gstreamer/distinfo Wed Jan 22 08:19:10 2014 (r340692) @@ -1,2 +1,2 @@ -SHA256 (KDE/phonon-backend-gstreamer-4.7.0.tar.xz) = 3a776b3166330260b356fb9e136302df3d46c6107deaf737bb3c4dee9585e77d -SIZE (KDE/phonon-backend-gstreamer-4.7.0.tar.xz) = 75416 +SHA256 (KDE/phonon-backend-gstreamer-4.7.1.tar.xz) = 7859782fb3d304e1d0363e665feecb7d3b64a712705dc326151c6402fef6f2ca +SIZE (KDE/phonon-backend-gstreamer-4.7.1.tar.xz) = 75528 Modified: head/multimedia/phonon-vlc/Makefile ============================================================================== --- head/multimedia/phonon-vlc/Makefile Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon-vlc/Makefile Wed Jan 22 08:19:10 2014 (r340692) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 0.7.0 -CATEGORIES= multimedia kde ipv6 -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src +PORTVERSION= 0.7.1 +CATEGORIES= multimedia kde +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION} PKGNAMESUFFIX= -vlc DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= KDE @@ -12,10 +11,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= VLC backend for Phonon -LIB_DEPENDS= vlc:${PORTSDIR}/multimedia/vlc - -# Required in order to avoid conflicts with multimedia/phonon. -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} +LIB_DEPENDS= libvlc.so:${PORTSDIR}/multimedia/vlc USE_KDE4= kdehier kdeprefix automoc4 USE_QT4= corelib gui phonon \ @@ -23,10 +19,6 @@ USE_QT4= corelib gui phonon \ USE_XZ= yes USES= cmake pkgconfig -PHONON_BRANCH= stable - -PLIST_SUB+= QT_PREFIX=${QT_PREFIX} - post-install: ${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend ${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so \ Modified: head/multimedia/phonon-vlc/distinfo ============================================================================== --- head/multimedia/phonon-vlc/distinfo Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon-vlc/distinfo Wed Jan 22 08:19:10 2014 (r340692) @@ -1,2 +1,2 @@ -SHA256 (KDE/phonon-backend-vlc-0.7.0.tar.xz) = edb5ada44ab91882e7dc337ec82cf0fe8623999e9177f7faf3862214da601fe6 -SIZE (KDE/phonon-backend-vlc-0.7.0.tar.xz) = 58648 +SHA256 (KDE/phonon-backend-vlc-0.7.1.tar.xz) = 230bb7f3377fd6e82b19d9438026308d7584ae34945cb5aa9fdb23f39980158e +SIZE (KDE/phonon-backend-vlc-0.7.1.tar.xz) = 58876 Modified: head/multimedia/phonon/Makefile ============================================================================== --- head/multimedia/phonon/Makefile Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon/Makefile Wed Jan 22 08:19:10 2014 (r340692) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.7.0 -CATEGORIES= multimedia kde ipv6 -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION} +PORTVERSION= 4.7.1 +CATEGORIES= multimedia kde +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -15,10 +14,6 @@ LICENSE= LGPL21 LIB_DEPENDS= libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist -CONFLICTS= qt4-phonon-4* - -PHONON_BRANCH= stable - USE_KDE4= kdehier kdeprefix automoc4 USE_QT4= corelib dbus gui \ qmake_build moc_build rcc_build uic_build @@ -29,7 +24,7 @@ CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIO -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF USE_LDCONFIG= yes -PLIST_SUB= QT_PREFIX=${QT_PREFIX} +PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= PULSEAUDIO Modified: head/multimedia/phonon/distinfo ============================================================================== --- head/multimedia/phonon/distinfo Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon/distinfo Wed Jan 22 08:19:10 2014 (r340692) @@ -1,2 +1,2 @@ -SHA256 (KDE/phonon-4.7.0.tar.xz) = 4ca5e17b6afbbfbfe92611f51f9e8d78552ecc31c2e15cbb18be37132ab7b9eb -SIZE (KDE/phonon-4.7.0.tar.xz) = 329792 +SHA256 (KDE/phonon-4.7.1.tar.xz) = 4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d +SIZE (KDE/phonon-4.7.1.tar.xz) = 329900 Modified: head/multimedia/phonon/pkg-plist ============================================================================== --- head/multimedia/phonon/pkg-plist Wed Jan 22 08:18:16 2014 (r340691) +++ head/multimedia/phonon/pkg-plist Wed Jan 22 08:19:10 2014 (r340692) @@ -163,10 +163,10 @@ lib/cmake/phonon/PhononTargets-%%CMAKE_B lib/cmake/phonon/PhononTargets.cmake lib/libphonon.so lib/libphonon.so.4 -lib/libphonon.so.4.7.0 +lib/libphonon.so.%%SHLIB_VER%% lib/libphononexperimental.so lib/libphononexperimental.so.4 -lib/libphononexperimental.so.4.7.0 +lib/libphononexperimental.so.%%SHLIB_VER%% libdata/pkgconfig/phonon.pc share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml %%DATADIR%%/buildsystem/COPYING-CMAKE-SCRIPTS