From owner-svn-ports-all@FreeBSD.ORG Fri Jan 3 10:55:42 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 280B5442; Fri, 3 Jan 2014 10:55:42 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 13947111C; Fri, 3 Jan 2014 10:55:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03AtfZb009547; Fri, 3 Jan 2014 10:55:41 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03Atfgj009535; Fri, 3 Jan 2014 10:55:41 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201401031055.s03Atfgj009535@svn.freebsd.org> From: Ashish SHUKLA Date: Fri, 3 Jan 2014 10:55:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338536 - in head/editors: emacs emacs-devel emacs21 emacs22 emacs23 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.17 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, 03 Jan 2014 10:55:42 -0000 Author: ashish Date: Fri Jan 3 10:55:40 2014 New Revision: 338536 URL: http://svnweb.freebsd.org/changeset/ports/338536 Log: - Update CONFLICTS, in accordance with PKGNAME changes Reported by: jgh Modified: head/editors/emacs-devel/Makefile head/editors/emacs/Makefile head/editors/emacs21/Makefile head/editors/emacs22/Makefile head/editors/emacs23/Makefile Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Fri Jan 3 10:38:51 2014 (r338535) +++ head/editors/emacs-devel/Makefile Fri Jan 3 10:55:40 2014 (r338536) @@ -16,8 +16,8 @@ COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ - xemacs-[0-9]* xemacs-devel-[0-9]* \ +CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \ + emacs24-* xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ emacs-nox11-[0-9]* Modified: head/editors/emacs/Makefile ============================================================================== --- head/editors/emacs/Makefile Fri Jan 3 10:38:51 2014 (r338535) +++ head/editors/emacs/Makefile Fri Jan 3 10:55:40 2014 (r338536) @@ -21,9 +21,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_SAFE= yes -CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ +CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ - xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ + emacs-devel-* EMACS_VER= 24.3 GNU_CONFIGURE= yes Modified: head/editors/emacs21/Makefile ============================================================================== --- head/editors/emacs21/Makefile Fri Jan 3 10:38:51 2014 (r338535) +++ head/editors/emacs21/Makefile Fri Jan 3 10:55:40 2014 (r338536) @@ -18,9 +18,10 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros -CONFLICTS= emacs-19.* emacs-22.* emacs-23.* emacs-24.* \ +CONFLICTS= emacs-19.* emacs22-* emacs23-* emacs24-* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ - xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ + emacs-devel-* emacs-nox11-* SSP_UNSAFE= yes Modified: head/editors/emacs22/Makefile ============================================================================== --- head/editors/emacs22/Makefile Fri Jan 3 10:38:51 2014 (r338535) +++ head/editors/emacs22/Makefile Fri Jan 3 10:55:40 2014 (r338536) @@ -23,9 +23,10 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/ png15:${PORTSDIR}/graphics/png .endif -CONFLICTS= emacs-19.* emacs-21.* emacs-23.* emacs-24.* \ +CONFLICTS= emacs-19.* emacs21-* emacs23-* emacs24-* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ - xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ + emacs-devel-* emacs-nox11-* EMACS_VER= 22.3 GNU_CONFIGURE= yes Modified: head/editors/emacs23/Makefile ============================================================================== --- head/editors/emacs23/Makefile Fri Jan 3 10:38:51 2014 (r338535) +++ head/editors/emacs23/Makefile Fri Jan 3 10:55:40 2014 (r338536) @@ -21,10 +21,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_UNSAFE= yes -CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-24.* \ +CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs24-* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ - emacs-nox11-[0-9]* + emacs-nox11-[0-9]* emacs-devel-* EMACS_VER= 23.4 GNU_CONFIGURE= yes