Attachment #174407 for bug #212404

Lines 2-8 Link Here

(-)scintilla/Makefile (-6 / +15 lines)
2	# $FreeBSD: head/x11-toolkits/scintilla/Makefile 418359 2016-07-11 08:58:51Z madpilot $	2	# $FreeBSD: head/x11-toolkits/scintilla/Makefile 418359 2016-07-11 08:58:51Z madpilot $
3		3
4	PORTNAME= scintilla	4	PORTNAME= scintilla
5	PORTVERSION= 3.6.6	5	PORTVERSION= 3.6.7
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 24-29 Link Here
24	MAKE_ENV+= LDFLAGS="${LDFLAGS}"	24	MAKE_ENV+= LDFLAGS="${LDFLAGS}"
25	CFLAGS+= -DPIC ${PICFLAG}	25	CFLAGS+= -DPIC ${PICFLAG}
26		26
		27	MAJOR= 2
		28	AGE= 0
		29	REVISION= 0
		30	MAKE_ARGS+= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
		31	PLIST_SUB+= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
		32
27	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
28		34
29	.if ${ARCH} == "sparc64"	35	.if ${ARCH} == "sparc64"
Lines 36-46 Link Here
36	@${REINPLACE_CMD} -e 's\| -Os\|\|g' ${WRKSRC}/makefile	42	@${REINPLACE_CMD} -e 's\| -Os\|\|g' ${WRKSRC}/makefile
37		43
38	do-install:	44	do-install:
39	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla	45	@${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
40	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla	46	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
41	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${STAGEDIR}${PREFIX}/lib	47	.for f in libscintilla.so libscintilla_lexers.so
42	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla.so.2 libscintilla.so)	48	${INSTALL_LIB} ${WRKSRC}/${f}.${MAJOR}.${AGE}.${REVISION} \
43	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${STAGEDIR}${PREFIX}/lib	49	${STAGEDIR}${PREFIX}/lib
44	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla_lexers.so.2 libscintilla_lexers.so)	50	(cd ${STAGEDIR}${PREFIX}/lib && \
		51	${LN} -sf ${f}.${MAJOR}.${AGE}.${REVISION} ${f}.${MAJOR} && \
		52	${LN} -sf ${f}.${MAJOR} ${f})
		53	.endfor
45		54
46	.include <bsd.port.post.mk>	55	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)scintilla/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1464048149	1	TIMESTAMP = 1472947347
2	SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa	2	SHA256 (scite367.tgz) = 851a681d2fefe02770d318c4c25401f423b6ea686f6cae3eed5257e27c86c49f
3	SIZE (scite366.tgz) = 2371062	3	SIZE (scite367.tgz) = 2331985




--- makefile.orig	2016-08-30 04:39:06 UTC
+++ makefile
@@ -9,14 +9,6 @@
 srcdir ?= .
 
 .SUFFIXES: .cxx .c .o .h .a .list
-ifdef CLANG

-SANITIZE = address
-#SANITIZE = undefined
-endif
 ARFLAGS = rc
 RANLIB = touch
 
@@ -45,7 +37,12 @@ DEL = del /q
 COMPLIB=$(srcdir)\..\bin\scintilla.a
 COMPLIB=..\bin\scintilla.a
 else
 DEL = rm -f
-COMPLIB=$(srcdir)/../bin/scintilla.a
+COMPLIB_NAME=libscintilla.so
+COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR)
+COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION)
+LEXRLIB_NAME=libscintilla_lexers.so
+LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR)
+LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION)
 CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
 endif
 
 vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
@@ -98,7 +95,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
 
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
@@ -83,7 +75,7 @@ MARSHALLER=scintilla-marshal.o
 .cxx.o:
 	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
 .c.o:
-	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
 
 GLIB_GENMARSHAL = glib-genmarshal
 GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
@@ -95,7 +87,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
 
 LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))
 
-all: $(COMPLIB)
+all: $(COMPLIB) $(LEXRLIB)
 
 clean:
 	$(DEL) *.o $(COMPLIB) *.plist
@@ -116,9 +113,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le
 	PropSetSimple.o PlatGTK.o \
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
-	$(MARSHALLER) $(LEXOBJS)
-	$(AR) $(ARFLAGS) $@ $^
-	$(RANLIB) $@
+	$(MARSHALLER)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
+
+$(LEXRLIB): $(LEXOBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak

Lines 5-10 Link Here

(-)scintilla/pkg-plist (-2 / +4 lines)
5	include/scintilla/Scintilla.h	5	include/scintilla/Scintilla.h
6	include/scintilla/ScintillaWidget.h	6	include/scintilla/ScintillaWidget.h
7	lib/libscintilla.so	7	lib/libscintilla.so
8	lib/libscintilla.so.2	8	lib/libscintilla.so.%%MAJOR%%
		9	lib/libscintilla.so.%%MAJOR%%.%%AGE%%.%%REVISION%%
9	lib/libscintilla_lexers.so	10	lib/libscintilla_lexers.so
10	lib/libscintilla_lexers.so.2	11	lib/libscintilla_lexers.so.%%MAJOR%%
		12	lib/libscintilla_lexers.so.%%MAJOR%%.%%AGE%%.%%REVISION%%

Return to bug 212404

Lines 1-7 Link Here

(-)scintilla/files/patch-makefile (-33 / +20 lines)
1	--- makefile.orig 2016-05-17 23:50:39 UTC	1	--- makefile.orig 2016-08-30 04:39:06 UTC
2	+++ makefile	2	+++ makefile
3	@@ -7,14 +7,6 @@	3	@@ -9,14 +9,6 @@
4	# Also works with ming32-make on Windows.	4	srcdir ?= .
5		5
6	.SUFFIXES: .cxx .c .o .h .a .list	6	.SUFFIXES: .cxx .c .o .h .a .list
7	-ifdef CLANG	7	-ifdef CLANG
Lines 12-68 Link Here
12	-SANITIZE = address	12	-SANITIZE = address
13	-#SANITIZE = undefined	13	-#SANITIZE = undefined
14	-endif	14	-endif
		15	ARFLAGS = rc
15	RANLIB = touch	16	RANLIB = touch
16		17
17	ifdef GTK3	18	@@ -45,7 +37,12 @@ DEL = del /q
18	@@ -42,7 +34,8 @@ DEL = del /q	19	COMPLIB=$(srcdir)\..\bin\scintilla.a
19	COMPLIB=..\bin\scintilla.a
20	else	20	else
21	DEL = rm -f	21	DEL = rm -f
22	-COMPLIB=../bin/scintilla.a	22	-COMPLIB=$(srcdir)/../bin/scintilla.a
23	+COMPLIB=../bin/libscintilla.so.2	23	+COMPLIB_NAME=libscintilla.so
24	+LEXRLIB=../bin/libscintilla_lexers.so.2	24	+COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR)
25	endif	25	+COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION)
26		26	+LEXRLIB_NAME=libscintilla_lexers.so
27	vpath %.h ../src ../include ../lexlib	27	+LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR)
28	@@ -74,7 +67,6 @@ else	28	+LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION)
29	CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
30	endif	29	endif
31		30
32	-CFLAGS:=$(CTFLAGS)	31	vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
33	CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)	32	@@ -98,7 +95,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
34
35	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
36	@@ -83,7 +75,7 @@ MARSHALLER=scintilla-marshal.o
37	.cxx.o:
38	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
39	.c.o:
40	- $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
41	+ $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
42
43	GLIB_GENMARSHAL = glib-genmarshal
44	GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
45	@@ -95,7 +87,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
46		33
47	LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))	34	LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))
48		35
49	-all: $(COMPLIB)	36	-all: $(COMPLIB)
50	+all: $(COMPLIB) $(LEXRLIB)	37	+all: $(COMPLIB) $(LEXRLIB)
51		38
52	clean:	39	clean:
53	$(DEL) .o $(COMPLIB) .plist	40	$(DEL) .o $(COMPLIB) .plist
54	@@ -112,9 +104,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le	41	@@ -116,9 +113,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le
55	PropSetSimple.o PlatGTK.o \	42	PropSetSimple.o PlatGTK.o \
56	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \	43	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
57	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \	44	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
58	- $(MARSHALLER) $(LEXOBJS)	45	- $(MARSHALLER) $(LEXOBJS)
59	- $(AR) rc $@ $^	46	- $(AR) $(ARFLAGS) $@ $^
60	- $(RANLIB) $@	47	- $(RANLIB) $@
61	+ $(MARSHALLER)	48	+ $(MARSHALLER)
62	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)	49	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
63	+	50	+
64	+$(LEXRLIB): $(LEXOBJS)	51	+$(LEXRLIB): $(LEXOBJS)
65	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)	52	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
66		53
67	# Automatically generate header dependencies with "make deps"	54	# Automatically generate header dependencies with "make deps"
68	include deps.mak	55	include deps.mak