Update to version 21.1.12. The new release only made changes to

configuration files and Emacs.ad and deleted xemacs-faq.info-6.

Use LOCALBASE instead of PREFIX in CONFIGURE_ARGS - that makes it
easier to test new versions of the port.

PR:		20480
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

12 files changed, 33 insertions, 36 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 020515e68ec9..8751f283d086 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 XEMACS_REL=	21.1
-XEMACS_VER=	21.1.11
+XEMACS_VER=	21.1.12
 DIST_SUBDIR=	xemacs
 
 SLAVEDIRS+=	editors/xemacs21-mule
@@ -39,8 +39,8 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \
 		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
 		--with-session=yes \
-		--site-includes=${PREFIX}/include \
-		--site-libraries=${PREFIX}/lib \
+		--site-includes=${LOCALBASE}/include \
+		--site-libraries=${LOCALBASE}/lib \
 		--with-png=yes \
 		--with-tiff=yes \
 		--with-site-lisp \
diff --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo
index 1395f77b4ffc..c9f3c78e0b2d 100644
--- a/editors/xemacs-devel/distinfo
+++ b/editors/xemacs-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.1.11.tar.gz) = f21ef96eb6db6f190e744450d597126b
-MD5 (xemacs/xemacs-21.1.11-elc.tar.gz) = fb36bedb4753c58091bdc4d5262c8852
-MD5 (xemacs/xemacs-21.1.11-info.tar.gz) = 4e85237040a3c9f64d5d12296f1c58fe
+MD5 (xemacs/xemacs-21.1.12.tar.gz) = 96eb9c1b011e633c3b9094515f7df95b
+MD5 (xemacs/xemacs-21.1.12-elc.tar.gz) = f8f92769624d8b698c95d290fae9ff2c
+MD5 (xemacs/xemacs-21.1.12-info.tar.gz) = 1c815ecdc153000659a7bc0c51ae5737
diff --git a/editors/xemacs-devel/files/patch-af b/editors/xemacs-devel/files/patch-af
index ab726c98e4d9..8021b4053971 100644
--- a/editors/xemacs-devel/files/patch-af
+++ b/editors/xemacs-devel/files/patch-af
@@ -1,5 +1,5 @@
---- configure.orig	Sat Jul 15 09:44:36 2000
-+++ configure	Tue Jul 25 19:13:53 2000
+--- configure.orig	Fri Aug  4 11:49:54 2000
++++ configure	Mon Aug  7 22:38:52 2000
 @@ -1042,6 +1042,7 @@
  
  case "$canonical" in
@@ -8,12 +8,12 @@
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -11324,7 +11325,7 @@
+@@ -11407,7 +11408,7 @@
  if test "$with_database_berkdb" != "no"; then
    echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
- echo "configure:11327: checking for Berkeley db.h" >&5
+ echo "configure:11410: checking for Berkeley db.h" >&5
 -  for path in "db/db.h" "db.h"; do
 +  for path in "/usr/include/db.h" "db/db.h" "db.h"; do
      cat > conftest.$ac_ext <<EOF
- #line 11330 "configure"
+ #line 11413 "configure"
  #include "confdefs.h"
diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist
index a34de01a5207..24ea0d596a4a 100644
--- a/editors/xemacs-devel/pkg-plist
+++ b/editors/xemacs-devel/pkg-plist
@@ -492,7 +492,6 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 020515e68ec9..8751f283d086 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 XEMACS_REL=	21.1
-XEMACS_VER=	21.1.11
+XEMACS_VER=	21.1.12
 DIST_SUBDIR=	xemacs
 
 SLAVEDIRS+=	editors/xemacs21-mule
@@ -39,8 +39,8 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \
 		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
 		--with-session=yes \
-		--site-includes=${PREFIX}/include \
-		--site-libraries=${PREFIX}/lib \
+		--site-includes=${LOCALBASE}/include \
+		--site-libraries=${LOCALBASE}/lib \
 		--with-png=yes \
 		--with-tiff=yes \
 		--with-site-lisp \
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 1395f77b4ffc..c9f3c78e0b2d 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.1.11.tar.gz) = f21ef96eb6db6f190e744450d597126b
-MD5 (xemacs/xemacs-21.1.11-elc.tar.gz) = fb36bedb4753c58091bdc4d5262c8852
-MD5 (xemacs/xemacs-21.1.11-info.tar.gz) = 4e85237040a3c9f64d5d12296f1c58fe
+MD5 (xemacs/xemacs-21.1.12.tar.gz) = 96eb9c1b011e633c3b9094515f7df95b
+MD5 (xemacs/xemacs-21.1.12-elc.tar.gz) = f8f92769624d8b698c95d290fae9ff2c
+MD5 (xemacs/xemacs-21.1.12-info.tar.gz) = 1c815ecdc153000659a7bc0c51ae5737
diff --git a/editors/xemacs/files/patch-af b/editors/xemacs/files/patch-af
index ab726c98e4d9..8021b4053971 100644
--- a/editors/xemacs/files/patch-af
+++ b/editors/xemacs/files/patch-af
@@ -1,5 +1,5 @@
---- configure.orig	Sat Jul 15 09:44:36 2000
-+++ configure	Tue Jul 25 19:13:53 2000
+--- configure.orig	Fri Aug  4 11:49:54 2000
++++ configure	Mon Aug  7 22:38:52 2000
 @@ -1042,6 +1042,7 @@
  
  case "$canonical" in
