summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authoragc <agc>2001-10-04 13:25:49 +0000
committeragc <agc>2001-10-04 13:25:49 +0000
commit6758ec60e0274424ca7d0415351f519fb097278b (patch)
treebe469b903257b70861aa418993abb9d125c536bb /editors
parent410c8f32301d4d53cecc38383a68cd52d3c7ec61 (diff)
downloadpkgsrc-6758ec60e0274424ca7d0415351f519fb097278b.tar.gz
*sigh* cvs ate my patches.
Replace patches which I accidentally removed in the last commit.
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-share/distinfo8
-rw-r--r--editors/vim-share/patches/patch-aa20
-rw-r--r--editors/vim-share/patches/patch-ad44
-rw-r--r--editors/vim-share/patches/patch-zb13
4 files changed, 81 insertions, 4 deletions
diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo
index 45e31b5c988..616341af441 100644
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2001/10/04 12:38:03 agc Exp $
+$NetBSD: distinfo,v 1.8 2001/10/04 13:25:49 agc Exp $
SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
Size (vim-6.0.tar.bz2) = 2776551 bytes
-SHA1 (patch-aa) = 1cae1dd34074204c2d673a5013a2e3b0a11c663b
-SHA1 (patch-ad) = 2a1668bde592e75a1c001dea5b16b65a4c6ce780
-SHA1 (patch-zb) = 466456c472aa62785e81724aae4646650330da9c
+SHA1 (patch-aa) = 6effc801a6454870fb694d380949a23f11272f1c
+SHA1 (patch-ad) = 48fbd96a410a54efb53e9cac00dc4cee91cf4f91
+SHA1 (patch-zb) = c4fb1eb259ec96a4e349d0feb3b520c2fa8a7782
diff --git a/editors/vim-share/patches/patch-aa b/editors/vim-share/patches/patch-aa
new file mode 100644
index 00000000000..69df7a63233
--- /dev/null
+++ b/editors/vim-share/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.4 2001/10/04 13:25:50 agc Exp $
+
+--- auto/configure.orig Thu Oct 4 14:19:08 2001
++++ auto/configure Thu Oct 4 14:20:12 2001
+@@ -2212,6 +2212,7 @@
+ # Look for the header file in a standard set of common directories.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in \
++ ${BUILDLINK_X11_DIR}/include \
+ /usr/X11/include \
+ /usr/X11R6/include \
+ /usr/X11R5/include \
+@@ -2287,6 +2288,7 @@
+ # First see if replacing the include by lib works.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
++ ${BUILDLINK_X11_DIR}/lib \
+ /usr/X11/lib \
+ /usr/X11R6/lib \
+ /usr/X11R5/lib \
diff --git a/editors/vim-share/patches/patch-ad b/editors/vim-share/patches/patch-ad
new file mode 100644
index 00000000000..0ad1cc99620
--- /dev/null
+++ b/editors/vim-share/patches/patch-ad
@@ -0,0 +1,44 @@
+$NetBSD: patch-ad,v 1.1 2001/10/04 13:25:51 agc Exp $
+
+--- Makefile.orig Wed Sep 26 13:10:59 2001
++++ Makefile Thu Oct 4 14:14:32 2001
+@@ -990,26 +990,31 @@
+ ### Athena GUI
+ ### Use Xaw3d to make the menus look a little bit nicer
+ #XAW_LIB = -lXaw3d
+-XAW_LIB = -lXaw
++#XAW_LIB = -lXaw
+
+ ### When using Xaw3d, uncomment/comment the following lines to also get the
+ ### scrollbars from Xaw3d.
+-#ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
+-#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
+-# objects/pty.o objects/gui_at_fs.o
+-#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
+-# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
+-# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
++.if defined(XAW_LIB)
++.if (${XAW_LIB} != "Xaw")
++ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c
++ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
++ objects/pty.o objects/gui_at_fs.o
++ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
++ -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
++ -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
++.else
+ ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
+ gui_at_sb.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_sb.o objects/gui_at_fs.o
+ ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
++.endif # Xaw
++.endif # defined(XAW_LIB)
+
+ ATHENA_IPATH = $(GUI_INC_LOC)
+ ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
+-ATHENA_LIBS1 = $(XAW_LIB)
++ATHENA_LIBS1 = $(LIBXAW)
+ ATHENA_LIBS2 = -lXt
+ ATHENA_TARGETS = installglinks
+ ATHENA_MAN_TARGETS = installghelplinks
diff --git a/editors/vim-share/patches/patch-zb b/editors/vim-share/patches/patch-zb
new file mode 100644
index 00000000000..efa7f2784ea
--- /dev/null
+++ b/editors/vim-share/patches/patch-zb
@@ -0,0 +1,13 @@
+$NetBSD: patch-zb,v 1.3 2001/10/04 13:25:51 agc Exp $
+
+--- feature.h.orig Tue Sep 25 19:51:26 2001
++++ feature.h Thu Oct 4 14:10:53 2001
+@@ -489,7 +489,7 @@
+ * (used only with NO_BUILTIN_TCAPS not defined).
+ */
+ #ifdef HAVE_TGETENT
+-/* #define NO_BUILTIN_TCAPS */
++#define NO_BUILTIN_TCAPS
+ #endif
+
+ #if !defined(NO_BUILTIN_TCAPS) && !defined(FEAT_GUI_W16)