Update to 22.0.50.20060703

Submitted by:	keramida(maintainer)

8 files changed, 39 insertions, 47 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index dde8a16f8833..08ae4f055bbc 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
-PORTREVISION=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	keramida
-DISTNAME=	${PORTNAME}-cvs-snapshot-2006.05.02.05.51.52
+DISTNAME=	${PORTNAME}-cvs-snapshot-2006.07.03.10.57.35
 
 MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
@@ -31,7 +30,7 @@ CONFLICTS=	emacs-19.* emacs-21.* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
 EMACS_VER=	22.0.50
-SNAPSHOT=	20060502
+SNAPSHOT=	20060703
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoconf:259
 .if !defined(WITHOUT_X11)
@@ -92,9 +91,9 @@ pre-build:
 
 post-build:
 	(cd ${WRKSRC}/lisp ; \
-	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \
-	${RM} ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.[0-9]* ; \
-	cd ${WRKSRC}/src ; \
-	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \
+	 ${RM} ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.[0-9]* ; \
+	 cd ${WRKSRC}/src ; \
+	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 .include <bsd.port.post.mk>
diff --git a/editors/emacs-devel/files/patch-Makefile.in b/editors/emacs-devel/files/patch-Makefile.in
index fce120d4cdab..f76276294fbc 100644
--- a/editors/emacs-devel/files/patch-Makefile.in
+++ b/editors/emacs-devel/files/patch-Makefile.in
@@ -1,9 +1,10 @@
---- Makefile.in.orig	Thu Apr 20 23:29:18 2006
-+++ Makefile.in	Wed May  3 07:04:47 2006
-@@ -409,14 +409,6 @@
+--- 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.
  ## 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 \
@@ -11,11 +12,10 @@
 -	  fi ; \
 -	  shift ; \
 -	done
--	-set ${COPYDESTS} ; \
+ 	-set ${COPYDESTS} ; \
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
- 	unset CDPATH; \
-@@ -503,9 +495,9 @@
+@@ -503,9 +495,9 @@ install-arch-indep: mkdir info
  	   fi; \
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
@@ -28,7 +28,7 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -515,7 +507,7 @@
+@@ -515,7 +507,7 @@ install-arch-indep: mkdir info
  	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 84ebc615c9ae..2c76eeb90e8f 100644
--- a/editors/emacs-devel/files/patch-configure.in
+++ b/editors/emacs-devel/files/patch-configure.in
@@ -1,8 +1,6 @@
-Index: configure.in
-===================================================================
---- configure.in	(.../branches/gnu/emacs)	(revision 15)
-+++ configure.in	(.../trunk/emacs)	(revision 15)
-@@ -237,6 +237,9 @@
+--- 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
      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 3a29ebe78735..cb444149cc0b 100644
--- a/editors/emacs-devel/files/patch-lib-src-Makefile.in
+++ b/editors/emacs-devel/files/patch-lib-src-Makefile.in
@@ -1,8 +1,6 @@
-Index: lib-src/Makefile.in
-===================================================================
---- lib-src/Makefile.in	(.../branches/gnu/emacs)	(revision 15)
-+++ lib-src/Makefile.in	(.../trunk/emacs)	(revision 15)
-@@ -94,6 +94,7 @@
+--- 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@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -10,7 +8,7 @@ Index: lib-src/Makefile.in
  # By default, we uphold the dignity of our programs.
  INSTALL_STRIP =
  
-@@ -319,7 +320,7 @@
+@@ -319,7 +320,7 @@ maybe-blessmail: BLESSMAIL
          if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
               != `(cd ${srcdir} && /bin/pwd)` ]; then \
  	  for file in ${SCRIPTS}; do \
@@ -19,7 +17,7 @@ Index: lib-src/Makefile.in
  	  done ; \
  	fi
  
-@@ -331,7 +332,7 @@
+@@ -331,7 +332,7 @@ install: $(DESTDIR)${archlibdir}
  	  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 1e3bca9f5a11..ee431421508e 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	Thu Apr 20 23:29:18 2006
-+++ lispintro/Makefile.in	Wed May  3 04:48:53 2006
-@@ -33,7 +33,7 @@
+--- 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
  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 014a8cfd974b..f83bc942aaad 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	Thu Apr 20 23:29:18 2006
-+++ lispref/Makefile.in	Wed May  3 04:50:53 2006
-@@ -31,7 +31,7 @@
+--- 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
  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 @@
+@@ -108,7 +108,7 @@ elisp.dvi: $(srcs)
  # 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 @@
+@@ -124,7 +124,7 @@ distclean: clean
  
  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 @@
+@@ -134,7 +134,7 @@ dist: $(infodir)/elisp elisp.dvi
   $(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 cd036d15d8ac..d8e10df11e47 100644
--- a/editors/emacs-devel/files/patch-man-Makefile.in
+++ b/editors/emacs-devel/files/patch-man-Makefile.in
@@ -1,11 +1,11 @@
---- man/Makefile.in.orig	Wed May  3 03:47:47 2006
-+++ man/Makefile.in	Wed May  3 03:48:25 2006
-@@ -32,7 +32,7 @@
+--- 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@
  
  # The makeinfo program is part of the Texinfo distribution.
  # Use --force so that it generates output even if there are errors.
 -MAKEINFO = makeinfo --force
 +MAKEINFO = makeinfo --force --no-split
- INFO_TARGETS = ../info/emacs ../info/emacs-xtra ../info/ccmode ../info/cl \
+ INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
  	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
  		../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
diff --git a/editors/emacs-devel/files/patch-src__alloc.c b/editors/emacs-devel/files/patch-src__alloc.c
index 9fee60ffca59..3f8ac192c991 100644
--- a/editors/emacs-devel/files/patch-src__alloc.c
+++ b/editors/emacs-devel/files/patch-src__alloc.c
@@ -1,8 +1,6 @@
-Index: src/alloc.c
-===================================================================
---- src/alloc.c	(.../branches/gnu/emacs)	(revision 15)
-+++ src/alloc.c	(.../trunk/emacs)	(revision 15)
-@@ -4542,8 +4542,12 @@
+--- 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 ()
       needed on ia64 too.  See mach_dep.c, where it also says inline
       assembler doesn't work with relevant proprietary compilers.  */
  #ifdef sparc
@@ -10,8 +8,7 @@ Index: src/alloc.c
 +  asm ("flushw");
 +#else
    asm ("ta 3");
- #endif
 +#endif
+ #endif
  
    /* Save registers that we need to see on the stack.  We need to see
-      registers used to hold register variables and registers used to