[Midnightbsd-cvs] mports [15815] trunk/multimedia/phonon: update phonon to 4.7.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Jan 5 20:58:14 EST 2014


Revision: 15815
          http://svnweb.midnightbsd.org/mports/?rev=15815
Author:   laffer1
Date:     2014-01-05 20:58:14 -0500 (Sun, 05 Jan 2014)
Log Message:
-----------
update phonon to 4.7.0

Modified Paths:
--------------
    trunk/multimedia/phonon/Makefile
    trunk/multimedia/phonon/distinfo
    trunk/multimedia/phonon/pkg-plist

Added Paths:
-----------
    trunk/multimedia/phonon/files/
    trunk/multimedia/phonon/files/patch-CMakeLists.txt

Modified: trunk/multimedia/phonon/Makefile
===================================================================
--- trunk/multimedia/phonon/Makefile	2014-01-06 01:51:23 UTC (rev 15814)
+++ trunk/multimedia/phonon/Makefile	2014-01-06 01:58:14 UTC (rev 15815)
@@ -1,17 +1,17 @@
 # $MidnightBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.6.0
-PORTREVISION=	1
+PORTVERSION=	4.7.0
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/src/
+MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Multimedia framework for KDE4
-LICENSE=	lgpl
 
+LICENSE=	lgpl2.1
+
 LIB_DEPENDS=	qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist
 
 CONFLICTS=	qt4-phonon-4*
@@ -19,7 +19,7 @@
 PHONON_BRANCH=	stable
 
 USE_KDE4=	kdehier kdeprefix automoc4
-USE_QT4=	dbus gui \
+USE_QT4=	corelib dbus gui \
 		qmake_build moc_build rcc_build uic_build
 USE_XZ=		yes
 USES=		cmake
@@ -26,7 +26,6 @@
 CMAKE_ARGS=	-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \
 		-DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE \
 		-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
-MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	PULSEAUDIO
@@ -56,6 +55,5 @@
 	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so
 	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so.4
 .endfor
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: trunk/multimedia/phonon/distinfo
===================================================================
--- trunk/multimedia/phonon/distinfo	2014-01-06 01:51:23 UTC (rev 15814)
+++ trunk/multimedia/phonon/distinfo	2014-01-06 01:58:14 UTC (rev 15815)
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-4.6.0.tar.xz) = 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4
-SIZE (KDE/phonon-4.6.0.tar.xz) = 280712
+SHA256 (KDE/phonon-4.7.0.tar.xz) = 4ca5e17b6afbbfbfe92611f51f9e8d78552ecc31c2e15cbb18be37132ab7b9eb
+SIZE (KDE/phonon-4.7.0.tar.xz) = 329792

Added: trunk/multimedia/phonon/files/patch-CMakeLists.txt
===================================================================
--- trunk/multimedia/phonon/files/patch-CMakeLists.txt	                        (rev 0)
+++ trunk/multimedia/phonon/files/patch-CMakeLists.txt	2014-01-06 01:58:14 UTC (rev 15815)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2013-11-10 20:21:04.000000000 +0200
++++ CMakeLists.txt	2013-11-10 20:21:49.000000000 +0200
+@@ -216,7 +216,7 @@
+     make_abs_install_path(ABS_BUILDSYSTEM_INSTALL_DIR "${BUILDSYSTEM_INSTALL_DIR}")
+ 
+     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME}.pc @ONLY)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME}.pc DESTINATION libdata/pkgconfig)
+ endif(NOT WIN32)
+ 
+ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PHONON_LIB_SONAME} )

Modified: trunk/multimedia/phonon/pkg-plist
===================================================================
--- trunk/multimedia/phonon/pkg-plist	2014-01-06 01:51:23 UTC (rev 15814)
+++ trunk/multimedia/phonon/pkg-plist	2014-01-06 01:58:14 UTC (rev 15815)
@@ -159,14 +159,14 @@
 include/phonon/volumeslider.h
 lib/cmake/phonon/PhononConfig.cmake
 lib/cmake/phonon/PhononConfigVersion.cmake
-lib/cmake/phonon/PhononTargets-release.cmake
+lib/cmake/phonon/PhononTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/phonon/PhononTargets.cmake
 lib/libphonon.so
 lib/libphonon.so.4
-lib/libphonon.so.4.6.0
+lib/libphonon.so.4.7.0
 lib/libphononexperimental.so
 lib/libphononexperimental.so.4
-lib/libphononexperimental.so.4.6.0
+lib/libphononexperimental.so.4.7.0
 libdata/pkgconfig/phonon.pc
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %%DATADIR%%/buildsystem/COPYING-CMAKE-SCRIPTS
@@ -173,14 +173,11 @@
 %%DATADIR%%/buildsystem/FindAutomoc4.cmake
 %%DATADIR%%/buildsystem/FindPackageHandleStandardArgs.cmake
 %%DATADIR%%/buildsystem/FindPhononInternal.cmake
-%%DATADIR%%/buildsystem/FindQt4.cmake
 %%DATADIR%%/buildsystem/MacroEnsureVersion.cmake
 %%DATADIR%%/buildsystem/MacroLogFeature.cmake
 %%DATADIR%%/buildsystem/MacroOptionalFindPackage.cmake
 %%DATADIR%%/buildsystem/MacroPushRequiredVars.cmake
 %%DATADIR%%/buildsystem/PhononMacros.cmake
-%%DATADIR%%/buildsystem/Qt4ConfigDependentSettings.cmake
-%%DATADIR%%/buildsystem/Qt4Macros.cmake
 %%DATADIR%%/buildsystem/cmake_uninstall.cmake.in
 @dirrm %%DATADIR%%/buildsystem
 @dirrm %%DATADIR%%
@@ -191,13 +188,13 @@
 @dirrm include/KDE/Phonon/Experimental
 @dirrm include/KDE/Phonon
 @cwd %%QT_PREFIX%%
-%%QT_INCDIR_REL%%/Phonon
-%%QT_INCDIR_REL%%/phonon
-%%QT_LIBDIR_REL%%/libphonon.so
-%%QT_LIBDIR_REL%%/libphonon.so.4
-%%QT_LIBDIR_REL%%/libphononexperimental.so
-%%QT_LIBDIR_REL%%/libphononexperimental.so.4
+%%QT_INCDIR%%/Phonon
+%%QT_INCDIR%%/phonon
+%%QT_LIBDIR%%/libphonon.so
+%%QT_LIBDIR%%/libphonon.so.4
+%%QT_LIBDIR%%/libphononexperimental.so
+%%QT_LIBDIR%%/libphononexperimental.so.4
 share/qt4/mkspecs/modules/qt_phonon.pri
 @dirrmtry share/qt4/mkspecs/modules
- at dirrmtry %%QT_LIBDIR_REL%%
- at dirrmtry %%QT_INCDIR_REL%%
+ at dirrmtry %%QT_LIBDIR%%
+ at dirrmtry %%QT_INCDIR%%



More information about the Midnightbsd-cvs mailing list