Date: Mon, 19 Jun 2006 03:49:07 -0700 From: "David O'Brien" <obrien@freebsd.org> To: ports@freebsd.org Subject: [PATCH] update editors/vim from 6.4->7.0 Message-ID: <20060619104907.GA19909@dragon.NUXI.org>
next in thread | raw e-mail | index | archive | help
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
There has been several requests to me to update the Vim port to the newly
released 7.0. Attached is the current WIP patch to do this. I'm not
quite yet ready to pull the trigger, but I'd like to offer this patch to
the community to beta-test.
Please email me if:
* If you can no longer do something with Vim 7.0, that you could do with
6.4.
* With any build and/or install problems encountered caused after
applying this patch.
* Any files left behind after 'make deinstall' / 'pkg_delete vim-7.0*'.
What I'm not interested in at this time:
* Tweaks to the "WITH_*" build options, or default GUI.
TIA,
--
-- David (obrien@FreeBSD.org)
Q: Because it reverses the logical flow of conversation.
A: Why is top-posting (putting a reply at the top of the message) frowned upon?
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="vim-6_to_7.patch"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/vim/Makefile,v
retrieving revision 1.275
diff -u -p -r1.275 Makefile
--- Makefile 6 May 2006 22:45:35 -0000 1.275
+++ Makefile 19 Jun 2006 10:38:52 -0000
@@ -7,8 +7,8 @@
#
PORTNAME?= vim
-PATCHLEVEL= 9
-PORTVERSION= 6.4.${PATCHLEVEL}
+PATCHLEVEL= 18
+PORTVERSION= 7.0.${PATCHLEVEL}
PORTREVISION?= 0
CATEGORIES?= editors
MASTER_SITES= ${MASTER_SITE_VIM}
@@ -18,9 +18,9 @@ PATCH_SITES= ${MASTER_SITES:S|unix|patch
PATCHFILES!= /usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d \
${PATCHLEVEL} 1 ${PATCHLEVEL}
# bits to remove
-BADPATCHES= 000 001
+BADPATCHES= 005
.for p in ${BADPATCHES}
-PATCHFILES:= ${PATCHFILES:N6.4.${p}}
+PATCHFILES:= ${PATCHFILES:N7.0.${p}}
.endfor
MAINTAINER?= obrien@FreeBSD.org
@@ -53,6 +53,8 @@ MLINKS= vim.1 rvim.1 vim.1 rview.1
MLINKS+= vim.1 gvim.1 vim.1 gview.1 vimdiff.1 gvimdiff.1 \
vim.1 rgvim.1 vim.1 rgview.1 evim.1 eview.1
.endif
+MANLANG= "" ru.KOI8-R ru.UTF-8 pl.ISO8859-2 pl.UTF-8 pl fr.ISO8859-1 \
+ fr.UTF-8 fr it.ISO8859-1 it.UTF-8 it
WANT_GNOME= yes
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/editors/vim/distinfo,v
retrieving revision 1.161
diff -u -p -r1.161 distinfo
--- distinfo 6 May 2006 22:45:35 -0000 1.161
+++ distinfo 19 Jun 2006 10:38:52 -0000
@@ -1,27 +1,57 @@
-MD5 (vim/vim-6.4.tar.bz2) = 774c14d93ce58674b3b2c880edd12d77
-SHA256 (vim/vim-6.4.tar.bz2) = 5141ff8c7ed8ddc769fcf3b2bda386c6255d72163ae6727d8a6031d749be9f95
-SIZE (vim/vim-6.4.tar.bz2) = 3737338
-MD5 (vim/6.4.002) = ac408535c97031cb8351b771c1723dcb
-SHA256 (vim/6.4.002) = c44bdbe513c9dcb87249415171f32b1bb7321663cc8a891220b833376c7eee91
-SIZE (vim/6.4.002) = 7802
-MD5 (vim/6.4.003) = 591a6164c46792f7b41039e979148514
-SHA256 (vim/6.4.003) = 53020fcb1c995f8bb8f97f5d7f15ebb35d64ab3317c669408d8b299f84322290
-SIZE (vim/6.4.003) = 1463
-MD5 (vim/6.4.004) = 89de2693da138c37adfd10fdce957758
-SHA256 (vim/6.4.004) = 90e75fb62818ab6747f5bb8448e5bd6a9f5923af74dcb72ba7c8bef89c43af3d
-SIZE (vim/6.4.004) = 1581
-MD5 (vim/6.4.005) = 362dd6214af5cf5436bd616f148d22f1
-SHA256 (vim/6.4.005) = bfb2965c3859bedda122dc46e2b6c037652aadcc1f30bd9e7ea689def0229f72
-SIZE (vim/6.4.005) = 1577
-MD5 (vim/6.4.006) = 82a1ca21cec39b3624036247f4f40fdc
-SHA256 (vim/6.4.006) = 1fe6be6a4e5378428adb92cf4d783ac3ab52613badf45444b2d01eed0e8cf76b
-SIZE (vim/6.4.006) = 2320
-MD5 (vim/6.4.007) = 253152bc93743b464f08f9f5d831fe52
-SHA256 (vim/6.4.007) = 6888aa7d8d8fc786a07a834676cdf5bf6d0c70777008cd7518b0c5748e9359a8
-SIZE (vim/6.4.007) = 1717
-MD5 (vim/6.4.008) = b4f9997af33d3f857327e4fede95ac3f
-SHA256 (vim/6.4.008) = 14b28c32ad8c2529d7051461c55210d511bd8965a96e9b4295d2788c9fd90c47
-SIZE (vim/6.4.008) = 2199
-MD5 (vim/6.4.009) = 7ccdd6044b9fdd42f544fdb4d179f9e5
-SHA256 (vim/6.4.009) = 15fb7942d7612bf775570e28213af06a182e39ef125e87d1059254652fc2721a
-SIZE (vim/6.4.009) = 2653
+MD5 (vim/vim-7.0.tar.bz2) = 4ca69757678272f718b1041c810d82d8
+SHA256 (vim/vim-7.0.tar.bz2) = 494e27bd169d333917c0febcace466f89d119f71961e8959022fc6eab89764fc
+SIZE (vim/vim-7.0.tar.bz2) = 6575205
+MD5 (vim/7.0.001) = f0a2d3a337ae83e9e2d95156a78325bb
+SHA256 (vim/7.0.001) = 4154ba1a7bea845fe39fa028f15ff5ee4313d8e6784a5041e319108fda3cb282
+SIZE (vim/7.0.001) = 1627
+MD5 (vim/7.0.002) = ede30f39fde8a3e8ac09cfd7b5411c65
+SHA256 (vim/7.0.002) = d3f30df793e2f08561d530ff6de0d86eb7c6969ff4d95aabf22702f61eec1f1e
+SIZE (vim/7.0.002) = 2007
+MD5 (vim/7.0.003) = 75a36566e2082f94ed61a4077c943b2f
+SHA256 (vim/7.0.003) = 25710114391ea557f97e91b021cf988f17393692e37eb4e1c5307eab2c2a5605
+SIZE (vim/7.0.003) = 1876
+MD5 (vim/7.0.004) = 7269378bd86145ea0eaffe1eb0a5493d
+SHA256 (vim/7.0.004) = ef24c17657ce431922e60d0c267a819b2b003ae11206422f97d00137c466f377
+SIZE (vim/7.0.004) = 1596
+MD5 (vim/7.0.005) = f2aea41b0fc83c0fe1ed1441bbfd72cb
+SHA256 (vim/7.0.005) = 64a83006e7c71ca042c4638eba33136b1b69cbb85f8290a160ab2c95565bb2a8
+SIZE (vim/7.0.005) = 1579
+MD5 (vim/7.0.006) = 55b7d25640b76317ab85e307eb132766
+SHA256 (vim/7.0.006) = 0244bf01fe3ab1f63189d0f437c00d5a2e5d4dbc9d1460a0765eee2fd1b4d004
+SIZE (vim/7.0.006) = 1347
+MD5 (vim/7.0.007) = 9657085af81eaa8e7e6c9e48d307f272
+SHA256 (vim/7.0.007) = cb9d648c8010dadb8ca1ec94b95f11a131364cf8386a4dc2f383879755baadf5
+SIZE (vim/7.0.007) = 1919
+MD5 (vim/7.0.008) = 090cdd1e165bc40a922c5117d0a59601
+SHA256 (vim/7.0.008) = 0ed018ab6cab92dcb5e1d5504959f586a282bc6d2a0956e98ce99af206a2fd89
+SIZE (vim/7.0.008) = 2081
+MD5 (vim/7.0.009) = 68ac9f593605a753366fc8ac42fd79e6
+SHA256 (vim/7.0.009) = a2d2c4256a62f49b810c39b92699815c748526d9366060d5a5f6b1e7d3200779
+SIZE (vim/7.0.009) = 1625
+MD5 (vim/7.0.010) = 56504f4ec9d6b4d6ed7335199681ee1e
+SHA256 (vim/7.0.010) = 276f6b5ec8508aecb17fa3c18173d072b95f12c3f7c968b75b2199ccfeb0d036
+SIZE (vim/7.0.010) = 3705
+MD5 (vim/7.0.011) = db9286d505d2ef281c8f823870871868
+SHA256 (vim/7.0.011) = e8c34cf78e25f30b176e6cfbdaee8794c0861371fa959a2d63ac20e760e33f6a
+SIZE (vim/7.0.011) = 1989
+MD5 (vim/7.0.012) = a0bfd3053fe2069bc282be9b8b1597b2
+SHA256 (vim/7.0.012) = cd365986015bb2f11b84fe756a831816cb3a2caa40b157f84b28aafdc61c8de5
+SIZE (vim/7.0.012) = 2532
+MD5 (vim/7.0.013) = 81239d59e4cb2ba6c3f26378c533b50b
+SHA256 (vim/7.0.013) = 90b4a80ad9f19da6dfbcec3fddb934b3fb87ee158457f8f9c38ea3409771b186
+SIZE (vim/7.0.013) = 4614
+MD5 (vim/7.0.014) = 03209cae66e9cfbd72e3857cd2d67b22
+SHA256 (vim/7.0.014) = c794195e01b601206e32872e1bc328e95a26e7ceef8f5a8ef8a07eebf43d6d23
+SIZE (vim/7.0.014) = 5712
+MD5 (vim/7.0.015) = e16feb22b9891756bee0ebe1adb2f812
+SHA256 (vim/7.0.015) = bacc693d2dd130e35532e3fccba4ce750feff0595a0df878fc9496edf1e15b95
+SIZE (vim/7.0.015) = 4485
+MD5 (vim/7.0.016) = 116bcde74158f4bb3ffda4726d9d6dfc
+SHA256 (vim/7.0.016) = 1f2727a59c60877c41d495960c53ab8728f16f694acfe52cd744c741c5191d87
+SIZE (vim/7.0.016) = 1810
+MD5 (vim/7.0.017) = 2b33b8827a3866edb817f16c4b31fbb1
+SHA256 (vim/7.0.017) = c1731d5090b70d563db49423a6fe553832d81b8566fe28d67500690ce8a240a4
+SIZE (vim/7.0.017) = 2302
+MD5 (vim/7.0.018) = 1a269105104f99d5e32241d9190c602b
+SHA256 (vim/7.0.018) = 05ff0674112c966b27d9bd96b28daa54f13499a18bb8582ccdcbc78af47b7e4c
+SIZE (vim/7.0.018) = 1649
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/editors/vim/pkg-plist,v
retrieving revision 1.45
diff -u -p -r1.45 pkg-plist
--- pkg-plist 21 Aug 2001 19:51:09 -0000 1.45
+++ pkg-plist 19 Jun 2006 10:38:52 -0000
@@ -19,4 +19,18 @@ bin/gvimdiff
@comment Insert PLIST.share-vim here
@comment -=[ begin PLIST.share-vim ]=-
@comment -=[ end PLIST.share-vim ]=-
+@dirrmtry man/fr.ISO8859-1/man1
+@dirrmtry man/fr.ISO8859-1
+@dirrmtry man/fr.UTF-8/man1
+@dirrmtry man/fr.UTF-8
+@dirrmtry man/it.ISO8859-1/man1
+@dirrmtry man/it.ISO8859-1
+@dirrmtry man/it.UTF-8/man1
+@dirrmtry man/it.UTF-8
+@dirrmtry man/pl.ISO8859-2/man1
+@dirrmtry man/pl.ISO8859-2
+@dirrmtry man/pl.UTF-8/man1
+@dirrmtry man/pl.UTF-8
+@dirrmtry man/ru.UTF-8/man1
+@dirrmtry man/ru.UTF-8
@dirrm share/vim
Index: files/patch-01
===================================================================
RCS file: /home/pcvs/ports/editors/vim/files/patch-01,v
retrieving revision 1.28
diff -u -p -r1.28 patch-01
--- files/patch-01 3 Aug 2004 19:16:15 -0000 1.28
+++ files/patch-01 19 Jun 2006 10:38:52 -0000
@@ -70,48 +70,3 @@
# create links for the manual pages with various names to vim. This is only
# done when the links (or manpages with the same name) don't exist yet.
-@@ -1845,34 +1846,34 @@
- $(DEST_MAN)/$(EVIEWNAME).1
-
- $(DEST_MAN)/$(EXNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(EXNAME).1
-+ #cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(EXNAME).1
-
- $(DEST_MAN)/$(VIEWNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(VIEWNAME).1
-+ #cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(VIEWNAME).1
-
- $(DEST_MAN)/$(GVIMNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIMNAME).1
-+ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIMNAME).1
-
- $(DEST_MAN)/$(GVIEWNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIEWNAME).1
-+ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
-
- $(DEST_MAN)/$(RVIMNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIMNAME).1
-+ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIMNAME).1
-
- $(DEST_MAN)/$(RVIEWNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIEWNAME).1
-+ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
-
- $(DEST_MAN)/$(RGVIMNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIMNAME).1
-+ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
-
- $(DEST_MAN)/$(RGVIEWNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
-+ cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
-
- $(DEST_MAN)/$(GVIMDIFFNAME).1:
-- cd $(DEST_MAN); ln -s $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1
-+ cd $(DEST_MAN); ln -sf $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1
-
- $(DEST_MAN)/$(EVIEWNAME).1:
-- cd $(DEST_MAN); ln -s $(EVIMNAME).1 $(EVIEWNAME).1
-+ cd $(DEST_MAN); ln -sf $(EVIMNAME).1 $(EVIEWNAME).1
-
- uninstall: uninstall_runtime
- -rm -f $(DEST_BIN)/$(VIMTARGET)
Index: files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/editors/vim/files/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- files/patch-configure 24 Oct 2005 01:28:48 -0000 1.2
+++ files/patch-configure 19 Jun 2006 10:38:52 -0000
@@ -1,11 +1,8 @@
---- auto/configure.orig Sat Oct 15 05:55:10 2005
-+++ auto/configure Sun Oct 23 18:13:17 2005
-@@ -2184,7 +2184,7 @@ echo "configure:2177: checking for locat
- echo "$ac_t""$try/tclConfig.sh" 1>&6
- . $try/tclConfig.sh
+--- auto/configure.orig Thu May 4 03:46:19 2006
++++ auto/configure Mon Jun 19 03:01:38 2006
+@@ -4644,3 +4644,4 @@ echo "${ECHO_T}$try/tclConfig.sh" >&6
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
-- TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\ /\X/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
-+ TCL_DEFS=`echo $TCL_DEFS | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
+- TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
++ TCL_DEFS=`echo $TCL_DEFS | tr ' ' '\012' | sed -e 's/\\\\ /\\\\X/g' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
++
break
- fi
- done
Index: files/patch-installml.sh
===================================================================
RCS file: files/patch-installml.sh
diff -N files/patch-installml.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-installml.sh 19 Jun 2006 10:38:52 -0000
@@ -0,0 +1,42 @@
+--- installml.sh.orig Sun Apr 30 08:48:53 2006
++++ installml.sh Mon Jun 19 03:36:37 2006
+@@ -55,12 +55,12 @@ if test $what = "install" -a \( -f $dest
+ # ex
+- if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then
+- echo creating link $destdir/$exname.1
+- cd $destdir; ln -s $vimname.1 $exname.1
+- fi
++ #if test ! -f $destdir/$exname.1 -a -f $destdir/$vimname.1; then
++ # echo creating link $destdir/$exname.1
++ # cd $destdir; ln -s $vimname.1 $exname.1
++ #fi
+
+ # view
+- if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then
+- echo creating link $destdir/$viewname.1
+- cd $destdir; ln -s $vimname.1 $viewname.1
+- fi
++ #if test ! -f $destdir/$viewname.1 -a -f $destdir/$vimname.1; then
++ # echo creating link $destdir/$viewname.1
++ # cd $destdir; ln -s $vimname.1 $viewname.1
++ #fi
+
+@@ -121,10 +121,10 @@ if test $what = "uninstall"; then
+
+- if test -L $destdir/$exname.1; then
+- echo deleting $destdir/$exname.1
+- rm -f $destdir/$exname.1
+- fi
+- if test -L $destdir/$viewname.1; then
+- echo deleting $destdir/$viewname.1
+- rm -f $destdir/$viewname.1
+- fi
++ #if test -L $destdir/$exname.1; then
++ # echo deleting $destdir/$exname.1
++ # rm -f $destdir/$exname.1
++ #fi
++ #if test -L $destdir/$viewname.1; then
++ # echo deleting $destdir/$viewname.1
++ # rm -f $destdir/$viewname.1
++ #fi
+ if test -L $destdir/$rvimname.1; then
--1yeeQ81UyVL57Vl7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060619104907.GA19909>