Clean up the patch section of the Makefile. Added one level of

directories to patch-a[ab] to make the Makefile simpler

6 files changed, 14 insertions, 28 deletions

diff --git a/devel/i386-rtems-chill/Makefile b/devel/i386-rtems-chill/Makefile
index d85f0a183f0d..c33ef8efa78f 100644
--- a/devel/i386-rtems-chill/Makefile
+++ b/devel/i386-rtems-chill/Makefile
@@ -43,17 +43,10 @@ CONFIGURE_ARGS?=	--with-gnu-as --with-gnu-ld --verbose \
 CONFIGURE_WRKSRC?=	${WRKDIR}/build-${LCLTARGET}
 CONFIGURE_SCRIPT?=	../${CHILLNAME}/configure
 
-MAKE_FLAGS=	LANGUAGES="CHILL"
+PATCH_WRKSRC=		${WRKDIR}
+PATCH_STRIP=		-p
 
-.if defined(PATCH_DEBUG)
-PATCH_DEBUG_TMP=	yes
-PATCH_ARGS=		-d ${WRKDIR}/${CHILLNAME} -E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR} -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DEBUG_TMP=	no
-PATCH_ARGS=		-d ${WRKDIR}/${CHILLNAME} --forward --quiet -E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
+MAKE_FLAGS=	LANGUAGES="CHILL"
 
 pre-configure:
 	@(cd ${WRKDIR} ; \
diff --git a/devel/i386-rtems-chill/files/patch-aa b/devel/i386-rtems-chill/files/patch-aa
index f71891546ce9..73960afa69fc 100644
--- a/devel/i386-rtems-chill/files/patch-aa
+++ b/devel/i386-rtems-chill/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Sep  1 21:07:00 2000
-+++ Makefile.in	Fri Sep  1 21:16:11 2000
+--- gcc-2.95.2/Makefile.in.orig	Fri Sep  1 21:07:00 2000
++++ gcc-2.95.2/Makefile.in	Fri Sep  1 21:16:11 2000
 @@ -656,9 +656,7 @@
  	install-autoconf \
  	install-automake \
diff --git a/devel/i386-rtems-chill/files/patch-ab b/devel/i386-rtems-chill/files/patch-ab
index ac40a7a6dd68..1f99506f8f1f 100644
--- a/devel/i386-rtems-chill/files/patch-ab
+++ b/devel/i386-rtems-chill/files/patch-ab
@@ -1,5 +1,5 @@
---- gcc/Makefile.in.orig	Fri Aug 13 03:46:55 1999
-+++ gcc/Makefile.in	Fri Sep  1 21:15:38 2000
+--- gcc-2.95.2/gcc/Makefile.in.orig	Fri Aug 13 03:46:55 1999
++++ gcc-2.95.2/gcc/Makefile.in	Fri Sep  1 21:15:38 2000
 @@ -400,7 +400,7 @@
  MAYBE_USE_COLLECT2 = @maybe_use_collect2@
  # It is convenient for configure to add the assignment at the beginning,
diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile
index 0af3720f8f85..b719ef947a50 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -43,17 +43,10 @@ CONFIGURE_ARGS?=	--with-gnu-as --with-gnu-ld --with-newlib --verbose \
 CONFIGURE_WRKSRC?=	${WRKDIR}/build-${LCLTARGET}
 CONFIGURE_SCRIPT?=	../${OBJCNAME}/configure
 
-MAKE_FLAGS=	LANGUAGES="objc"
+PATCH_WRKSRC=		${WRKDIR}
+PATCH_STRIP=		-p
 
-.if defined(PATCH_DEBUG)
-PATCH_DEBUG_TMP=	yes
-PATCH_ARGS=		-d ${WRKDIR}/${OBJCNAME} -E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR} -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DEBUG_TMP=	no
-PATCH_ARGS=		-d ${WRKDIR}/${OBJCNAME} --forward --quiet -E ${PATCH_STRIP}
-PATCH_DIST_ARGS=	-d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
+MAKE_FLAGS=	LANGUAGES="objc"
 
 pre-configure:
 	@(cd ${WRKDIR} ; \
diff --git a/devel/i386-rtems-objc/files/patch-aa b/devel/i386-rtems-objc/files/patch-aa
index f71891546ce9..73960afa69fc 100644
--- a/devel/i386-rtems-objc/files/patch-aa
+++ b/devel/i386-rtems-objc/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Sep  1 21:07:00 2000
-+++ Makefile.in	Fri Sep  1 21:16:11 2000
+--- gcc-2.95.2/Makefile.in.orig	Fri Sep  1 21:07:00 2000
++++ gcc-2.95.2/Makefile.in	Fri Sep  1 21:16:11 2000
 @@ -656,9 +656,7 @@
  	install-autoconf \
  	install-automake \
diff --git a/devel/i386-rtems-objc/files/patch-ab b/devel/i386-rtems-objc/files/patch-ab
index ac40a7a6dd68..1f99506f8f1f 100644
--- a/devel/i386-rtems-objc/files/patch-ab
+++ b/devel/i386-rtems-objc/files/patch-ab
@@ -1,5 +1,5 @@
---- gcc/Makefile.in.orig	Fri Aug 13 03:46:55 1999
-+++ gcc/Makefile.in	Fri Sep  1 21:15:38 2000
+--- gcc-2.95.2/gcc/Makefile.in.orig	Fri Aug 13 03:46:55 1999
++++ gcc-2.95.2/gcc/Makefile.in	Fri Sep  1 21:15:38 2000
 @@ -400,7 +400,7 @@
  MAYBE_USE_COLLECT2 = @maybe_use_collect2@
  # It is convenient for configure to add the assignment at the beginning,