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)

22 files changed, 25 insertions, 25 deletions

diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index 05d14d3..e71c2ad 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -9,5 +9,5 @@ COMMENT=	Arabic messages and documentation for KDE SC 4
 
 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>
diff --git a/chinese/calligra-l10n-zh_CN/Makefile b/chinese/calligra-l10n-zh_CN/Makefile
index f8f5d22..c01be37 100644
--- a/chinese/calligra-l10n-zh_CN/Makefile
+++ b/chinese/calligra-l10n-zh_CN/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Simplified Chinese messages and documentation for Calligra
 
 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>
diff --git a/chinese/kde4-l10n-zh_CN/Makefile b/chinese/kde4-l10n-zh_CN/Makefile
index 6b88a81..1549977 100644
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Simplified Chinese messages and documentation for KDE SC 4
 
 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>
diff --git a/chinese/kde4-l10n-zh_TW/Makefile b/chinese/kde4-l10n-zh_TW/Makefile
index b48e4d0..d014d4f 100644
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Traditional Chinese messages and documentation for KDE SC 4
 
 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>
diff --git a/devel/py-pykdeuic4/Makefile b/devel/py-pykdeuic4/Makefile
index 9b2fae6..a971958 100644
--- a/devel/py-pykdeuic4/Makefile
+++ b/devel/py-pykdeuic4/Makefile
@@ -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}
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index e3a6be5..e10f16d 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -40,7 +40,7 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 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
diff --git a/editors/kate-plugin-pate/Makefile b/editors/kate-plugin-pate/Makefile
index 7fe8ce4..25c9f70 100644
--- a/editors/kate-plugin-pate/Makefile
+++ b/editors/kate-plugin-pate/Makefile
@@ -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
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index 7764606..c81906e 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	French messages and documentation for KDE SC 4
 
 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>
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index b358a21..7485b50 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	German messages and documentation for KDE SC 4
 
 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>
diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common
index c20a716..9c58523 100644
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@@ -111,7 +111,7 @@ vkontakte_DESC=		Export images to VKontakte web service
 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
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index 568edd9..e81eb12 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -9,5 +9,5 @@ COMMENT=	Hebrew messages and documentation for KDE SC 4
 
 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>
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index 18bcf0a..30f1b7a 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Hungarian messages and documentation for KDE SC 4
 
 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>
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index 3f8edd5..96c9ef2 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Japanese messages and documentation for KDE SC 4
 
 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>
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index 5fadfc9..3fc30f3 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Korean messages and documentation for KDE SC 4
 
 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>
diff --git a/net/libmediawiki/Makefile b/net/libmediawiki/Makefile
index a33b79f..a6e31d3 100644
--- a/net/libmediawiki/Makefile
+++ b/net/libmediawiki/Makefile
@@ -10,7 +10,7 @@ COMMENT=	KDE4 library for accessing MediaWiki sites
 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}
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index 7d430bc..b653ce4 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Polish messages and documentation for KDE SC 4
 
 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>
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index a102551..481a6cb 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Brazilian messages and documentation for KDE SC 4
 
 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>
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index 83d932c..2cfe16b 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Portuguese messages and documentation for KDE SC 4
 
 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>
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index ff30049..7ee7898 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Russian messages and documentation for KDE SC 4
 
 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>
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index 2e7c7f0..9c09502 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -10,5 +10,5 @@ COMMENT=	Ukrainian messages and documentation for KDE SC 4
 
 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>
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 8d1e328..338cf12 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	-I../../include/QtCore -I../../include/QtGui \
 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
diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile
index 075cf22..88f3f47 100644
--- a/x11/libkonq/Makefile
+++ b/x11/libkonq/Makefile
@@ -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}