Date: Thu, 29 Oct 2020 20:06:33 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553639 - in head/editors/scite: . files Message-ID: <202010292006.09TK6Xlt096833@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Thu Oct 29 20:06:33 2020 New Revision: 553639 URL: https://svnweb.freebsd.org/changeset/ports/553639 Log: editors/scite: Updaet to 4.4.5 PR: 250663 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) MFH: 2020Q4 Modified: head/editors/scite/Makefile head/editors/scite/distinfo head/editors/scite/files/patch-gtk_makefile head/editors/scite/pkg-descr head/editors/scite/pkg-plist Modified: head/editors/scite/Makefile ============================================================================== --- head/editors/scite/Makefile Thu Oct 29 20:05:37 2020 (r553638) +++ head/editors/scite/Makefile Thu Oct 29 20:06:33 2020 (r553639) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scite -DISTVERSION= 4.3.2 +DISTVERSION= 4.4.5 CATEGORIES= editors gnome MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} @@ -28,6 +28,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}/gtk USE_GNOME= cairo gdkpixbuf2 gtk30 MAKEFILE= makefile MAKE_ARGS= GTK3=1 +.if defined(WITH_DEBUG) +MAKE_ARGS+= DEBUG=1 +.endif PORTDATA= *.properties PORTDOCS= *.html *.jpg *.png @@ -39,12 +42,12 @@ MAKE_ARGS+= CLANG=1 .endif post-patch: - @${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile @${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \ ${WRKSRC}/../src/SciTEGlobal.properties do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin + ${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps Modified: head/editors/scite/distinfo ============================================================================== --- head/editors/scite/distinfo Thu Oct 29 20:05:37 2020 (r553638) +++ head/editors/scite/distinfo Thu Oct 29 20:06:33 2020 (r553639) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584222159 -SHA256 (scite432.tgz) = fb7d9d2899b9559b31beca6a695d5b271cc7a6461b218e4a961b4fcd320a798f -SIZE (scite432.tgz) = 2710026 +TIMESTAMP = 1601836826 +SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1 +SIZE (scite445.tgz) = 2777899 Modified: head/editors/scite/files/patch-gtk_makefile ============================================================================== --- head/editors/scite/files/patch-gtk_makefile Thu Oct 29 20:05:37 2020 (r553638) +++ head/editors/scite/files/patch-gtk_makefile Thu Oct 29 20:06:33 2020 (r553639) @@ -1,32 +1,33 @@ ---- gtk/makefile.orig 2020-01-02 00:45:08 UTC +--- gtk/makefile.orig 2020-09-11 10:44:44 UTC +++ gtk/makefile -@@ -18,8 +18,6 @@ ifdef CLANG +@@ -18,9 +18,7 @@ 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) +-BASE_FLAGS += -fsanitize=$(SANITIZE) ++#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) -+gnomeprefix:=$(PREFIX) - ifndef prefix - ifdef gnomeprefix - prefix=$(gnomeprefix) -@@ -141,8 +139,9 @@ SRC_OBJS = \ - StyleWriter.o \ + else +@@ -59,7 +57,7 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a + COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION) + LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION) + +-all: $(PROG) $(COMPONENT) $(LEXILLA) ++all: $(PROG) + + vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include + vpath %.cxx $(srcdir) $(srcdir)/../src +@@ -151,7 +149,9 @@ SRC_OBJS = \ 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) + $(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS) +- $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS) ++ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic \ ++ -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ -lscintilla \ ++ -Wl,--as-needed $(CONFIGLIB) # Automatically generate header dependencies with "make deps" include deps.mak Modified: head/editors/scite/pkg-descr ============================================================================== --- head/editors/scite/pkg-descr Thu Oct 29 20:05:37 2020 (r553638) +++ head/editors/scite/pkg-descr Thu Oct 29 20:06:33 2020 (r553639) @@ -4,4 +4,4 @@ building and running programs. It is best used for job configurations - I use it for building test and demonstration programs as well as SciTE and Scintilla, themselves. -WWW: http://www.scintilla.org/SciTE.html +WWW: https://www.scintilla.org/SciTE.html Modified: head/editors/scite/pkg-plist ============================================================================== --- head/editors/scite/pkg-plist Thu Oct 29 20:05:37 2020 (r553638) +++ head/editors/scite/pkg-plist Thu Oct 29 20:06:33 2020 (r553639) @@ -1,4 +1,5 @@ bin/SciTE +bin/scite man/man1/scite.1.gz share/applications/SciTE.desktop share/pixmaps/Sci48M.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010292006.09TK6Xlt096833>