diff options
| author | makc <makc@FreeBSD.org> | 2014-01-18 00:00:09 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2014-01-18 00:00:09 +0800 |
| commit | ae96f9ea8948914de9945e978bbd9309e7330868 (patch) | |
| tree | 63f7ffb4c74b05a03d7d4af0a6ac211d4a7d066a /multimedia | |
| parent | fcf3fec0437bd2b43f31ad8bcea80df32391bf13 (diff) | |
| download | freebsd-ports-graphics-ae96f9ea8948914de9945e978bbd9309e7330868.tar.gz freebsd-ports-graphics-ae96f9ea8948914de9945e978bbd9309e7330868.tar.zst freebsd-ports-graphics-ae96f9ea8948914de9945e978bbd9309e7330868.zip | |
- Update to 0.7.4
- Fix build with non-default options
- Remove obsolete patch (CMAKE_INSTALL_RPATH_USE_LINK_PATH is now set globally)
PR: ports/185219
Submitted by: RyoTa SimaMoto (maintainer)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/qmmp-plugin-pack/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/qmmp-plugin-pack/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/qmmp-plugin-pack/files/patch-SET_RPATH | 10 | ||||
| -rw-r--r-- | multimedia/qmmp/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/qmmp/distinfo | 4 |
5 files changed, 11 insertions, 21 deletions
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile index 3739f328b2e..1429e3447e4 100644 --- a/multimedia/qmmp-plugin-pack/Makefile +++ b/multimedia/qmmp-plugin-pack/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qmmp-plugin-pack -PORTVERSION= 0.7.3 +PORTVERSION= 0.7.4 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/plugins/ \ http://qmmp.googlecode.com/files/ @@ -46,13 +46,13 @@ QSUI_USE= QT4=network,uic_build QSUI_CMAKE_ON= -DUSE_QSUI:BOOL=TRUE QSUI_CMAKE_OFF= -DUSE_QSUI:BOOL=FALSE -.include <bsd.port.pre.mk> - CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib pre-configure: @${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt + @${REINPLACE_CMD} -e 's/IF[(]/&USE_QSUI AND /' \ + ${WRKSRC}/src/Ui/CMakeLists.txt -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/qmmp-plugin-pack/distinfo b/multimedia/qmmp-plugin-pack/distinfo index e30b99fdd50..319ef395927 100644 --- a/multimedia/qmmp-plugin-pack/distinfo +++ b/multimedia/qmmp-plugin-pack/distinfo @@ -1,2 +1,2 @@ -SHA256 (qmmp-plugin-pack-0.7.3.tar.bz2) = fd07f480a5b1affdd4c82a49c27a00c3cddfa58f7cc8e9081b8e35c4518ae4b2 -SIZE (qmmp-plugin-pack-0.7.3.tar.bz2) = 135705 +SHA256 (qmmp-plugin-pack-0.7.4.tar.bz2) = 6e3559519925cb488a79be078c75de5a5f3f58cb893f055b8422aa37bea32144 +SIZE (qmmp-plugin-pack-0.7.4.tar.bz2) = 136618 diff --git a/multimedia/qmmp-plugin-pack/files/patch-SET_RPATH b/multimedia/qmmp-plugin-pack/files/patch-SET_RPATH deleted file mode 100644 index 96e9e0ad330..00000000000 --- a/multimedia/qmmp-plugin-pack/files/patch-SET_RPATH +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2012-07-23 03:56:51.000000000 +0900 -+++ CMakeLists.txt 2012-07-24 07:13:44.000000000 +0900 -@@ -3,6 +3,7 @@ - #freebsd include - include_directories(SYSTEM /usr/include /usr/local/include) - -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile index 6e9d048c896..7cbba43b82a 100644 --- a/multimedia/qmmp/Makefile +++ b/multimedia/qmmp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qmmp -PORTVERSION= 0.7.3 +PORTVERSION= 0.7.4 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ ${MASTER_SITE_GOOGLE_CODE} @@ -259,7 +259,7 @@ QMMP_DIALOG_DESC= An original dialog QMMP_DIALOG_CMAKE_ON= -DUSE_QMMP_DIALOG:BOOL=TRUE QMMP_DIALOG_CMAKE_OFF= -DUSE_QMMP_DIALOG:BOOL=FALSE -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> PLIST_SUB+= SHLIB_VER=${PORTVERSION:C/-.*//} @@ -308,4 +308,4 @@ post-install: cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo index e9c230a4949..e05e8b234bd 100644 --- a/multimedia/qmmp/distinfo +++ b/multimedia/qmmp/distinfo @@ -1,2 +1,2 @@ -SHA256 (qmmp-0.7.3.tar.bz2) = 57e4e1a00450a5a094b290df5410f8ab5a80da364ad3f1402835573cb0b75562 -SIZE (qmmp-0.7.3.tar.bz2) = 848638 +SHA256 (qmmp-0.7.4.tar.bz2) = ba10d0595b99495587643584c9c8400e6eb987bd2e4bbb30c1060c507f44b4f2 +SIZE (qmmp-0.7.4.tar.bz2) = 862966 |