@@ -8,12 +8,12 @@
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -11324,7 +11325,7 @@
+@@ -11407,7 +11408,7 @@
  if test "$with_database_berkdb" != "no"; then
    echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
- echo "configure:11327: checking for Berkeley db.h" >&5
+ echo "configure:11410: checking for Berkeley db.h" >&5
 -  for path in "db/db.h" "db.h"; do
 +  for path in "/usr/include/db.h" "db/db.h" "db.h"; do
      cat > conftest.$ac_ext <<EOF
- #line 11330 "configure"
+ #line 11413 "configure"
  #include "confdefs.h"
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index a34de01a5207..24ea0d596a4a 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -492,7 +492,6 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 020515e68ec9..8751f283d086 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 XEMACS_REL=	21.1
-XEMACS_VER=	21.1.11
+XEMACS_VER=	21.1.12
 DIST_SUBDIR=	xemacs
 
 SLAVEDIRS+=	editors/xemacs21-mule
@@ -39,8 +39,8 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \
 		--lockdir=/var/run/emacs/lock \
 		--with-sound=native \
 		--with-session=yes \
-		--site-includes=${PREFIX}/include \
-		--site-libraries=${PREFIX}/lib \
+		--site-includes=${LOCALBASE}/include \
+		--site-libraries=${LOCALBASE}/lib \
 		--with-png=yes \
 		--with-tiff=yes \
 		--with-site-lisp \
diff --git a/editors/xemacs21/distinfo b/editors/xemacs21/distinfo
index 1395f77b4ffc..c9f3c78e0b2d 100644
--- a/editors/xemacs21/distinfo
+++ b/editors/xemacs21/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.1.11.tar.gz) = f21ef96eb6db6f190e744450d597126b
-MD5 (xemacs/xemacs-21.1.11-elc.tar.gz) = fb36bedb4753c58091bdc4d5262c8852
-MD5 (xemacs/xemacs-21.1.11-info.tar.gz) = 4e85237040a3c9f64d5d12296f1c58fe
+MD5 (xemacs/xemacs-21.1.12.tar.gz) = 96eb9c1b011e633c3b9094515f7df95b
+MD5 (xemacs/xemacs-21.1.12-elc.tar.gz) = f8f92769624d8b698c95d290fae9ff2c
+MD5 (xemacs/xemacs-21.1.12-info.tar.gz) = 1c815ecdc153000659a7bc0c51ae5737
diff --git a/editors/xemacs21/files/patch-af b/editors/xemacs21/files/patch-af
index ab726c98e4d9..8021b4053971 100644
--- a/editors/xemacs21/files/patch-af
+++ b/editors/xemacs21/files/patch-af
@@ -1,5 +1,5 @@
---- configure.orig	Sat Jul 15 09:44:36 2000
-+++ configure	Tue Jul 25 19:13:53 2000
+--- configure.orig	Fri Aug  4 11:49:54 2000
++++ configure	Mon Aug  7 22:38:52 2000
 @@ -1042,6 +1042,7 @@
  
  case "$canonical" in
@@ -8,12 +8,12 @@
    *-*-netbsd*   ) opsys=netbsd ;;
    *-*-openbsd*	) opsys=openbsd ;;
    *-*-nextstep* ) opsys=nextstep ;;
-@@ -11324,7 +11325,7 @@
+@@ -11407,7 +11408,7 @@
  if test "$with_database_berkdb" != "no"; then
    echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
- echo "configure:11327: checking for Berkeley db.h" >&5
+ echo "configure:11410: checking for Berkeley db.h" >&5
 -  for path in "db/db.h" "db.h"; do
 +  for path in "/usr/include/db.h" "db/db.h" "db.h"; do
      cat > conftest.$ac_ext <<EOF
- #line 11330 "configure"
+ #line 11413 "configure"
  #include "confdefs.h"
diff --git a/editors/xemacs21/pkg-plist b/editors/xemacs21/pkg-plist
index a34de01a5207..24ea0d596a4a 100644
--- a/editors/xemacs21/pkg-plist
+++ b/editors/xemacs21/pkg-plist
@@ -492,7 +492,6 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10