Attachment 170016 Details for Bug 209303 – Patch updates CURDIR

[patch] Patch updates CURDIR

curdir.patch (text/plain), 11.80 KB, created by groot on 2016-05-05 19:02:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2016-05-05 19:02:14 UTC

Size: 11.80 KB

patch

obsolete

>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/graphics/digikam-kde4/Makefile.common /zbigone/src/area51/trunk/PORTS/graphics/digikam-kde4/Makefile.common
>--- /zbigone/src/ports-playground/graphics/digikam-kde4/Makefile.common	2016-04-20 09:31:52.760453000 +0200
>+++ /zbigone/src/area51/trunk/PORTS/graphics/digikam-kde4/Makefile.common	2016-04-23 22:31:33.923551000 +0200
>@@ -111,7 +111,7 @@
> 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 @@
> . 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/net/libmediawiki/Makefile /zbigone/src/area51/trunk/PORTS/net/libmediawiki/Makefile
>--- /zbigone/src/ports-playground/net/libmediawiki/Makefile	2016-04-20 09:31:29.062736000 +0200
>+++ /zbigone/src/area51/trunk/PORTS/net/libmediawiki/Makefile	2016-04-23 22:31:33.917894000 +0200
>@@ -10,7 +10,7 @@
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/qt4-corelib/Makefile /zbigone/src/area51/trunk/QT/devel/qt4-corelib/Makefile
>--- /zbigone/src/ports-playground/devel/qt4-corelib/Makefile	2016-04-01 20:01:17.965976707 +0200
>+++ /zbigone/src/area51/trunk/QT/devel/qt4-corelib/Makefile	2016-04-23 22:31:33.896431000 +0200
>@@ -40,7 +40,7 @@
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/x11-toolkits/qt4-gui/Makefile /zbigone/src/area51/trunk/QT/x11-toolkits/qt4-gui/Makefile
>--- /zbigone/src/ports-playground/x11-toolkits/qt4-gui/Makefile	2016-04-01 20:02:45.149970838 +0200
>+++ /zbigone/src/area51/trunk/QT/x11-toolkits/qt4-gui/Makefile	2016-04-23 22:31:33.837773000 +0200
>@@ -49,7 +49,7 @@
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/arabic/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/arabic/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/arabic/kde4-l10n/Makefile	2016-03-30 11:03:35.417110011 +0200
>+++ /zbigone/src/area51/trunk/KDE/arabic/kde4-l10n/Makefile	2016-04-23 22:31:33.434489000 +0200
>@@ -9,5 +9,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/chinese/kde4-l10n-zh_CN/Makefile /zbigone/src/area51/trunk/KDE/chinese/kde4-l10n-zh_CN/Makefile
>--- /zbigone/src/ports-playground/chinese/kde4-l10n-zh_CN/Makefile	2016-03-30 11:02:18.458114385 +0200
>+++ /zbigone/src/area51/trunk/KDE/chinese/kde4-l10n-zh_CN/Makefile	2016-04-23 22:31:33.834763000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/chinese/kde4-l10n-zh_TW/Makefile /zbigone/src/area51/trunk/KDE/chinese/kde4-l10n-zh_TW/Makefile
>--- /zbigone/src/ports-playground/chinese/kde4-l10n-zh_TW/Makefile	2016-03-30 11:02:18.684114365 +0200
>+++ /zbigone/src/area51/trunk/KDE/chinese/kde4-l10n-zh_TW/Makefile	2016-04-23 22:31:33.816789000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/devel/py-pykdeuic4/Makefile /zbigone/src/area51/trunk/KDE/devel/py-pykdeuic4/Makefile
>--- /zbigone/src/ports-playground/devel/py-pykdeuic4/Makefile	2016-03-30 11:03:02.856117777 +0200
>+++ /zbigone/src/area51/trunk/KDE/devel/py-pykdeuic4/Makefile	2016-04-23 22:31:33.499393000 +0200
>@@ -13,7 +13,7 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/editors/kate-plugin-pate/Makefile /zbigone/src/area51/trunk/KDE/editors/kate-plugin-pate/Makefile
>--- /zbigone/src/ports-playground/editors/kate-plugin-pate/Makefile	2016-03-30 11:03:31.892109815 +0200
>+++ /zbigone/src/area51/trunk/KDE/editors/kate-plugin-pate/Makefile	2016-04-23 22:31:33.741699000 +0200
>@@ -16,7 +16,7 @@
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/french/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/french/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/french/kde4-l10n/Makefile	2016-03-30 11:03:30.957109767 +0200
>+++ /zbigone/src/area51/trunk/KDE/french/kde4-l10n/Makefile	2016-04-23 22:31:33.738124000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/german/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/german/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/german/kde4-l10n/Makefile	2016-03-30 11:03:33.145109645 +0200
>+++ /zbigone/src/area51/trunk/KDE/german/kde4-l10n/Makefile	2016-04-23 22:31:33.747235000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/hebrew/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/hebrew/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/hebrew/kde4-l10n/Makefile	2016-03-30 11:03:12.400110956 +0200
>+++ /zbigone/src/area51/trunk/KDE/hebrew/kde4-l10n/Makefile	2016-04-23 22:31:33.548034000 +0200
>@@ -9,5 +9,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/hungarian/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/hungarian/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/hungarian/kde4-l10n/Makefile	2016-03-30 11:03:12.464111028 +0200
>+++ /zbigone/src/area51/trunk/KDE/hungarian/kde4-l10n/Makefile	2016-04-23 22:31:33.524635000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/japanese/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/japanese/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/japanese/kde4-l10n/Makefile	2016-03-30 11:01:49.991116582 +0200
>+++ /zbigone/src/area51/trunk/KDE/japanese/kde4-l10n/Makefile	2016-04-23 22:31:33.609263000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/korean/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/korean/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/korean/kde4-l10n/Makefile	2016-03-30 11:03:35.192109539 +0200
>+++ /zbigone/src/area51/trunk/KDE/korean/kde4-l10n/Makefile	2016-04-23 22:31:33.431568000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/polish/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/polish/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/polish/kde4-l10n/Makefile	2016-03-30 11:02:06.899116344 +0200
>+++ /zbigone/src/area51/trunk/KDE/polish/kde4-l10n/Makefile	2016-04-23 22:31:33.659464000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/portuguese/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/portuguese/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/portuguese/kde4-l10n/Makefile	2016-03-30 11:02:07.715115390 +0200
>+++ /zbigone/src/area51/trunk/KDE/portuguese/kde4-l10n/Makefile	2016-04-23 22:31:33.697898000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/portuguese/kde4-l10n-pt_BR/Makefile /zbigone/src/area51/trunk/KDE/portuguese/kde4-l10n-pt_BR/Makefile
>--- /zbigone/src/ports-playground/portuguese/kde4-l10n-pt_BR/Makefile	2016-03-30 11:02:07.749242004 +0200
>+++ /zbigone/src/area51/trunk/KDE/portuguese/kde4-l10n-pt_BR/Makefile	2016-04-23 22:31:33.735051000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/russian/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/russian/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/russian/kde4-l10n/Makefile	2016-03-30 11:03:21.531111517 +0200
>+++ /zbigone/src/area51/trunk/KDE/russian/kde4-l10n/Makefile	2016-04-23 22:31:33.577885000 +0200
>@@ -10,5 +10,5 @@
> 
> 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 -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/ukrainian/kde4-l10n/Makefile /zbigone/src/area51/trunk/KDE/ukrainian/kde4-l10n/Makefile
>--- /zbigone/src/ports-playground/ukrainian/kde4-l10n/Makefile	2016-03-30 11:03:16.446604161 +0200
>+++ /zbigone/src/area51/trunk/KDE/ukrainian/kde4-l10n/Makefile	2016-04-23 22:31:33.555992000 +0200
>@@ -10,5 +10,5 @@
> 
> 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>

Actions: View | Diff

Attachments on bug 209303: 170016 | 170018