ports

commit 5695c893f2551238761746a19bca6550f7d0c810
parent c2ddd67aea842bfec14a2326afc14820b4bf5e46
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sat, 17 May 2014 20:54:40 +0200

check if a patch is already applied before applying it

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
M
curl/curl.mk
 | 
3
++-
M
xorglibpciaccess/xorglibpciaccess.mk
 | 
3
++-
M
xorglibxfont/xorglibxfont.mk
 | 
3
++-

3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/curl/curl.mk b/curl/curl.mk
@@ -12,7 +12,8 @@ INSTALL_MAN1 = \
 curl:QV:
 	# fix: hugehelp is not defined because we use --disable-manual.
 	#      in src/tool_operate.c this is used though, so it's a bug.
-	patch -p0 < ../curl-fix-hugehelp.patch
+	patch --silent --dry-run -N -p0 < ../curl-fix-hugehelp.patch && \
+		patch -p0 < ../curl-fix-hugehelp.patch
 	#
 	export CFLAGS="$CFLAGS $DEPS_CFLAGS"
 	export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS"
diff --git a/xorglibpciaccess/xorglibpciaccess.mk b/xorglibpciaccess/xorglibpciaccess.mk
@@ -7,7 +7,8 @@ xorglibpciaccess:QV:
 	export CFLAGS="$CFLAGS $DEPS_CFLAGS"
 	export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS"
 	# fix missing include for limits.h (PATH_MAX).
-	patch -p0 < ../limits.patch
+	patch --silent --dry-run -N -p0 < ../limits.patch && \
+		patch -p0 < ../limits.patch
 	CC="$CC" ./configure \
 		--prefix="$prefix" \
 		--mandir="$ROOT/share/man" \
diff --git a/xorglibxfont/xorglibxfont.mk b/xorglibxfont/xorglibxfont.mk
@@ -5,7 +5,8 @@ DEPS = freetype zlib xorgxproto xorglibfontenc xorgxtrans xorgfontsproto
 
 xorglibxfont:QV:
 	# patch "error: conflicting types for ‘CacheFontPattern’"
-	patch -p1 -i ../xorg-libxfont-const.diff
+	patch -p1 -N --silent --dry-run < ../xorg-libxfont-const.diff && \
+		patch -p1 < ../xorg-libxfont-const.diff
 	#
 	export CFLAGS="$CFLAGS $DEPS_CFLAGS"
 	export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS"