From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 4 02:30:01 2007 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 D85ED16A417 for ; Sat, 4 Aug 2007 02:30:01 +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 C418213C46E for ; Sat, 4 Aug 2007 02:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l742U1rh093282 for ; Sat, 4 Aug 2007 02:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l742U1Do093281; Sat, 4 Aug 2007 02:30:01 GMT (envelope-from gnats) Resent-Date: Sat, 4 Aug 2007 02:30:01 GMT Resent-Message-Id: <200708040230.l742U1Do093281@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, Naram Qashat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7290B16A419 for ; Sat, 4 Aug 2007 02:21:30 +0000 (UTC) (envelope-from root@cyberbotx.com) Received: from alnrmhc14.comcast.net (alnrmhc14.comcast.net [206.18.177.54]) by mx1.freebsd.org (Postfix) with ESMTP id 5D01B13C474 for ; Sat, 4 Aug 2007 02:21:30 +0000 (UTC) (envelope-from root@cyberbotx.com) Received: from samus.cyberbotx.com ([68.62.97.217]) by comcast.net (alnrmhc14) with ESMTP id <20070804022129b1400qu42he>; Sat, 4 Aug 2007 02:21:29 +0000 Received: from localhost (localhost.cyberbotx.com [127.0.0.1]) by samus.cyberbotx.com (Postfix) with ESMTP id 0E4CF170F9 for ; Fri, 3 Aug 2007 22:21:29 -0400 (EDT) Received: from samus.cyberbotx.com ([127.0.0.1]) by localhost (samus.cyberbotx.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uzqIusdjYKd1 for ; Fri, 3 Aug 2007 22:21:16 -0400 (EDT) Received: from kirby.cyberbotx.com (unknown [192.168.2.2]) by samus.cyberbotx.com (Postfix) with ESMTP id 15175170FF for ; Fri, 3 Aug 2007 22:21:16 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by kirby.cyberbotx.com (Postfix) with ESMTP id 2DFEEC2D6 for ; Fri, 3 Aug 2007 22:21:55 -0400 (EDT) Received: from kirby.cyberbotx.com ([127.0.0.1]) by localhost (kirby.cyberbotx.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qC5KvA9SLPr1 for ; Fri, 3 Aug 2007 22:21:07 -0400 (EDT) Received: by kirby.cyberbotx.com (Postfix, from userid 0) id 4518FC69E; Fri, 3 Aug 2007 22:21:07 -0400 (EDT) Message-Id: <20070804022107.4518FC69E@kirby.cyberbotx.com> Date: Fri, 3 Aug 2007 22:21:07 -0400 (EDT) From: Naram Qashat To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/115188: [PATCH] editors/scite: update to 1.74, take maintainership 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: Sat, 04 Aug 2007 02:30:01 -0000 >Number: 115188 >Category: ports >Synopsis: [PATCH] editors/scite: update to 1.74, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 04 02:30:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 6.2-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #9: Fri Jun 15 22:26:29 EDT 2007 >Description: - Update to 1.74 - Take maintainership - Force use of GTK2 because SciTE refuses to compile with GTK1 - Removed DEPRECATED because the program does let you write text into a new file - Added a knob to make the Buffers menu show more than 40 files if the user sets their buffers higher Generated with FreeBSD Port Tools 0.77 I would like this PR to replace the previous PR I submitted, PR ports/115128. Also, this port update depends on the update of x11-toolkits/scintilla, which I sent as a PR under ports/115127. >How-To-Repeat: >Fix: --- scite-1.74.patch begins here --- diff -ruN --exclude=CVS /usr/ports/editors/scite/Makefile /kirby/shared/scite/Makefile --- /usr/ports/editors/scite/Makefile Mon Jul 30 20:02:08 2007 +++ /kirby/shared/scite/Makefile Fri Aug 3 22:09:28 2007 @@ -6,8 +6,7 @@ # PORTNAME= scite -PORTVERSION= 1.71 -PORTREVISION= 4 +PORTVERSION= 1.74 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ @@ -15,19 +14,16 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cyberbotx@cyberbotx.com COMMENT= A full-featured SCIntilla based Text Editor for GTK/GNOME LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla -IGNORE= is unusable, writing text does not work -DEPRECATED= ${IGNORE} -EXPIRATION_DATE=2007-09-30 - WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USE_GMAKE= yes WANT_GNOME= yes +USE_GNOME+= gtk20 MAKEFILE= makefile MAKE_ENV= CC="${CXX}" EXTRA_PATCH_FILES= lua/include/lauxlib.h \ @@ -49,19 +45,10 @@ lua/src/lparser.c \ lua/src/lib/lauxlib.c -OPTIONS= GTK2 "Turns on GTK+ 2.x support (Default is GTK+ 1)" off - .include -.if (${ARCH} == "amd64") && defined(WITH_GTK2) -IGNORE= coredumps on startup -.endif -.if defined(WITH_GTK2) -USE_GNOME+= gtk20 -PKGNAMESUFFIX:= -gtk2 -.else -USE_GNOME+= gtk12 -MAKE_ARGS= GTK1=yes +.if ${ARCH} == "amd64" +IGNORE= coredumps on startup .endif MAN1= scite.1 @@ -77,6 +64,9 @@ @col < ${WRKSRC}/../${file}.orig \ > ${WRKSRC}/../${file} .endfor +.if defined(WITH_FULL_BUFFER_MENU) + @${REINPLACE_CMD} -e 's|30, "/Buffers|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers|g' ${WRKSRC}/SciTEGTK.cxx +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin diff -ruN --exclude=CVS /usr/ports/editors/scite/distinfo /kirby/shared/scite/distinfo --- /usr/ports/editors/scite/distinfo Mon Sep 18 11:18:21 2006 +++ /kirby/shared/scite/distinfo Wed Aug 1 09:40:36 2007 @@ -1,3 +1,3 @@ -MD5 (scite171.tgz) = b62946c770686909a4d4d0e42de3754c -SHA256 (scite171.tgz) = c84ba2fc252345e3d36d36f14b3ab43c6f20e0e7ee5c30d8560f938d505116e3 -SIZE (scite171.tgz) = 1300416 +MD5 (scite174.tgz) = 09ad25f1fa6dab3feec41dba2480047f +SHA256 (scite174.tgz) = 10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01 +SIZE (scite174.tgz) = 1460459 diff -ruN --exclude=CVS /usr/ports/editors/scite/files/patch-aa /kirby/shared/scite/files/patch-aa --- /usr/ports/editors/scite/files/patch-aa Thu Jan 4 06:31:19 2007 +++ /kirby/shared/scite/files/patch-aa Fri Aug 3 09:59:07 2007 @@ -1,5 +1,5 @@ ---- makefile.bak Mon Feb 13 07:27:08 2006 -+++ makefile Sat Jun 24 09:06:54 2006 +--- makefile.orig Wed Aug 1 09:41:29 2007 ++++ makefile Wed Aug 1 09:46:30 2007 @@ -5,7 +5,7 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. @@ -9,16 +9,22 @@ AR = ar # If explicit setting of GTK1 or GTK2 then use that else look for -@@ -28,10 +28,10 @@ +@@ -24,14 +24,14 @@ + # "h@h@" is printed here when gnome-config unavailable. Seems harmless. + ifdef GTK2 + CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0) +-CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0) ++CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0 CONFIGTHREADS= gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null) else --CONFIGFLAGS=gtk-config --cflags --CONFIGLIB=gtk-config --libs -+CONFIGFLAGS=pkg-config --cflags gtk+ -+CONFIGLIB=pkg-config --libs gtk+ - CONFIGTHREADS=glib-config --libs gthread +-CONFIGFLAGS=$(shell gtk-config --cflags) +-CONFIGLIB=$(shell gtk-config --libs) +-CONFIGTHREADS=$(shell glib-config --libs gthread) -gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null) ++CONFIGFLAGS=$(shell pkg-config --cflags gtk+) ++CONFIGLIB=pkg-config --libs gtk+ ++CONFIGTHREADS=glib-config --libs gthread +gnomeprefix:=$(PREFIX) endif ifndef prefix @@ -31,20 +37,19 @@ +CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) else -CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) -+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) ++CXXTFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS) endif ifndef NO_LUA -@@ -102,9 +102,9 @@ +@@ -102,8 +102,9 @@ $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \ MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \ - $(COMPLIB) $(LUA_OBJS) -- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)` -- +- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB) + $(LUA_OBJS) + $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \ + `$(CONFIGTHREADS)` -DGTK $^ -o $@ + # Automatically generate header dependencies with "make deps" include deps.mak - diff -ruN --exclude=CVS /usr/ports/editors/scite/pkg-plist /kirby/shared/scite/pkg-plist --- /usr/ports/editors/scite/pkg-plist Sun May 20 16:59:51 2007 +++ /kirby/shared/scite/pkg-plist Wed Aug 1 10:21:03 2007 @@ -1,6 +1,7 @@ bin/SciTE share/applications/SciTE.desktop share/pixmaps/Sci48M.png +%%DATADIR%%/CommandValues.html %%DATADIR%%/Embedded.properties %%DATADIR%%/PrintHi.png %%DATADIR%%/SciBreak2.jpg @@ -30,10 +31,12 @@ %%DATADIR%%/blitzbasic.properties %%DATADIR%%/bullant.properties %%DATADIR%%/caml.properties +%%DATADIR%%/cmake.properties %%DATADIR%%/conf.properties %%DATADIR%%/cpp.properties %%DATADIR%%/csound.properties %%DATADIR%%/css.properties +%%DATADIR%%/d.properties %%DATADIR%%/demo.png %%DATADIR%%/eiffel.properties %%DATADIR%%/erlang.properties @@ -42,6 +45,7 @@ %%DATADIR%%/forth.properties %%DATADIR%%/fortran.properties %%DATADIR%%/freebasic.properties +%%DATADIR%%/gap.properties %%DATADIR%%/html.properties %%DATADIR%%/inno.properties %%DATADIR%%/kix.properties --- scite-1.74.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: