Attachment #211095 for bug #243644




# $FreeBSD$

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

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

USE_GNOME=	cairo gdkpixbuf2 gtk30
MAKEFILE=	makefile
MAKE_ARGS=	GTK3=1

PORTDATA=	*.properties
PORTDOCS=	*.html *.jpg *.png

.include <bsd.port.pre.mk>

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

post-patch:
	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
	@${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \

	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})

.include <bsd.port.post.mk>

Lines 1-3 Link Here

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




--- gtk/makefile.orig	2020-01-02 00:45:08 UTC
+++ gtk/makefile
@@ -18,8 +18,6 @@ ifdef CLANG
 # thread also need to create Position Independent Executable -> search online documentation
 SANITIZE = address
 #SANITIZE = undefined
-CXX = clang++
-CC = clang
 BASE_FLAGS += -fsanitize=$(SANITIZE)
 WARNINGS += -Wno-deprecated-register
 WARNINGS += -Wno-empty-body
@@ -33,7 +31,7 @@ GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
 # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
 CONFIGLIB:=$(shell pkg-config --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTK_VERSION) 2>/dev/null)
 CONFIGTHREADS:=
-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
+gnomeprefix:=$(PREFIX)
 ifndef prefix
 ifdef gnomeprefix
   prefix=$(gnomeprefix)
@@ -141,8 +139,9 @@ SRC_OBJS = \
 	StyleWriter.o \
 	Utf8_16.o
 
-$(PROG): SciTEGTK.o GUIGTK.o Widget.o GTKMutex.o DirectorExtension.o $(SRC_OBJS) $(COMPLIB) $(LUA_OBJS)
-	$(CXX) $(BASE_FLAGS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ $(CONFIGLIB) $(LIBS) $(LDLIBS)
+$(PROG): SciTEGTK.o GUIGTK.o Widget.o GTKMutex.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
+	$(CXX) $(BASE_FLAGS) -rdynamic -Wl,--version-script $(srcdir)/lua.vers $(CXXFLAGS) $^ -o $@ \
+	$(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
 
 # Automatically generate header dependencies with "make deps"

Return to bug 243644

Lines 2-8 Link Here

(-)Makefile (-3 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scite	4	PORTNAME= scite
5	DISTVERSION= 4.2.3	5	DISTVERSION= 4.3.0
6	CATEGORIES= editors gnome	6	CATEGORIES= editors gnome
7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
8	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}	8	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
Lines 25-36 Link Here
25	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}	25	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}
26	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	26	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
27		27
28	USE_GNOME= cairo gdkpixbuf2 gtk20	28	USE_GNOME= cairo gdkpixbuf2 gtk30
29	MAKEFILE= makefile	29	MAKEFILE= makefile
		30	MAKE_ARGS= GTK3=1
30		31
31	PORTDATA= *.properties	32	PORTDATA= *.properties
32	PORTDOCS= .html .jpg *.png	33	PORTDOCS= .html .jpg *.png
33		34
		35	.include <bsd.port.pre.mk>
		36
		37	.if ${CHOSEN_COMPILER_TYPE} == clang
		38	MAKE_ARGS+= CLANG=1
		39	.endif
		40
34	post-patch:	41	post-patch:
35	@${REINPLACE_CMD} -e 's\| -Os\|\|g' ${WRKSRC}/makefile	42	@${REINPLACE_CMD} -e 's\| -Os\|\|g' ${WRKSRC}/makefile
36	@${REINPLACE_CMD} -e 's\|$$(SciteDefaultHome)\|${DOCSDIR}\|' \	43	@${REINPLACE_CMD} -e 's\|$$(SciteDefaultHome)\|${DOCSDIR}\|' \
Lines 44-47 Link Here
44	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})	51	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
45	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})	52	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
46		53
47	.include <bsd.port.mk>	54	.include <bsd.port.post.mk>

Lines 1-33 Link Here

(-)files/patch-gtk_makefile (-22 / +20 lines)
1	--- gtk/makefile.orig 2019-06-07 22:35:09 UTC	1	--- gtk/makefile.orig 2020-01-02 00:45:08 UTC
2	+++ gtk/makefile	2	+++ gtk/makefile
3	@@ -12,8 +12,8 @@ ifdef CLANG	3	@@ -18,8 +18,6 @@ ifdef CLANG
4	# thread also need to create Position Independent Executable -> search online documentation	4	# thread also need to create Position Independent Executable -> search online documentation
5	SANITIZE = address	5	SANITIZE = address
6	#SANITIZE = undefined	6	#SANITIZE = undefined
7	-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register	7	-CXX = clang++
8	-CC = clang -fsanitize=$(SANITIZE)	8	-CC = clang
9	+CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register	9	BASE_FLAGS += -fsanitize=$(SANITIZE)
10	+CC = $(CC) -fsanitize=$(SANITIZE)	10	WARNINGS += -Wno-deprecated-register
11	CCWARNINGS = -Wno-empty-body -Wno-string-plus-int	11	WARNINGS += -Wno-empty-body
12	else	12	@@ -33,7 +31,7 @@ GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
13	MISLEADING=-Wno-misleading-indentation	13	# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
14	@@ -29,7 +29,7 @@ endif	14	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
15	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))	15	CONFIGLIB:=$(shell pkg-config --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
16	CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)	16	-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTK_VERSION) 2>/dev/null)
17	CONFIGTHREADS:=
18	-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
19	+gnomeprefix:=$(PREFIX)	17	+gnomeprefix:=$(PREFIX)
20	ifndef prefix	18	ifndef prefix
21	ifdef gnomeprefix	19	ifdef gnomeprefix
22	prefix=$(gnomeprefix)	20	prefix=$(gnomeprefix)
23	@@ -125,8 +125,9 @@ FilePath.o EditorConfig.o SciTEBase.o FileWorker.o Coo	21	@@ -141,8 +139,9 @@ SRC_OBJS = \
24	ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \	22	StyleWriter.o \
25	MatchMarker.o StringHelpers.o \	23	Utf8_16.o
26	PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \	24
27	- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)	25	-$(PROG): SciTEGTK.o GUIGTK.o Widget.o GTKMutex.o DirectorExtension.o $(SRC_OBJS) $(COMPLIB) $(LUA_OBJS)
28	- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++	26	- $(CXX) $(BASE_FLAGS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ $(CONFIGLIB) $(LIBS) $(LDLIBS)
29	+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)	27	+$(PROG): SciTEGTK.o GUIGTK.o Widget.o GTKMutex.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
30	+ $(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \	28	+ $(CXX) $(BASE_FLAGS) -rdynamic -Wl,--version-script $(srcdir)/lua.vers $(CXXFLAGS) $^ -o $@ \
31	+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)	29	+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
32		30
33	# Automatically generate header dependencies with "make deps"	31	# Automatically generate header dependencies with "make deps"