From 10c4c9d1fda9745ada459b847ee0479bb17bda41 Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Sat, 5 Sep 2009 03:17:07 +0000 Subject: [PATCH] - Get rid of /usr/X11R6 - Add missing dependency on x11/rgb Approved by: miwi (mentor) --- x11/kdelibs4/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 43418ce3ee52..7d1c3bd2bdc7 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -35,6 +36,7 @@ LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \ lzma.0:${PORTSDIR}/archivers/lzmautils-devel \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ + showrgb:${PORTSDIR}/x11/rgb \ iceauth:${PORTSDIR}/x11/iceauth \ xauth:${PORTSDIR}/x11/xauth @@ -94,11 +96,16 @@ post-patch: ${PATCH_WRKSRC}/kio/kssl/kopenssl.cpp \ ${PATCH_WRKSRC}/kio/kio/ksambashare.cpp \ ${PATCH_WRKSRC}/kjsembed/qtonly/FindQJSInternal.cmake +#Fix rgb named colors database path. + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/kdeui/colors/kcolordialog.cpp pre-configure: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/cmake/modules/*.cmake \ - ${PATCH_WRKSRC}/ConfigureChecks.cmake + ${PATCH_WRKSRC}/ConfigureChecks.cmake \ + ${PATCH_WRKSRC}/doc/api/doxygen.sh # FindBerkeleyDB.cmake should be rewritten to support multiple version # provided by ports, instead of hardcoding one of them # ${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \