luakit-git: remove patches which have been merged upstream

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: luakit-git: remove patches which have been merged upstream
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sun, 25 Nov 2018 09:19:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Nov 25 11:19:11 2018 +0200
Changeset:	f2d75730f4107f81ce2986a9b928ba76d8aa79a0

Modified Files:
	luakit-git/distinfo
Removed Files:
	luakit-git/patches/patch-Makefile
	luakit-git/patches/patch-config.mk

Log Message:
luakit-git: remove patches which have been merged upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f2d75730f4107f81ce2986a9b928ba76d8aa79a0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 luakit-git/distinfo                |  2 -
 luakit-git/patches/patch-Makefile  | 86 --------------------------------------
 luakit-git/patches/patch-config.mk | 27 ------------
 3 files changed, 115 deletions(-)

diffs:
diff --git a/luakit-git/distinfo b/luakit-git/distinfo
index 0b7775455b..bee64336e1 100644
--- a/luakit-git/distinfo
+++ b/luakit-git/distinfo
@@ -4,6 +4,4 @@ SHA1 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903
 RMD160 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = c829f11889a2e50e8a91b5c9553e84c0ded5fdd9
 SHA512 (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = f493fde91e87b8bd40f3a90b558c4d297ed31bc00e6924660a5c1fa55aa35bfd2eb7c8a6a7ea1d6b9ef7d095d358659d350ca92fbc6f654a9df9a1544ce30fdf
 Size (luakit/2aecefe95c99808121edbf3903c3947779f8c4d4-2aecefe95c99808121edbf3903c3947779f8c4d4.zip) = 518360 bytes
-SHA1 (patch-Makefile) = 6a62050e0b65604b893dbd9d2b21bb19d2855916
-SHA1 (patch-config.mk) = 0818316651f9cda2cc149a3eaa4f84eb2923ee6d
 SHA1 (patch-lib_window.lua) = cdbea2b3a9cca18c6e3a6b682cdb33b44ef286c0
diff --git a/luakit-git/patches/patch-Makefile b/luakit-git/patches/patch-Makefile
deleted file mode 100644
index 8121f4fbbe..0000000000
--- a/luakit-git/patches/patch-Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD$
-
-Improve DESTDIR support and use it only in install and deinstall target.
-The various paths are used in buildopts.h and there having the
-DESTDIR is not desiderable.
-
-Reported uptsream via:
-
- <https://github.com/luakit/luakit/pull/727>
-
---- Makefile.orig	2018-09-22 23:42:41.000000000 +0000
-+++ Makefile
-@@ -27,7 +27,6 @@ options:
- 	@echo "CFLAGS       = $(CFLAGS)"
- 	@echo "CPPFLAGS     = $(CPPFLAGS)"
- 	@echo "LDFLAGS      = $(LDFLAGS)"
--	@echo "INSTALLDIR   = $(INSTALLDIR)"
- 	@echo "MANPREFIX    = $(MANPREFIX)"
- 	@echo "DOCDIR       = $(DOCDIR)"
- 	@echo "XDGPREFIX    = $(XDGPREFIX)"
-@@ -94,37 +93,37 @@ clean:
- 	rm -rf doc/apidocs doc/html luakit $(OBJS) $(EXT_OBJS) $(TSRC) $(THEAD) buildopts.h luakit.1 luakit.1.gz luakit.so
- 
- install: all
--	install -d $(INSTALLDIR)/share/luakit/
--	install -d $(DOCDIR) $(DOCDIR)/classes $(DOCDIR)/modules $(DOCDIR)/pages
--	install -m644 README.md AUTHORS COPYING.GPLv3 $(DOCDIR)
--	install -m644 doc/apidocs/classes/* $(DOCDIR)/classes
--	install -m644 doc/apidocs/modules/* $(DOCDIR)/modules
--	install -m644 doc/apidocs/pages/* $(DOCDIR)/pages
--	install -m644 doc/apidocs/*.html $(DOCDIR)
--	install -d $(INSTALLDIR)/share/luakit/lib $(INSTALLDIR)/share/luakit/lib/lousy $(INSTALLDIR)/share/luakit/lib/lousy/widget
--	install -m644 lib/*.* $(INSTALLDIR)/share/luakit/lib
--	install -m644 lib/lousy/*.* $(INSTALLDIR)/share/luakit/lib/lousy
--	install -m644 lib/lousy/widget/*.* $(INSTALLDIR)/share/luakit/lib/lousy/widget
--	install -d $(INSTALLDIR)/lib/luakit
--	install -m644 luakit.so $(INSTALLDIR)/lib/luakit/luakit.so
--	install -d $(INSTALLDIR)/bin
--	install luakit $(INSTALLDIR)/bin/luakit
--	install -d $(XDGPREFIX)/luakit/
--	install -m644 config/*.lua $(XDGPREFIX)/luakit/
--	install -d $(PIXMAPDIR)
--	install -m644 extras/luakit.png $(PIXMAPDIR)
--	install -d $(APPDIR)
--	install -m644 extras/luakit.desktop $(APPDIR)
--	install -d $(MANPREFIX)/man1/
--	install -m644 luakit.1.gz $(MANPREFIX)/man1/
-+	install -d $(DESTDIR)$(PREFIX)/share/luakit/
-+	install -d $(DESTDIR)$(DOCDIR) $(DESTDIR)$(DOCDIR)/classes $(DESTDIR)$(DOCDIR)/modules $(DESTDIR)$(DOCDIR)/pages
-+	install -m644 README.md AUTHORS COPYING.GPLv3 $(DESTDIR)$(DOCDIR)
-+	install -m644 doc/apidocs/classes/* $(DESTDIR)$(DOCDIR)/classes
-+	install -m644 doc/apidocs/modules/* $(DESTDIR)$(DOCDIR)/modules
-+	install -m644 doc/apidocs/pages/* $(DESTDIR)$(DOCDIR)/pages
-+	install -m644 doc/apidocs/*.html $(DESTDIR)$(DOCDIR)
-+	install -d $(DESTDIR)$(PREFIX)/share/luakit/lib $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy/widget
-+	install -m644 lib/*.* $(DESTDIR)$(PREFIX)/share/luakit/lib
-+	install -m644 lib/lousy/*.* $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy
-+	install -m644 lib/lousy/widget/*.* $(DESTDIR)$(PREFIX)/share/luakit/lib/lousy/widget
-+	install -d $(DESTDIR)$(PREFIX)/lib/luakit
-+	install -m644 luakit.so $(DESTDIR)$(PREFIX)/lib/luakit/luakit.so
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install luakit $(DESTDIR)$(PREFIX)/bin/luakit
-+	install -d $(DESTDIR)$(XDGPREFIX)/luakit/
-+	install -m644 config/*.lua $(DESTDIR)$(XDGPREFIX)/luakit/
-+	install -d $(DESTDIR)$(PIXMAPDIR)
-+	install -m644 extras/luakit.png $(DESTDIR)$(PIXMAPDIR)
-+	install -d $(DESTDIR)$(APPDIR)
-+	install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
-+	install -d $(DESTDIR)$(MANPREFIX)/man1/
-+	install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
- 	mkdir -p resources
--	find resources -type d -exec install -d $(INSTALLDIR)/share/luakit/'{}' \;
--	find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(INSTALLDIR)/share/luakit/$$(dirname $$f)"' \;
-+	find resources -type d -exec install -d $(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
-+	find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;
- 
- uninstall:
--	rm -rf $(INSTALLDIR)/bin/luakit $(INSTALLDIR)/share/luakit $(INSTALLDIR)/lib/luakit
--	rm -rf $(MANPREFIX)/man1/luakit.1.gz $(XDGPREFIX)/luakit
--	rm -rf $(APPDIR)/luakit.desktop $(PIXMAPDIR)/luakit.png
-+	rm -rf $(DESTDIR)$(PREFIX)/bin/luakit $(DESTDIR)$(PREFIX)/share/luakit $(DESTDIR)$(PREFIX)/lib/luakit
-+	rm -rf $(DESTDIR)$(MANPREFIX)/man1/luakit.1.gz $(DESTDIR)$(XDGPREFIX)/luakit
-+	rm -rf $(DESTDIR)$(APPDIR)/luakit.desktop $(DESTDIR)$(PIXMAPDIR)/luakit.png
- 
- tests/util.so: tests/util.c Makefile
- 	$(CC) -fpic $(CFLAGS) $(CPPFLAGS) -shared $< $(LDFLAGS) -o $@
diff --git a/luakit-git/patches/patch-config.mk b/luakit-git/patches/patch-config.mk
deleted file mode 100644
index 6fb6acea5a..0000000000
--- a/luakit-git/patches/patch-config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-Improve DESTDIR support and use it only in install and deinstall target.
-The various paths are used in buildopts.h and there having the
-DESTDIR is not desiderable.
-
-Reported uptsream via:
-
- <https://github.com/luakit/luakit/pull/727>
-
---- config.mk.orig	2018-09-22 23:42:41.000000000 +0000
-+++ config.mk
-@@ -25,14 +25,6 @@ PIXMAPDIR  ?= $(PREFIX)/share/pixmaps
- APPDIR     ?= $(PREFIX)/share/applications
- LIBDIR     ?= $(PREFIX)/lib/luakit
- 
--INSTALLDIR := $(DESTDIR)$(PREFIX)
--MANPREFIX  := $(DESTDIR)$(MANPREFIX)
--DOCDIR     := $(DESTDIR)$(DOCDIR)
--XDGPREFIX  := $(DESTDIR)$(XDGPREFIX)
--PIXMAPDIR  := $(DESTDIR)$(PIXMAPDIR)
--APPDIR     := $(DESTDIR)$(APPDIR)
--LIBDIR     := $(DESTDIR)$(LIBDIR)
--
- # Should luakit be built to load relative config paths (./lib ./config) ?
- # (Useful when running luakit from it's source directory, disable otherwise).
- ifneq ($(DEVELOPMENT_PATHS),0)
Prev by Date: luakit-git: add a patch for luakit PR 737
Next by Date: luakit: update to luakit-2.1
Previous by Thread: luakit-git: add a patch for luakit PR 737
Next by Thread: luakit: update to luakit-2.1
Indexes:
Home | Main Index | Thread Index | Old Index