Update to 4.7.0.

Get rid of the sed calls in the Makefile I abhor: the first one has been
replaced with an actual patch in files/ now that the file being patched has
changed, and the second one is not necessary anymore.
This commit is contained in:
Raphael Kubo da Costa 2013-11-10 20:16:16 +00:00
parent 57d0a077b3
commit 8b06647d55
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=333437
4 changed files with 17 additions and 15 deletions

View file

@ -2,11 +2,10 @@
# $FreeBSD$
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= kde@FreeBSD.org
@ -42,11 +41,6 @@ CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
PLIST_SUB+= QT_PREFIX=${QT_PREFIX}
pre-configure:
${REINPLACE_CMD} -e '/phonon.pc/s|pkgconfig|../libdata/pkgconfig|' \
-e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
${PATCH_WRKSRC}/CMakeLists.txt
post-install:
${MKDIR} ${STAGEDIR}${QT_INCDIR}
${MKDIR} ${STAGEDIR}${QT_LIBDIR}

View file

@ -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

View file

@ -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} )

View file

@ -163,24 +163,21 @@ lib/cmake/phonon/PhononTargets-release.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
%%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%%