pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q2]: pkgsrc/editors Pullup ticket 627 - requested by Martt...
details: https://anonhg.NetBSD.org/pkgsrc/rev/659d13c5fb2b
branches: pkgsrc-2005Q2
changeset: 495914:659d13c5fb2b
user: snj <snj%pkgsrc.org@localhost>
date: Fri Jul 29 07:08:44 2005 +0000
description:
Pullup ticket 627 - requested by Martti Kuparinen
security update for vim
Revisions pulled up:
- pkgsrc/editors/vim/Makefile 1.62
- pkgsrc/editors/vim-gtk/Makefile 1.50
- pkgsrc/editors/vim-gtk2/Makefile 1.17
- pkgsrc/editors/vim-motif/Makefile 1.16
- pkgsrc/editors/vim-share/Makefile 1.15-1.16
- pkgsrc/editors/vim-share/Makefile.common 1.47-1.49
- pkgsrc/editors/vim-share/distinfo 1.37-1.40
- pkgsrc/editors/vim-share/version.mk 1.2-1.3
- pkgsrc/editors/vim-share/patches/patch-ad 1.7
- pkgsrc/editors/vim-xaw/Makefile 1.39
Module Name: pkgsrc
Committed By: grant
Date: Tue Jul 19 10:18:59 UTC 2005
Modified Files:
pkgsrc/editors/leim20: Makefile
pkgsrc/editors/vim: Makefile
pkgsrc/editors/vim-gtk: Makefile
pkgsrc/editors/vim-gtk2: Makefile
pkgsrc/editors/vim-lang: Makefile
pkgsrc/editors/vim-motif: Makefile
pkgsrc/editors/vim-xaw: Makefile
Log Message:
depends should be ../../<category>/<pkg>
----
Module Name: pkgsrc
Committed By: kristerw
Date: Thu Jun 23 17:49:40 UTC 2005
Modified Files:
pkgsrc/editors/vim-share: Makefile distinfo
pkgsrc/editors/vim-share/patches: patch-ad
Log Message:
Prevent paths to the build directories from being included in the package.
Bump PKGREVISION.
----
Module Name: pkgsrc
Committed By: martti
Date: Thu Jul 7 08:21:36 UTC 2005
Modified Files:
pkgsrc/editors/vim-share: Makefile Makefile.common distinfo version.mk
Log Message:
Updated vim to 6.3.079
1745 6.3.075 syntax highlighting wrong after unloading another buffer
3546 6.3.076 crash when using Cscope interface with very long result
1853 6.3.079 crash after executing a command in the command-line window
----
Module Name: pkgsrc
Committed By: martti
Date: Thu Jul 7 07:59:11 UTC 2005
Modified Files:
pkgsrc/editors/vim-share: Makefile.common distinfo
Log Message:
Added vim-6.3-lang.tar.gz to the list of downloadable files (will only be
used by the new vim-lang package).
----
Module Name: pkgsrc
Committed By: martti
Date: Wed Jul 27 06:29:55 UTC 2005
Modified Files:
pkgsrc/editors/vim-share: Makefile.common distinfo version.mk
Log Message:
Updated vim to 6.3.085
1729 6.3.081 glob() may execute shell command unexpectedly
2102 6.3.082 (after 6.3.081) more generic solution to avoid shell
commands
5053 6.3.083 VMS: add function keys to vt320 termcap entry
3408 6.3.085 crash in syntax highlighting
diffstat:
editors/vim-gtk/Makefile | 4 ++--
editors/vim-gtk2/Makefile | 4 ++--
editors/vim-motif/Makefile | 4 ++--
editors/vim-share/Makefile | 6 ++++--
editors/vim-share/Makefile.common | 8 ++++++--
editors/vim-share/distinfo | 28 ++++++++++++++++++++++++++--
editors/vim-share/patches/patch-ad | 30 +++++++++++++++++++++++-------
editors/vim-share/version.mk | 4 ++--
editors/vim-xaw/Makefile | 4 ++--
editors/vim/Makefile | 4 ++--
10 files changed, 71 insertions(+), 25 deletions(-)
diffs (253 lines):
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-gtk/Makefile
--- a/editors/vim-gtk/Makefile Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-gtk/Makefile Fri Jul 29 07:08:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.49.2.1 2005/07/29 07:08:44 snj Exp $
PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -7,7 +7,7 @@
.include "../vim-share/Makefile.common"
-DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-gtk2/Makefile
--- a/editors/vim-gtk2/Makefile Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-gtk2/Makefile Fri Jul 29 07:08:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2005/07/29 07:08:44 snj Exp $
PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -7,7 +7,7 @@
.include "../vim-share/Makefile.common"
-DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-motif/Makefile
--- a/editors/vim-motif/Makefile Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-motif/Makefile Fri Jul 29 07:08:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2005/07/29 07:08:44 snj Exp $
PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -7,7 +7,7 @@
.include "../vim-share/Makefile.common"
-DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-share/Makefile
--- a/editors/vim-share/Makefile Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-share/Makefile Fri Jul 29 07:08:44 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/05 09:33:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2005/07/29 07:08:44 snj Exp $
PKGNAME= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION= 1
+#PKGREVISION= 1
COMMENT= Data files for the vim editor (vi clone)
@@ -10,6 +10,8 @@
CONFIGURE_ARGS+= --disable-gui
INSTALL_TARGET= installruntime installmacros installtutor installtools
+USE_TOOLS+= awk
+INSTALL_MAKE_FLAGS+= TOOLS_AWK="${TOOLS_AWK}"
PLIST_SUBST+= VIM_SUBDIR="${VIM_SUBDIR}"
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-share/Makefile.common
--- a/editors/vim-share/Makefile.common Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-share/Makefile.common Fri Jul 29 07:08:44 2005 +0000
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile.common,v 1.46 2005/05/30 14:18:14 martti Exp $
+# $NetBSD: Makefile.common,v 1.46.2.1 2005/07/29 07:08:44 snj Exp $
.include "../../editors/vim-share/version.mk"
DISTNAME= vim-${VIM_VERSION}
+DISTFILES= vim-${VIM_VERSION}${EXTRACT_SUFX}
+DISTFILES+= vim-${VIM_VERSION}-lang.tar.gz
CATEGORIES= editors
MASTER_SITES= ftp://ftp.vim.org/pub/editors/vim/unix/ \
ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
ftp://ftp.twics.co.jp/pub/vim/unix/
+SITES_vim-${VIM_VERSION}-lang.tar.gz= ftp://ftp.vim.org/pub/vim/extra/
DIST_SUBDIR= vim
EXTRACT_SUFX= .tar.bz2
@@ -19,7 +22,8 @@
6.3.040 6.3.042 6.3.043 6.3.045 6.3.046 6.3.049 6.3.050\
6.3.051 6.3.054 6.3.055 6.3.056 6.3.057 6.3.058 6.3.059\
6.3.060 6.3.061 6.3.062 6.3.063 6.3.064 6.3.065 6.3.066\
- 6.3.067 6.3.068 6.3.069 6.3.070 6.3.071 6.3.072 6.3.074
+ 6.3.067 6.3.068 6.3.069 6.3.070 6.3.071 6.3.072 6.3.074\
+ 6.3.075 6.3.076 6.3.079 6.3.081 6.3.082 6.3.083 6.3.085
MAINTAINER= martti%NetBSD.org@localhost
HOMEPAGE= http://www.vim.org/
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-share/distinfo
--- a/editors/vim-share/distinfo Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-share/distinfo Fri Jul 29 07:08:44 2005 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.36 2005/06/05 09:33:33 jmmv Exp $
+$NetBSD: distinfo,v 1.36.2.1 2005/07/29 07:08:44 snj Exp $
SHA1 (vim/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
RMD160 (vim/vim-6.3.tar.bz2) = 321c59d62f6fce99396be33875ec5a7d84944525
Size (vim/vim-6.3.tar.bz2) = 3699397 bytes
+SHA1 (vim/vim-6.3-lang.tar.gz) = f265365b6075d7887c2000a3b90dac8c0b4222db
+RMD160 (vim/vim-6.3-lang.tar.gz) = e8e332657a4773396f143b341edaf587c1bba0c7
+Size (vim/vim-6.3-lang.tar.gz) = 1057792 bytes
SHA1 (vim/6.3.001) = 09a75ac41d4c454092b716ff6838768ef8665e5c
RMD160 (vim/6.3.001) = d3b36602eb6c61771df870bf1f9d0e2330fbd76b
Size (vim/6.3.001) = 2672 bytes
@@ -192,7 +195,28 @@
SHA1 (vim/6.3.074) = 42d51d2e7f7db314e25e656f2154c348ee38b284
RMD160 (vim/6.3.074) = 8f12301e801f94346c3e73b00546ae35f3e8b526
Size (vim/6.3.074) = 2365 bytes
+SHA1 (vim/6.3.075) = c56e07b4949872c444aa40a52ebe257737758c00
+RMD160 (vim/6.3.075) = e46917ae6f15563f1ef5040501f067bfeaa6791f
+Size (vim/6.3.075) = 1745 bytes
+SHA1 (vim/6.3.076) = 1df1a0423da5fb4c90edac4848eee47b9a527548
+RMD160 (vim/6.3.076) = c6521d68e9f31af6553f92c9374fc3bba6cf8298
+Size (vim/6.3.076) = 3546 bytes
+SHA1 (vim/6.3.079) = 359e571776c085bcf1ea04417bee9f62aaafeab0
+RMD160 (vim/6.3.079) = ecce1c0acc43f02dc2c4dfb251bc8ccd0f7b3c3c
+Size (vim/6.3.079) = 1853 bytes
+SHA1 (vim/6.3.081) = 1e2b184af09ee23ffa4b1d959ed625e2ccf2e6d4
+RMD160 (vim/6.3.081) = 8f9b67208026185ff698638c9f06ff8f3eaf76d6
+Size (vim/6.3.081) = 1729 bytes
+SHA1 (vim/6.3.082) = af5f267bd2f7db970c672deea62a81c92528b3fc
+RMD160 (vim/6.3.082) = bc52881512112bcaee5c5ef80415df18ff5b08e7
+Size (vim/6.3.082) = 2102 bytes
+SHA1 (vim/6.3.083) = 8f3b78a6df68aeaef174f5fcdd99373167b76a56
+RMD160 (vim/6.3.083) = 6cd3477d2598784096d7cca2472b385fe764479d
+Size (vim/6.3.083) = 5053 bytes
+SHA1 (vim/6.3.085) = f319ec7b1d8ff7553935b8c5f1a2758e4d49cf1c
+RMD160 (vim/6.3.085) = 521b5f08b013e8b91f8324f1980ace1dc7d4af57
+Size (vim/6.3.085) = 3408 bytes
SHA1 (patch-aa) = 226983cd130c91de83f46baa38d18b243bd029c8
SHA1 (patch-ab) = cb8930aaeefd1ddbfa204290662078994dd985c0
-SHA1 (patch-ad) = 305b3f9cd2837482362c0176b8e2025ffb0eb254
+SHA1 (patch-ad) = 7a4eb1027a0018bdda51b1d0de9dfce60794cc02
SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-share/patches/patch-ad
--- a/editors/vim-share/patches/patch-ad Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-share/patches/patch-ad Fri Jul 29 07:08:44 2005 +0000
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.6 2004/06/21 08:23:48 martti Exp $
+$NetBSD: patch-ad,v 1.6.8.1 2005/07/29 07:08:45 snj Exp $
---- src/Makefile.orig 2004-05-16 13:52:54.000000000 +0000
-+++ src/Makefile 2004-06-11 21:40:33.000000000 +0000
-@@ -1076,3 +1076,3 @@
+--- src//Makefile.orig 2004-06-07 12:03:56.000000000 +0200
++++ src//Makefile 2005-06-23 19:43:26.000000000 +0200
+@@ -1074,26 +1074,31 @@
+ ### Athena GUI
+ ### Use Xaw3d to make the menus look a little bit nicer
#XAW_LIB = -lXaw3d
-XAW_LIB = -lXaw
+#XAW_LIB = -lXaw
-@@ -1080,8 +1080,11 @@
+ ### 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_beval.c gui_at_fs.c
-#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
@@ -25,13 +27,27 @@
+ -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
+.else
ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
-@@ -1092,2 +1095,4 @@
+ 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)
-@@ -1095,3 +1100,3 @@
+ 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
+ ATHENA_TARGETS = installglinks
+@@ -1779,7 +1784,7 @@
+ -chmod $(FILEMOD) $(DEST_TOOLS)/*
+ # replace the path in some tools
+ perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
+- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
++ awkpath=$(TOOLS_AWK) && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
+ awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
+ awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
+ -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-share/version.mk
--- a/editors/vim-share/version.mk Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-share/version.mk Fri Jul 29 07:08:44 2005 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: version.mk,v 1.1 2005/05/30 14:18:14 martti Exp $
+# $NetBSD: version.mk,v 1.1.2.1 2005/07/29 07:08:44 snj Exp $
VIM_VERSION= 6.3
-VIM_PATCHLEVEL= 074
+VIM_PATCHLEVEL= 085
VIM_SUBDIR= vim63
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim-xaw/Makefile
--- a/editors/vim-xaw/Makefile Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim-xaw/Makefile Fri Jul 29 07:08:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:46 jlam Exp $
+# $NetBSD: Makefile,v 1.38.2.1 2005/07/29 07:08:45 snj Exp $
PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -7,7 +7,7 @@
COMMENT= Vim editor (vi clone) with X11 Athena GUI
-DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]*
diff -r 43e5c20aacba -r 659d13c5fb2b editors/vim/Makefile
--- a/editors/vim/Makefile Wed Jul 27 08:02:56 2005 +0000
+++ b/editors/vim/Makefile Fri Jul 29 07:08:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2005/05/30 14:18:14 martti Exp $
+# $NetBSD: Makefile,v 1.61.2.1 2005/07/29 07:08:44 snj Exp $
PKGNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
@@ -7,7 +7,7 @@
.include "../vim-share/Makefile.common"
-DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
+DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]*
Home |
Main Index |
Thread Index |
Old Index