[csw-devel] SF.net SVN: gar:[15152] csw/mgar/pkg/vim/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Jul 20 15:20:39 CEST 2011
Revision: 15152
http://gar.svn.sourceforge.net/gar/?rev=15152&view=rev
Author: dmichelsen
Date: 2011-07-20 13:20:39 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
vim: Update to patch 254, reorg split, add python support
Modified Paths:
--------------
csw/mgar/pkg/vim/trunk/Makefile
csw/mgar/pkg/vim/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/vim/trunk/files/0001-Expect-tab-instead-of-whitespace.patch
Modified: csw/mgar/pkg/vim/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vim/trunk/Makefile 2011-07-20 12:47:08 UTC (rev 15151)
+++ csw/mgar/pkg/vim/trunk/Makefile 2011-07-20 13:20:39 UTC (rev 15152)
@@ -1,6 +1,6 @@
NAME = vim
DISTVERSION = 7.3
-PATCHREV = 055
+PATCHREV = 254
VERSION = $(DISTVERSION).$(PATCHREV)
CATEGORIES = utils
SPKG_SOURCEURL = http://www.vim.org/download.php
@@ -13,13 +13,35 @@
Unix, MS Windows, OS/2, Macintosh, VMS, and Amiga.
endef
-PACKAGES = CSWvim CSWvimrt
+PACKAGES = CSWvim
CATALOGNAME_CSWvim = vim
+SPKG_DESC_CSWvim = Vi IMproved without GUI
+RUNTIME_DEP_PKGS_CSWvim += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWvim += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWvim += CSWiconv
+# This contains base configuration stuff checkpkg cannot track
+RUNTIME_DEP_PKGS_CSWvim += CSWvimrt
+CHECKPKG_OVERRIDES_CSWvim += surplus-dependency|CSWvimrt
+INCOMPATIBLE_PKGS_CSWvim = CSWvim-minimal
+
+PACKAGES += CSWvimrt
CATALOGNAME_CSWvimrt = vimrt
-SPKG_DESC_CSWvim = Vi IMproved without GUI
SPKG_DESC_CSWvimrt = Vi IMproved runtime and documentation
+PKGFILES_CSWvimrt = $(sharedstatedir)/.*
ARCHALL_CSWvimrt = 1
+# We have .el files, but that is purely optional
+CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWemacscommon
+
+# Some tools need Perl and one is hardcoded to CSW Perl:
+# /opt/csw/share/vim/vim73/tools/efm_perl.pl
+# Maybe the tools should be separated package depending on CSWperl.
+# Overwrite for the moment.
+CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWperl
+
+# These are all in the docs
+CHECKPKG_OVERRIDES_CSWvimrt += file-with-bad-content
+
MASTER_SITES = ftp://ftp.vim.org/pub/vim/patches/$(DISTVERSION)/
MASTER_SITES += ftp://ftp.vim.org/pub/vim/extra/
MASTER_SITES += ftp://ftp.vim.org/pub/vim/unix/
@@ -32,8 +54,10 @@
PATCHFILES = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T))
-WORKSRC = $(WORKDIR)/$(NAME)$(subst .,,$(DISTVERSION))
+PATCHFILES += 0001-Expect-tab-instead-of-whitespace.patch
+DISTNAME = $(NAME)$(subst .,,$(DISTVERSION))
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-xim
CONFIGURE_ARGS += --without-x
@@ -45,27 +69,17 @@
CONFIGURE_ARGS += --enable-multibyte
CONFIGURE_ARGS += --enable-cscope
+CONFIGURE_ARGS += --enable-pythoninterp=dynamic
+CONFIGURE_ARGS += --with-python-config-dir=$(libdir)/python
+
BUILD_ARGS = "VIMRCLOC=/opt/csw/share/vim"
BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim$(subst .,,$(DISTVERSION))"
PATCHDIRLEVEL = 0
-RUNTIME_DEP_PKGS_CSWvim = CSWggettextrt CSWiconv CSWncurses CSWvimrt
-INCOMPATIBLE_PKGS_CSWvim = CSWvim-minimal
-
-PKGFILES_CSWvimrt = /opt/csw/share/.*
-
# Note: Tests require controlling terminal
TEST_TARGET = test
-CHECKPKG_OVERRIDES_CSWvim += surplus-dependency|CSWvimrt
-# We have .el files, but that is purely optional
-CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWemacscommon
-# Some tools need Perl and one is hardcoded to CSW Perl:
-# /opt/csw/share/vim/vim73/tools/efm_perl.pl
-# Maybe the tools should be separated package depending on CSWperl.
-# Overwrite for the moment.
-CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWperl
include gar/category.mk
Modified: csw/mgar/pkg/vim/trunk/checksums
===================================================================
--- csw/mgar/pkg/vim/trunk/checksums 2011-07-20 12:47:08 UTC (rev 15151)
+++ csw/mgar/pkg/vim/trunk/checksums 2011-07-20 13:20:39 UTC (rev 15152)
@@ -53,4 +53,203 @@
faaf035020dcf22b57fa76c998e4553b 7.3.053
90bd11788f022dc1107f93e702734a2a 7.3.054
5b4fe73d1c47ab36a6b0a8f5ddd2fe65 7.3.055
+b53b7452e5b92bb1b91e9dd97e52dfcd 7.3.056
+bce5e42b7d2b7a91c332e39ed1f0eec8 7.3.057
+1c6054466398f4612a81289de764ef5c 7.3.058
+e2cf5697e8708390e106553de68ebb2b 7.3.059
+16da4369ed89f0305cf2c3ed1bf338fc 7.3.060
+cbed85cdfe0ad4a1b7b43efc64b1531c 7.3.061
+77f08258dbf30e12914475802eeb9b3d 7.3.062
+97c878554fec3d4f9caf934c0a0c227d 7.3.063
+5f74fee465073a3eb48565300636d9db 7.3.064
+a20ea56117d918b43f5109c9c06787ed 7.3.065
+7c51cfbd55673906035df7b274b247c4 7.3.066
+45625adbc8757b46ba9393dc136cc2e1 7.3.067
+49b340dc261ed455c97d955517264a89 7.3.068
+b423664733d7fd9d7de052dad8154643 7.3.069
+b9ef636a41df5500f8437d38ab3177e2 7.3.070
+1afcb15f38d1e4926918dbbe52356382 7.3.071
+132f122c3b8ac49c1ad56f54c8994e3a 7.3.072
+4a387415ce192506bcb7353cd8dda3c0 7.3.073
+e2b2af94486554c6818693fbf1e3c34e 7.3.074
+91acb2d1e70f6b7bff5e02460d4c3e62 7.3.075
+2627b860bed5c08cead6e48986577fed 7.3.076
+2a8c6197b193a16cb273606d8afcb6b5 7.3.077
+660b3e99b1433a4e992e087e66bc1567 7.3.078
+f69b91c3c55ef81df257178e0af1ca73 7.3.079
+bbe3b3aa56bde525cd4028e807014b33 7.3.080
+d4ce2f5eab7a74f8a51a352b05fde53f 7.3.081
+75b69fb091a12c588992dd282841bde0 7.3.082
+d6bc3caf366cc6735e35bb624701c52b 7.3.083
+c1056e5eac01e94b841ee0f6698bd996 7.3.084
+008cab55300e4aca60b10c5da48fa64b 7.3.085
+d3ce3330380068fc0bb71e1e46715cf8 7.3.086
+76ad849ed21f0f7ea55b5e45bf0ebb8e 7.3.087
+5fe24e8201c4a6bfb04cc1eba830c7d1 7.3.088
+e11e017a6ec88695ed4e68823c8519c8 7.3.089
+85b27ad24ccf7a0a35659104ad5d50a0 7.3.090
+30c533bfa3ce25d6d4ae69537ac6dc5c 7.3.091
+9583f16a6bc74a69848278648692dd0b 7.3.092
+dc1df531af4c8b457291ec3fe55df57d 7.3.093
+4f2fa0bc9ddb599ad5f202474d1baaa9 7.3.094
+527d8531d7d347784506508114eb436c 7.3.095
+07cc669cf0c531c4b9f6410350baad64 7.3.096
+ef918a856c94f9e1ac3732e967e99421 7.3.097
+f5d870f443d75a9849477e937774681b 7.3.098
+60fde4bc61ce362397d430b79856355b 7.3.099
+eb3795dd02ef74e825f0a41b3ae4d6d5 7.3.100
+44b023e4248395d2ccaaac9fda15407b 7.3.101
+f1a8bcdb44fee91a060b5ef4ea8721dc 7.3.102
+fca2fd799b4b76010b2df17e6b0e0c14 7.3.103
+bf17912c76b1bc930af41836899483ae 7.3.104
+2624889029aa8d780eea22c249d53691 7.3.105
+8c94d914a359a1aa81b41efd00f58486 7.3.106
+f91ca9cbbc54d8b9fca3c1884ddcce7a 7.3.107
+5963094fc8a07e5730f7557a9d8d1cf4 7.3.108
+bd660ce14300a3110ea7638c1e11eabd 7.3.109
+ee0dc9b0b38308aa235f0b2b3e5dcea5 7.3.110
+c91b1fb95f25fa9e0915b9e8cf613a49 7.3.111
+67f989ce99ce53c7ab6df5478ca3a90c 7.3.112
+4da7b00c8009a2ebcef6b9dac625bd5f 7.3.113
+5b4db3de0ecef5ca677cba0aedcdff89 7.3.114
+3aa1850a33864d0476104c12be96047d 7.3.115
+31c69a15462f16a6f7601a50a3eaf89b 7.3.116
+9c4c855111dc6acda7c05488da75c7b4 7.3.117
+0ef3f26f6ebd0ae418dae472eb6afcc1 7.3.118
+0010f602a56167a874739c1101da5255 7.3.119
+6cd06c54fe40ab1082fafa461174ab23 7.3.120
+7d4f0af28d817baea5e6c43bde1e1df2 7.3.121
+363a24bec321be90193b60b10e29587b 7.3.122
+7f31de4c9fffd8e504685eef84666dae 7.3.123
+642c96e6a15b67f38022131b5e46132a 7.3.124
+5fc1a25eaae81f91557672a2426b74e1 7.3.125
+6ff55983c952781418172f93374db783 7.3.126
+84ef6940f97c7c946d136dad4ac81d3b 7.3.127
+d56e9032d55d99d19ddb9dfd8f52ccf2 7.3.128
+4a7699f7db4032b1d67e52b3d384b647 7.3.129
+f1a33fe74ead0aaf7a440a7432480d6f 7.3.130
+bbf7bb68b777b831029082e0e865dc2d 7.3.131
+3f761bf7b71b038dc2f775781e6847e5 7.3.132
+7cc3bce20547604b0521be8383c9a6d0 7.3.133
+a34e3da262050d97cb9db46acdd4490b 7.3.134
+b75499f0b035962d7f19de1e2b866f35 7.3.135
+a3631062779f49ed4ab4bc7f87fd307c 7.3.136
+53a736c4dbf298fa465f01d06c15de0b 7.3.137
+a51e6c61c24303a90941571b6bd7753b 7.3.138
+8da651b02794bc7a34286e455e916a2f 7.3.139
+6312930f6a176305bd4f9838700605e6 7.3.140
+2c9665b8da67d1712db9d300b87fc07c 7.3.141
+613a153f1b0901b76f0026a51f19530e 7.3.142
+c3132b4cddda5fa3c11c048c5297e872 7.3.143
+cc8986b4f694b76cb348375c158034d6 7.3.144
+c919c2ea5b3e5b397a53eb8fcc4accde 7.3.145
+d3790014ac6c74d4691e64a839ac0d3a 7.3.146
+5816612acbb7e9862e71defb7e596243 7.3.147
+7610c456812aa93bacaedb8fb90a638b 7.3.148
+7f689222db2fbbc2a1c616b4e2eb6f50 7.3.149
+4ccdacef73da3c14360832393fd18956 7.3.150
+0322e8b82527503b08911c3436f4e5b7 7.3.151
+60e6111797abb558f9869b72892de126 7.3.152
+e791726fd04b11b9293f472fe9e3cb51 7.3.153
+1def37c933f7b1a0aaeb6bb8545e91de 7.3.154
+b1c84972297e04dead1c06c7976ebd69 7.3.155
+05a5584d72fa02708e12de57c1dd230d 7.3.156
+bcbe4f926d7c4ce7c33f2ee163f8e481 7.3.157
+5457a5d2d8e192662dafb4441d728b1a 7.3.158
+8a1b1e2b134e1ffe8058a1007b3f0244 7.3.159
+f8ad1c839a70db0fd67d9a91f2c5adfe 7.3.160
+b8e6b94818cdd5d824bb5bdd71845dcf 7.3.161
+640e4dab93c97e3fc591fa139f3626a0 7.3.162
+b718f9c84f0ef31746837aeb76584b9d 7.3.163
+3658977a1d6601e084001f4ca14990c2 7.3.164
+2a351662b4eb7546a13a697ce6c99e2c 7.3.165
+49be67f5a924f41efd02092d5a363ea2 7.3.166
+763d467cb7f52e65fa04abd47391c46f 7.3.167
+b03500932a593d8f8b503b7f4e597d27 7.3.168
+2bdead87e63f14c1ad94baa4ab83ea31 7.3.169
+55be8ac756a32da430a27684f9b8e1a8 7.3.170
+36cc61d0b91ef0c3a580e244e4062b1c 7.3.171
+38e90f8e7c56ea752ddeef1310854679 7.3.172
+9265e7ca265d58278475cdb4c981b8dd 7.3.173
+3e594ed292b1f2f19a5c9f4906c1479a 7.3.174
+acb7321db8f740b6671765185603a718 7.3.175
+6712e5eebfc7132b4d23044854c29cde 7.3.176
+687088eda45ccf1fdd83e0ce18cdbeb9 7.3.177
+44e37b259178bbea8de1aad8744b639c 7.3.178
+ef97eecd1643ae1375c2141b42ff2a8f 7.3.179
+85efa44de886e0e84914b13f7e356cd3 7.3.180
+a41871ead65ba67d0e91f46e4ed31d74 7.3.181
+a496deb8e705a15931566cc54de95b0e 7.3.182
+a5a93687afc2acb93caed156c5990507 7.3.183
+79db5edf359097848c50baa8e9f1de66 7.3.184
+5a466b6c01d84c6f3b58b409ec77147f 7.3.185
+2073073b84c308648bcc222a6e0e396b 7.3.186
+0aebb3a0fcf78937c8f4930de20fdb09 7.3.187
+665e541c24f5571bb07354a4a6441a28 7.3.188
+540131415452ba4cfa01332ab60571e4 7.3.189
+55d0ac5b715fabce51a05bf8380f6c01 7.3.190
+895a121a97504929ebd5a7a8eb67a2a3 7.3.191
+3b957b9de63a93a30e4c1ee7e9def7c9 7.3.192
+b37da657ae0b51f8181eb8a31d6cc4e8 7.3.193
+c911d5f14e34c8d0c1d3abea73bc830d 7.3.194
+dc09888cdc86f980789cd22889df0bcd 7.3.195
+fb396c9c2e57daf55fdba63635208985 7.3.196
+448eca99d96f5f5c4ddbe05e66ebf812 7.3.197
+d977fa831208ee16503b87a3a29673fe 7.3.198
+39028c76f0b15f9d014b050fb222d24a 7.3.199
+2dd2f0cd5b9af8f127fa02b3d838dd2f 7.3.200
+c1cd1bdaa61c6ab76a39dc59926781ef 7.3.201
+88de82991d04a741c1038f8ce061c5c7 7.3.202
+0d460c9ad9cfac6074960000ff98be7e 7.3.203
+07443373d2221a375988d58e25935599 7.3.204
+857f19149697b27088447bbac1dac8a2 7.3.205
+f6c7f47221c0459c7742a82163b875ec 7.3.206
+8345c7411daf0d5874569aecc00116d6 7.3.207
+305b1a2aca53880ae175bcf5c8b8677c 7.3.208
+318086a8e28f1ef629c447410bcfd5bb 7.3.209
+fc829046b2c27d7255bd41ee53c6bdf3 7.3.210
+3e6c6aeadc3e4442426db92774030fcc 7.3.211
+3fb34281705b6e665b9ec2dbe4529170 7.3.212
+1c2fb1aec7b85b941d4459e65dbf6be2 7.3.213
+d4dc20af8f15778ddea5669ee758d8c1 7.3.214
+ab31988223b9ec68c551ef2e493049d6 7.3.215
+8bfadd46248bbfbe7979d1d6161befc2 7.3.216
+d42c9de414acf351e37f19af168905bc 7.3.217
+6d01c2640c6c27c4b52462d6fb932598 7.3.218
+b723228570479525596d8ecb801d9c76 7.3.219
+36dd4e49c8d0a7407cd3447ce11c0aff 7.3.220
+11791e6072d3237424c0f383835a4b7f 7.3.221
+4a084d6e010fc5c31a89478a918ebe53 7.3.222
+fb57886a2e3e9791b87d68fbc9eef52f 7.3.223
+0b9747a5a0465d7fe543f8b61ffc9b06 7.3.224
+3a36d002f35d54e7e71da0cde224534b 7.3.225
+caa99b2aba3d2f64d4da35c28d4e6ef8 7.3.226
+4e0baffb29e3e38487c4206c78ea515c 7.3.227
+511c6f3ee0703d2b1380c72c7d296e6f 7.3.228
+14997e70581cfb6ff6f2388789171e33 7.3.229
+17259f324289a8e398a3acfba915b979 7.3.230
+97d5c45f8962fc301ca53ce8c5ecc7eb 7.3.231
+4601b72331313fbd68789673055020a8 7.3.232
+d00dd333810b99a9c34ea9fe44c6dec7 7.3.233
+e93dd1dcf4659ad7f7a31d186842180d 7.3.234
+78e79d2172140d6cb26012859d2b765e 7.3.235
+f48a731e37bb068a11615fc84b13d9b4 7.3.236
+ae4c4ba1a880872d735e33d721847f82 7.3.237
+d7b91bce232cc3592aee0b999f2260ce 7.3.238
+45c528a5991e5269d0f99f1bd60a1108 7.3.239
+e73f15b7f1a7cf257a126a797bc1024e 7.3.240
+f32f5f0c4c437f7f661bfe1bbd03924f 7.3.241
+4071af06946723d29a502a0a005ad79a 7.3.242
+93d093ed4a247ebfd9d485e1949b73c6 7.3.243
+0eaf4bd3d26ed9760901e9dbefc0a631 7.3.244
+7906c8701fcfc608c2845937c58d4ebe 7.3.245
+514a57d874e75020342622e3031ff1f6 7.3.246
+0cc613cf226c3eb2b2c6992f6abf8fa6 7.3.247
+36aa885fdfb0ae812b3f3371ee178b7d 7.3.248
+2f1a1c835e46e409ca62a906b014bead 7.3.249
+e3c8db05d35f495ab87f2bd7d6f0798c 7.3.250
+8fad46eda9f29a79b852f9761951b528 7.3.251
+54e0f0c2d867cc3e9dc0d619ceab2fa0 7.3.252
+1dba332eda89257de3b4ab6bb7df2ffb 7.3.253
+42135c50e9b0de895fea643b9fbf31ff 7.3.254
5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2
Added: csw/mgar/pkg/vim/trunk/files/0001-Expect-tab-instead-of-whitespace.patch
===================================================================
--- csw/mgar/pkg/vim/trunk/files/0001-Expect-tab-instead-of-whitespace.patch (rev 0)
+++ csw/mgar/pkg/vim/trunk/files/0001-Expect-tab-instead-of-whitespace.patch 2011-07-20 13:20:39 UTC (rev 15152)
@@ -0,0 +1,19 @@
+From 9befd8901e41aeac1f72cbf155aa3f8474ab581e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 20 Jul 2011 12:44:53 +0200
+Subject: [PATCH] Expect tab instead of whitespace
+
+---
+ src/testdir/test77.ok | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/testdir/test77.ok b/src/testdir/test77.ok
+index 11f148c..c8f3917 100644
+--- a/src/testdir/test77.ok
++++ b/src/testdir/test77.ok
+@@ -1 +1 @@
+-3678979763 14888896 Xtest
++3678979763 14888896 Xtest
+--
+1.7.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list