Attachment #144639 for bug #190754




# $FreeBSD$

PORTNAME=	scintilla
PORTVERSION=	3.4.4
CATEGORIES=	x11-toolkits
MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
DISTNAME=	scite${PORTVERSION:S/.//g}


WRKSRC=		${WRKDIR}/${PORTNAME}/gtk

USES=		gmake iconv pkgconfig
MAKEFILE=	makefile
USE_LDCONFIG=	yes
USE_GNOME=	gtk20

PICFLAG?=	-fpic
.endif

.if ! ${COMPILER_TYPE:Mclang}
CPPSTDRE=	-e 's|--std=c++0x||'
.else
CPPSTDRE=	
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g' \
		${CPPSTDRE} \
		${WRKSRC}/makefile

do-install:

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (scite341.tgz) = ab2940ba6ad3f1c7c33aea233dd5b44efc75319062fe0b3625db04c747bf3341	1	SHA256 (scite344.tgz) = e3c477d96ab233e526020ff176b7113ada0cdf90425765ca5cb7c48e55317995
2	SIZE (scite341.tgz) = 2237159	2	SIZE (scite344.tgz) = 2244513

Lines 1-12 Link Here

(-)files/patch-aa (-9 / +18 lines)
1	--- makefile.orig 2013-08-31 05:20:24.000000000 +0200	1	--- ./makefile.orig 2014-05-25 21:47:49.000000000 -0400
2	+++ makefile 2013-09-11 13:10:02.007909736 +0200	2	+++ ./makefile 2014-06-07 11:51:21.000000000 -0400
3	@@ -7,14 +7,7 @@	3	@@ -7,18 +7,7 @@
4	# Also works with ming32-make on Windows.	4	# Also works with ming32-make on Windows.
5		5
6	.SUFFIXES: .cxx .c .o .h .a	6	.SUFFIXES: .cxx .c .o .h .a
7	-ifdef CLANG	7	-ifdef CLANG
8	-CC = clang	8	-CC = clang++
9	-CCOMP = clang	9	-CCOMP = clang
		10	-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
		11	-# thread also need to create Position Independent Executable -> search online documentation
		12	-SANITIZE = address
		13	-#SANITIZE = undefined
10	-else	14	-else
11	-CC = g++	15	-CC = g++
12	-CCOMP = gcc	16	-CCOMP = gcc
Lines 16-22 Link Here
16	RANLIB = touch	20	RANLIB = touch
17		21
18	ifdef GTK3	22	ifdef GTK3
19	@@ -36,7 +29,8 @@	23	@@ -40,7 +29,8 @@
20	COMPLIB=..\bin\scintilla.a	24	COMPLIB=..\bin\scintilla.a
21	else	25	else
22	DEL = rm -f	26	DEL = rm -f
Lines 26-34 Link Here
26	endif	30	endif
27		31
28	vpath %.h ../src ../include ../lexlib	32	vpath %.h ../src ../include ../lexlib
29	@@ -68,16 +62,17 @@	33	@@ -68,20 +58,20 @@
30	CXXTFLAGS:=--std=c++0x $(CTFLAGS)	34	CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
		35	endif
31		36
		37	-CFLAGS:=$(CTFLAGS)
		38	-CXXTFLAGS:=--std=c++0x $(CTFLAGS)
		39	+CXXTFLAGS:=$(CTFLAGS)
		40
32	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))	41	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
33	+CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION))	42	+CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION))
34	MARSHALLER=scintilla-marshal.o	43	MARSHALLER=scintilla-marshal.o
Lines 37-43 Link Here
37	$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<	46	$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
38	.c.o:	47	.c.o:
39	- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<	48	- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
40	+ $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) $(CXXFLAGS) -w -c $<	49	+ $(CCOMP) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
41		50
42	LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))	51	LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
43		52
Lines 46-52 Link Here
46		55
47	clean:	56	clean:
48	$(DEL) .o $(COMPLIB) .plist	57	$(DEL) .o $(COMPLIB) .plist
49	@@ -93,9 +88,11 @@	58	@@ -97,9 +87,11 @@
50	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \	59	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \
51	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \	60	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
52	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \	61	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \

Return to bug 190754

Lines 2-8 Link Here

(-)Makefile (-9 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scintilla	4	PORTNAME= scintilla
5	PORTVERSION= 3.4.1	5	PORTVERSION= 3.4.4
6	CATEGORIES= x11-toolkits	6	CATEGORIES= x11-toolkits
7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
8	DISTNAME= scite${PORTVERSION:S/.//g}	8	DISTNAME= scite${PORTVERSION:S/.//g}
Lines 13-19 Link Here
13		13
14	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	14	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
15		15
16	USES= compiler gmake iconv pkgconfig	16	USES= gmake iconv pkgconfig
17	MAKEFILE= makefile	17	MAKEFILE= makefile
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19	USE_GNOME= gtk20	19	USE_GNOME= gtk20
Lines 28-42 Link Here
28	PICFLAG?= -fpic	28	PICFLAG?= -fpic
29	.endif	29	.endif
30		30
31	.if ! ${COMPILER_TYPE:Mclang}
32	CPPSTDRE= -e 's\|--std=c++0x\|\|'
33	.else
34	CPPSTDRE=
35	.endif
36
37	post-patch:	31	post-patch:
38	@${REINPLACE_CMD} -e 's\|[(]CC[)]\|(CXX)\|g ; s\|[(]CCOMP[)]\|(CC)\|g' \	32	@${REINPLACE_CMD} -e 's\|[(]CC[)]\|(CXX)\|g ; s\|[(]CCOMP[)]\|(CC)\|g' \
39	${CPPSTDRE} \
40	${WRKSRC}/makefile	33	${WRKSRC}/makefile
41		34
42	do-install:	35	do-install: