From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 12:56:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 26A29B86; Fri, 27 Jun 2014 12:56:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06EA52BF8; Fri, 27 Jun 2014 12:56:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RCuihF068024; Fri, 27 Jun 2014 12:56:44 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RCuh0e068012; Fri, 27 Jun 2014 12:56:43 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201406271256.s5RCuh0e068012@svn.freebsd.org> From: Ashish SHUKLA Date: Fri, 27 Jun 2014 12:56:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359516 - in head: deskutils/etask devel/eieio devel/semantic editors/flim editors/semi graphics/xface.el textproc/emacs-wiki textproc/xml-parse.el X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 12:56:45 -0000 Author: ashish Date: Fri Jun 27 12:56:42 2014 New Revision: 359516 URL: http://svnweb.freebsd.org/changeset/ports/359516 QAT: https://qat.redports.org/buildarchive/r359516/ Log: - Properly remove references to deprecated emacs versions, and unbreak INDEX Approved by: portmgr (bapt) Modified: head/deskutils/etask/Makefile head/devel/eieio/Makefile head/devel/semantic/Makefile head/editors/flim/Makefile head/editors/semi/Makefile head/graphics/xface.el/Makefile head/textproc/emacs-wiki/Makefile head/textproc/xml-parse.el/Makefile Modified: head/deskutils/etask/Makefile ============================================================================== --- head/deskutils/etask/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/deskutils/etask/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -17,10 +17,6 @@ USE_EMACS= yes USE_GHOSTSCRIPT_RUN= yes USE_TEX= latex dvipsk -.if ${EMACS_PORT_NAME} != "emacs21" -PORTNAMESUFFIX= ${PKGNAMESUFFIX} -.endif - LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}a Modified: head/devel/eieio/Makefile ============================================================================== --- head/devel/eieio/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/devel/eieio/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -16,10 +16,6 @@ COMMENT= Enhanced Integration of Emacs I USE_EMACS= yes -.if ${EMACS_PORT_NAME} != "emacs21" -PORTNAMESUFFIX= ${PKGNAMESUFFIX} -.endif - BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/speedbar/speedbar.el:${PORTSDIR}/editors/speedbar${PORTNAMESUFFIX} USES= gmake Modified: head/devel/semantic/Makefile ============================================================================== --- head/devel/semantic/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/devel/semantic/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -16,10 +16,6 @@ COMMENT= Lexer, parser-generator, and pa USE_EMACS= yes -.if ${EMACS_PORT_NAME} != "emacs21" -PORTNAMESUFFIX= ${PKGNAMESUFFIX} -.endif - BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/eieio/eieio.el:${PORTSDIR}/devel/eieio${PORTNAMESUFFIX} \ ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/speedbar/speedbar.el:${PORTSDIR}/editors/speedbar${PORTNAMESUFFIX} RUN_DEPENDS:= ${BUILD_DEPENDS} Modified: head/editors/flim/Makefile ============================================================================== --- head/editors/flim/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/editors/flim/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -53,7 +53,7 @@ DEPPORT_SUFFIX= .else DEPPORT_SUFFIX= -${EMACS_PORT_NAME} .endif -.if (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel") +.if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel") PLIST= ${PKGDIR}/pkg-plist.emacs21 .endif # depends on apel (case of xemacs-21.x or later) Modified: head/editors/semi/Makefile ============================================================================== --- head/editors/semi/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/editors/semi/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -54,7 +54,7 @@ DEPPORT_SUFFIX= .else DEPPORT_SUFFIX= -${EMACS_PORT_NAME} .endif -.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel") +.if (${EMACS_PORT_NAME} == "emacs23") || (${EMACS_PORT_NAME} == "emacs24") || (${EMACS_PORT_NAME} == "emacs-devel") PLIST= ${PKGDIR}/pkg-plist.emacs20 .endif # depends on flim Modified: head/graphics/xface.el/Makefile ============================================================================== --- head/graphics/xface.el/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/graphics/xface.el/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -16,6 +16,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= X-Face encoder/decoder/viewer for Emacsen +EMACS_PORT_NAME?= emacs24 + RUN_DEPENDS= compface:${PORTSDIR}/mail/faces USE_EMACS= yes Modified: head/textproc/emacs-wiki/Makefile ============================================================================== --- head/textproc/emacs-wiki/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/textproc/emacs-wiki/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -18,10 +18,6 @@ OPTIONS_DEFINE= CONTRIB CONTRIB_DESC= Install extra packages. This can shadow versions already there. OPTIONS_SUB= yes -.if ${EMACS_PORT_NAME} != "emacs21" -PORTNAMESUFFIX= ${PKGNAMESUFFIX} -.endif - RUN_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/xml-parse.el:${PORTSDIR}/textproc/xml-parse.el RUN_DEPENDS+= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/htmlize.el:${PORTSDIR}/textproc/htmlize.el Modified: head/textproc/xml-parse.el/Makefile ============================================================================== --- head/textproc/xml-parse.el/Makefile Fri Jun 27 12:47:26 2014 (r359515) +++ head/textproc/xml-parse.el/Makefile Fri Jun 27 12:56:42 2014 (r359516) @@ -17,10 +17,6 @@ COMMENT= Code to efficiently read/write USE_EMACS= yes -.if ${EMACS_PORT_NAME} != "emacs21" -PORTNAMESUFFIX= ${PKGNAMESUFFIX} -.endif - NO_BUILD= yes NO_STAGE= yes