Date: Fri, 2 Mar 2007 11:55:12 +0900 (JST) From: NIIMI Satoshi <sa2c@sa2c.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109741: editors/emacs-devel: update to 22.0.95 Message-ID: <20070302025512.B140040E2@berkeley.l.sa2c.net> Resent-Message-ID: <200703020300.l2230BKI085515@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109741
>Category: ports
>Synopsis: editors/emacs-devel: update to 22.0.95
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 02 03:00:11 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: NIIMI Satoshi
>Release: FreeBSD 6.2-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #2: Thu Mar 1 09:54:12 JST 2007 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update editors/emacs-devel to 22.0.95.
This PR also contains the changes in PR ports/109176:
| When WITHOUT_GTK is defined, etc/DOC-22.0.93.2 is included in pkg-plist.
| The file is not made because this port was changed to use GNU make.
|
| New build target "bootfast", which recompiles necessary emacs lisp files
| before dump, is introduced in Emacs 22. I think this is more preferable
| than current hack.
This PR supersedes ports/109484.
>How-To-Repeat:
>Fix:
* Update to 22.0.95.
* Remove etc/DOC-22.0.93.2 from pkg-plist even if WITHOUT_GTK is defined.
* Use "bootfast" target to recompile necessary emacs lisp files before dump.
--- emacs-devel.diff begins here ---
Index: Mk/bsd.emacs.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.emacs.mk,v
retrieving revision 1.61
diff -u -r1.61 bsd.emacs.mk
--- Mk/bsd.emacs.mk 6 Feb 2007 20:58:06 -0000 1.61
+++ Mk/bsd.emacs.mk 2 Mar 2007 00:45:11 -0000
@@ -115,7 +115,7 @@
# Emacs-22.x
.elif (${EMACS_PORT_NAME} == "emacs22")
EMACS_NAME= emacs
-EMACS_VER= 22.0.93
+EMACS_VER= 22.0.95
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.12
diff -u -r1.12 Makefile
--- editors/emacs-devel/Makefile 6 Feb 2007 20:58:05 -0000 1.12
+++ editors/emacs-devel/Makefile 2 Mar 2007 00:45:25 -0000
@@ -28,9 +28,10 @@
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
-EMACS_VER= 22.0.93
+EMACS_VER= 22.0.95
GNU_CONFIGURE= yes
USE_GMAKE= yes
+ALL_TARGET= bootfast
.if !defined(WITHOUT_X11)
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
@@ -57,11 +58,8 @@
MAN1= ctags.1 emacs.1 emacsclient.1 etags.1
PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
-.if defined(WITHOUT_GTK)
-PLIST_SUB+= DOC2=""
-.else
-PLIST_SUB+= DOC2="@comment "
-.endif
+
+MAKE_ENV= LC_ALL=C
INFO= ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
efaq eintr elisp emacs-mime emacs erc eshell eudc \
@@ -85,11 +83,4 @@
@${ECHO_MSG} "====>"
.endif
-pre-install:
- (cd ${WRKSRC}/lisp ; \
- ${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} ${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.7
diff -u -r1.7 distinfo
--- editors/emacs-devel/distinfo 6 Feb 2007 20:58:05 -0000 1.7
+++ editors/emacs-devel/distinfo 2 Mar 2007 00:53:12 -0000
@@ -1,3 +1,3 @@
-MD5 (emacs-22.0.93.tar.gz) = 4e768a1489e514fbb78d1a5f9c512846
-SHA256 (emacs-22.0.93.tar.gz) = 44dd612b521a47d923c759525b1134bbc571350cae80bdc543c31f30acc7739e
-SIZE (emacs-22.0.93.tar.gz) = 37118034
+MD5 (emacs-22.0.95.tar.gz) = 07ae2a749fec6decbdf65ae3673d5546
+SHA256 (emacs-22.0.95.tar.gz) = 5e25e8f221fe18f07feadd831bb482e6cde53c9470713c63f059ff2d3e715b1d
+SIZE (emacs-22.0.95.tar.gz) = 37754533
Index: editors/emacs-devel/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/editors/emacs-devel/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- editors/emacs-devel/pkg-plist 6 Feb 2007 20:58:05 -0000 1.9
+++ editors/emacs-devel/pkg-plist 2 Mar 2007 01:05:24 -0000
@@ -25,9 +25,9 @@
%%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
%%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS
%%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF
+%%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.README
%%DATADIR%%/%%EMACS_VER%%/etc/FTP
%%DATADIR%%/%%EMACS_VER%%/etc/GNU
%%DATADIR%%/%%EMACS_VER%%/etc/GNUS-NEWS
@@ -47,7 +47,6 @@
%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.20
%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.21
%%DATADIR%%/%%EMACS_VER%%/etc/ORDERS
-%%DATADIR%%/%%EMACS_VER%%/etc/OTHER.EMACSES
%%DATADIR%%/%%EMACS_VER%%/etc/PROBLEMS
%%DATADIR%%/%%EMACS_VER%%/etc/README
%%DATADIR%%/%%EMACS_VER%%/etc/SERVICE
@@ -59,6 +58,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.cn
%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.cs
%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.de
+%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.eo
%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.es
%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.fr
%%DATADIR%%/%%EMACS_VER%%/etc/TUTORIAL.it
@@ -103,7 +103,6 @@
%%DATADIR%%/%%EMACS_VER%%/etc/emacs.csh
%%DATADIR%%/%%EMACS_VER%%/etc/emacs.icon
%%DATADIR%%/%%EMACS_VER%%/etc/emacs.py
-%%DATADIR%%/%%EMACS_VER%%/etc/emacs.xbm
%%DATADIR%%/%%EMACS_VER%%/etc/emacsclient.1
%%DATADIR%%/%%EMACS_VER%%/etc/emacstool.1
%%DATADIR%%/%%EMACS_VER%%/etc/enriched.doc
@@ -114,12 +113,14 @@
%%DATADIR%%/%%EMACS_VER%%/etc/fr-refcard.tex
%%DATADIR%%/%%EMACS_VER%%/etc/fr-survival.tex
%%DATADIR%%/%%EMACS_VER%%/etc/future-bug
-%%DATADIR%%/%%EMACS_VER%%/etc/gnu.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/gnus-booklet.ps
%%DATADIR%%/%%EMACS_VER%%/etc/gnus-logo.eps
+%%DATADIR%%/%%EMACS_VER%%/etc/gnus-refcard.ps
%%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
@@ -145,6 +146,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/disconnect.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/exit.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/exit.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/README
%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/bits.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/bitsbang.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/box-minus.xpm
@@ -174,13 +176,11 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/unlock.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/bar.xbm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/bar.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/README
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/catchup.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/catchup.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/cu-exit.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/cu-exit.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/dead.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/describe-group.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/describe-group.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/exit-gnus.pbm
@@ -217,7 +217,6 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/reply-wo.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/reply.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/reply.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/reverse-smile.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/rot13.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/rot13.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/save-aif.pbm
@@ -234,6 +233,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-decode.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/README
%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/cont.pbm
@@ -274,6 +274,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/help.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/home.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/home.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/README
%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs_16.png
%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs_24.png
%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/emacs_32.png
@@ -289,6 +290,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/lock-ok.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/lock.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/README
%%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/back-arrow.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/copy.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/cut.xpm
@@ -313,6 +315,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/undo.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/up-arrow.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/low-color/up-node.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/README
%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/compose.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/compose.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/mail/copy.xpm
@@ -374,10 +377,12 @@
%%DATADIR%%/%%EMACS_VER%%/etc/images/separator.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/show.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/show.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/README
%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/blink.pbm
%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/blink.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/braindamaged.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/cry.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/dead.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/evil.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/forced.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/frown.pbm
@@ -436,6 +441,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/spook.lines
%%DATADIR%%/%%EMACS_VER%%/etc/survival.tex
%%DATADIR%%/%%EMACS_VER%%/etc/termcap.src
+%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/README
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/close.png
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/close.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/empty.png
@@ -454,6 +460,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/no-handle.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/open.png
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/default/open.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/README
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/close.png
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/close.xpm
%%DATADIR%%/%%EMACS_VER%%/etc/tree-widget/folder/empty.png
--- emacs-devel.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070302025512.B140040E2>