View | Details | Raw Unified | Return to bug 238505 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	scintilla
4
PORTNAME=	scintilla
5
DISTVERSION=	4.1.0
5
DISTVERSION=	4.1.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 15-21 Link Here
15
LICENSE_FILE=	${WRKSRC}/../License.txt
15
LICENSE_FILE=	${WRKSRC}/../License.txt
16
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
16
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17
17
18
USES=		compiler:c++17-lang gmake iconv pkgconfig tar:tgz
18
USES=		compiler:c++17-lang gmake gnome iconv pkgconfig tar:tgz
19
19
20
WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
20
WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
21
MAKEFILE=	makefile
21
MAKEFILE=	makefile
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1529613442
1
TIMESTAMP = 1560640808
2
SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7
2
SHA256 (scite417.tgz) = 8fc0a4c615056440df553db00f9a20926935c4c5e5ce6d4671def20753834c96
3
SIZE (scite410.tgz) = 2493701
3
SIZE (scite417.tgz) = 2624929
(-)files/patch-makefile (-4 / +4 lines)
Lines 1-4 Link Here
1
--- makefile.orig	2018-04-10 01:38:39 UTC
1
--- makefile.orig	2019-04-16 20:34:45 UTC
2
+++ makefile
2
+++ makefile
3
@@ -11,9 +11,7 @@
3
@@ -11,9 +11,7 @@
4
 srcdir ?= .
4
 srcdir ?= .
Lines 24-30 Link Here
24
 endif
24
 endif
25
 
25
 
26
 vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
26
 vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
27
@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(RE
27
@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS)
28
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
28
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
29
 MARSHALLER=scintilla-marshal.o
29
 MARSHALLER=scintilla-marshal.o
30
 
30
 
Lines 33-42 Link Here
33
 
33
 
34
 clean:
34
 clean:
35
 	$(DEL) *.o $(COMPLIB) *.plist
35
 	$(DEL) *.o $(COMPLIB) *.plist
36
@@ -123,9 +126,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De
36
@@ -119,9 +122,11 @@ $(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o L
37
 	PropSetSimple.o PlatGTK.o \
37
 	PropSetSimple.o PlatGTK.o \
38
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
38
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
39
 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
39
 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o UniqueString.o XPM.o \
40
-	$(MARSHALLER) $(LEXOBJS)
40
-	$(MARSHALLER) $(LEXOBJS)
41
-	$(AR) $(ARFLAGS) $@ $^
41
-	$(AR) $(ARFLAGS) $@ $^
42
-	$(RANLIB) $@
42
-	$(RANLIB) $@

Return to bug 238505