Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7703c194558f254901edf02a5a1e3c882117490d
commit 7703c194558f254901edf02a5a1e3c882117490d Author: crazy <[email protected]> Date: Wed Apr 27 11:29:27 2016 +0200 vim-7.4-4-x86_64 * move to base * TMP removed gvim , will have an own package * kill arm diff --git a/source/apps/vim/FrugalBuild b/source/apps/vim/FrugalBuild deleted file mode 100644 index b754553..0000000 --- a/source/apps/vim/FrugalBuild +++ /dev/null @@ -1,79 +0,0 @@ -# Compiling Time: 0.50 SBU -# Maintainer: Miklos Vajna <[email protected]> - -USE_GUI=${USE_GUI:-"y"} - -pkgname=vim -pkgver=7.4 -pkgrel=3 -pkgdesc="VIM - Vi IMproved console" -url="http://www.vim.org" -depends=('ncurses>=6.0-3' 'xfsprogs-acl') -makedepends=('python>=2.7.4-1') -groups=('apps') -options=('scriptlet') -archs=('i686' 'x86_64' 'arm') -backup=(usr/share/vim/vimrc) -up2date="lynx -dump $url/sources.php|grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=(ftp://ftp.vim.org/pub/vim/unix/$pkgname-$pkgver.tar.bz2 \ - gvim.xpm README.Frugalware \ - vim-vimrc.diff frugalware.diff) -sha1sums=('601abf7cc2b5ab186f40d8790e542f86afca86b7' \ - 'f7262c7429c42b7c1ef9cf1eaa6aa12292933525' \ - '50e139d94557b2ca361fed2130af103c47a8d654' \ - '985911e5902d495897105cdd1570dfe47adfa254' \ - '2a13f115db21d458a03c60e90945ef026eb24ca2') - -if Fuse $USE_GUI; then - makedepends+=('x11-protos') - subpkgs=('gvim') - subdescs=("VIM - Vi IMproved console (GTK version)") - subdepends=("gpm>=1.20.5-2 gtk+2>=2.20.0-2 libxpm libsm libice libxt") - subrodepends=("vim=$pkgver") - subgroups=('xapps') - subarchs=('i686 x86_64 arm') - _F_desktop_filename='gvim.desktop' - _F_desktop_name='gvim' - _F_desktop_desc='VIM - Vi IMproved console (GTK version)' - _F_desktop_icon='gvim.xpm' - _F_desktop_exec='gvim' - _F_desktop_categories='Utility;TextEditor;GTK;' -fi - -build() -{ - Fcd vim${pkgver/.} - Fpatchall - cd src - - # Remove these 2 lines if the linking script is ever fixed. - # It loops infinitely for me. - Fexec sed -i '2 i $LINK -Wl,--as-needed' link.sh - Fexec sed -i '3 i exit $?' link.sh - - if Fuse $USE_GUI; then - # first build gvim - Fmake --prefix=/usr --with-x --enable-gui=gtk2 \ - --enable-multibyte --enable-pythoninterp --with-features=big - make DESTDIR=$Fdestdir VIMRTDIR= installvimbin - Fmv /usr/bin/vim /usr/bin/gvim - Fln /usr/bin/gvim /usr/bin/gview - Ficon ../gvim.xpm - Fdesktop2 - make distclean || return 1 - fi - - # now vim - Fmake --localstatedir=/var/lib/$pkgname --disable-gpm --without-x \ - --prefix=/usr --enable-gui=no \ - --enable-multibyte --enable-pythoninterp --with-features=big - make DESTDIR=$Fdestdir VIMRTDIR= install || return 1 - Fcp /usr/share/vim/vimrc_example.vim /usr/share/vim/vimrc - Fdoc README.Frugalware - - if Fuse $USE_GUI; then - Fsplit gvim usr/bin/g{vim,view} - Fsplit gvim usr/share/{applications,pixmaps} - fi -} -# optimization ok diff --git a/source/apps/vim/gvim.xpm b/source/apps/vim/gvim.xpm deleted file mode 100644 index 694720a..0000000 --- a/source/apps/vim/gvim.xpm +++ /dev/null @@ -1,46 +0,0 @@ -/* XPM */ -static char *magick[] = { -/* columns rows colors chars-per-pixel */ -"32 32 8 1", -" c Gray0", -". c #000080", -"X c #008000", -"o c Green", -"O c #808080", -"+ c #c0c0c0", -"@ c Gray100", -"# c None", -/* pixels */ -"############### ###############", -"############## oo ##############", -"### oXXo # ###", -"## @@@@@@@@@@@ XXXo @@@@@@@@@ ##", -"## @+++++++++++ XXX @+++++++++ #", -"### ++++++++++O XXXX ++++++++O #", -"#### O++++++OO XXXXXX O+++++OO #", -"#### @++++++O XXXXXX @+++++OO ##", -"#### @++++++O XXXXX @@++++OO ###", -"#### @++++++O XXXX @@++++OO ####", -"#### @++++++O XXX @@++++OO #####", -"#### @++++++O XX @@++++OO . ####", -"### @++++++O X @@++++OO XX. ###", -"## o @++++++O @@++++OO XXXX. ##", -"# oX @++++++O @@++++OO XXXXXX. #", -" oXX @++++++O@@++++OO XXXXXXXX. ", -" oXX @++++++O@++++OO XXXXXXXXX. ", -"# oX @++++++O++++OO XXXXXXXXX. #", -"## o @++++++++++ XXXXXXXXX. ##", -"### @+++++++++ ++ XXXXXXXX. ###", -"#### @+++++++++ ++ XXXXXXX. ####", -"#### @++++++++O X X ###", -"#### @+++++++O +++ +++ +++ ++ ##", -"#### @++++++OO ++ ++++++++++ #", -"#### @+++++OO ++ ++..++ + ##", -"#### @++++OO X ++ ++. ++ ++ ##", -"#### @+++OO XX ++ ++ ++ ++ ##", -"#### @++OO X ++ ++ ++ ++ ###", -"##### +OO ## +++ ++ ++ +++ ##", -"###### #### . ## ## ###", -"############## .. ##############", -"############### ###############" -}; diff --git a/source/base/vim/FrugalBuild b/source/base/vim/FrugalBuild new file mode 100644 index 0000000..4a17bc6 --- /dev/null +++ b/source/base/vim/FrugalBuild @@ -0,0 +1,49 @@ +# Compiling Time: 0.50 SBU +# Maintainer: Miklos Vajna <[email protected]> + +pkgname=vim +pkgver=7.4 +pkgrel=4 +pkgdesc="VIM - Vi IMproved console" +url="http://www.vim.org" +depends=('ncurses>=6.0-3' 'xfsprogs-acl') +makedepends=('python>=2.7.4-1') +groups=('base') +options+=('scriptlet') +archs=('i686' 'x86_64') +backup=(usr/share/vim/vimrc) +up2date="lynx -dump $url/sources.php|grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" +source=(ftp://ftp.vim.org/pub/vim/unix/$pkgname-$pkgver.tar.bz2 README.Frugalware \ + vim-vimrc.diff frugalware.diff) +sha1sums=('601abf7cc2b5ab186f40d8790e542f86afca86b7' \ + '50e139d94557b2ca361fed2130af103c47a8d654' \ + '985911e5902d495897105cdd1570dfe47adfa254' \ + '2a13f115db21d458a03c60e90945ef026eb24ca2') + +build() +{ + Fcd vim${pkgver/.} + Fpatchall + cd src + + # Remove these 2 lines if the linking script is ever fixed. + # It loops infinitely for me. + Fexec sed -i '2 i $LINK -Wl,--as-needed' link.sh + Fexec sed -i '3 i exit $?' link.sh + + Fmake \ + --localstatedir=/var/lib/$pkgname \ + --disable-gpm \ + --without-x \ + --prefix=/usr \ + --enable-gui=no \ + --enable-multibyte \ + --enable-pythoninterp \ + --with-features=big + make DESTDIR=$Fdestdir VIMRTDIR= install || return 1 + + Fcp /usr/share/vim/vimrc_example.vim /usr/share/vim/vimrc + Fdoc README.Frugalware + +} +# optimization ok diff --git a/source/apps/vim/README.Frugalware b/source/base/vim/README.Frugalware similarity index 100% rename from source/apps/vim/README.Frugalware rename to source/base/vim/README.Frugalware diff --git a/source/apps/vim/frugalware.diff b/source/base/vim/frugalware.diff similarity index 100% rename from source/apps/vim/frugalware.diff rename to source/base/vim/frugalware.diff diff --git a/source/apps/vim/vim-vimrc.diff b/source/base/vim/vim-vimrc.diff similarity index 100% rename from source/apps/vim/vim-vimrc.diff rename to source/base/vim/vim-vimrc.diff _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
