Date: Thu, 15 Feb 2007 06:34:08 +0900 (JST) From: NIIMI Satoshi <sa2c@sa2c.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109176: editors/emacs-devel: fix plist and build process Message-ID: <20070214213408.A58F140E6@berkeley.l.sa2c.net> Resent-Message-ID: <200702142140.l1ELe6AB062816@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109176
>Category: ports
>Synopsis: editors/emacs-devel: fix plist and build process
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 14 21:40:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: NIIMI Satoshi
>Release: FreeBSD 6.2-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #1: Sat Feb 10 16:24:38 JST 2007 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
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.
>How-To-Repeat:
>Fix:
* 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: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/emacs-devel/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 6 Feb 2007 20:58:05 -0000 1.12
+++ Makefile 14 Feb 2007 20:01:56 -0000
@@ -31,6 +31,7 @@
EMACS_VER= 22.0.93
GNU_CONFIGURE= yes
USE_GMAKE= yes
+ALL_TARGET= bootfast
.if !defined(WITHOUT_X11)
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
@@ -57,11 +58,6 @@
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
INFO= ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
efaq eintr elisp emacs-mime emacs erc eshell eudc \
@@ -85,11 +81,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: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/editors/emacs-devel/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist 6 Feb 2007 20:58:05 -0000 1.9
+++ pkg-plist 14 Feb 2007 20:02:02 -0000
@@ -25,7 +25,6 @@
%%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/FTP
--- 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?20070214213408.A58F140E6>