From root@cyberbotx.com  Tue Feb 26 23:20:21 2013
Return-Path: <root@cyberbotx.com>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 894BF542
	for <freebsd-gnats-submit@freebsd.org>; Tue, 26 Feb 2013 23:20:21 +0000 (UTC)
	(envelope-from root@cyberbotx.com)
Received: from qmta02.emeryville.ca.mail.comcast.net (qmta02.emeryville.ca.mail.comcast.net [IPv6:2001:558:fe2d:43:76:96:30:24])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A8318C6
	for <freebsd-gnats-submit@freebsd.org>; Tue, 26 Feb 2013 23:20:21 +0000 (UTC)
Received: from omta07.emeryville.ca.mail.comcast.net ([76.96.30.59])
	by qmta02.emeryville.ca.mail.comcast.net with comcast
	id 550F1l0041GXsucA2BLMpr; Tue, 26 Feb 2013 23:20:21 +0000
Received: from kirby.cyberbotx.com ([69.244.146.119])
	by omta07.emeryville.ca.mail.comcast.net with comcast
	id 5BLK1l00w2anbQt8UBLLsU; Tue, 26 Feb 2013 23:20:20 +0000
Received: by kirby.cyberbotx.com (Postfix, from userid 0)
	id 70EEC2846A; Tue, 26 Feb 2013 18:20:19 -0500 (EST)
Message-Id: <20130226232019.70EEC2846A@kirby.cyberbotx.com>
Date: Tue, 26 Feb 2013 18:20:19 -0500 (EST)
From: Naram Qashat <cyberbotx@cyberbotx.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] x11-toolkits/scintilla: update to 3.2.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         176457
>Category:       ports
>Synopsis:       [MAINTAINER] x11-toolkits/scintilla: update to 3.2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 26 23:30:00 UTC 2013
>Closed-Date:    Wed Feb 27 11:49:33 UTC 2013
>Last-Modified:  Wed Feb 27 11:50:00 UTC 2013
>Originator:     Naram Qashat
>Release:        FreeBSD 8.3-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.3-RELEASE-p4 FreeBSD 8.3-RELEASE-p4 #4: Mon Oct  1 19:56:21 EDT
>Description:
- Update to 3.2.5

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- scintilla-3.2.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/Makefile ./Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile	2013-01-18 21:32:38.000000000 -0500
+++ ./Makefile	2013-02-26 17:38:59.000000000 -0500
@@ -2,7 +2,7 @@
 # $FreeBSD: head/x11-toolkits/scintilla/Makefile 310600 2013-01-18 12:35:17Z madpilot $
 
 PORTNAME=	scintilla
-PORTVERSION=	3.2.4
+PORTVERSION=	3.2.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/distinfo ./distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo	2013-01-18 21:32:38.000000000 -0500
+++ ./distinfo	2013-02-26 17:21:48.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (scite324.tgz) = bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08
-SIZE (scite324.tgz) = 1956084
+SHA256 (scite325.tgz) = ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef
+SIZE (scite325.tgz) = 1974782
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/files/patch-aa ./files/patch-aa
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa	2012-10-07 17:04:50.000000000 -0400
+++ ./files/patch-aa	2013-02-26 18:17:05.000000000 -0500
@@ -1,15 +1,12 @@
---- makefile.orig	2012-06-01 04:26:24.000000000 -0400
-+++ makefile	2012-08-12 14:34:52.000000000 -0400
-@@ -7,17 +7,7 @@
+--- makefile.orig	2013-02-18 02:20:43.000000000 -0500
++++ makefile	2013-02-26 18:16:54.000000000 -0500
+@@ -7,14 +7,7 @@
  # Also works with ming32-make on Windows.
  
  .SUFFIXES: .cxx .c .o .h .a
 -ifdef CLANG
--ifdef CLANG_ANALYZE
--ANALYZE=--analyze
--endif
--CC = clang $(ANALYZE)
--CCOMP = clang $(ANALYZE)
+-CC = clang --std=c++0x
+-CCOMP = clang
 -else
 -CC = g++
 -CCOMP = gcc
@@ -19,7 +16,7 @@
  RANLIB = touch
  
  ifdef GTK3
-@@ -39,7 +29,8 @@
+@@ -36,7 +29,8 @@
  COMPLIB=..\bin\scintilla.a
  else
  DEL = rm -f
@@ -29,7 +26,7 @@
  endif
  
  vpath %.h ../src ../include ../lexlib
-@@ -66,6 +57,7 @@
+@@ -63,16 +57,17 @@
  CFLAGS:=$(CXXTFLAGS)
  
  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
@@ -37,7 +34,10 @@
  MARSHALLER=scintilla-marshal.o
  
  .cxx.o:
-@@ -75,7 +67,7 @@
+ 	$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
+ .c.o:
+-	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
++	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) $(CXXFLAGS) -w -c $<
  
  LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
  
@@ -45,8 +45,8 @@
 +all: $(COMPLIB) $(LEXRLIB)
  
  clean:
- 	$(DEL) *.o $(COMPLIB)
-@@ -88,9 +80,11 @@
+ 	$(DEL) *.o $(COMPLIB) *.plist
+@@ -88,9 +83,11 @@
  	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \
  	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
  	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
--- scintilla-3.2.5.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Wed Feb 27 10:21:16 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176457 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Wed Feb 27 11:49:32 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176457 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176457: commit references a PR
Date: Wed, 27 Feb 2013 11:47:34 +0000 (UTC)

 Author: makc
 Date: Wed Feb 27 11:47:26 2013
 New Revision: 313046
 URL: http://svnweb.freebsd.org/changeset/ports/313046
 
 Log:
   Update to 3.2.5
   
   PR:		ports/176457
   Submitted by:	Naram Qashat (maintainer)
 
 Modified:
   head/x11-toolkits/scintilla/Makefile
   head/x11-toolkits/scintilla/distinfo
   head/x11-toolkits/scintilla/files/patch-aa   (contents, props changed)
 
 Modified: head/x11-toolkits/scintilla/Makefile
 ==============================================================================
 --- head/x11-toolkits/scintilla/Makefile	Wed Feb 27 10:39:48 2013	(r313045)
 +++ head/x11-toolkits/scintilla/Makefile	Wed Feb 27 11:47:26 2013	(r313046)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	scintilla
 -PORTVERSION=	3.2.4
 +PORTVERSION=	3.2.5
  CATEGORIES=	x11-toolkits
  MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
  DISTNAME=	scite${PORTVERSION:S/.//g}
 
 Modified: head/x11-toolkits/scintilla/distinfo
 ==============================================================================
 --- head/x11-toolkits/scintilla/distinfo	Wed Feb 27 10:39:48 2013	(r313045)
 +++ head/x11-toolkits/scintilla/distinfo	Wed Feb 27 11:47:26 2013	(r313046)
 @@ -1,2 +1,2 @@
 -SHA256 (scite324.tgz) = bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08
 -SIZE (scite324.tgz) = 1956084
 +SHA256 (scite325.tgz) = ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef
 +SIZE (scite325.tgz) = 1974782
 
 Modified: head/x11-toolkits/scintilla/files/patch-aa
 ==============================================================================
 --- head/x11-toolkits/scintilla/files/patch-aa	Wed Feb 27 10:39:48 2013	(r313045)
 +++ head/x11-toolkits/scintilla/files/patch-aa	Wed Feb 27 11:47:26 2013	(r313046)
 @@ -1,15 +1,12 @@
 ---- makefile.orig	2012-06-01 04:26:24.000000000 -0400
 -+++ makefile	2012-08-12 14:34:52.000000000 -0400
 -@@ -7,17 +7,7 @@
 +--- makefile.orig	2013-02-18 02:20:43.000000000 -0500
 ++++ makefile	2013-02-26 18:16:54.000000000 -0500
 +@@ -7,14 +7,7 @@
   # Also works with ming32-make on Windows.
   
   .SUFFIXES: .cxx .c .o .h .a
  -ifdef CLANG
 --ifdef CLANG_ANALYZE
 --ANALYZE=--analyze
 --endif
 --CC = clang $(ANALYZE)
 --CCOMP = clang $(ANALYZE)
 +-CC = clang --std=c++0x
 +-CCOMP = clang
  -else
  -CC = g++
  -CCOMP = gcc
 @@ -19,7 +16,7 @@
   RANLIB = touch
   
   ifdef GTK3
 -@@ -39,7 +29,8 @@
 +@@ -36,7 +29,8 @@
   COMPLIB=..\bin\scintilla.a
   else
   DEL = rm -f
 @@ -29,7 +26,7 @@
   endif
   
   vpath %.h ../src ../include ../lexlib
 -@@ -66,6 +57,7 @@
 +@@ -63,16 +57,17 @@
   CFLAGS:=$(CXXTFLAGS)
   
   CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 @@ -37,7 +34,10 @@
   MARSHALLER=scintilla-marshal.o
   
   .cxx.o:
 -@@ -75,7 +67,7 @@
 + 	$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
 + .c.o:
 +-	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
 ++	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) $(CXXFLAGS) -w -c $<
   
   LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
   
 @@ -45,8 +45,8 @@
  +all: $(COMPLIB) $(LEXRLIB)
   
   clean:
 - 	$(DEL) *.o $(COMPLIB)
 -@@ -88,9 +80,11 @@
 + 	$(DEL) *.o $(COMPLIB) *.plist
 +@@ -88,9 +83,11 @@
   	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \
   	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
   	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
