From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 14 21:40:06 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A797A16A406 for ; Wed, 14 Feb 2007 21:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 8693513C442 for ; Wed, 14 Feb 2007 21:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1ELe6Mm062817 for ; Wed, 14 Feb 2007 21:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1ELe6AB062816; Wed, 14 Feb 2007 21:40:06 GMT (envelope-from gnats) Resent-Date: Wed, 14 Feb 2007 21:40:06 GMT Resent-Message-Id: <200702142140.l1ELe6AB062816@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, NIIMI Satoshi Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 68E9916A402 for ; Wed, 14 Feb 2007 21:34:14 +0000 (UTC) (envelope-from sa2c@sa2c.net) Received: from py-out-1112.google.com (py-out-1112.google.com [64.233.166.179]) by mx1.freebsd.org (Postfix) with ESMTP id 31CFD13C48D for ; Wed, 14 Feb 2007 21:34:13 +0000 (UTC) (envelope-from sa2c@sa2c.net) Received: by py-out-1112.google.com with SMTP id f47so153257pye for ; Wed, 14 Feb 2007 13:34:13 -0800 (PST) Received: by 10.35.45.1 with SMTP id x1mr580233pyj.1171488852969; Wed, 14 Feb 2007 13:34:12 -0800 (PST) Received: from berkeley.l.sa2c.net ( [125.197.232.106]) by mx.google.com with ESMTP id w43sm1361551pyg.2007.02.14.13.34.11; Wed, 14 Feb 2007 13:34:12 -0800 (PST) Received: by berkeley.l.sa2c.net (Postfix, from userid 3104) id A58F140E6; Thu, 15 Feb 2007 06:34:08 +0900 (JST) Message-Id: <20070214213408.A58F140E6@berkeley.l.sa2c.net> Date: Thu, 15 Feb 2007 06:34:08 +0900 (JST) From: NIIMI Satoshi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109176: editors/emacs-devel: fix plist and build process X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: NIIMI Satoshi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Feb 2007 21:40:06 -0000 >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 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: