As pointed out by mjl @ #bsdports: The patch I commited was a patch

on itself. Extracted the patch and recommit it.

PR:		ports/120370

9 files changed, 33 insertions, 45 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 99d7720bc867..c81405e870d9 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/emacs/files/patch-configure b/editors/emacs/files/patch-configure
new file mode 100644
index 000000000000..ea507e10728b
--- /dev/null
+++ b/editors/emacs/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Feb  8 09:19:48 2008
++++ configure	Fri Feb  8 09:20:26 2008
+@@ -2204,6 +2204,7 @@
+     opsys=freebsd
+     case "${canonical}" in
+       alpha*-*-freebsd*)	machine=alpha ;;
++      arm*-*-freebsd*)		machine=arm ;;
+       ia64-*-freebsd*)		machine=ia64 ;;
+       sparc64-*-freebsd*)	machine=sparc ;;
+       powerpc-*-freebsd*)	machine=macppc ;;
diff --git a/editors/emacs/files/patch-emacs-arm b/editors/emacs/files/patch-emacs-arm
deleted file mode 100644
index 9d3c171b3d4f..000000000000
--- a/editors/emacs/files/patch-emacs-arm
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr emacs.orig/files/patch-configure emacs/files/patch-configure
---- emacs.orig/files/patch-configure	1970-01-01 12:00:00.000000000 +1200
-+++ emacs/files/patch-configure	2008-02-08 09:20:46.000000000 +1300
-@@ -0,0 +1,10 @@
-+--- configure.orig	Fri Feb  8 09:19:48 2008
-++++ configure	Fri Feb  8 09:20:26 2008
-+@@ -2204,6 +2204,7 @@
-+     opsys=freebsd
-+     case "${canonical}" in
-+       alpha*-*-freebsd*)	machine=alpha ;;
-++      arm*-*-freebsd*)		machine=arm ;;
-+       ia64-*-freebsd*)		machine=ia64 ;;
-+       sparc64-*-freebsd*)	machine=sparc ;;
-+       powerpc-*-freebsd*)	machine=macppc ;;
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 99d7720bc867..c81405e870d9 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/emacs22/files/patch-configure b/editors/emacs22/files/patch-configure
new file mode 100644
index 000000000000..ea507e10728b
--- /dev/null
+++ b/editors/emacs22/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Feb  8 09:19:48 2008
++++ configure	Fri Feb  8 09:20:26 2008
+@@ -2204,6 +2204,7 @@
+     opsys=freebsd
+     case "${canonical}" in
+       alpha*-*-freebsd*)	machine=alpha ;;
++      arm*-*-freebsd*)		machine=arm ;;
+       ia64-*-freebsd*)		machine=ia64 ;;
+       sparc64-*-freebsd*)	machine=sparc ;;
+       powerpc-*-freebsd*)	machine=macppc ;;
diff --git a/editors/emacs22/files/patch-emacs-arm b/editors/emacs22/files/patch-emacs-arm
deleted file mode 100644
index 9d3c171b3d4f..000000000000
--- a/editors/emacs22/files/patch-emacs-arm
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr emacs.orig/files/patch-configure emacs/files/patch-configure
---- emacs.orig/files/patch-configure	1970-01-01 12:00:00.000000000 +1200
-+++ emacs/files/patch-configure	2008-02-08 09:20:46.000000000 +1300
-@@ -0,0 +1,10 @@
-+--- configure.orig	Fri Feb  8 09:19:48 2008
-++++ configure	Fri Feb  8 09:20:26 2008
-+@@ -2204,6 +2204,7 @@
-+     opsys=freebsd
-+     case "${canonical}" in
-+       alpha*-*-freebsd*)	machine=alpha ;;
-++      arm*-*-freebsd*)		machine=arm ;;
-+       ia64-*-freebsd*)		machine=ia64 ;;
-+       sparc64-*-freebsd*)	machine=sparc ;;
-+       powerpc-*-freebsd*)	machine=macppc ;;
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 99d7720bc867..c81405e870d9 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/editors/emacs23/files/patch-configure b/editors/emacs23/files/patch-configure
new file mode 100644
index 000000000000..ea507e10728b
--- /dev/null
+++ b/editors/emacs23/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Feb  8 09:19:48 2008
++++ configure	Fri Feb  8 09:20:26 2008
+@@ -2204,6 +2204,7 @@
+     opsys=freebsd
+     case "${canonical}" in
+       alpha*-*-freebsd*)	machine=alpha ;;
++      arm*-*-freebsd*)		machine=arm ;;
+       ia64-*-freebsd*)		machine=ia64 ;;
+       sparc64-*-freebsd*)	machine=sparc ;;
+       powerpc-*-freebsd*)	machine=macppc ;;
diff --git a/editors/emacs23/files/patch-emacs-arm b/editors/emacs23/files/patch-emacs-arm
deleted file mode 100644
index 9d3c171b3d4f..000000000000
--- a/editors/emacs23/files/patch-emacs-arm
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr emacs.orig/files/patch-configure emacs/files/patch-configure
---- emacs.orig/files/patch-configure	1970-01-01 12:00:00.000000000 +1200
-+++ emacs/files/patch-configure	2008-02-08 09:20:46.000000000 +1300
-@@ -0,0 +1,10 @@
-+--- configure.orig	Fri Feb  8 09:19:48 2008
-++++ configure	Fri Feb  8 09:20:26 2008
-+@@ -2204,6 +2204,7 @@
-+     opsys=freebsd
-+     case "${canonical}" in
-+       alpha*-*-freebsd*)	machine=alpha ;;
-++      arm*-*-freebsd*)		machine=arm ;;
-+       ia64-*-freebsd*)		machine=ia64 ;;
-+       sparc64-*-freebsd*)	machine=sparc ;;
-+       powerpc-*-freebsd*)	machine=macppc ;;