- Update editors/emacs-devel to 23.0.50.20080101 snapshot.

PR:		ports/119290
Submitted by:	keramida(maintainer)

Mk/bsd.emacs.mk

@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.70 2007-12-13 19:25:09 anray Exp $
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.71 2008-01-27 14:26:42 anray Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -100,8 +100,8 @@ PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 # Emacs-22.x (development version)
 .elif (${EMACS_PORT_NAME} == "emacs-devel")
 EMACS_NAME=		emacs
-EMACS_VER=		22.0.99
-EMACS_MAJOR_VER=	22
+EMACS_VER=		23.0.50
+EMACS_MAJOR_VER=	23
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
 EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs-devel

editors/emacs-devel/Makefile

@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	emacs
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	1
+PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
 CATEGORIES=	editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR=	emacs/pretest
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	keramida
+DISTNAME=	${PORTNAME}-cvs-snapshot-2008.01.01.21.19.17
 
 MAINTAINER=	keramida@ceid.upatras.gr
 COMMENT=	GNU editing macros
@@ -25,11 +25,12 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 .endif
 
-CONFLICTS=	emacs-19.* emacs-21.* \
+CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
-EMACS_VER=	22.0.99
+EMACS_VER=	23.0.50
+SNAPSHOT=	20080101
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	bootfast
@@ -42,6 +43,8 @@ USE_XLIB=	yes
 USE_XPM=	yes
 .endif
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--with-x=no
@@ -60,18 +63,18 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
 
 MAKE_ENV=	LC_ALL=C
 
-INFO=		ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
+INFO=		ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
 		efaq eintr elisp emacs-mime emacs erc eshell eudc \
 		flymake forms gnus idlwave info message mh-e newsticker \
-		org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar \
+		nxml-mode org pcl-cvs pgg rcirc reftex remember sc ses sieve smtpmail speedbar \
 		tramp url vip viper widget woman
 
-LATEST_LINK=	emacs22
+LATEST_LINK=	emacs23
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
-BROKEN= Emacs 22.X does not currently build on ia64
+BROKEN=	Emacs 22.X and later does not currently build on ia64
 .endif
 
 pre-everything::

editors/emacs-devel/distinfo

@@ -1,3 +1,3 @@
-SHA256 (emacs-22.0.99.tar.gz) = 03711c96b0be87944bab3a40478e68970066f85303970d1d0d0d1438609f1b15
-MD5 (emacs-22.0.99.tar.gz) = f0f6c5e4163113f5e292e7b03b078aa9
-SIZE (emacs-22.0.99.tar.gz) = 38105148
+SHA256 (emacs-cvs-snapshot-2008.01.01.21.19.17.tar.gz) = d9c3bbe40c5becb5109b44fe4cba0f923b7510841686a07f89b4178a90fa1e71
+MD5 (emacs-cvs-snapshot-2008.01.01.21.19.17.tar.gz) = 6dbefac5a8e9f57b2d242f5239db9529
+SIZE (emacs-cvs-snapshot-2008.01.01.21.19.17.tar.gz) = 26813634

editors/emacs-devel/files/patch-Makefile.in

@@ -1,7 +1,7 @@
---- ./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
+--- Makefile.in.orig	2008-01-02 14:45:46.000000000 +0200
++++ Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -431,14 +431,6 @@
+ ## commands to set make variables.
  install-arch-indep: mkdir info
  	-set ${COPYDESTS} ; \
 -	unset CDPATH; \
@@ -15,7 +15,7 @@
  	mkdir ${COPYDESTS} ; \
  	chmod ugo+rx ${COPYDESTS} ; \
  	unset CDPATH; \
-@@ -503,9 +495,9 @@
+@@ -547,9 +539,9 @@
  	   fi; \
  	   cd ${srcdir}/info ; \
  	   for elt in $(INFO_FILES); do \
@@ -28,7 +28,7 @@
  	      done; \
  	   done); \
  	else true; fi
-@@ -515,7 +507,7 @@
+@@ -559,7 +551,7 @@
  	then \
  	  for elt in $(INFO_FILES); do \
  	    (cd $${thisdir}; \
@@ -36,4 +36,4 @@
 +	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
  	  done; \
  	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir}
+ 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}

editors/emacs-devel/files/patch-doc-emacs-Makefile.in

@@ -0,0 +1,20 @@
+--- doc/emacs/Makefile.in.orig	2008-01-02 14:45:46.000000000 +0200
++++ doc/emacs/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+ # 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 = $(infodir)/emacs
+ DVI_TARGETS  = emacs.dvi
+@@ -146,7 +146,7 @@
+ #	rm -f Makefile
+ 
+ maintainer-clean: distclean
+-	for file in $(INFO_TARGETS); do rm -f $${file}*; done
++	for file in $(INFO_TARGETS); do rm -f $${file}; done
+ 
+ 
+ # Formerly this directory had texindex.c and getopt.c in it

editors/emacs-devel/files/patch-doc-lispintro-Makefile.in

@@ -0,0 +1,19 @@
+--- doc/lispintro/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
++++ doc/lispintro/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -34,7 +34,7 @@
+ INFO_TARGETS = ${infodir}/eintr
+ DVI_TARGETS = emacs-lisp-intro.dvi
+ 
+-MAKEINFO = makeinfo
++MAKEINFO = makeinfo --no-split
+ TEXI2DVI = texi2dvi
+ DVIPS = dvips
+ 
+@@ -66,7 +66,6 @@
+ 
+ maintainer-clean: distclean
+ 	rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
+-	cd $(infodir); rm -f eintr eintr-[1-9]
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

editors/emacs-devel/files/patch-doc-lispref-Makefile.in

@@ -1,6 +1,6 @@
---- ./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 @@
+--- doc/lispref/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
++++ doc/lispref/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -33,7 +33,7 @@
  TEXI2DVI = texi2dvi
  SHELL = /bin/sh
  INSTALL_INFO = install-info
@@ -9,7 +9,7 @@
  
  # The name of the manual:
  VERSION=2.9
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,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.
-@@ -125,7 +125,7 @@
+@@ -126,7 +126,7 @@
  
  maintainer-clean: clean
  	rm -f elisp.dvi elisp.oaux
@@ -27,9 +27,9 @@
  
  dist: $(infodir)/elisp elisp.dvi
  	-rm -rf temp
-@@ -135,7 +135,7 @@
+@@ -136,7 +136,7 @@
   $(srcdir)/Makefile.in $(srcs) \
-  $(srcdir)/../man/texinfo.tex \
+  $(miscmanualdir)/texinfo.tex \
   elisp.dvi elisp.aux elisp.??s \
 - $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
 + $(infodir)/elisp \

editors/emacs-devel/files/patch-doc-misc-Makefile.in

@@ -0,0 +1,11 @@
+--- doc/misc/Makefile.in.orig	2008-01-02 14:45:47.000000000 +0200
++++ doc/misc/Makefile.in	2008-01-02 14:41:21.000000000 +0200
+@@ -36,7 +36,7 @@
+ 
+ # 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 = \
+ 	$(infodir)/ada-mode \

editors/emacs-devel/files/patch-lispintro-Makefile.in

@@ -1,11 +0,0 @@
---- ./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
- 
--MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"

editors/emacs-devel/files/patch-man-Makefile.in

@@ -1,11 +0,0 @@
---- ./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.
--MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- 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 \

editors/emacs-devel/files/patch-src__alloc.c

@@ -1,14 +0,0 @@
---- ./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
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
-+#endif
- #endif
- 
-   /* Save registers that we need to see on the stack.  We need to see