10 files changed, 36 insertions, 40 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index b81f6dd707c8..2341d4d65441 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	keramida
-DISTNAME=	${PORTNAME}-cvs-snapshot-2006.08.13.19.02.57
+DISTNAME=	${PORTNAME}-cvs-snapshot-2006.09.01.17.52.26
 
 MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
@@ -30,7 +30,7 @@ CONFLICTS=	emacs-19.* emacs-21.* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
 EMACS_VER=	22.0.50
-SNAPSHOT=	20060813
+SNAPSHOT=	20060901
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoconf:259
 .if !defined(WITHOUT_X11)
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index ea2da0b4788d..9eea04b3272d 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (emacs-cvs-snapshot-2006.08.13.19.02.57.tar.bz2) = adf2acbcd2618bd1ad0b004b5d1021de
-SHA256 (emacs-cvs-snapshot-2006.08.13.19.02.57.tar.bz2) = a279ad5a806f076dc367770f9fceaa3b7d32d2ac41d86a205fc7379054621732
-SIZE (emacs-cvs-snapshot-2006.08.13.19.02.57.tar.bz2) = 20069219
+MD5 (emacs-cvs-snapshot-2006.09.01.17.52.26.tar.bz2) = cd31836242596e245eeb0209578ba063
+SHA256 (emacs-cvs-snapshot-2006.09.01.17.52.26.tar.bz2) = 97289c41e60ce38265700509fb78e75f14e40624eb726dd34c76039c60364b10
+SIZE (emacs-cvs-snapshot-2006.09.01.17.52.26.tar.bz2) = 20050570
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index f76276294fbc..29774c94a862 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -1,10 +1,9 @@
---- Makefile.in.orig	Tue Jul 04 16:55:30 2006 +0300
-+++ Makefile.in	Tue Jul 04 16:58:01 2006 +0300
-@@ -408,14 +408,6 @@ install-arch-dep: mkdir
- ## If people complain about the h flag in tar command, take that out.
+--- ./Makefile.in.orig	Sun Aug 27 04:16:25 2006
++++ ./Makefile.in	Fri Sep  1 21:10:08 2006
+@@ -409,14 +409,6 @@
  ## That flag is also used in leim/Makefile.in
  install-arch-indep: mkdir info
--	-set ${COPYDESTS} ; \
+ 	-set ${COPYDESTS} ; \
 -	unset CDPATH; \
 -	for dir in ${COPYDIR} ; do \
 -	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
@@ -12,10 +11,11 @@
 -	  fi ; \
 -	  shift ; \
 -	done
- 	-set ${COPYDESTS} ; \
+-	-set ${COPYDESTS} ; \
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
-@@ -503,9 +495,9 @@ install-arch-indep: mkdir info
+ 	unset CDPATH; \
+@@ -503,9 +495,9 @@
  	   fi; \
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
@@ -28,7 +28,7 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -515,7 +507,7 @@ install-arch-indep: mkdir info
+@@ -515,7 +507,7 @@
  	then \
  	  for elt in $(INFO_FILES); do \
  	    (cd $${thisdir}; \
diff --git a/editors/emacs-devel/files/patch-configure.in b/editors/emacs-devel/files/patch-configure.in
index 2c76eeb90e8f..3663c7d84c11 100644
--- a/editors/emacs-devel/files/patch-configure.in
+++ b/editors/emacs-devel/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Tue Jul 04 16:55:30 2006 +0300
-+++ configure.in	Tue Jul 04 16:58:01 2006 +0300
-@@ -237,6 +237,9 @@ case "${canonical}" in
+--- ./configure.in.orig	Sun Aug 27 04:16:25 2006
++++ ./configure.in	Fri Sep  1 21:10:08 2006
+@@ -237,6 +237,9 @@
      opsys=freebsd
      case "${canonical}" in
        alpha*-*-freebsd*)	machine=alpha ;;
diff --git a/editors/emacs-devel/files/patch-lib-src-Makefile.in b/editors/emacs-devel/files/patch-lib-src-Makefile.in
index cb444149cc0b..44eee50d9ed2 100644
--- a/editors/emacs-devel/files/patch-lib-src-Makefile.in
+++ b/editors/emacs-devel/files/patch-lib-src-Makefile.in
@@ -1,6 +1,6 @@
---- lib-src/Makefile.in.orig	Tue Jul 04 16:55:30 2006 +0300
-+++ lib-src/Makefile.in	Tue Jul 04 16:58:01 2006 +0300
-@@ -94,6 +94,7 @@ INSTALL = @INSTALL@
+--- ./lib-src/Makefile.in.orig	Fri Jun  9 20:53:58 2006
++++ ./lib-src/Makefile.in	Fri Sep  1 21:10:08 2006
+@@ -94,6 +94,7 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -8,7 +8,7 @@
  # By default, we uphold the dignity of our programs.
  INSTALL_STRIP =
  
-@@ -319,7 +320,7 @@ maybe-blessmail: BLESSMAIL
+@@ -319,7 +320,7 @@
          if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
               != `(cd ${srcdir} && /bin/pwd)` ]; then \
  	  for file in ${SCRIPTS}; do \
@@ -17,7 +17,7 @@
  	  done ; \
  	fi
  
-@@ -331,7 +332,7 @@ install: $(DESTDIR)${archlibdir}
+@@ -331,7 +332,7 @@
  	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
  	done
  	for file in ${INSTALLABLE_SCRIPTS} ; do \
diff --git a/editors/emacs-devel/files/patch-lispintro-Makefile.in b/editors/emacs-devel/files/patch-lispintro-Makefile.in
index ee431421508e..eac664f21cda 100644
--- a/editors/emacs-devel/files/patch-lispintro-Makefile.in
+++ b/editors/emacs-devel/files/patch-lispintro-Makefile.in
@@ -1,6 +1,6 @@
---- lispintro/Makefile.in.orig	Tue Jul 04 16:55:30 2006 +0300
-+++ lispintro/Makefile.in	Tue Jul 04 16:58:01 2006 +0300
-@@ -33,7 +33,7 @@ INFO_TARGETS = ${infodir}/eintr
+--- ./lispintro/Makefile.in.orig	Mon Feb  6 01:05:17 2006
++++ ./lispintro/Makefile.in	Fri Sep  1 21:10:08 2006
+@@ -33,7 +33,7 @@
  INFO_TARGETS = ${infodir}/eintr
  DVI_TARGETS = emacs-lisp-intro.dvi
  
diff --git a/editors/emacs-devel/files/patch-lispref-Makefile.in b/editors/emacs-devel/files/patch-lispref-Makefile.in
index f83bc942aaad..cfd8699c6512 100644
--- a/editors/emacs-devel/files/patch-lispref-Makefile.in
+++ b/editors/emacs-devel/files/patch-lispref-Makefile.in
@@ -1,6 +1,6 @@
---- lispref/Makefile.in.orig	Tue Jul 04 16:55:30 2006 +0300
-+++ lispref/Makefile.in	Tue Jul 04 16:58:01 2006 +0300
-@@ -31,7 +31,7 @@ TEXI2DVI = texi2dvi
+--- ./lispref/Makefile.in.orig	Mon Aug 21 08:22:22 2006
++++ ./lispref/Makefile.in	Fri Sep  1 21:10:08 2006
+@@ -32,7 +32,7 @@
  TEXI2DVI = texi2dvi
  SHELL = /bin/sh
  INSTALL_INFO = install-info
@@ -9,7 +9,7 @@
  
  # The name of the manual:
  VERSION=2.9
-@@ -108,7 +108,7 @@ elisp.dvi: $(srcs)
+@@ -109,7 +109,7 @@
  # This is for use in a separate distro of the Emacs Lisp manual.
  install: elisp
  	$(srcdir)/mkinstalldirs $(infodir)
@@ -18,7 +18,7 @@
  	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
  
  # This is for use in a separate distro of the Emacs Lisp manual.
-@@ -124,7 +124,7 @@ distclean: clean
+@@ -125,7 +125,7 @@
  
  maintainer-clean: clean
  	rm -f elisp.dvi elisp.oaux
@@ -27,7 +27,7 @@
  
  dist: $(infodir)/elisp elisp.dvi
  	-rm -rf temp
-@@ -134,7 +134,7 @@ dist: $(infodir)/elisp elisp.dvi
+@@ -135,7 +135,7 @@
   $(srcdir)/Makefile.in $(srcs) \
   $(srcdir)/../man/texinfo.tex \
   elisp.dvi elisp.aux elisp.??s \
diff --git a/editors/emacs-devel/files/patch-man-Makefile.in b/editors/emacs-devel/files/patch-man-Makefile.in
index d8e10df11e47..3c3ab4cb91ef 100644
--- a/editors/emacs-devel/files/patch-man-Makefile.in
+++ b/editors/emacs-devel/files/patch-man-Makefile.in
@@ -1,6 +1,6 @@
---- man/Makefile.in.orig	Tue Jul 04 16:55:30 2006 +0300
-+++ man/Makefile.in	Tue Jul 04 16:58:01 2006 +0300
-@@ -32,7 +32,7 @@ VPATH=@srcdir@
+--- ./man/Makefile.in.orig	Sat May  6 18:54:21 2006
++++ ./man/Makefile.in	Fri Sep  1 21:10:08 2006
+@@ -32,7 +32,7 @@
  
  # The makeinfo program is part of the Texinfo distribution.
  # Use --force so that it generates output even if there are errors.
diff --git a/editors/emacs-devel/files/patch-src__alloc.c b/editors/emacs-devel/files/patch-src__alloc.c
index 3f8ac192c991..b295275127d5 100644
--- a/editors/emacs-devel/files/patch-src__alloc.c
+++ b/editors/emacs-devel/files/patch-src__alloc.c
@@ -1,6 +1,6 @@
---- src/alloc.c.orig	Tue Jul 04 16:55:30 2006 +0300
-+++ src/alloc.c	Tue Jul 04 16:58:01 2006 +0300
-@@ -4542,7 +4542,11 @@ mark_stack ()
+--- ./src/alloc.c.orig	Thu Aug 31 20:50:29 2006
++++ ./src/alloc.c	Fri Sep  1 21:10:08 2006
+@@ -4560,7 +4560,11 @@
       needed on ia64 too.  See mach_dep.c, where it also says inline
       assembler doesn't work with relevant proprietary compilers.  */
  #ifdef sparc
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index cce3bc1c1ddf..aae0c0295155 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -2638,10 +2638,6 @@ var/games/emacs/tetris-scores
 @dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
 @dirrmtry %%DATADIR%%/%%EMACS_VER%%
 @dirrmtry %%DATADIR%%/site-lisp
-@dirrmtry %%DATADIR%%/nls/POSIX
-@dirrmtry %%DATADIR%%/nls/en_US.US-ASCII
-@dirrmtry %%DATADIR%%/nls
-@dirrmtry %%DATADIR%%
 @dirrmtry var/games/emacs
 @dirrmtry var/games
 @dirrmtry var