Hi, Here an update to editors/scintilla (a library) and editors/scite (editor based on scintilla) to 4.4.6
In editors/scintilla, the library 'scintilla_lexers' (which was "port homemade" for scite) is now properly exported as 'lexilla' (by upstream). So I just changed the SHARED_LIBS part to keep the name from upstream. All library versioning is proper to openbsd, so I kept the current version identique for 'scintilla' and 'lexilla' libraries. The upstream makefile (of both ports) is a bit spagetti, and changed since last update, so the big diffs on them. Tested on amd64. Comments or OK ? -- Sebastien Marie diff f509cc83fea9c4b51979334e1e39915b75c7f8a3 /home/semarie/repos/openbsd/ports blob - 815f39119a9b90baa9947b7839048b1633d46241 file + editors/scintilla/Makefile --- editors/scintilla/Makefile +++ editors/scintilla/Makefile @@ -2,15 +2,15 @@ COMMENT= source code editing component for GTK+ -VERSION= 4.0.3 +VERSION= 4.4.6 DISTNAME= scintilla${VERSION:S/.//g} PKGNAME= scintilla-${VERSION} CATEGORIES= editors x11 -SHARED_LIBS= scintilla 11.0 \ - scintilla_lexers 11.0 +SHARED_LIBS= scintilla 12.0 \ + lexilla 12.0 -HOMEPAGE= http://www.scintilla.org/ +HOMEPAGE= https://www.scintilla.org/ # old Python license PERMIT_PACKAGE= Yes blob - 49104d793d1b1170d4559285e7ecbb7608a60030 file + editors/scintilla/distinfo --- editors/scintilla/distinfo +++ editors/scintilla/distinfo @@ -1,2 +1,2 @@ -SHA256 (scintilla403.tgz) = nmfi9NjJy6Pi6D7qiDhSrZrfqNwXdfJR+GjMbNBYya4= -SIZE (scintilla403.tgz) = 1404814 +SHA256 (scintilla446.tgz) = LfkwbsRTn0/hP4a6uPJBm6kEZJM9fMqEbXu25wRuwtw= +SIZE (scintilla446.tgz) = 1640227 blob - da46a19cd256a3dfee2c1dbf79504c2303b55fbc file + editors/scintilla/patches/patch-gtk_makefile --- editors/scintilla/patches/patch-gtk_makefile +++ editors/scintilla/patches/patch-gtk_makefile @@ -1,119 +1,76 @@ -$OpenBSD: patch-gtk_makefile,v 1.14 2018/02/24 10:54:50 bket Exp $ +$OpenBSD$ Index: gtk/makefile --- gtk/makefile.orig +++ gtk/makefile -@@ -8,19 +8,9 @@ +@@ -15,28 +15,8 @@ srcdir ?= . + basedir = $(srcdir)/.. - srcdir ?= . - --.SUFFIXES: .cxx .c .o .h .a .list + 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 +-# is including Microsoft headers. +-# incompatible-ms-struct is because more complex structs are not quite the same as MSVC +-WARNINGS += -Wno-incompatible-ms-struct +-# language-extension-token is because of __int64 in glib-2.0 glibconfig.h +-WARNINGS += -Wno-language-extension-token +-# register may be used in glib +-# This produces a warning since -Wno-register is not valid for C files but it still works +-WARNINGS += -Wno-register +-DEFINES += -D_CRT_SECURE_NO_DEPRECATE +-endif -# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for -# thread also need to create Position Independent Executable -> search online documentation -SANITIZE = address -#SANITIZE = undefined --else --CXXWARNFLAGS = -Wall -pedantic +-BASE_FLAGS += -fsanitize=$(SANITIZE) -endif -+.SUFFIXES: .cxx .c .o .h .a .list .so ++ ARFLAGS = rc -+AR = ar - RANLIB = touch + RANLIB ?= ranlib + PKG_CONFIG ?= pkg-config +@@ -58,7 +38,7 @@ normalize = $(if $(windir),$(subst /,\,$1),$1) - ifdef GTK3 -@@ -48,18 +38,21 @@ DEL = del /q - COMPLIB=$(srcdir)\..\bin\scintilla.a + PYTHON = $(if $(windir),pyw,python3) + +-SHAREDEXTENSION = $(if $(windir),dll,so) ++SHAREDEXTENSION = $(if $(windir),dll,so).${LIBscintilla_VERSION} + + ifdef windir + CC = gcc +@@ -66,9 +46,9 @@ DEL = del /q + LEXILLA = lexilla.dll else DEL = rm -f --COMPLIB=$(srcdir)/../bin/scintilla.a -+COMPLIB=$(srcdir)/../bin/libscintilla.a -+LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a -+SHAREDLIB=$(srcdir)/../bin/libscintilla.so.${LIBscintilla_VERSION} -+SHAREDLEXER=$(srcdir)/../bin/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION} +-LEXILLA = liblexilla.so ++LEXILLA = liblexilla.so.${LIBlexilla_VERSION} endif +-COMPLIB=$(basedir)/bin/scintilla.a ++COMPLIB=$(basedir)/bin/libscintilla.a + COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION) - vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib - vpath %.c $(srcdir) - vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../lexlib $(srcdir)/../lexers - --INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib -+INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib -I${LOCALBASE}/include - ifdef CHECK_DEPRECATED - DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT + vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib +@@ -84,7 +64,6 @@ DEFINES += -DNO_CXX11_REGEX endif --CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED) -+CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER -Dunix $(INCLUDEDIRS) $(DEPRECATED) - ifdef NOTHREADS - THREADFLAGS=-DG_THREADS_IMPL_NONE -@@ -78,7 +71,7 @@ else - CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) - endif - else --CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) -+CTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS) - endif + DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) +-BASE_FLAGS += $(if $(DEBUG),-g,-Os) - CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS) -@@ -88,8 +81,12 @@ MARSHALLER=scintilla-marshal.o + CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS) + CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS) +@@ -94,6 +73,11 @@ CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) + MARSHALLER=scintilla-marshal.o - .cxx.o: - $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $< -+.cxx.so: -+ $(CXX) -fPIC $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -o $@ -c $< - .c.o: - $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $< -+.c.so: -+ $(CC) -fPIC $(CONFIGFLAGS) $(CFLAGS) -w -o $@ -c $< - - GLIB_GENMARSHAL = glib-genmarshal - GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal -@@ -101,8 +98,14 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal - - LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))) - --all: $(COMPLIB) -+all: $(COMPLIB) $(SHAREDLIB) $(LEXERLIB) $(SHAREDLEXER) - + all: $(COMPLIB) $(COMPONENT) $(LEXILLA) ++ +install: + mkdir -p ${PREFIX}/include/scintilla + install -m 444 ../include/*.h ${PREFIX}/include/scintilla -+ install -m 444 ${COMPLIB} ${LEXERLIB} ${PREFIX}/lib -+ install -m 444 ${SHAREDLIB} ${SHAREDLEXER} ${PREFIX}/lib -+ - clean: - $(DEL) *.o $(COMPLIB) *.plist ++ install -m 444 ../bin/*.a ../bin/*.so.* ${PREFIX}/lib -@@ -116,15 +119,26 @@ deps: deps.mak - deps.mak: - $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.* //' | grep [a-zA-Z] > $@ + static: $(COMPLIB) --$(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \ -+LIBOBJS= Accessor.o CharacterSet.o DefaultLexer.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \ - CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \ - ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o ExternalLexer.o MarginView.o \ - PropSetSimple.o PlatGTK.o \ - KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.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) -+ $(MARSHALLER) -+ -+$(COMPLIB): $(LIBOBJS) - $(AR) $(ARFLAGS) $@ $^ - $(RANLIB) $@ -+ -+$(LEXERLIB): $(LEXOBJS) -+ $(AR) rc $@ $^ -+ $(RANLIB) $@ -+ -+$(SHAREDLIB): $(addsuffix .so,$(basename $(LIBOBJS))) -+ $(CXX) -shared -fPIC -o $@ -Wl,-soname,$(notdir $(SHAREDLIB)) $^ -+$(SHAREDLEXER): $(addsuffix .so,$(basename $(LEXOBJS))) -+ $(CXX) -shared -fPIC -o $@ -Wl,-soname,$(notdir $(SHAREDLEXER)) $^ - - # Automatically generate header dependencies with "make deps" - include deps.mak blob - 9f3f957c5bc2cab67fc376860013376a6edb9fd3 file + editors/scintilla/pkg/PLIST --- editors/scintilla/pkg/PLIST +++ editors/scintilla/pkg/PLIST @@ -7,7 +7,7 @@ include/scintilla/SciLexer.h include/scintilla/Sci_Position.h include/scintilla/Scintilla.h include/scintilla/ScintillaWidget.h -lib/libscintilla.a +@static-lib lib/liblexilla.a +@lib lib/liblexilla.so.${LIBlexilla_VERSION} +@static-lib lib/libscintilla.a @lib lib/libscintilla.so.${LIBscintilla_VERSION} -lib/libscintilla_lexers.a -@lib lib/libscintilla_lexers.so.${LIBscintilla_lexers_VERSION} diff f509cc83fea9c4b51979334e1e39915b75c7f8a3 /home/semarie/repos/openbsd/ports blob - b4c1a4d3536740375b26e6e7c52fa86da38cab32 file + editors/scite/Makefile --- editors/scite/Makefile +++ editors/scite/Makefile @@ -2,21 +2,21 @@ COMMENT= flexible and small GTK+ editor -VERSION= 4.0.3 +VERSION= 4.4.6 DISTNAME= scite${VERSION:S/.//g} PKGNAME= scite-${VERSION} CATEGORIES= editors x11 -HOMEPAGE= http://www.scintilla.org/SciTE.html +HOMEPAGE= https://www.scintilla.org/SciTE.html # old Python license PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0 WANTLIB += gobject-2.0 gtk-3 pango-1.0 pangocairo-1.0 scintilla -WANTLIB += scintilla_lexers +WANTLIB += lexilla -MASTER_SITES= http://www.scintilla.org/ +MASTER_SITES= https://www.scintilla.org/ EXTRACT_SUFX= .tgz # c++17 @@ -24,6 +24,7 @@ COMPILER= base-clang ports-clang ports-gcc LIB_DEPENDS= x11/gtk+3 \ editors/scintilla +RUN_DEPENDS= devel/desktop-file-utils USE_GMAKE= Yes NO_TEST= Yes @@ -34,6 +35,7 @@ MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ CC="${CC}" CFLAGS="${CFLAGS}" GTK3=1 post-extract: + rm -rf -- ${WRKDIST}/../scintilla perl -pi -e 's|\x0d||' ${WRKSRC}/*.cxx ${WRKDIST}/src/*.cxx pre-build: blob - 9bd50f41d3b897c6a50f2b520af57e1d23cae91f file + editors/scite/distinfo --- editors/scite/distinfo +++ editors/scite/distinfo @@ -1,2 +1,2 @@ -SHA256 (scite403.tgz) = crVJIMqL4cbsXg9Cnc/bCSgtkhl51keXMyff165Uq94= -SIZE (scite403.tgz) = 2433537 +SHA256 (scite446.tgz) = HC5u7myKouUpg9lxOkscl9BsN2Mko+yJMq38ueVdFtE= +SIZE (scite446.tgz) = 2777984 blob - 693fe9cce6522e2e80c56d609ee7736bef4a987e file + editors/scite/patches/patch-gtk_makefile --- editors/scite/patches/patch-gtk_makefile +++ editors/scite/patches/patch-gtk_makefile @@ -1,32 +1,37 @@ -$OpenBSD: patch-gtk_makefile,v 1.11 2018/02/24 10:55:25 bket Exp $ +$OpenBSD$ Index: gtk/makefile --- gtk/makefile.orig +++ gtk/makefile -@@ -7,16 +7,6 @@ +@@ -7,25 +7,14 @@ + .PHONY: all clean analyze depend install uninstall + srcdir ?= . +-SCINTILLA_DIR ?= $(srcdir)/../../scintilla ++SCINTILLA_DIR ?= ${LOCALBASE} .SUFFIXES: .cxx .o .h .a .c + + WARNINGS += -Wall -pedantic -Wextra +- -ifdef CLANG -# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for -# thread also need to create Position Independent Executable -> search online documentation -SANITIZE = address -#SANITIZE = undefined --CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register --CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body +-CXX = clang++ +-CC = clang +-BASE_FLAGS += -fsanitize=$(SANITIZE) + WARNINGS += -Wno-deprecated-register + WARNINGS += -Wno-empty-body -else --MISLEADING=-Wno-misleading-indentation +-WARNINGS += -Wno-misleading-indentation -endif ++ + PKG_CONFIG ?= pkg-config - ifdef GTK3 - GTKVERSION=gtk+-3.0 -@@ -28,20 +18,21 @@ endif - CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) - CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) - CONFIGTHREADS:= --gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null) -+#gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null) - ifndef prefix + GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0) +@@ -40,7 +29,7 @@ ifndef prefix ifdef gnomeprefix prefix=$(gnomeprefix) else @@ -35,93 +40,74 @@ Index: gtk/makefile endif endif datadir=$(prefix)/share - pixmapdir=$(datadir)/pixmaps +@@ -48,8 +37,9 @@ pixmapdir=$(datadir)/pixmaps bindir=$(prefix)/bin + libdir=$(prefix)/lib/scite SYSCONF_PATH=$(prefix)/share/scite +DOC_PATH=$(prefix)/share/doc/scite -INSTALL=install +INSTALL=install -o root -g bin + COPY = cp -a PROG = $(srcdir)/../bin/SciTE +@@ -59,17 +49,16 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a + COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION) + LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION) -@@ -50,19 +41,21 @@ all: $(PROG) - vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../../scintilla/include +-all: $(PROG) $(COMPONENT) $(LEXILLA) ++all: $(PROG) + +-vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include ++vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include/scintilla vpath %.cxx $(srcdir) $(srcdir)/../src --INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -+INCLUDEDIRS=-I ${prefix}/include/scintilla -I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -I ${prefix}/include - ifdef CHECK_DEPRECATED - DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED - endif - CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED) +-INCLUDES=-I $(SCINTILLA_DIR)/include -I $(srcdir)/../src ++INCLUDES=-I $(SCINTILLA_DIR)/include/scintilla -I $(srcdir)/../src + DEFINES += -DGTK + DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" - ifdef DEBUG --CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) -+CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) - else --CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) -+CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) - endif + DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) +-BASE_FLAGS += $(if $(DEBUG),-g,-Os) --ifndef NO_LUA -+LIBS= -L $(prefix)/lib -lscintilla -lscintilla_lexers -+ -+ifdef LUA + ifndef NO_LUA LUA_CORE_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \ - ltable.o ltm.o lundump.o lvm.o lzio.o -@@ -74,7 +67,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_O +@@ -151,32 +140,24 @@ SRC_OBJS = \ + Utf8_16.o - vpath %.c $(srcdir)/../lua/src + $(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,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L $(SCINTILLA_DIR)/lib -lscintilla $(LDLIBS) --INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -I$(srcdir)/../lua/src -+INCLUDEDIRS+=-I$(srcdir)/../lua/src - - .c.o: - $(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o $@ -@@ -111,9 +104,6 @@ deps: deps.mak - deps.mak: - $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@ - --# make should be run in ../../scintilla/gtk to compile all the lexers. --COMPLIB=$(srcdir)/../../scintilla/bin/scintilla.a -- - # To almost make lua.vers (needs header and footer added) which is only needed after updating Lua: - # nm -g ../bin/SciTE | grep lua | awk '{print "\t\t" $3 ";"}' >lua2.vers - -@@ -123,7 +113,7 @@ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o Expor - MatchMarker.o StringHelpers.o \ - PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \ - JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) -- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++ -+ $(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++ - # Automatically generate header dependencies with "make deps" - include deps.mak -@@ -132,19 +122,17 @@ include deps.mak +-include deps.mak ++#include deps.mak + + # The two last install commands will fail if Gnome is not installed or is not at $(prefix). # This is OK - just means no SciTE in the Gnome Applications menu # Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties install: - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH) -+ $(INSTALL) -m 755 -d $(bindir) $(SYSCONF_PATH) +- $(INSTALL) -m 755 -d $(DESTDIR)$(libdir) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH) $(DESTDIR)$(DOC_PATH) -- $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 $(PROG) $(bindir) -+ $(INSTALL) -m 755 -d $(SYSCONF_PATH) $(DOC_PATH) -+ $(INSTALL) -m 444 ../src/*.properties $(SYSCONF_PATH) -+ $(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png $(DOC_PATH) + $(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir) +- $(INSTALL) -m 755 $(COMPONENT) $(DESTDIR)$(libdir) +- $(INSTALL) -m 755 $(LEXILLA) $(DESTDIR)$(libdir) ++ $(INSTALL) -m 444 ../src/*.properties $(DESTDIR)$(SYSCONF_PATH) ++ $(INSTALL) -m 444 ../doc/*.html ../doc/SciTEIco.png ../doc/PrintHi.png ../doc/SciTEIndicators.png $(DESTDIR)$(DOC_PATH) -- for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png; \ +- for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \ - do \ - $(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \ - done - - ifdef gnomeprefix +-ifdef gnomeprefix $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir) $(INSTALL) -m 644 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop - $(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png +-endif + $(INSTALL) -m 444 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png - endif uninstall: + rm -f $(DESTDIR)$(bindir)/SciTE blob - e445f430c82849f64f7f58255927cdf33bfd3e06 file + editors/scite/pkg/PLIST --- editors/scite/pkg/PLIST +++ editors/scite/pkg/PLIST @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.10 2018/02/24 10:55:25 bket Exp $ @bin bin/SciTE +share/applications/SciTE.desktop share/doc/scite/ share/doc/scite/CommandValues.html share/doc/scite/PaneAPI.html @@ -14,10 +15,13 @@ share/doc/scite/SciTEExtras.html share/doc/scite/SciTEFAQ.html share/doc/scite/SciTEIco.png share/doc/scite/SciTEImage.html +share/doc/scite/SciTEIndicators.png share/doc/scite/SciTELexer.html share/doc/scite/SciTELua.html share/doc/scite/SciTERegEx.html share/doc/scite/ScriptLexer.html +share/pixmaps/ +share/pixmaps/Sci48M.png share/scite/ share/scite/Embedded.properties share/scite/SciTE.properties @@ -35,6 +39,7 @@ share/scite/baan.properties share/scite/blitzbasic.properties share/scite/bullant.properties share/scite/caml.properties +share/scite/cil.properties share/scite/cmake.properties share/scite/cobol.properties share/scite/coffeescript.properties @@ -43,6 +48,7 @@ share/scite/cpp.properties share/scite/csound.properties share/scite/css.properties share/scite/d.properties +share/scite/dataflex.properties share/scite/ecl.properties share/scite/eiffel.properties share/scite/erlang.properties @@ -65,9 +71,11 @@ share/scite/lout.properties share/scite/lua.properties share/scite/markdown.properties share/scite/matlab.properties +share/scite/maxima.properties share/scite/metapost.properties share/scite/mmixal.properties share/scite/modula3.properties +share/scite/nim.properties share/scite/nimrod.properties share/scite/nncrontab.properties share/scite/nsis.properties @@ -83,6 +91,7 @@ share/scite/ps.properties share/scite/purebasic.properties share/scite/python.properties share/scite/r.properties +share/scite/raku.properties share/scite/rebol.properties share/scite/registry.properties share/scite/ruby.properties @@ -103,3 +112,4 @@ share/scite/verilog.properties share/scite/vhdl.properties share/scite/visualprolog.properties share/scite/yaml.properties +@tag update-desktop-database