Date: Tue, 1 Jun 2010 18:38:23 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/147299: [MAINTAINER] editors/scite: update to 2.12 Message-ID: <201006012238.o51McN3w029146@kirby.cyberbotx.com> Resent-Message-ID: <201006012240.o51Me66p019875@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147299
>Category: ports
>Synopsis: [MAINTAINER] editors/scite: update to 2.12
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 01 22:40:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Fri Apr 16 09:09:45 EDT 2010
>Description:
- Update to 2.12
Note: This PR relies on PR ports/147298 being committed first.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- scite-2.12.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/editors/scite/Makefile /kirby/shared/ports/scite/Makefile
--- /usr/ports/editors/scite/Makefile 2010-04-16 17:49:28.000000000 -0400
+++ /kirby/shared/ports/scite/Makefile 2010-06-01 18:33:46.000000000 -0400
@@ -6,7 +6,7 @@
#
PORTNAME= scite
-PORTVERSION= 2.11
+PORTVERSION= 2.12
CATEGORIES= editors gnome
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
@@ -27,8 +27,8 @@
MAN1= scite.1
post-patch:
- @${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|gcc|$$(CC)|g ; s| -Os||g' \
- ${WRKSRC}/makefile
+ @${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(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
diff -ruN --exclude=CVS /usr/ports/editors/scite/distinfo /kirby/shared/ports/scite/distinfo
--- /usr/ports/editors/scite/distinfo 2010-04-16 17:49:28.000000000 -0400
+++ /kirby/shared/ports/scite/distinfo 2010-06-01 17:45:59.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (scite211.tgz) = 129aad231c9618aaa2c2e41226db2327
-SHA256 (scite211.tgz) = bf0254e8eadbda1f32214a909b34c35bfb1f38f39551643c0445d92e224e34c8
-SIZE (scite211.tgz) = 1784014
+MD5 (scite212.tgz) = 8868c06c1cfb248abd92cb3956bb5ba1
+SHA256 (scite212.tgz) = e1da8da68a75237b6c0d25533c92192564fc9a0df4f1f44665f241991d49963b
+SIZE (scite212.tgz) = 1930331
diff -ruN --exclude=CVS /usr/ports/editors/scite/files/patch-aa /kirby/shared/ports/scite/files/patch-aa
--- /usr/ports/editors/scite/files/patch-aa 2010-04-16 17:49:28.000000000 -0400
+++ /kirby/shared/ports/scite/files/patch-aa 2010-06-01 18:35:07.000000000 -0400
@@ -1,33 +1,44 @@
---- makefile.orig 2010-03-13 20:41:15.000000000 -0500
-+++ makefile 2010-04-05 07:57:38.000000000 -0400
-@@ -5,7 +5,7 @@
+--- makefile.orig 2010-05-31 23:35:36.000000000 -0400
++++ makefile 2010-06-01 18:35:04.000000000 -0400
+@@ -5,20 +5,20 @@
# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
.SUFFIXES: .cxx .o .h .a .c
+-ifdef CLANG
+-CC = clang
+-CCOMP = clang
+-else
-CC = g++
+-CCOMP = gcc
+-endif
++#ifdef CLANG
++#CC = clang
++#CCOMP = clang
++#else
+#CC = g++
++#CCOMP = gcc
++#endif
AR = ar
- # If explicit setting of GTK1 or GTK2 then use that else look for
-@@ -26,7 +26,7 @@
+ # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
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:=$(PREFIX)
- else
- CONFIGFLAGS:=$(shell gtk-config --cflags)
- CONFIGLIB:=$(shell gtk-config --libs)
-@@ -76,12 +76,12 @@
+ ifndef prefix
+ ifdef gnomeprefix
+ prefix=$(gnomeprefix)
+@@ -61,12 +61,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
+- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
++ $(CCOMP) $(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
+- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
-CXXFLAGS=$(CXXTFLAGS)
-+ gcc $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
++ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
+CXXFLAGS+=$(CXXTFLAGS)
else
-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
@@ -35,15 +46,15 @@
endif
ifeq ($(shell uname), Darwin)
-@@ -102,8 +102,9 @@
+@@ -87,8 +87,9 @@
$(PROG): SciTEGTK.o GUIGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
-- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB)
+- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -lstdc++
+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
-+ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers \
-+ -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@
++ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \
++ -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@
# Automatically generate header dependencies with "make deps"
include deps.mak
--- scite-2.12.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?201006012238.o51McN3w029146>