diff options
| author | morr <morr> | 2013-01-15 00:06:23 +0000 |
|---|---|---|
| committer | morr <morr> | 2013-01-15 00:06:23 +0000 |
| commit | 807bce2898ec4b52db6211988f26ffede9780f28 (patch) | |
| tree | 51df062f0e58c4ee8f0983948689113895d73316 /editors/vim-share | |
| parent | 27c4a1a1c4a20759bdfcabcfce5502adb3b7efac (diff) | |
| download | pkgsrc-807bce2898ec4b52db6211988f26ffede9780f28.tar.gz | |
Simplify patch a little
Diffstat (limited to 'editors/vim-share')
| -rw-r--r-- | editors/vim-share/patches/patch-Makefile | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/editors/vim-share/patches/patch-Makefile b/editors/vim-share/patches/patch-Makefile index c0ce938aafd..747a4737ece 100644 --- a/editors/vim-share/patches/patch-Makefile +++ b/editors/vim-share/patches/patch-Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-Makefile,v 1.1 2012/08/28 05:59:39 morr Exp $ +$NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $ ---- src/Makefile.orig 2012-05-25 09:26:31.000000000 +0000 -+++ src/Makefile -@@ -1192,26 +1192,31 @@ MOTIF_BUNDLE = +--- src/Makefile.orig 2012-11-22 15:18:52.000000000 +0100 ++++ src/Makefile 2013-01-14 23:51:58.000000000 +0100 +@@ -1196,22 +1196,27 @@ ### Athena GUI ### Use Xaw3d to make the menus look a little bit nicer #XAW_LIB = -lXaw3d @@ -18,7 +18,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/08/28 05:59:39 morr Exp $ -# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \ -# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb +.if defined(XAW_LIB) -+.if (${XAW_LIB} != "Xaw") ++.if (${XAW_LIB} != "-lXaw") +ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c +ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \ + objects/pty.o objects/gui_beval.o objects/gui_at_fs.o @@ -37,12 +37,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/08/28 05:59:39 morr Exp $ ATHENA_IPATH = $(GUI_INC_LOC) ATHENA_LIBS_DIR = $(GUI_LIB_LOC) --ATHENA_LIBS1 = $(XAW_LIB) -+ATHENA_LIBS1 = $(LIBXAW) - ATHENA_LIBS2 = -lXt - ATHENA_INSTALL = install_normal install_gui_extra - ATHENA_TARGETS = installglinks -@@ -1912,7 +1917,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES +@@ -1917,7 +1922,7 @@ -$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS) @echo generating help tags # Generate the help tags with ":helptags" to handle all languages. @@ -51,7 +46,7 @@ $NetBSD: patch-Makefile,v 1.1 2012/08/28 05:59:39 morr Exp $ cd $(HELPSOURCE); \ files=`ls *.txt tags`; \ files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \ -@@ -2041,25 +2046,25 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ +@@ -2046,25 +2051,25 @@ fi -chmod $(FILEMOD) $(DEST_TOOLS)/* # replace the path in some tools |