Attachment #211094 for bug #243644




# $FreeBSD$

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

WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
MAKEFILE=	makefile
USE_LDCONFIG=	yes
USE_GNOME=	gtk30
MAKE_ENV=	LDFLAGS="${LDFLAGS}"
CFLAGS+=	-DPIC ${PICFLAG}

MAJOR=		3
AGE=		0
REVISION=	0
MAKE_ARGS=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" GTK3=1
PLIST_SUB=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"

.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang
MAKE_ARGS+=	CLANG=1
.endif

.if ${ARCH} == "sparc64"
PICFLAG?=	-fPIC
.else

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1578437926	1	TIMESTAMP = 1579621912
2	SHA256 (scite423.tgz) = 7bd651008afe7fb7e2d0cbd28fd8f75803c64b5558f56aa68b035b3f994900b6	2	SHA256 (scite430.tgz) = 6401a2c25f8c2a1e0c06279e2f022722374a6aaf37d0b0acebce1a103fafe589
3	SIZE (scite423.tgz) = 2644248	3	SIZE (scite430.tgz) = 2705289




--- makefile.orig	2020-01-02 00:45:04 UTC
+++ makefile
@@ -16,8 +16,6 @@ basedir = $(srcdir)/..
 srcdir ?= .
 
 WARNINGS = -Wpedantic -Wall
 ifdef CLANG
-CXX = clang++
 CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
-CC = clang
 WARNINGS += -Wno-deprecated-register
 ifdef windir
 # Turn off some warnings that occur when Clang is being used on Windows where it
@@ -58,7 +56,12 @@ DEL = del /q
 COMPLIB=$(srcdir)\..\bin\scintilla.a
 else
 DEL = rm -f
 endif
-COMPLIB=$(basedir)/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)
 endif
 
 vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
 vpath %.c $(srcdir)
@@ -81,7 +84,7 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS
 CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
 MARSHALLER=scintilla-marshal.o
 
-all: $(COMPLIB)

+all: $(COMPLIB) $(LEXRLIB)
 
 clean:
 	$(DEL) *.o $(call normalize,$(COMPLIB)) *.plist
@@ -158,9 +161,11 @@ GTK_OBJS = \
 	ScintillaGTK.o \
 	ScintillaGTKAccessible.o
 
-$(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
-	$(AR) $(ARFLAGS) $@ $^
-	$(RANLIB) $@
+$(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
+
+$(LEXRLIB): $(LEXLIB_OBJS) $(LEX_OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
 
 # Automatically generate header dependencies with "make deps"

Return to bug 243644

Lines 2-8 Link Here

(-)Makefile (-4 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scintilla	4	PORTNAME= scintilla
5	DISTVERSION= 4.2.3	5	DISTVERSION= 4.3.0
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 20-37 Link Here
20	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	20	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
21	MAKEFILE= makefile	21	MAKEFILE= makefile
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	USE_GNOME= gtk20	23	USE_GNOME= gtk30
24	MAKE_ENV= LDFLAGS="${LDFLAGS}"	24	MAKE_ENV= LDFLAGS="${LDFLAGS}"
25	CFLAGS+= -DPIC ${PICFLAG}	25	CFLAGS+= -DPIC ${PICFLAG}
26		26
27	MAJOR= 2	27	MAJOR= 3
28	AGE= 0	28	AGE= 0
29	REVISION= 0	29	REVISION= 0
30	MAKE_ARGS= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"	30	MAKE_ARGS= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" GTK3=1
31	PLIST_SUB= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"	31	PLIST_SUB= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
32		32
33	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
34		34
		35	.if ${CHOSEN_COMPILER_TYPE} == clang
		36	MAKE_ARGS+= CLANG=1
		37	.endif
		38
35	.if ${ARCH} == "sparc64"	39	.if ${ARCH} == "sparc64"
36	PICFLAG?= -fPIC	40	PICFLAG?= -fPIC
37	.else	41	.else

Lines 1-20 Link Here

(-)files/patch-makefile (-22 / +21 lines)
1	--- makefile.orig 2019-04-16 20:34:45 UTC	1	--- makefile.orig 2020-01-02 00:45:04 UTC
2	+++ makefile	2	+++ makefile
3	@@ -11,9 +11,7 @@	3	@@ -16,8 +16,6 @@ basedir = $(srcdir)/..
4	srcdir ?= .
5		4
		5	WARNINGS = -Wpedantic -Wall
6	ifdef CLANG	6	ifdef CLANG
7	-CXX = clang++	7	-CXX = clang++
8	CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
9	-CC = clang	8	-CC = clang
10	# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for	9	WARNINGS += -Wno-deprecated-register
11	# thread also need to create Position Independent Executable -> search online documentation	10	ifdef windir
12	SANITIZE = address	11	# Turn off some warnings that occur when Clang is being used on Windows where it
13	@@ -49,7 +47,12 @@ DEL = del /q	12	@@ -58,7 +56,12 @@ DEL = del /q
14	COMPLIB=$(srcdir)\..\bin\scintilla.a
15	else	13	else
16	DEL = rm -f	14	DEL = rm -f
17	-COMPLIB=$(srcdir)/../bin/scintilla.a	15	endif
		16	-COMPLIB=$(basedir)/bin/scintilla.a
18	+COMPLIB_NAME=libscintilla.so	17	+COMPLIB_NAME=libscintilla.so
19	+COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR)	18	+COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR)
20	+COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION)	19	+COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION)
Lines 21-31 Link Here
21	+LEXRLIB_NAME=libscintilla_lexers.so	20	+LEXRLIB_NAME=libscintilla_lexers.so
22	+LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR)	21	+LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR)
23	+LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION)	22	+LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION)
24	endif
25		23
26	vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib	24	vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
27	@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS)	25	vpath %.c $(srcdir)
28	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))	26	@@ -81,7 +84,7 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS
		27	CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
29	MARSHALLER=scintilla-marshal.o	28	MARSHALLER=scintilla-marshal.o
30		29
31	-all: $(COMPLIB)	30	-all: $(COMPLIB)
Lines 32-49 Link Here
32	+all: $(COMPLIB) $(LEXRLIB)	31	+all: $(COMPLIB) $(LEXRLIB)
33		32
34	clean:	33	clean:
35	$(DEL) .o $(COMPLIB) .plist	34	$(DEL) .o $(call normalize,$(COMPLIB)) .plist
36	@@ -119,9 +122,11 @@ $(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o L	35	@@ -158,9 +161,11 @@ GTK_OBJS = \
37	PropSetSimple.o PlatGTK.o \	36	ScintillaGTK.o \
38	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \	37	ScintillaGTKAccessible.o
39	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o UniqueString.o XPM.o \	38
40	- $(MARSHALLER) $(LEXOBJS)	39	-$(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
41	- $(AR) $(ARFLAGS) $@ $^	40	- $(AR) $(ARFLAGS) $@ $^
42	- $(RANLIB) $@	41	- $(RANLIB) $@
43	+ $(MARSHALLER)	42	+$(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
44	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)	43	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
45	+	44	+
46	+$(LEXRLIB): $(LEXOBJS)	45	+$(LEXRLIB): $(LEXLIB_OBJS) $(LEX_OBJS)
47	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)	46	+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
48		47
49	# Automatically generate header dependencies with "make deps"	48	# Automatically generate header dependencies with "make deps"