From 3d5025c1d86029911026e4b40d0788baace8e833 Mon Sep 17 00:00:00 2001
From: Jeremy Messenger <mezz@FreeBSD.org>
Date: Wed, 22 Aug 2007 03:36:05 +0000
Subject: - Update to 1.74, only build with GTK+2 since GTK+1 is broke. -
Passing the maintainership to the submitter. - Respect
CC/CXX/CFLAGS/CXXFLAGS. - Remove IGNORE check on amd64, need someone to test
it to see if it's fixed or not. If not, then it can be add back. - Block
create package since scintilla builds with GTK+1 by default. It will not
build unless you enable scintilla with GTK+2 support. - Removed
DEPRECATED/EXPIRATION_DATE.
PR: ports/115188
Submitted by: Naram Qashat <cyberbotx@cyberbotx.com>
---
editors/scite/Makefile | 69 ++++++++++++--------------------------------
editors/scite/distinfo | 6 ++--
editors/scite/files/patch-aa | 65 ++++++++++++++++++++++-------------------
editors/scite/pkg-plist | 4 +++
4 files changed, 61 insertions(+), 83 deletions(-)
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 8b70fdf6d4bd..d454867398f0 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -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,68 +14,36 @@ MASTER_SITE_SUBDIR= scintilla
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 \
- lua/include/lua.h \
- lua/src/lobject.h \
- lua/src/lopcodes.c \
- lua/src/lopcodes.h \
- lua/src/lstate.c \
- lua/src/lstate.h \
- lua/src/ldo.h \
- lua/src/lmem.h \
- lua/src/lgc.c \
- lua/src/lvm.h \
- lua/src/lstring.h \
- lua/src/ldo.c \
- lua/src/lfunc.c \
- lua/src/llex.h \
- lua/src/llex.c \
- lua/src/lparser.c \
- lua/src/lib/lauxlib.c
-
-OPTIONS= GTK2 "Turns on GTK+ 2.x support (Default is GTK+ 1)" off
+MAKE_ENV= CC="${CC}" CXX="${CXX}"
-.include <bsd.port.pre.mk>
+MAN1= scite.1
-.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 defined(PACKAGE_BUILDING)
+IGNORE= x11-toolkits/scintilla does not build with GTK+2 support by default
.endif
-MAN1= scite.1
+pre-configure:
+ @if [ -n "`${PKG_INFO} -E 'scintilla-[0-9]*' 2> /dev/null`" ]; then \
+ ${ECHO_CMD} "${PKGNAME}: requires x11-toolkits/scintilla to be built with GTK+2."; \
+ ${FALSE}; \
+ fi
post-patch:
- @cd ${WRKSRC} && ${MV} SciTE.desktop SciTE.desktop.pre_tr \
- && ${TR} -d "\r" < SciTE.desktop.pre_tr > SciTE.desktop
- @${ECHO_CMD} 'Categories=Application;Development;' >> ${WRKSRC}/SciTE.desktop
-# deal with dos end-of-line symbols break build with gcc 2.95.
-.for file in ${EXTRA_PATCH_FILES}
- @${CP} ${WRKSRC}/../${file} \
- ${WRKSRC}/../${file}.orig
- @col < ${WRKSRC}/../${file}.orig \
- > ${WRKSRC}/../${file}
-.endfor
+ @${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|gcc|$$(CC)|g ; s| -Os||g' \
+ ${WRKSRC}/makefile
+.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
@@ -91,4 +58,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index a53ce13ba425..2e960f42ad4e 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -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 --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index ef23382eee95..f481021af160 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,50 +1,57 @@
---- makefile.bak Mon Feb 13 07:27:08 2006
-+++ makefile Sat Jun 24 09:06:54 2006
+--- makefile.orig 2007-06-14 19:37:56.000000000 -0500
++++ makefile 2007-08-21 11:16:18.000000000 -0500
@@ -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++
++#CC = g++
AR = ar
-
+
# If explicit setting of GTK1 or GTK2 then use that else look for
-@@ -28,10 +28,10 @@
+@@ -26,12 +26,12 @@
+ CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
+ CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
CONFIGTHREADS=
- gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
+-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
++gnomeprefix:=$(PREFIX)
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)
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+)
++CONFIGLIB=$(shell pkg-config --libs gtk+)
+ CONFIGTHREADS=$(shell 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)
-
- ifdef DEBUG
--CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
+@@ -76,12 +76,12 @@
+
+ INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
+ $(LUA_CORE_OBJS): ../lua/src/*.c
+- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
++ gcc $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
+ $(LUA_LIB_OBJS): ../lua/src/lib/*.c
+- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
+-CXXFLAGS=$(CXXTFLAGS)
++ gcc $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
++CXXFLAGS+=$(CXXTFLAGS)
else
--CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
-+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
+-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
++CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
endif
-
- ifndef NO_LUA
-@@ -102,9 +102,9 @@
-
+
+ ifeq ($(shell uname), Darwin)
+@@ -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 $@
++ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers \
++ $(CONFIGTHREADS) -DGTK $^ -o $@
+
# Automatically generate header dependencies with "make deps"
include deps.mak
-
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index c0d4364ff542..d6073dcc4293 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -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 @@ share/pixmaps/Sci48M.png
%%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 @@ share/pixmaps/Sci48M.png
%%DATADIR%%/forth.properties
%%DATADIR%%/fortran.properties
%%DATADIR%%/freebasic.properties
+%%DATADIR%%/gap.properties
%%DATADIR%%/html.properties
%%DATADIR%%/inno.properties
%%DATADIR%%/kix.properties
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0