From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 4 07:00:26 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13A2A106568C for ; Mon, 4 Apr 2011 07:00:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7D29D8FC1C for ; Mon, 4 Apr 2011 07:00:22 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p3470M42075168 for ; Mon, 4 Apr 2011 07:00:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3470MDd075167; Mon, 4 Apr 2011 07:00:22 GMT (envelope-from gnats) Resent-Date: Mon, 4 Apr 2011 07:00:22 GMT Resent-Message-Id: <201104040700.p3470MDd075167@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, Zhihao Yuan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 365CF106566B for ; Mon, 4 Apr 2011 06:52:33 +0000 (UTC) (envelope-from lichray@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id EE3BA8FC0A for ; Mon, 4 Apr 2011 06:52:32 +0000 (UTC) Received: by iyj12 with SMTP id 12so7056899iyj.13 for ; Sun, 03 Apr 2011 23:52:32 -0700 (PDT) Received: by 10.42.151.70 with SMTP id d6mr6561772icw.176.1301899952095; Sun, 03 Apr 2011 23:52:32 -0700 (PDT) Received: from compaq.yuetime (c-98-228-191-105.hsd1.il.comcast.net [98.228.191.105]) by mx.google.com with ESMTPS id c4sm3288155ict.19.2011.04.03.23.52.29 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 03 Apr 2011 23:52:31 -0700 (PDT) Received: by compaq.yuetime (sSMTP sendmail emulation); Mon, 04 Apr 2011 01:52:24 -0500 Message-Id: <4d996aaf.44842a0a.0831.ffffe721@mx.google.com> Date: Mon, 04 Apr 2011 01:52:24 -0500 From: Zhihao Yuan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/156167: editor/emacs: better -nox11 support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Zhihao Yuan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2011 07:00:26 -0000 >Number: 156167 >Category: ports >Synopsis: editor/emacs: better -nox11 support >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: Mon Apr 04 07:00:22 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Zhihao Yuan >Release: FreeBSD 8.2-STABLE amd64 >Organization: Northern Illinois University >Environment: System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Mar 14 02:51:28 CDT 2011 root@compaq.yuetime:/usr/obj/usr/src/sys/HOUKAGO amd64 >Description: The emacs port does no add -nox11 suffix when WITHOUT_X11 is defined. And, no matter how you install a -nox11 emacs, the .desktop entity does not work. >How-To-Repeat: >Fix: 1. Add the suffix support; 2. Rearrange the CONFLICTS; 3. Use Terminal=true when WITHOUT_X11 is defined. --- patch-emacs-w-nox11 begins here --- diff -ruN --exclude=CVS /usr/ports/editors/emacs.orig/Makefile /usr/ports/editors/emacs/Makefile --- /usr/ports/editors/emacs.orig/Makefile 2010-09-29 23:38:00.000000000 -0500 +++ /usr/ports/editors/emacs/Makefile 2011-04-04 01:40:10.937168475 -0500 @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -20,8 +20,7 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-24.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ - xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ - emacs-nox11-[0-9]* + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* INSTALLS_ICONS= yes @@ -78,10 +77,13 @@ .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x +PKGNAMESUFFIX= -nox11 +CONFLICTS+= emacs-23.* .else USE_XORG= x11 USE_GNOME= +CONFLICTS+= emacs-nox11-[0-9]* .if defined(WITHOUT_SVG) CONFIGURE_ARGS+= --without-rsvg @@ -223,6 +225,9 @@ .endif post-patch: +.if defined(WITHOUT_X11) + ${REINPLACE_CMD} -e 's/Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop +.endif @${RM} -f ${WRKSRC}/info/* @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el --- patch-emacs-w-nox11 ends here --- >Release-Note: >Audit-Trail: >Unformatted: