Date: Sun, 30 Jun 2013 14:21:54 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322086 - in head/editors/vim: . files Message-ID: <201306301421.r5UELsK1014537@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Sun Jun 30 14:21:53 2013 New Revision: 322086 URL: http://svnweb.freebsd.org/changeset/ports/322086 Log: Many of the BADPATCHES do apply. Some "just apply", others needed tweaks: * patch 7.3.122 applies, but caused a pre-configure build error. Follow the "Solution" instructions in the patch and start applying patch 7.3.122. * Manually doing the 's/newwin/new_wp/g' of patch 7.3.400, allows patch 7.3.603 to apply. Unfortunately, no other additional patches apply due to patch 7.3.603 applying. * patch 7.3.674 does apply fine, but needed files/patch-configure adjusted. Modified: head/editors/vim/Makefile head/editors/vim/distinfo head/editors/vim/files/patch-configure Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Sun Jun 30 13:47:07 2013 (r322085) +++ head/editors/vim/Makefile Sun Jun 30 14:21:53 2013 (r322086) @@ -7,10 +7,15 @@ PORTNAME?= vim # ! _NEVER_ reduce or lower PATCHLEVEL, even if the PATCHLEVEL # ! value # is added to BADPATCHES. Doing otherwise will cause # ! PORTEPOCH to be needed, which we do NOT want. +# +# ! DO NOT increase PATCHLEVEL to a patch listed in BADPATCHES. +# ! Doing so is dis-genuine. It implies we're at a level we are +# ! not. The "PATCHLEVEL" patch needs to apply before bumping +# ! PATCHLEVEL to that level. PATCHLEVEL= 1014 PORTVERSION= 7.3.${PATCHLEVEL} RELEASE= vim-${PORTVERSION:C/\.[0-9a-z]*$//} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= ${MASTER_SITE_VIM} DISTFILES= ${RELEASE}${EXTRACT_SUFX} @@ -20,14 +25,14 @@ 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= 122 225 235 246 247 252 253 336 386 387 400 434 487 491 527 569 578 579 580 581 583 584 \ - 603 611 629 640 650 654 655 656 657 658 659 660 670 671 672 674 683 684 688 693 694 709 711 748 \ - 749 750 751 769 771 780 786 791 793 796 798 803 805 808 810 816 817 819 824 825 827 829 831 \ - 838 853 861 873 881 887 890 893 895 896 897 898 904 906 907 908 909 910 911 914 922 924 \ +BADPATCHES= 225 235 246 247 252 253 336 386 387 400 434 487 491 527 569 578 579 580 581 583 584 \ + 611 640 650 654 655 656 657 658 659 660 670 671 672 683 684 688 711 748 \ + 749 751 780 786 791 793 796 798 803 808 810 816 817 819 825 827 831 \ + 838 861 873 881 887 890 893 895 896 898 904 906 907 908 909 910 911 914 922 924 \ 925 926 928 929 932 937 938 939 940 941 942 943 945 947 948 949 950 951 952 954 955 956 \ 957 958 959 960 961 962 963 964 965 966 967 969 970 973 975 976 977 978 979 980 981 982 \ 983 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1001 1002 1003 1004 1005 1006 \ - 1007 1008 1009 1010 1011 1012 1013 1014 + 1008 1009 1010 1011 1012 1013 1014 .for p in ${BADPATCHES} PATCHFILES:= ${PATCHFILES:N7.3.${p}} @@ -176,6 +181,9 @@ USES+= iconv .endif +pre-patch: + @${REINPLACE_CMD} -e 's/newwin/new_wp/g' ${WRKSRC}/window.c + post-patch: @(${FIND} ${WRKSRC}/../runtime/ -name menu\*.vim -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's,ctags -R \.,${CTAGS_CMD},g') @@ -184,6 +192,7 @@ post-patch: .endif pre-configure: + @${CP} -pv ${WRKSRC}/config.mk.dist ${WRKSRC}/auto/config.mk @(cd ${WRKSRC} ; ${MAKE} distclean) @${REINPLACE_CMD} -e ' \ s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \ Modified: head/editors/vim/distinfo ============================================================================== --- head/editors/vim/distinfo Sun Jun 30 13:47:07 2013 (r322085) +++ head/editors/vim/distinfo Sun Jun 30 14:21:53 2013 (r322086) @@ -242,6 +242,8 @@ SHA256 (vim/7.3.120) = a228183dde81726d1 SIZE (vim/7.3.120) = 2597 SHA256 (vim/7.3.121) = 0e0ba10a442ea46cd3936c1bc64384700209efd48a7486b341f44ca275fe87fc SIZE (vim/7.3.121) = 1721 +SHA256 (vim/7.3.122) = 2338aee9de9b373d8f93d98823c3375e932b101ae661d23d6cdb14c7863ea214 +SIZE (vim/7.3.122) = 3936 SHA256 (vim/7.3.123) = 54a8809e78a480a4bcc8883eb987428fd08f7774a70cb4cc0c9502f0fb1eb2c7 SIZE (vim/7.3.123) = 1954 SHA256 (vim/7.3.124) = dc163315ff0d9dd1ce3e7b2a5fdb914baab2f21d54185d339f4acbc69f1ee0f2 @@ -1160,6 +1162,8 @@ SHA256 (vim/7.3.601) = 0f7b4b0f1dd098cfd SIZE (vim/7.3.601) = 1492 SHA256 (vim/7.3.602) = 6ad72a988da2247b0845d36c14a38707e90801a8a936e02e2b75d1a0500350a8 SIZE (vim/7.3.602) = 1532 +SHA256 (vim/7.3.603) = 21930c861f88862753b00456159751e3df8e3e59a5c7a4eb9ff503bcb0ed72a0 +SIZE (vim/7.3.603) = 11248 SHA256 (vim/7.3.604) = a7156288fb23c18c9b97ba5c424789d2b0db07d09b366910cb77c66f64176c58 SIZE (vim/7.3.604) = 1861 SHA256 (vim/7.3.605) = 798bec8afa11e4b7fc1ba90f95d71d205c5b2873de2072d0e8055b32ad30070b @@ -1208,6 +1212,8 @@ SHA256 (vim/7.3.627) = 9ebebe46b6e7f5564 SIZE (vim/7.3.627) = 2803 SHA256 (vim/7.3.628) = 25bdb13b6ed7707e69c75bdcc3fb6dd47f4ea80d43a4f0bc0295a35d8c06d621 SIZE (vim/7.3.628) = 1802 +SHA256 (vim/7.3.629) = 0e69a9f0e47e3854ca92585f4b11a58734bea17acfc93bb58d12697966517f82 +SIZE (vim/7.3.629) = 12019 SHA256 (vim/7.3.630) = e523b4d92a5e315fbdd799562ebcf21d391e44335bce138938fe05ac053e79f8 SIZE (vim/7.3.630) = 1487 SHA256 (vim/7.3.631) = 07c64812e1d891adcdd435de0d7fdce1a0978585a4633cd15a7eb647ffbd6867 @@ -1272,6 +1278,8 @@ SHA256 (vim/7.3.669) = ddf9f56a0705dd9c1 SIZE (vim/7.3.669) = 4757 SHA256 (vim/7.3.673) = 985f26d99311e1f8f7de6030047a28686e89389dbeb31d1483cdb4f27dab9b64 SIZE (vim/7.3.673) = 1967 +SHA256 (vim/7.3.674) = 51aeea7b353364c05ec9b182e3fa5bace092d062589231f3b1018c3cfc1e21ca +SIZE (vim/7.3.674) = 10873 SHA256 (vim/7.3.675) = ee7436590bac240073019860fce38c261b869da0bea55b41fb46d568364c0f98 SIZE (vim/7.3.675) = 1597 SHA256 (vim/7.3.676) = 8c38cfeff96fc56105b7a11e4e13bf66e33988bc56c8fcea81d7efb4d2bd987c @@ -1302,6 +1310,10 @@ SHA256 (vim/7.3.691) = 7873ba723abadaf05 SIZE (vim/7.3.691) = 1910 SHA256 (vim/7.3.692) = 6b10461717c264fc4fe7e8948795428b84ed98514dd82f7caf0e045c406aa8ff SIZE (vim/7.3.692) = 1598 +SHA256 (vim/7.3.693) = 69f8bed55d57939b8a64f1af556e41f89b15c52a7e7974bb070e06643894c9af +SIZE (vim/7.3.693) = 5071 +SHA256 (vim/7.3.694) = 3cf520ce20982cc11e2028350ef808fc14f87b585d6f45cb1313d1393abfc3bb +SIZE (vim/7.3.694) = 4631 SHA256 (vim/7.3.695) = 53079920ddb1b34880092b667064c85e8947b6bc54bdad7d9b9b134cbab78a08 SIZE (vim/7.3.695) = 3710 SHA256 (vim/7.3.696) = 9bfef90f0f251765bee314785b73e147352c946b02f2526dde82e51368c4830f @@ -1330,6 +1342,8 @@ SHA256 (vim/7.3.707) = 7581ecba97354ad58 SIZE (vim/7.3.707) = 4088 SHA256 (vim/7.3.708) = 65dc542f6fbab9ef1b778ee579c2840c0e89b56ec09b50d5684a5070d41f2f78 SIZE (vim/7.3.708) = 3001 +SHA256 (vim/7.3.709) = 56aade2f827a95635b94f3c30d8bb220da3a39b3a4185993eedbd2801e2e9e84 +SIZE (vim/7.3.709) = 1513 SHA256 (vim/7.3.710) = 1618869bb7dc25b1ed7e45e3d795cc75d1e75611d054efef7f43713c852e34dd SIZE (vim/7.3.710) = 1685 SHA256 (vim/7.3.712) = a030056c9411d2471ff1375a3fa87b23f71abfb648787706f9d203636caa075b @@ -1404,6 +1418,8 @@ SHA256 (vim/7.3.746) = 6bb49221f016b4fc5 SIZE (vim/7.3.746) = 2902 SHA256 (vim/7.3.747) = 49aea6e95ef8d94ac9a4a91e33325ba4d672039e508793fa760bef680bd682d7 SIZE (vim/7.3.747) = 2285 +SHA256 (vim/7.3.750) = 706e6b6a8ecc50c116d255c784291f7ec96e70327ec67d1f8674787b97a5a8dd +SIZE (vim/7.3.750) = 3050 SHA256 (vim/7.3.752) = ec05e6866fefef51991ca121f4311a959710743950f76ce396da1a554e29b0b1 SIZE (vim/7.3.752) = 2410 SHA256 (vim/7.3.753) = 40802ac7a1e27b78d7f08cfb5f90f919bb4f652295cd0eba56312f416ecfd44a @@ -1438,8 +1454,12 @@ SHA256 (vim/7.3.767) = 6444294ee8b9fcbc3 SIZE (vim/7.3.767) = 4437 SHA256 (vim/7.3.768) = 49fdd1fd7a26e9352fc26cf45f6ee646dec12c4e4fce07eb38d9efc37f2b8295 SIZE (vim/7.3.768) = 1979 +SHA256 (vim/7.3.769) = 2cdaf057ed1ee444e75d2483cc09730349653fcbfab17dcffb7732b9092ca121 +SIZE (vim/7.3.769) = 9748 SHA256 (vim/7.3.770) = 0f604b16d1f38e3ea884a6c87133322df51b88b8e43880fd905b6f24e1cfe847 SIZE (vim/7.3.770) = 3912 +SHA256 (vim/7.3.771) = bda95986b5cdd0ae91b2c38e3b12aaab6d78ae2648283deadd64739d20ca3261 +SIZE (vim/7.3.771) = 2074 SHA256 (vim/7.3.772) = 32caed3f75387b8692322f6eb79ab855b391ec9229b48addbd71dc89c34ce596 SIZE (vim/7.3.772) = 1539 SHA256 (vim/7.3.773) = d0254ceb18517d84e906c99dd8dbdf1a17d50793b305187abf7216bbc2e84d6e @@ -1492,6 +1512,8 @@ SHA256 (vim/7.3.802) = ff2a594cea454dfd5 SIZE (vim/7.3.802) = 1426 SHA256 (vim/7.3.804) = 13e87f6443ed23aa6128cd9ed47f3bf7a9b1bfa496c3e1016780964c25249510 SIZE (vim/7.3.804) = 1373 +SHA256 (vim/7.3.805) = b5ea5bca3e7ce103aea454c5cb2cffffd7382bc7aaa49247ec80cfa08ee4a2c7 +SIZE (vim/7.3.805) = 3434 SHA256 (vim/7.3.806) = b9458a85adc4a325488b970183cde0ddceeaea9996603ebc9eeee331aa0287b4 SIZE (vim/7.3.806) = 4287 SHA256 (vim/7.3.807) = b6621f7ccf390a3c332fcfeb3a9458ca8ca57beb723460dbfedc3ac0efb9768c @@ -1518,10 +1540,14 @@ SHA256 (vim/7.3.822) = 398f881c54639a7e3 SIZE (vim/7.3.822) = 4013 SHA256 (vim/7.3.823) = 100a706772e3ad9bdda724e567102c2b5c10c31fac209bd23c047f1703740c3d SIZE (vim/7.3.823) = 2051 +SHA256 (vim/7.3.824) = 08515052383c5f70430ea410131e8197cc738b8f8b6d5941de440816eebab53f +SIZE (vim/7.3.824) = 1566 SHA256 (vim/7.3.826) = 1dc1bbdc79cdfef994f0742b0cc903dad30415c2c4068ede727124161b343abd SIZE (vim/7.3.826) = 3807 SHA256 (vim/7.3.828) = 5a6eee1b1929035d71c56a5aa84b00ad09b213b5d18752db34af68636587a700 SIZE (vim/7.3.828) = 4780 +SHA256 (vim/7.3.829) = ca1b20bf69f9a50dc8c4cfff6060a84e622951bd579ceaf1b6a5f271a1d9950e +SIZE (vim/7.3.829) = 2664 SHA256 (vim/7.3.830) = b206651bf116e6d1e6fd6971816351b84f6db39862ecb0de856da30352f372c0 SIZE (vim/7.3.830) = 2841 SHA256 (vim/7.3.832) = d9212cc50211102adc81028f036601f283a469169d839ae65d7c74969b071ea8 @@ -1564,6 +1590,8 @@ SHA256 (vim/7.3.851) = b54bb6a056effda04 SIZE (vim/7.3.851) = 2264 SHA256 (vim/7.3.852) = e794ffca06dac76a81ad4996bbf2460c468776f0158cfe0a52e23e03697f4bd9 SIZE (vim/7.3.852) = 3376 +SHA256 (vim/7.3.853) = ebaaa7a7ef919ef772b601b8feaf59e871241c4a44527cddf9ecaf1138061636 +SIZE (vim/7.3.853) = 2711 SHA256 (vim/7.3.854) = f72e4692c4d68e9ef2cf04980bfceed930b847d49302e62a150b2edfc13094d1 SIZE (vim/7.3.854) = 1630 SHA256 (vim/7.3.855) = 5b8ba58dc8631ff6932c57a11611447f4aa4fb7b53f1404c3c7465a6eb0c3f60 @@ -1634,6 +1662,8 @@ SHA256 (vim/7.3.892) = 4c541d5d7b29d8884 SIZE (vim/7.3.892) = 7984 SHA256 (vim/7.3.894) = 2c284e244b5f39acf6ce32ccd33cc8f06c70a3119b42722b7639b4c24fd0dc71 SIZE (vim/7.3.894) = 2219 +SHA256 (vim/7.3.897) = 2730fbc2cc49a8acec60d04bc9c3c013ae9394c9d365bf0573290316461b589f +SIZE (vim/7.3.897) = 4487 SHA256 (vim/7.3.899) = 9b0199aa8cbe6fe5e897d8db28ecfd302ecd275eda323d30374108143ea550c0 SIZE (vim/7.3.899) = 2116 SHA256 (vim/7.3.900) = 700e1f79efd1d7d3c60b6c106b027fbb5d0c74390f2e54233df1f730df4cac36 @@ -1700,3 +1730,5 @@ SHA256 (vim/7.3.985) = 129c60b68757d599c SIZE (vim/7.3.985) = 1691 SHA256 (vim/7.3.1000) = 84811fd90146d77e3d360b6e5829e83d580420e8b076972b80caa6a3aac0beef SIZE (vim/7.3.1000) = 1637 +SHA256 (vim/7.3.1007) = 6986fdce8fcc4e7a2c8fabd83ec4d59bd939f2388d480dcf53774ab7101d5956 +SIZE (vim/7.3.1007) = 1745 Modified: head/editors/vim/files/patch-configure ============================================================================== --- head/editors/vim/files/patch-configure Sun Jun 30 13:47:07 2013 (r322085) +++ head/editors/vim/files/patch-configure Sun Jun 30 14:21:53 2013 (r322086) @@ -9,7 +9,7 @@ LUA_SRC="if_lua.c" @@ -4725,3 +4726,4 @@ $as_echo "no" >&6; } LUA_LIBS="" -- LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS" +- LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS" + vi_cv_version_lua=${LUA_VER} + LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua-${vi_cv_version_lua}.so.$LUA_VER_SH\\\" $LUA_CFLAGS" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306301421.r5UELsK1014537>