Date: Sat, 11 Aug 2007 09:09:30 GMT From: David Yeske <dyeske@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/115418: editors/scite update to 1.74 Message-ID: <200708110909.l7B99UY3028526@www.freebsd.org> Resent-Message-ID: <200708110910.l7B9A18G085935@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115418
>Category: ports
>Synopsis: editors/scite update to 1.74
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 11 09:10:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: David Yeske
>Release: HEAD
>Organization:
>Environment:
$ uname -a
FreeBSD speed 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Jul 18 23:40:39 EDT 2007 root@speed:/usr/obj/usr/src/sys/SPEED amd64
>Description:
1. update to 1.74
2. take maintainership
3. more fixes on the way (gtk1, lua)
>How-To-Repeat:
>Fix:
see attachment
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/scite/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile 30 Jul 2007 12:51:29 -0000 1.44
+++ Makefile 11 Aug 2007 09:05:56 -0000
@@ -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,15 +14,11 @@
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dyeske@gmail.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
@@ -49,20 +44,9 @@
lua/src/lparser.c \
lua/src/lib/lauxlib.c
-OPTIONS= GTK2 "Turns on GTK+ 2.x support (Default is GTK+ 1)" off
-
-.include <bsd.port.pre.mk>
-.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
-.endif
MAN1= scite.1
@@ -91,4 +75,4 @@
${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/editors/scite/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo 17 Sep 2006 22:06:46 -0000 1.21
+++ distinfo 2 Aug 2007 01:46:53 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/editors/scite/pkg-plist,v
retrieving revision 1.23
diff -u -r1.23 pkg-plist
--- pkg-plist 19 May 2007 20:04:15 -0000 1.23
+++ pkg-plist 11 Aug 2007 09:02:21 -0000
@@ -30,10 +30,13 @@
%%DATADIR%%/blitzbasic.properties
%%DATADIR%%/bullant.properties
%%DATADIR%%/caml.properties
+%%DATADIR%%/cmake.properties
+%%DATADIR%%/CommandValues.html
%%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
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/editors/scite/files/patch-aa,v
retrieving revision 1.14
diff -u -r1.14 patch-aa
--- files/patch-aa 31 Dec 2006 18:29:54 -0000 1.14
+++ files/patch-aa 11 Aug 2007 08:50:17 -0000
@@ -1,50 +1,34 @@
---- makefile.bak Mon Feb 13 07:27:08 2006
-+++ makefile Sat Jun 24 09:06:54 2006
-@@ -5,7 +5,7 @@
- # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
-
- .SUFFIXES: .cxx .o .h .a .c
--CC = g++
-+CC ?= g++
- AR = ar
-
- # If explicit setting of GTK1 or GTK2 then use that else look for
-@@ -28,10 +28,10 @@
- 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
--gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
-+gnomeprefix:=$(PREFIX)
- endif
- ifndef prefix
- ifdef gnomeprefix
-@@ -59,9 +59,9 @@
- CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
-
+--- makefile.orig 2007-08-11 04:41:46.000000000 -0400
++++ makefile 2007-08-11 04:45:42.000000000 -0400
+@@ -56,14 +56,15 @@
+
+ #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
+ INCLUDEDIRS=-I ../../scintilla/include -I ../src
+-CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
++CXXBASEFLAGS= -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
+
ifdef DEBUG
--CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
+ CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
else
-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
++CXXTFLAGS=-DNDEBUG $(CXXBASEFLAGS)
endif
-
+
++NO_LUA=yes
ifndef NO_LUA
-@@ -102,9 +102,9 @@
-
+ LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
+@@ -98,12 +99,11 @@
+ $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+
+ # make should be run in ../../scintilla/gtk to compile all the lexers.
+-COMPLIB=../../scintilla/bin/scintilla.a
+
$(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)`
--
-+ $(LUA_OBJS)
-+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \
-+ `$(CONFIGTHREADS)` -DGTK $^ -o $@
+ $(COMPLIB) $(LUA_OBJS)
+- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
++ $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB) -lscintilla -lscintilla_lexers
+
# Automatically generate header dependencies with "make deps"
include deps.mak
-
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708110909.l7B99UY3028526>