diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/eaglemode/Makefile | 7 | ||||
| -rw-r--r-- | x11/kde4-runtime/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake | 11 |
4 files changed, 18 insertions, 6 deletions
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile index 53895f2e797d..d58141fb2668 100644 --- a/x11/eaglemode/Makefile +++ b/x11/eaglemode/Makefile @@ -7,7 +7,7 @@ PORTNAME= eaglemode PORTVERSION= 0.82.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -31,7 +31,7 @@ BUILD_ARGS+= ${lib}-inc-dir="${LOCALBASE}/include" \ ${lib}-lib-dir="${LOCALBASE}/lib" .endfor -OPTIONS= XINE "Video playback support through libxine" on \ +OPTIONS= XINE "Video playback support through libxine" off \ RSVG "SVG support throute librsvg" on .include <bsd.port.options.mk> @@ -41,10 +41,11 @@ BROKEN= Does not build on 6.x .endif .if !defined(WITHOUT_XINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine BUILD_ARGS+= xine-inc-dir="${LOCALBASE}/include" \ xine-lib-dir="${LOCALBASE}/lib" PLIST_SUB+= EMAV="" +BROKEN= does not build with libxine 1.2.x .else PLIST_SUB+= EMAV="@comment " .endif diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 21371ecff749..56e6d3e615d5 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,7 @@ PORTNAME= kde-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -20,7 +20,7 @@ COMMENT= Basic applications for the KDE system LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ jpeg.11:${PORTSDIR}/graphics/jpeg \ exiv2.10:${PORTSDIR}/graphics/exiv2 \ - xine.1:${PORTSDIR}/multimedia/libxine \ + xine.2:${PORTSDIR}/multimedia/libxine \ slp.1:${PORTSDIR}/net/openslp \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \ ssh.4:${PORTSDIR}/security/libssh \ diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index f179f83c3b15..39f520c83557 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake b/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake new file mode 100644 index 000000000000..1942c75267f1 --- /dev/null +++ b/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake @@ -0,0 +1,11 @@ +--- cmake/modules/FindXine.cmake 2011-09-26 06:34:51.000000000 -0300 ++++ cmake/modules/FindXine.cmake 2012-01-25 20:37:43.000000000 -0200 +@@ -42,7 +42,7 @@ + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ execute_process(COMMAND ${XINECONFIG_EXECUTABLE} --version OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) |