From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 3 18:40:17 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 53E59106567A for ; Wed, 3 Aug 2011 18:40:17 +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 358C98FC2A for ; Wed, 3 Aug 2011 18:40:17 +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 p73IeHjv075384 for ; Wed, 3 Aug 2011 18:40:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p73IeH1T075383; Wed, 3 Aug 2011 18:40:17 GMT (envelope-from gnats) Resent-Date: Wed, 3 Aug 2011 18:40:17 GMT Resent-Message-Id: <201108031840.p73IeH1T075383@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D3F51065674 for ; Wed, 3 Aug 2011 18:31:34 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166]) by mx1.freebsd.org (Postfix) with ESMTP id 6313B8FC1C for ; Wed, 3 Aug 2011 18:31:34 +0000 (UTC) Received: from localhost.localdomain (ZT028230.ppp.dion.ne.jp [59.128.28.230]) by msa103lp.auone-net.jp (au one net msa) with ESMTP id 7DE0647C036 for ; Thu, 4 Aug 2011 03:31:31 +0900 (JST) Message-Id: <20110804032104.f866fb89.tkato432@yahoo.com> Date: Thu, 4 Aug 2011 03:21:04 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/159434: Update port: editors/e93 to 1.4.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2011 18:40:17 -0000 >Number: 159434 >Category: ports >Synopsis: Update port: editors/e93 to 1.4.2 >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 Aug 03 18:40:16 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 1.4.2 Remove file: files/patch-machdef.mk >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/e93/Makefile editors/e93/Makefile --- /usr/ports/editors/e93/Makefile 2009-11-20 15:36:40.000000000 +0900 +++ editors/e93/Makefile 2011-07-16 16:02:45.000000000 +0900 @@ -6,37 +6,45 @@ # PORTNAME= e93 -PORTVERSION= 1.3.4 -PORTREVISION= 2 -CATEGORIES= editors tcl tk +PORTVERSION= 1.4.2 +CATEGORIES= editors tcl MASTER_SITES= ftp://ftp.e93.org/pub/ -DISTNAME= ${PORTNAME}-1.3r4X +DISTNAME= ${PORTNAME}-${PORTVERSION:R}r${PORTVERSION:E}X EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A nifty editor based on Tcl/Tk +COMMENT= A nifty editor based on Tcl + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -USE_TCL= 84 -USE_TCL_BUILD= 84 -USE_TK= 84 -USE_TK_BUILD= 84 -USE_XORG= x11 xt WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_JOBS_UNSAFE= yes + +USE_XORG= x11 xinerama +USE_TCL_BUILD= yes +USE_TCL= yes +USE_GMAKE= yes +MAKE_ARGS= PREFIX="${PREFIX}" \ + TCL_INCLUDE="-I${TCL_INCLUDEDIR}" \ + TCL_LIB="-L${LOCALBASE}/lib" \ + TCL_VERSION="${TCL_VER:S/.//}" \ + X_INCLUDE="-I${LOCALBASE}/include" \ + X_LIB="-L${LOCALBASE}/lib" \ + EXTRALIBS="-lm" \ + CC="${CXX}" \ + OPTIONS="${CXXFLAGS}" +MAKE_JOBS_SAFE= yes post-patch: - @${REINPLACE_CMD} 's|wish|wish${TK_VER}|' ${WRKSRC}/e93r - @${REINPLACE_CMD} 's|CFLAGS=|CFLAGS+=$$(TK_INCLUDE) -I${LOCALBASE}/include |' \ - ${WRKSRC}/Makefile ${WRKSRC}/xgui/Makefile + @${REINPLACE_CMD} -e 's|-lstdc++||g ; \ + s|;make|;$$(MAKE)|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/e93 ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/e93r ${PREFIX}/bin - ${MKDIR} ${PREFIX}/lib/e93lib - ${CP} -R ${WRKSRC}/e93lib/* ${PREFIX}/lib/e93lib -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README* ${DOCSDIR} -.endif + @${MKDIR} ${PREFIX}/lib/e93lib +.for ext in e93 regex syntaxmaps + ${INSTALL_DATA} ${WRKSRC}/README.${ext} ${PREFIX}/lib/e93lib +.endfor + @(cd ${WRKSRC}/e93lib && ${COPYTREE_SHARE} . ${PREFIX}/lib/e93lib) .include diff -urN /usr/ports/editors/e93/distinfo editors/e93/distinfo --- /usr/ports/editors/e93/distinfo 2011-03-21 02:42:16.000000000 +0900 +++ editors/e93/distinfo 2011-07-16 15:24:45.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (e93-1.3r4X.tgz) = 479f584d8d35ebbb5ceb8ee957ffa2b1dc84fdfa6d38e384756db6667d5c1329 -SIZE (e93-1.3r4X.tgz) = 431179 +SHA256 (e93-1.4r2X.tgz) = 750d812fe5911a71cf18a4e0d623ae6c4ee420d9c7886205d3dcf19aecfbc3c1 +SIZE (e93-1.4r2X.tgz) = 431733 diff -urN /usr/ports/editors/e93/files/patch-machdef.mk editors/e93/files/patch-machdef.mk --- /usr/ports/editors/e93/files/patch-machdef.mk 2008-04-20 10:12:46.000000000 +0900 +++ editors/e93/files/patch-machdef.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,44 +0,0 @@ ---- machdef.mk.orig Fri Sep 29 02:47:44 2000 -+++ machdef.mk Fri Sep 29 02:50:54 2000 -@@ -27,33 +27,32 @@ - # - # e93 will install its single executable "e93" in $PREFIX/bin - # and it will place a directory called "e93lib" in $PREFIX/lib --PREFIX=/usr/local - - - # The following lines may need to be altered if the Tcl - # files are located elsewhere on your system: --TCL_INCLUDE=-I/usr/local/include --TCL_LIB=-L/usr/local/lib -+TCL_INCLUDE=-I${LOCALBASE}/include/tcl8.4 -+TCL_LIB=-L${LOCALBASE}/lib - # uncomment and change if you want to link with specific versions of Tcl/Tk --#TCL_VERSION=8.3 -+TCL_VERSION=84 -+TK_INCLUDE=-I${LOCALBASE}/include/tk8.4 - - - # The following lines may need to be altered if the X include and library - # files are located elsewhere on your system: --X_INCLUDE=-I/usr/X11R6/include --X_LIB=-L/usr/X11R6/lib -+X_INCLUDE=-I${LOCALBASE}/include -+X_LIB=-L${LOCALBASE}/lib - - - # if your system needs some extra libraries, add them here: --EXTRALIBS=-lm -ldl -+EXTRALIBS=-lm - - # Uncomment this line if running Solaris: - #MACHINESPEC=-DSOLARIS - - # set compiler to use --CC=gcc - - - # set some compiler options --OPTIONS=-O2 -Wall -x c++ -g -+OPTIONS=-Wall -x c++ - #OPTIONS = -Wall -O2 -x c++ -mcpu=21164a -Wa,-m21164a -g diff -urN /usr/ports/editors/e93/pkg-plist editors/e93/pkg-plist --- /usr/ports/editors/e93/pkg-plist 2006-12-21 22:01:28.000000000 +0900 +++ editors/e93/pkg-plist 2011-07-16 16:01:19.000000000 +0900 @@ -1,5 +1,7 @@ bin/e93 -bin/e93r +lib/e93lib/README.e93 +lib/e93lib/README.regex +lib/e93lib/README.syntaxmaps lib/e93lib/e93rc.tcl lib/e93lib/examples/README lib/e93lib/examples/sethighlightscheme.tcl @@ -18,6 +20,7 @@ lib/e93lib/syntaxmaps/c.tcl lib/e93lib/syntaxmaps/css.tcl lib/e93lib/syntaxmaps/eiffel.tcl +lib/e93lib/syntaxmaps/email.tcl lib/e93lib/syntaxmaps/html.tcl lib/e93lib/syntaxmaps/java.tcl lib/e93lib/syntaxmaps/javaScript.tcl @@ -29,12 +32,6 @@ lib/e93lib/syntaxmaps/vhdl.tcl lib/e93lib/syntaxmaps/xml.tcl lib/e93lib/syntaxmaps/xsl.tcl -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.e93 -%%PORTDOCS%%%%DOCSDIR%%/README.rants -%%PORTDOCS%%%%DOCSDIR%%/README.regex -%%PORTDOCS%%%%DOCSDIR%%/README.syntaxmaps -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/e93lib/syntaxmaps @dirrm lib/e93lib/newstuff @dirrm lib/e93lib/modules >Release-Note: >Audit-Trail: >Unformatted: