From 1f7791426e2f7f12d23d802bbd002fdb5ac6014d Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Wed, 18 Oct 2006 10:20:57 +0000 Subject: Do not install hicolor-theme directories and index file, instead depend on misc/hicolor-icon-theme. Approved by: portmgr (marcus) --- x11/kdelibs3/Makefile | 6 ++++-- x11/kdelibs3/pkg-plist | 1 - x11/kdelibs4/Makefile | 6 ++++-- x11/kdelibs4/pkg-plist | 1 - 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'x11') diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 2b22d7547581..00ae1a11b738 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -34,7 +34,8 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ xslt.2:${PORTSDIR}/textproc/libxslt RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \ ${FONTSCALE}:${X_FONTS_TTF_PORT} \ - ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} + ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \ + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2* .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS) @@ -86,6 +87,7 @@ pre-configure: -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp + ${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 6f2655702458..bfad1b9ed1a6 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -5076,7 +5076,6 @@ share/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz share/icons/crystalsvg/scalable/mimetypes/zip.svgz share/icons/default.kde -share/icons/hicolor/index.theme share/locale/all_languages share/mimelnk/all/all.desktop share/mimelnk/all/allfiles.desktop diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 2b22d7547581..00ae1a11b738 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -34,7 +34,8 @@ LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ xslt.2:${PORTSDIR}/textproc/libxslt RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \ ${FONTSCALE}:${X_FONTS_TTF_PORT} \ - ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} + ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \ + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2* .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS) @@ -86,6 +87,7 @@ pre-configure: -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp + ${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 6f2655702458..bfad1b9ed1a6 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -5076,7 +5076,6 @@ share/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz share/icons/crystalsvg/scalable/mimetypes/zip.svgz share/icons/default.kde -share/icons/hicolor/index.theme share/locale/all_languages share/mimelnk/all/all.desktop share/mimelnk/all/allfiles.desktop -- cgit v1.2.3