diff options
author | joerg <joerg@pkgsrc.org> | 2016-01-05 21:36:04 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2016-01-05 21:36:04 +0000 |
commit | 0369c16abaca38236ae43388049abfdc8bd65f04 (patch) | |
tree | 6aec54951b05a687a1721933a0b1d55dbf80f5dd /editors | |
parent | 74028877824fae2f9f38f2225e32475f294a611c (diff) | |
download | pkgsrc-0369c16abaca38236ae43388049abfdc8bd65f04.tar.gz |
Unbreak vim-gtk2, now depending on gmakeisms.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/vim-share/distinfo | 4 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-Makefile | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index 5d4a1d06193..bf4cf5d3338 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.148 2016/01/03 16:49:49 morr Exp $ +$NetBSD: distinfo,v 1.149 2016/01/05 21:36:04 joerg Exp $ SHA1 (vim-7.4.1040.tar.bz2) = aa9439cfc4bbabae2862ac3668414d696f3c8aec RMD160 (vim-7.4.1040.tar.bz2) = 34c84099f8151b1457a6d69a4de167dac70457fa SHA512 (vim-7.4.1040.tar.bz2) = 2d01e742c3ddb029c6cff594cffdac13b36cb399fdfa8a2dc03c9ea15f180f50a1fa0e894c3314e18d3aafd138ada906a145aa6a437dae2ba9e9590eaaa40380 Size (vim-7.4.1040.tar.bz2) = 10147321 bytes -SHA1 (patch-Makefile) = 741f2b59d843094dbc1677aef9df93cf97c8d5a1 +SHA1 (patch-Makefile) = 51e66d150f01deb40c9fad2cffe4ebc71d30b544 SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8 SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56 SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39 diff --git a/editors/vim-share/patches/patch-Makefile b/editors/vim-share/patches/patch-Makefile index 2d3e2faa39e..8e6b946ecf5 100644 --- a/editors/vim-share/patches/patch-Makefile +++ b/editors/vim-share/patches/patch-Makefile @@ -1,4 +1,8 @@ -$NetBSD: patch-Makefile,v 1.3 2013/10/07 19:26:28 morr Exp $ +$NetBSD: patch-Makefile,v 1.4 2016/01/05 21:36:04 joerg Exp $ + +Handle Xaw support appropiately. + +Fix GNUmakeism by not depending on $< in non-suffix rules. --- src/Makefile.orig 2013-08-10 15:07:12.000000000 +0000 +++ src/Makefile @@ -87,3 +91,15 @@ $NetBSD: patch-Makefile,v 1.3 2013/10/07 19:26:28 morr Exp $ # install the language specific files, if they were unpacked install-languages: languages $(DEST_LANG) $(DEST_KMAP) +@@ -2596,9 +2601,9 @@ auto/pathdef.c: Makefile auto/config.mk + -@sh $(srcdir)/pathdef.sh + + auto/gui_gtk_gresources.c: gui_gtk_res.xml +- $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< ++ $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml + auto/gui_gtk_gresources.h: gui_gtk_res.xml +- $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< ++ $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml + + # All the object files are put in the "objects" directory. Since not all make + # commands understand putting object files in another directory, it must be |