Date: Thu, 26 May 2016 03:38:38 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415873 - in head: arabic/kde4-l10n chinese/calligra-l10n-zh_CN chinese/kde4-l10n-zh_CN chinese/kde4-l10n-zh_TW devel/py-pykdeuic4 devel/qt4-corelib editors/kate-plugin-pate french/kde4... Message-ID: <201605260338.u4Q3ccs7032761@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Thu May 26 03:38:38 2016 New Revision: 415873 URL: https://svnweb.freebsd.org/changeset/ports/415873 Log: Many KDE i10n ports: Patch updates CURDIR This patch replaces a bunch of ${CURDIR}/../../ by ${CURDIR:H:H}; the latter is considered proper contemporary usage by kde@ . The patch is independent of other KDE4 infrastructure changes. PR: 209303 Submitted by: Adriaan de Groot <groot@kde.org>, rakuco, T.C.Berner <tcberner@gmail.com> (kde) Modified: head/arabic/kde4-l10n/Makefile head/chinese/calligra-l10n-zh_CN/Makefile head/chinese/kde4-l10n-zh_CN/Makefile head/chinese/kde4-l10n-zh_TW/Makefile head/devel/py-pykdeuic4/Makefile head/devel/qt4-corelib/Makefile head/editors/kate-plugin-pate/Makefile head/french/kde4-l10n/Makefile head/german/kde4-l10n/Makefile head/graphics/digikam-kde4/Makefile.common head/hebrew/kde4-l10n/Makefile head/hungarian/kde4-l10n/Makefile head/japanese/kde4-l10n/Makefile head/korean/kde4-l10n/Makefile head/net/libmediawiki/Makefile head/polish/kde4-l10n/Makefile head/portuguese/kde4-l10n-pt_BR/Makefile head/portuguese/kde4-l10n/Makefile head/russian/kde4-l10n/Makefile head/ukrainian/kde4-l10n/Makefile head/x11-toolkits/qt4-gui/Makefile head/x11/libkonq/Makefile Modified: head/arabic/kde4-l10n/Makefile ============================================================================== --- head/arabic/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/arabic/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -9,5 +9,5 @@ COMMENT= Arabic messages and documentati KDE4_L10N= ar -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/chinese/calligra-l10n-zh_CN/Makefile ============================================================================== --- head/chinese/calligra-l10n-zh_CN/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/chinese/calligra-l10n-zh_CN/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Simplified Chinese messages and CALLIGRA_L10N= zh_CN -.include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/editors/calligra-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/chinese/kde4-l10n-zh_CN/Makefile ============================================================================== --- head/chinese/kde4-l10n-zh_CN/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/chinese/kde4-l10n-zh_CN/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Simplified Chinese messages and KDE4_L10N= zh_CN -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/chinese/kde4-l10n-zh_TW/Makefile ============================================================================== --- head/chinese/kde4-l10n-zh_TW/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/chinese/kde4-l10n-zh_TW/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Traditional Chinese messages an KDE4_L10N= zh_TW -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/devel/py-pykdeuic4/Makefile ============================================================================== --- head/devel/py-pykdeuic4/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/devel/py-pykdeuic4/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -13,7 +13,7 @@ COMMENT= Enhanced version of pyuic4 USE_KDE4= kdelibs automoc4 pykde4 USE_QT4= moc_build qmake_build rcc_build uic_build -DISTINFO_FILE= ${PORTSDIR}/devel/py-pykde4/distinfo +DISTINFO_FILE= ${.CURDIR:H:H}/devel/py-pykde4/distinfo USES= cmake:outsource python:2 tar:xz WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} Modified: head/devel/qt4-corelib/Makefile ============================================================================== --- head/devel/qt4-corelib/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/devel/qt4-corelib/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -40,7 +40,7 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNA BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -.include "${.CURDIR}/../../devel/qt4/files/Makefile.options" +.include "${.CURDIR:H:H}/devel/qt4/files/Makefile.options" .if empty(QT4_OPTIONS:MCUPS) CONFIGURE_ARGS+= -no-cups Modified: head/editors/kate-plugin-pate/Makefile ============================================================================== --- head/editors/kate-plugin-pate/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/editors/kate-plugin-pate/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -16,7 +16,7 @@ USE_KDE4= kdelibs automoc4 kate \ USE_QT4= gui webkit \ moc_build qmake_build rcc_build uic_build -DISTINFO_FILE= ${PORTSDIR}/editors/kate/distinfo +DISTINFO_FILE= ${.CURDIR:H:H}/editors/kate/distinfo # cmake.mk doesn't allow to overwrite BUILD_WRKSRC for out-of-source builds _pate_WRKSRC= ${BUILD_WRKSRC}/addons/kate/pate Modified: head/french/kde4-l10n/Makefile ============================================================================== --- head/french/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/french/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= French messages and documentati KDE4_L10N= fr -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/german/kde4-l10n/Makefile ============================================================================== --- head/german/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/german/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= German messages and documentati KDE4_L10N= de -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/graphics/digikam-kde4/Makefile.common ============================================================================== --- head/graphics/digikam-kde4/Makefile.common Thu May 26 03:24:23 2016 (r415872) +++ head/graphics/digikam-kde4/Makefile.common Thu May 26 03:38:38 2016 (r415873) @@ -111,7 +111,7 @@ vkontakte_DESC= Export images to VKonta yandexfotki_DESC= Export images to Yandex web service DISTNAME= digikam-${DIGIKAM_VER} -DISTINFO_FILE= ${.CURDIR}/../../graphics/digikam-kde4/distinfo +DISTINFO_FILE= ${.CURDIR:H:H}/graphics/digikam-kde4/distinfo LICENSE?= GPLv2 @@ -129,14 +129,14 @@ PLIST_SUB+= SHLIB_VER=${DIGIKAM_VER} . if defined(KIPI_PLUGIN) CONFLICTS_INSTALL= kipi-plugins-2.* -DESCR= ${.CURDIR}/../../graphics/kipi-plugins-kde4/pkg-descr +DESCR= ${.CURDIR:H:H}/graphics/kipi-plugins-kde4/pkg-descr USES+= pkgconfig .if ${KIPI_PLUGIN} != "libkipiplugins" -EXTRA_PATCHES= ${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt +EXTRA_PATCHES= ${.CURDIR:H:H}/graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt LIB_DEPENDS+= libkipiplugins.so:graphics/libkipiplugins .endif -EXTRA_PATCHES+= ${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch +EXTRA_PATCHES+= ${.CURDIR:H:H}/graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions ${DISTNAME}/extra/kipi-plugins WRKSRC= ${WRKDIR}/${DISTNAME}/extra/kipi-plugins Modified: head/hebrew/kde4-l10n/Makefile ============================================================================== --- head/hebrew/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/hebrew/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -9,5 +9,5 @@ COMMENT= Hebrew messages and documentati KDE4_L10N= he -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/hungarian/kde4-l10n/Makefile ============================================================================== --- head/hungarian/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/hungarian/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Hungarian messages and document KDE4_L10N= hu -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/japanese/kde4-l10n/Makefile ============================================================================== --- head/japanese/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/japanese/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Japanese messages and documenta KDE4_L10N= ja -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/korean/kde4-l10n/Makefile ============================================================================== --- head/korean/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/korean/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Korean messages and documentati KDE4_L10N= ko -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/net/libmediawiki/Makefile ============================================================================== --- head/net/libmediawiki/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/net/libmediawiki/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,7 +10,7 @@ COMMENT= KDE4 library for accessing Medi USES= pathfix USE_LDCONFIG= yes -.include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common" +.include "${.CURDIR:H:H}/graphics/digikam-kde4/Makefile.common" # Replace some values set up by Makefile.common DIGIKAM_VER= ${PORTVERSION} Modified: head/polish/kde4-l10n/Makefile ============================================================================== --- head/polish/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/polish/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Polish messages and documentati KDE4_L10N= pl -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/portuguese/kde4-l10n-pt_BR/Makefile ============================================================================== --- head/portuguese/kde4-l10n-pt_BR/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/portuguese/kde4-l10n-pt_BR/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Brazilian messages and document KDE4_L10N= pt_BR -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/portuguese/kde4-l10n/Makefile ============================================================================== --- head/portuguese/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/portuguese/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Portuguese messages and documen KDE4_L10N= pt -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/russian/kde4-l10n/Makefile ============================================================================== --- head/russian/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/russian/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Russian messages and documentat KDE4_L10N= ru -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/ukrainian/kde4-l10n/Makefile ============================================================================== --- head/ukrainian/kde4-l10n/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/ukrainian/kde4-l10n/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -10,5 +10,5 @@ COMMENT= Ukrainian messages and document KDE4_L10N= uk -.include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/bsd.l10n.mk" .include <bsd.port.mk> Modified: head/x11-toolkits/qt4-gui/Makefile ============================================================================== --- head/x11-toolkits/qt4-gui/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/x11-toolkits/qt4-gui/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= -I../../include/QtCore FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir -.include "${.CURDIR}/../../devel/qt4/files/Makefile.options" +.include "${.CURDIR:H:H}/devel/qt4/files/Makefile.options" .if ${QT4_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:print/cups Modified: head/x11/libkonq/Makefile ============================================================================== --- head/x11/libkonq/Makefile Thu May 26 03:24:23 2016 (r415872) +++ head/x11/libkonq/Makefile Thu May 26 03:38:38 2016 (r415873) @@ -17,7 +17,7 @@ USE_QT4= corelib dbus gui \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes -DISTINFO_FILE= ${PORTSDIR}/x11/kde4-baseapps/distinfo +DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-baseapps/distinfo BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/lib/konq INSTALL_WRKSRC= ${BUILD_WRKSRC}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605260338.u4Q3ccs7032761>