- Udpate to 23.0.95 pretest

PR:             ports/135951
Submitted by:   Giorgos Keramidas <keramida@ceid.upatras.gr> (maintainer)

6 files changed, 16 insertions, 13 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 610ba083d073..c410b9992af0 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -35,7 +35,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 
 INSTALLS_ICONS=	yes
 
-EMACS_VER=	23.0.94
+EMACS_VER=	23.0.95
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	bootstrap
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index b199a65487cf..2a94e7c595e4 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (emacs-23.0.94.tar.gz) = b90e20fe97253764f386dffff702b38c
-SHA256 (emacs-23.0.94.tar.gz) = c391ec2d1baa9fad5fc503414d7781d5aabfc14c1157bb99453968096435ed6e
-SIZE (emacs-23.0.94.tar.gz) = 42801442
+MD5 (emacs-23.0.95.tar.gz) = 82dabe28e28872f0b577f9d292866505
+SHA256 (emacs-23.0.95.tar.gz) = 703001e949b426f99dcdb65eb563118a3214bd8e057bf930925984dc4d8434cf
+SIZE (emacs-23.0.95.tar.gz) = 42792970
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index eb25559d5936..fd303bd3a231 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Feb 02 04:32:35 2009 +0200
-+++ Makefile.in	Mon Feb 02 04:22:03 2009 +0200
-@@ -451,14 +451,6 @@
+--- Makefile.in.orig	Tue Jun 23 07:41:36 2009 +0300
++++ Makefile.in	Tue Jun 23 07:39:33 2009 +0300
+@@ -461,14 +461,6 @@
  
  install-arch-indep: mkdir info install-etc
  	-set ${COPYDESTS} ; \
@@ -15,7 +15,7 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
-@@ -559,9 +551,9 @@
+@@ -570,9 +562,9 @@
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
  	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
@@ -28,7 +28,7 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -572,7 +564,7 @@
+@@ -583,7 +575,7 @@
  	  for elt in $(INFO_FILES); do \
  	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
  	    (cd $${thisdir}; \
diff --git a/editors/emacs-devel/files/patch-doc-misc-Makefile.in b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
index 74c400c2b024..8626784b0f4e 100644
--- a/editors/emacs-devel/files/patch-doc-misc-Makefile.in
+++ b/editors/emacs-devel/files/patch-doc-misc-Makefile.in
@@ -1,5 +1,5 @@
---- doc/misc/Makefile.in.orig	2008-12-09 19:27:59.000000000 +0200
-+++ doc/misc/Makefile.in	2008-12-09 19:25:20.000000000 +0200
+--- doc/misc/Makefile.in.orig	Tue Jun 23 07:39:39 2009 +0300
++++ doc/misc/Makefile.in	Tue Jun 23 07:39:41 2009 +0300
 @@ -34,7 +34,7 @@
  
  # The makeinfo program is part of the Texinfo distribution.
@@ -7,5 +7,5 @@
 -MAKEINFO = makeinfo --force
 +MAKEINFO = makeinfo --force --no-split
  
+ # Also add new entries to INFO_FILES in the top-level Makefile.in.
  INFO_TARGETS = \
- 	$(infodir)/ada-mode \
diff --git a/editors/emacs-devel/pkg-message b/editors/emacs-devel/pkg-message
index cd25099431a1..82da2dd26b23 100644
--- a/editors/emacs-devel/pkg-message
+++ b/editors/emacs-devel/pkg-message
@@ -1,4 +1,4 @@
-This is the first pretest for what will be the Emacs 23.1
+This is a pretest snapshot of what will be the Emacs 23.1
 release.  As a result, there may be packaging errors in the
 tarball, so please be on the lookout for problems with
 installation.
@@ -18,3 +18,5 @@ those who have not been following Emacs CVS development:
    Emacs may be less stable than others; for safety, please
    back up your mail files before trying the new Rmail.
 
+ - The default toolkit is now GTK+.  You can use WITHOUT_GTK
+   to build GNU Emacs with the Lucid toolkit.
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 38c34f7af38d..d1ce7db1792f 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -1926,6 +1926,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/info.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/informat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/informat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/README
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/ccl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/ccl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/characters.el.gz