Attachment 75053 Details for Bug 108464 – emacs-devel.diff

[patch] emacs-devel.diff

emacs-devel.diff (text/plain), 10.13 KB, created by NIIMI Satoshi on 2007-01-28 04:10:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: NIIMI Satoshi

Created: 2007-01-28 04:10:18 UTC

Size: 10.13 KB

patch

obsolete

>Index: Mk/bsd.emacs.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.emacs.mk,v
>retrieving revision 1.60
>diff -u -r1.60 bsd.emacs.mk
>--- Mk/bsd.emacs.mk	12 Dec 2006 11:41:14 -0000	1.60
>+++ Mk/bsd.emacs.mk	28 Jan 2007 01:49:14 -0000
>@@ -115,7 +115,7 @@
> # Emacs-22.x
> .elif (${EMACS_PORT_NAME} == "emacs22")
> EMACS_NAME=		emacs
>-EMACS_VER=		22.0.50
>+EMACS_VER=		22.0.93
> EMACS_MAJOR_VER=	22
> EMACS_LIBDIR?=		share/${EMACS_NAME}
> EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
>Index: editors/emacs-devel/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/emacs-devel/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- editors/emacs-devel/Makefile	23 Sep 2006 23:26:25 -0000	1.11
>+++ editors/emacs-devel/Makefile	28 Jan 2007 02:53:19 -0000
>@@ -6,11 +6,10 @@
> #
> 
> PORTNAME=	emacs
>-PORTVERSION=	${EMACS_VER}.${SNAPSHOT}
>+PORTVERSION=	${EMACS_VER}
> CATEGORIES=	editors ipv6
>-MASTER_SITES=	${MASTER_SITE_LOCAL}
>-MASTER_SITE_SUBDIR=	keramida
>-DISTNAME=	${PORTNAME}-cvs-snapshot-2006.09.01.17.52.26
>+MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
>+MASTER_SITE_SUBDIR=	emacs/pretest
> 
> MAINTAINER=	keramida@ceid.upatras.gr
> COMMENT=	GNU editing macros
>@@ -29,10 +28,9 @@
> 		xemacs-[0-9]* xemacs-devel-[0-9]* \
> 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
> 
>-EMACS_VER=	22.0.50
>-SNAPSHOT=	20060901
>-USE_BZIP2=	yes
>-USE_AUTOTOOLS=	autoconf:259
>+EMACS_VER=	22.0.93
>+GNU_CONFIGURE=	yes
>+USE_GMAKE=	yes
> .if !defined(WITHOUT_X11)
> .if !defined(WITHOUT_GTK)
> USE_GNOME=	gtk20
>@@ -42,8 +40,6 @@
> USE_XPM=	yes
> .endif
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-
> CONFIGURE_TARGET=	${MACHINE_ARCH}-freebsd
> .if defined(WITHOUT_X11)
> CONFIGURE_ARGS=		--with-x=no
>@@ -57,6 +53,8 @@
> CONFIGURE_ARGS+=	--without-xim
> .endif
> 
>+CONFIGURE_ARGS+=	--infodir='$${prefix}/info' --mandir='$${prefix}/man'
>+
> MAN1=		ctags.1 emacs.1 emacsclient.1 etags.1
> PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
> .if defined(WITHOUT_GTK)
>@@ -87,14 +85,11 @@
> 	@${ECHO_MSG} "====>"
> .endif
> 
>-pre-build:
>-	(cd ${WRKSRC} ; ${MAKE} bootstrap)
>-
> pre-install:
> 	(cd ${WRKSRC}/lisp ; \
>-	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \
>+	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${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} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
> 
> .include <bsd.port.post.mk>
>Index: editors/emacs-devel/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/editors/emacs-devel/distinfo,v
>retrieving revision 1.6
>diff -u -r1.6 distinfo
>--- editors/emacs-devel/distinfo	2 Sep 2006 16:03:28 -0000	1.6
>+++ editors/emacs-devel/distinfo	28 Jan 2007 01:49:26 -0000
>@@ -1,3 +1,3 @@
>-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
>+MD5 (emacs-22.0.93.tar.gz) = 4e768a1489e514fbb78d1a5f9c512846
>+SHA256 (emacs-22.0.93.tar.gz) = 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e
>+SIZE (emacs-22.0.93.tar.gz) = 37118034
>Index: editors/emacs-devel/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/editors/emacs-devel/pkg-plist,v
>retrieving revision 1.8
>diff -u -r1.8 pkg-plist
>--- editors/emacs-devel/pkg-plist	23 Sep 2006 23:26:25 -0000	1.8
>+++ editors/emacs-devel/pkg-plist	28 Jan 2007 02:46:11 -0000
>@@ -22,6 +22,7 @@
> %%DATADIR%%/%%EMACS_VER%%/etc/COOKIES
> %%DATADIR%%/%%EMACS_VER%%/etc/COPYING
> %%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
>+%%DATADIR%%/%%EMACS_VER%%/etc/DEVEL.HUMOR
> %%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
> %%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
> %%DOC2%%%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2
>@@ -113,14 +114,12 @@
> %%DATADIR%%/%%EMACS_VER%%/etc/fr-refcard.tex
> %%DATADIR%%/%%EMACS_VER%%/etc/fr-survival.tex
> %%DATADIR%%/%%EMACS_VER%%/etc/future-bug
>-%%DATADIR%%/%%EMACS_VER%%/etc/gfdl.1
> %%DATADIR%%/%%EMACS_VER%%/etc/gnu.xpm
> %%DATADIR%%/%%EMACS_VER%%/etc/gnus-logo.eps
> %%DATADIR%%/%%EMACS_VER%%/etc/gnus-refcard.tex
> %%DATADIR%%/%%EMACS_VER%%/etc/gnus-tut.txt
> %%DATADIR%%/%%EMACS_VER%%/etc/gnus.pbm
> %%DATADIR%%/%%EMACS_VER%%/etc/grep.txt
>-%%DATADIR%%/%%EMACS_VER%%/etc/images/README
> %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm
> %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.xpm
> %%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.pbm
>@@ -633,7 +632,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/button.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/button.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/README
>-%%DATADIR%%/%%EMACS_VER%%/lisp/calc/README.prev
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-aent.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/calc/calc-alg.el.gz
>@@ -732,6 +730,8 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-french.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-hebrew.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-hebrew.elc
>+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-html.el.gz
>+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-html.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-islam.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-islam.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-iso.el.gz
>@@ -1062,6 +1062,8 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-backend.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-button.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-button.elc
>+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-capab.el.gz
>+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-capab.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-compat.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-compat.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-dcc.el.gz
>@@ -1084,8 +1086,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-join.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-match.el.gz
>@@ -2469,6 +2469,8 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/tumme.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/tumme.elc
>+%%DATADIR%%/%%EMACS_VER%%/lisp/tutorial.el.gz
>+%%DATADIR%%/%%EMACS_VER%%/lisp/tutorial.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/type-break.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/type-break.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/uniquify.el.gz
>@@ -2501,8 +2503,6 @@
> %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-history.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-http.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-http.elc
>-%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-https.el.gz
>-%%DATADIR%%/%%EMACS_VER%%/lisp/url/url-https.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-imap.el.gz
> %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-imap.elc
> %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-irc.el.gz
>Index: editors/emacs-devel/files/patch-configure.in
>===================================================================
>RCS file: editors/emacs-devel/files/patch-configure.in
>diff -N editors/emacs-devel/files/patch-configure.in
>--- editors/emacs-devel/files/patch-configure.in	2 Sep 2006 16:03:28 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,12 +0,0 @@
>---- ./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 ;;
>-+      ia64-*-freebsd*)		machine=ia64 ;;
>-+      sparc64-*-freebsd*)	machine=sparc ;;
>-+      powerpc-*-freebsd*)	machine=macppc ;;
>-       i[3456]86-*-freebsd*)	machine=intel386 ;;
>-       amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
>-     esac
>Index: editors/emacs-devel/files/patch-lib-src-Makefile.in
>===================================================================
>RCS file: editors/emacs-devel/files/patch-lib-src-Makefile.in
>diff -N editors/emacs-devel/files/patch-lib-src-Makefile.in
>--- editors/emacs-devel/files/patch-lib-src-Makefile.in	2 Sep 2006 16:03:28 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,28 +0,0 @@
>---- ./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@
>-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
>- # By default, we uphold the dignity of our programs.
>- INSTALL_STRIP =
>- 
>-@@ -319,7 +320,7 @@
>-         if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
>-              != `(cd ${srcdir} && /bin/pwd)` ]; then \
>- 	  for file in ${SCRIPTS}; do \
>--	    $(INSTALL_PROGRAM) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
>-+	    $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
>- 	  done ; \
>- 	fi
>- 
>-@@ -331,7 +332,7 @@
>- 	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
>- 	done
>- 	for file in ${INSTALLABLE_SCRIPTS} ; do \
>--	  $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
>-+	  $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
>- 	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
>- 	done
>- 
>Index: editors/emacs-devel/files/patch-src__xmenu.c
>===================================================================
>RCS file: editors/emacs-devel/files/patch-src__xmenu.c
>diff -N editors/emacs-devel/files/patch-src__xmenu.c
>--- editors/emacs-devel/files/patch-src__xmenu.c	2 Sep 2006 22:42:54 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,15 +0,0 @@
>---- src/xmenu.c.orig	Sun Sep  3 01:35:27 2006
>-+++ src/xmenu.c	Sun Sep  3 01:37:02 2006
>-@@ -1391,9 +1391,10 @@
>-      Lisp_Object frame;
>- {
>-   GtkWidget *menubar;
>--  BLOCK_INPUT;
>--  FRAME_PTR f = check_x_frame (frame);
>-+  FRAME_PTR f;
>- 
>-+  BLOCK_INPUT;
>-+  f = check_x_frame (frame);
>-   if (FRAME_EXTERNAL_MENU_BAR (f))
>-     set_frame_menubar (f, 0, 1);
>-

Actions: View | Diff

Attachments on bug 108464: 75053