From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 9 00:20:22 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA0EB16A4CE for ; Wed, 9 Jun 2004 00:20:22 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBF2443D2F for ; Wed, 9 Jun 2004 00:20:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i590KMDV099967 for ; Wed, 9 Jun 2004 00:20:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i590KMlD099966; Wed, 9 Jun 2004 00:20:22 GMT (envelope-from gnats) Resent-Date: Wed, 9 Jun 2004 00:20:22 GMT Resent-Message-Id: <200406090020.i590KMlD099966@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, Dryice Liu Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1057916A4CE for ; Wed, 9 Jun 2004 00:12:55 +0000 (GMT) Received: from snickers.hotpop.com (snickers.hotpop.com [38.113.3.51]) by mx1.FreeBSD.org (Postfix) with ESMTP id D140F43D1F for ; Wed, 9 Jun 2004 00:12:54 +0000 (GMT) (envelope-from dryice@hotpop.com) Received: from hotpop.com (kubrick.hotpop.com [38.113.3.103]) by snickers.hotpop.com (Postfix) with SMTP id D9F9F7080A for ; Tue, 8 Jun 2004 23:15:03 +0000 (UTC) Received: from hotpop.com (unknown [219.146.250.147]) by smtp-1.hotpop.com (Postfix) with ESMTP id B588B1A01B3 for ; Tue, 8 Jun 2004 23:15:01 +0000 (UTC) Received: by hotpop.com (sSMTP sendmail emulation); Wed, 9 Jun 2004 08:12:48 +0800 Message-Id: <20040608231501.B588B1A01B3@smtp-1.hotpop.com> Date: Wed, 9 Jun 2004 08:12:48 +0800 From: Dryice Liu To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/67729: [maintainer update] devel/ecb: default build with cedet X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Dryice Liu List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2004 00:20:23 -0000 >Number: 67729 >Category: ports >Synopsis: [maintainer update] devel/ecb: default build with cedet >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 09 00:20:22 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Dryice Liu >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: >Environment: System: FreeBSD dryice.3322.org 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Mon Mar 1 16:17:42 CST 2004 ddliu@dryice.3322.org:/usr/obj/usr/src/sys/SERVER i386 >Description: Changes: - Now default build with CEDET, a new knob to build with the old libraries - Now install icons by default - Removed file: files/patch-Makefile. Use the MAKE_ARGS macro - Bump PORTREVISION >How-To-Repeat: N/A >Fix: --- ecb.diff begins here --- diff -ruN ecb.old/Makefile ecb/Makefile --- ecb.old/Makefile Wed May 19 20:20:53 2004 +++ ecb/Makefile Wed Jun 9 08:07:12 2004 @@ -1,4 +1,3 @@ - # New ports collection makefile for: ecb # Date created: 25 January 2002 # Whom: Kimura Fuyuki @@ -8,6 +7,7 @@ PORTNAME= ecb PORTVERSION= 2.24 +PORTREVISION= 1 CATEGORIES= devel elisp MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ecb @@ -22,9 +22,6 @@ PORTNAMESUFFIX= ${PKGNAMESUFFIX} .endif -BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic${PORTNAMESUFFIX} -RUN_DEPENDS= ${BUILD_DEPENDS} - LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} ICONSRC= ${WRKSRC}/ecb-images ICONDIR= ${LISPDIR}/ecb-images @@ -33,23 +30,36 @@ USE_REINPLACE= yes USE_GMAKE= yes -MAKE_ARGS= CEDET="" ALL_TARGET= ecb -.if defined(WITH_ICONS) -PLIST_SUB+= ICONS="" +.if defined(WITHOUT_CEDET) +BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic${PORTNAMESUFFIX} +MAKE_ARGS= CEDET="" .else +BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet/common/cedet.el:${PORTSDIR}/devel/cedet +MAKE_ARGS= CEDET=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet +.endif + +RUN_DEPENDS= ${BUILD_DEPENDS} + +.if defined(WITHOUT_ICONS) PLIST_SUB+= ICONS="@comment " +.else +PLIST_SUB+= ICONS="" .endif INFO= ecb pre-everything:: -.if !defined(WITH_ICONS) +.if !defined(WITHOUT_ICONS) @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build options:" @${ECHO_MSG} "" - @${ECHO_MSG} " WITH_ICONS=yes Install also ecb's icons" + @${ECHO_MSG} " WITHOUT_ICONS=yes Don't install ecb's icons" + @${ECHO_MSG} "" + @${ECHO_MSG} " WITHOUT_CEDET=yes Don't use theCEDET library," + @${ECHO_MSG} " use the old version of " + @${ECHO_MSG} " eieio/semantic/speedbar instead." @${ECHO_MSG} "" .endif @@ -66,7 +76,7 @@ .endfor ${INSTALL_DATA} ${WRKSRC}/ecb.info ${PREFIX}/info -.if defined(WITH_ICONS) +.if !defined(WITHOUT_ICONS) .for i in ${ICONSUBDIRS} ${MKDIR} ${ICONDIR}/default/${i} ${INSTALL_DATA} ${ICONSRC}/default/${i}/*.xpm ${ICONDIR}/default/${i} diff -ruN ecb.old/files/patch-Makefile ecb/files/patch-Makefile --- ecb.old/files/patch-Makefile Sat May 8 16:02:19 2004 +++ ecb/files/patch-Makefile Thu Jan 1 08:00:00 1970 @@ -1,13 +0,0 @@ ---- Makefile.orig Sat May 8 15:22:25 2004 -+++ Makefile Sat May 8 15:23:57 2004 -@@ -46,8 +46,8 @@ - # you want compile ECB with the cedet library then set here the full path - # to the cedet-installation directory. - --#CEDET= --CEDET=C:/Programme/emacs-21/site-lisp/multi-file-packages/cedet-1.0beta2b -+CEDET= -+# CEDET=C:/Programme/emacs-21/site-lisp/multi-file-packages/cedet-1.0beta2b - - # -------- Compiling ECB with the semantic < 2.0 ------------------------- - --- ecb.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: