diff options
| author | jperkin <jperkin> | 2015-02-13 16:58:17 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-02-13 16:58:17 +0000 |
| commit | c215bf0ffe0e61052718280d5b15832fc21f28c2 (patch) | |
| tree | 15f66e7578943c8b5b8101e5d1c27345519887dd /editors/scite | |
| parent | 9bacdc281dae7942af31490346b04c327dbdd854 (diff) | |
| download | pkgsrc-c215bf0ffe0e61052718280d5b15832fc21f28c2.tar.gz | |
Remove --version-script linker arguments on SunOS.
Diffstat (limited to 'editors/scite')
| -rw-r--r-- | editors/scite/Makefile | 6 | ||||
| -rw-r--r-- | editors/scite/distinfo | 4 | ||||
| -rw-r--r-- | editors/scite/patches/patch-aa | 19 |
3 files changed, 21 insertions, 8 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile index 49e086bb335..d073470dfbd 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/05/05 00:47:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.23 2015/02/13 16:58:17 jperkin Exp $ # DISTNAME= scite339 @@ -20,6 +20,10 @@ USE_TOOLS+= gmake pkg-config MAKE_FILE= makefile INSTALLATION_DIRS= share/applications share/pixmaps +OPSYSVARS+= BUILDLINK_TRANSFORM + +BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=lua.vers + post-extract: ${RM} -r ${WRKDIR}/scintilla ${RM} ${WRKSRC}/gtk/deps.mak diff --git a/editors/scite/distinfo b/editors/scite/distinfo index e046ec8ab06..44d6497579c 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2014/02/06 17:26:32 drochner Exp $ +$NetBSD: distinfo,v 1.7 2015/02/13 16:58:17 jperkin Exp $ SHA1 (scite339.tgz) = 6ac4fc0c56aad1d037dba2e46acb83922a639330 RMD160 (scite339.tgz) = f7cf3a47280fe34fe1e558945fe86c0f4b4e3bb4 Size (scite339.tgz) = 2229269 bytes -SHA1 (patch-aa) = af56e927d5a2902229b7d95232d81dab67d55686 +SHA1 (patch-aa) = 3579a07d7a2e9157421602c07b0d6310848882a1 diff --git a/editors/scite/patches/patch-aa b/editors/scite/patches/patch-aa index d7f5a661e72..c7ed52f774a 100644 --- a/editors/scite/patches/patch-aa +++ b/editors/scite/patches/patch-aa @@ -1,8 +1,10 @@ -$NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $ +$NetBSD: patch-aa,v 1.5 2015/02/13 16:58:17 jperkin Exp $ ---- gtk/makefile.orig 2013-01-17 01:17:02.000000000 +0000 +Use --version-script=file form so we can rm it if necessary. + +--- gtk/makefile.orig 2013-10-13 21:38:06.000000000 +0000 +++ gtk/makefile -@@ -46,10 +46,10 @@ PROG = ../bin/SciTE +@@ -43,10 +43,10 @@ PROG = ../bin/SciTE all: $(PROG) @@ -15,7 +17,7 @@ $NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $ ifdef CHECK_DEPRECATED DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED endif -@@ -73,7 +73,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ +@@ -74,7 +74,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ vpath %.c ../lua/src ../lua/src/lib @@ -24,7 +26,7 @@ $NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $ .c.o: $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@ -@@ -102,7 +102,7 @@ deps: +@@ -111,13 +111,13 @@ deps: $(CC) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak # make should be run in ../../scintilla/gtk to compile all the lexers. @@ -33,3 +35,10 @@ $NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.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) +- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ ++ $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script=lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ + + # Automatically generate header dependencies with "make deps" + include deps.mak |