Date: Wed, 1 Aug 2007 17:56:00 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/115128: [PATCH] editors/scite: update to 1.74, take maintainership Message-ID: <20070801215600.F26FFC9FC@kirby.cyberbotx.com> Resent-Message-ID: <200708012200.l71M03se070646@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115128
>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: Wed Aug 01 22:00:03 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 DEPRECIATED because the program does let you write text into a new file
- Added a patch to SciTEGTK.cxx to allow the Buffers menu to show more than just
40 files if the user sets their buffers higher (a feature request for this has
been submitted upstream, but has not let trinkled down yet)
Added file(s):
- files/patch-scite-gtk-SciTEGTK.cxx
Generated with FreeBSD Port Tools 0.77
>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 Wed Aug 1 15:15:04 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 <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
+.if ${ARCH} == "amd64"
+IGNORE= coredumps on startup
.endif
MAN1= scite.1
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 Wed Aug 1 09:47:15 2007
@@ -1,50 +1,55 @@
---- 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.
-
+
.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 @@
+@@ -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
ifdef gnomeprefix
@@ -59,9 +59,9 @@
CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
-
+
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+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 $@
++ `$(CONFIGTHREADS)` -DGTK $^ -o $@
+
# Automatically generate header dependencies with "make deps"
include deps.mak
-
diff -ruN --exclude=CVS /usr/ports/editors/scite/files/patch-scite-gtk-SciTEGTK.cxx /kirby/shared/scite/files/patch-scite-gtk-SciTEGTK.cxx
--- /usr/ports/editors/scite/files/patch-scite-gtk-SciTEGTK.cxx Wed Dec 31 19:00:00 1969
+++ /kirby/shared/scite/files/patch-scite-gtk-SciTEGTK.cxx Wed Aug 1 10:43:29 2007
@@ -0,0 +1,12 @@
+--- SciTEGTK.cxx.orig Wed Aug 1 10:25:56 2007
++++ SciTEGTK.cxx Wed Aug 1 10:28:00 2007
+@@ -2938,7 +2938,8 @@
+ 60, "/Language/Language", 0, IDM_LANGUAGE, 0);
+ if (props.GetInt("buffers") > 1)
+ CreateTranslatedMenu(ELEMENTS(menuItemsBuffer), menuItemsBuffer,
+- 30, "/Buffers/Buffer", 10, bufferCmdID, "/Buffers/Buffer0");
++ props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30,
++ "/Buffers/Buffer", 10, bufferCmdID, "/Buffers/Buffer0");
+ CreateTranslatedMenu(ELEMENTS(menuItemsHelp), menuItemsHelp);
+ #if GTK_MAJOR_VERSION < 2
+ gtk_accel_group_attach(accelGroup, GTK_OBJECT(PWidget(wSciTE)));
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070801215600.F26FFC9FC>