diff options
Diffstat (limited to 'abs')
41 files changed, 579 insertions, 743 deletions
diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release index 156ac78..1745618 100644 --- a/abs/core/LinHES-config/LinHES-release +++ b/abs/core/LinHES-config/LinHES-release @@ -1 +1 @@ -LinHES R7.00.01 (Punta Gorda) +LinHES R7.00.01 (Glass Veins) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 9552089..d51b233 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=1 +pkgrel=2 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -113,7 +113,7 @@ md5sums=('381de315bceff755c7c5106ee693059f' '4620f6f498ef4523398635cb0bd59425' '06188493e5ed79cb501d3c5694dee8ca' 'e459ed069317bccb20351f037a9df3d2' - 'b47f477693ed3e83a0cd951a616e16d1' + '22c5e24bf87ad94ee2244d9016a0eea2' '6aff504ed5e860adc1b7317cd0780900' '55fccb1da0417a896b724f7cfc32dd5a' 'ab2aa42c2947148c2b1cac0ade6d1d55' @@ -128,7 +128,7 @@ md5sums=('381de315bceff755c7c5106ee693059f' 'df43bce1712320508d4eef8449c5d223' '65d93f15ac85adf8299552581789a731' '4badc3c664c55f87396a473e6c14d4bc' - 'e2aa772fe0bf366e26eaaf663f9257bd' + '36f5953944f98c50c0212a584996028e' 'fe5e31b833cc6707209e9d656b6eb53c' 'd328d63eaa4252f3d4888476c79bbff6' '23d0e12b7ca1cc6ea6b993c1d7ff20b9' diff --git a/abs/core/LinHES-config/mv_screensaver.py b/abs/core/LinHES-config/mv_screensaver.py index 4068832..35f0868 100755 --- a/abs/core/LinHES-config/mv_screensaver.py +++ b/abs/core/LinHES-config/mv_screensaver.py @@ -84,7 +84,7 @@ def setup_x_screensaver(idle,theme,screenconfigfile,templatefile): startline = k if re.search(theme,line): foundline = k - themenumber=foundline-startline-2 + themenumber=foundline-startline-1 for line in screenconfigcontents: if re.match("selected.*$",line): diff --git a/abs/core/etcnet/PKGBUILD b/abs/core/etcnet/PKGBUILD index e9ac4f4..50e604c 100755 --- a/abs/core/etcnet/PKGBUILD +++ b/abs/core/etcnet/PKGBUILD @@ -1,16 +1,17 @@ pkgname=etcnet -pkgver=0.9.8 -pkgrel=13 +pkgver=0.9.10 +pkgrel=2 pkgdesc="/etc/net network configuration subsystem" url="http://etcnet.org/" depends=('bash' 'grep' 'sed' 'iproute2' 'wireless_tools' 'iptables' 'dhcpcd') arch=i686 install=etcnet.install -source=(http://etcnet.org/files/$pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address ) +#source=(http://etcnet.org/files/$pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address ) +source=($pkgname-$pkgver.tar.gz 10-defaults network functions.patch options ipv4route ipv4address ) #backup=(etc/net/ifaces/eth0/options etc/net/ifaces/eth0/ipv4route etc/net/ifaces/eth0/ipv4address) build() { - cd $startdir/src/$pkgname-$pkgver + cd $startdir/src/$pkgname mkdir -p $startdir/pkg/var/lib/etcnet mkdir -p $startdir/pkg/etc/sysconfig cd etc/net @@ -18,8 +19,10 @@ build() { install -D -m 644 $startdir/src/10-defaults $startdir/pkg/etc/net/options.d/10-defaults install -D -m 644 $startdir/src/network $startdir/pkg/etc/sysconfig/network - cp -rp $startdir/src/$pkgname-$pkgver/docs $startdir/pkg/etc/net - cp -rp $startdir/src/$pkgname-$pkgver/examples $startdir/pkg/etc/net + install -D -m 644 $startdir/src/etcnet/docs/etcnet.8 $startdir/pkg/usr/man/man8/etcnet.8 + install -D -m 644 $startdir/src/etcnet/docs/etcnet-options.5 $startdir/pkg/usr/man/man5/etcnet-options.5 + cp -rp $startdir/src/$pkgname/docs $startdir/pkg/etc/net + cp -rp $startdir/src/$pkgname/examples $startdir/pkg/etc/net #setup default for eth0 mkdir -p $startdir/pkg/etc/net/ifaces/eth0 @@ -27,7 +30,7 @@ build() { # cp $startdir/src/ipv4route $startdir/pkg/etc/net/ifaces/eth0/ipv4route # cp $startdir/src/ipv4address $startdir/pkg/etc/net/ifaces/eth0/ipv4address - cd $startdir/src/$pkgname-$pkgver + cd $startdir/src/$pkgname rm -Rf etc/sysconfig etc/net/{README.ALT,TODO,ChangeLog,ifaces/unknown} cp -Rf etc $startdir/pkg cd $startdir/pkg/etc/net/scripts @@ -35,3 +38,10 @@ build() { ln -s ifdown-ifplugd ifdown-wireless } +md5sums=('edb58f3515beb356d268704a1dae0466' + '0e45b165b5496347407d1ac928f0d2a8' + '6b7df6be8f895d46c9cc3169cfa952ed' + '0869475449bddc92fa7d5153cfdb6b00' + '4764050578c3d7293d9498b7028c65ec' + 'd4688d85bf69ab43fd0619c60d36b50e' + '9ad5cbc0b19d73f2848a9e9e66274f23') diff --git a/abs/core/etcnet/etcnet-0.9.10.tar.gz b/abs/core/etcnet/etcnet-0.9.10.tar.gz Binary files differnew file mode 100644 index 0000000..edfb357 --- /dev/null +++ b/abs/core/etcnet/etcnet-0.9.10.tar.gz diff --git a/abs/core/eventlog/ChangeLog b/abs/core/eventlog/ChangeLog new file mode 100644 index 0000000..f2f386d --- /dev/null +++ b/abs/core/eventlog/ChangeLog @@ -0,0 +1,10 @@ +2010-07-10 Dan McGee <dan@archlinux.org> + + * Updated PKGBUILD to be in line with standard style + * Upstream update + +2009-01-03 Eric Belanger <eric@archlinux.org> + + * eventlog 0.2.9-1 + * Upstream update + * Added ChangeLog diff --git a/abs/core/eventlog/PKGBUILD b/abs/core/eventlog/PKGBUILD index 476dbad..36f657b 100644 --- a/abs/core/eventlog/PKGBUILD +++ b/abs/core/eventlog/PKGBUILD @@ -1,20 +1,29 @@ - +# $Id: PKGBUILD 85218 2010-07-10 21:39:54Z dan $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + pkgname=eventlog -pkgver=0.2.5 -pkgrel=2 +pkgver=0.2.12 +pkgrel=1 pkgdesc="A new API to format and send structured log messages" arch=('i686' 'x86_64') url="http://www.balabit.com/support/community/products/" license=('BSD') depends=('glibc') options=('!libtool') -source=(http://www.balabit.com/downloads/files/eventlog/0.2/eventlog-$pkgver.tar.gz) -md5sums=('a6bdba91f88540cc69b398fd138d86cd') +changelog=ChangeLog +source=(http://www.balabit.com/downloads/files/eventlog/${pkgver%.*}/eventlog_${pkgver}.tar.gz) +md5sums=('3d6ebda8a161d36cb40d09328f78786b') +sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE -}
\ No newline at end of file + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/core/filesystem/PKGBUILD b/abs/core/filesystem/PKGBUILD index 0345d29..01b8a0d 100644 --- a/abs/core/filesystem/PKGBUILD +++ b/abs/core/filesystem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90913 2010-09-18 23:00:51Z pierre $ +# $Id: PKGBUILD 96685 2010-10-24 09:56:25Z pierre $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=filesystem -pkgver=2010.09 -pkgrel=2 +pkgver=2010.10 +pkgrel=1 pkgdesc="Base filesystem" arch=('any') license=('GPL') @@ -17,8 +17,8 @@ install=filesystem.install depends=('iana-etc') backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf - etc/shells etc/host.conf etc/securetty etc/profile etc/issue) -source=(group issue nsswitch.conf securetty host.conf ld.so.conf + etc/shells etc/host.conf etc/securetty etc/profile ) +source=(group nsswitch.conf securetty host.conf ld.so.conf passwd shadow fstab crypttab hosts motd resolv.conf shells gshadow profile modprobe.d.usb-load-ehci-first) md5sums=('75c7e1770305e1f3b75c52785c137611' @@ -29,22 +29,21 @@ md5sums=('75c7e1770305e1f3b75c52785c137611' '6e488ffecc8ba142c0cf7e2d7aeb832e' '8a9042a2cedf6b6b47eb8973f14289cb' 'b8355d9d2782f424f4cedcf682651be0' - '57c5cc9da249c3b06a70fd7efb8c34a5' + 'ef40305da5803ca69d22e428ffc2ab9b' 'e5d8323a4dbee7a6d0d2a19cbf4b819f' '81b3cb42a6ddabc2ed2310511ee9c859' 'd41d8cd98f00b204e9800998ecf8427e' '6f48288b6fcaf0065fcb7b0e525413e0' '40dac0de4c6b99c8ca97effbd7527c84' '5340b9287b71ffe9d4d99510bffe933f' - 'f7ba22b78c5d2b53f86227aa2447e7ea' + 'ccc4e6292ae594f16b44c66c7769765c' '8098ffd9fbf890468d3198277596b85a') build() { cd ${pkgdir} - mkdir -p bin boot dev etc home lib mnt proc root sbin tmp usr var opt srv sys + mkdir -p bin boot dev etc home lib media mnt proc root sbin tmp usr var opt srv sys chmod 555 proc - mkdir -p media/{fl,cd,dvd} mkdir -p usr/{bin,include,lib,sbin,share/misc,src} mkdir -p usr/share/man/man{1,2,3,4,5,6,7,8} @@ -94,21 +93,19 @@ build() mkdir ${pkgdir}/var/empty touch ${pkgdir}/var/empty/.keep } - md5sums=('75c7e1770305e1f3b75c52785c137611' - '1bdc5dba66947d74866a5df8ce9ef3b1' '13753e4e0964f3652b0cc60a28528bdf' 'f97799ef3d8990f2eda9166122d8d5aa' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' '8a9042a2cedf6b6b47eb8973f14289cb' 'b8355d9d2782f424f4cedcf682651be0' - '57c5cc9da249c3b06a70fd7efb8c34a5' + 'ef40305da5803ca69d22e428ffc2ab9b' 'e5d8323a4dbee7a6d0d2a19cbf4b819f' '81b3cb42a6ddabc2ed2310511ee9c859' 'd41d8cd98f00b204e9800998ecf8427e' '6f48288b6fcaf0065fcb7b0e525413e0' '40dac0de4c6b99c8ca97effbd7527c84' '5340b9287b71ffe9d4d99510bffe933f' - 'f7ba22b78c5d2b53f86227aa2447e7ea' + 'ccc4e6292ae594f16b44c66c7769765c' '8098ffd9fbf890468d3198277596b85a') diff --git a/abs/core/filesystem/fstab b/abs/core/filesystem/fstab index ee16ccc..a23e795 100644 --- a/abs/core/filesystem/fstab +++ b/abs/core/filesystem/fstab @@ -4,8 +4,3 @@ # <file system> <dir> <type> <options> <dump> <pass> devpts /dev/pts devpts defaults 0 0 shm /dev/shm tmpfs nodev,nosuid 0 0 - -/dev/cdrom /media/cd auto ro,user,noauto,unhide 0 0 -/dev/dvd /media/dvd auto ro,user,noauto,unhide 0 0 -/dev/fd0 /media/fl auto user,noauto 0 0 - diff --git a/abs/core/filesystem/profile b/abs/core/filesystem/profile index cf461f7..e7a958a 100644 --- a/abs/core/filesystem/profile +++ b/abs/core/filesystem/profile @@ -24,6 +24,7 @@ fi # Load shell specific profile settings test -f "/etc/profile.$shell" && . "/etc/profile.$shell" +unset shell #Set our umask umask 022 @@ -32,19 +33,6 @@ umask 022 PATH="/bin:/usr/bin:/sbin:/usr/sbin" export PATH -# Export default pkg-config path -PKG_CONFIG_PATH="/usr/lib/pkgconfig" -export PKG_CONFIG_PATH - -# Some readline stuff that is fairly common -HISTSIZE=1000 -HISTCONTROL="erasedups" - -INPUTRC="/etc/inputrc" -LESS="-R" - -export HISTSIZE HISTCONTROL INPUTRC LESS - # Load profiles from /etc/profile.d if test -d /etc/profile.d/; then for profile in /etc/profile.d/*.sh; do diff --git a/abs/core/ncurses/PKGBUILD b/abs/core/ncurses/PKGBUILD index c0fd425..017e900 100644 --- a/abs/core/ncurses/PKGBUILD +++ b/abs/core/ncurses/PKGBUILD @@ -1,26 +1,39 @@ -# $Id: PKGBUILD 19129 2008-11-15 00:00:47Z allan $ +# $Id: PKGBUILD 77821 2010-04-18 09:29:42Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=ncurses pkgver=5.7 -pkgrel=2 +pkgrel=3 pkgdesc="System V Release 4.0 curses emulation library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ncurses/" license=('MIT') -groups=('base') depends=('glibc') source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('cce05daf61a64501ef6cd8da1f727ec6') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr --mandir=/usr/share/man \ + cd ${srcdir}/ + mkdir ncurses{,w}-build + + cd ${srcdir}/ncursesw-build + ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \ --with-shared --with-normal --without-debug --without-ada \ --with-install-prefix=${pkgdir} --enable-widec make || return 1 + + # libncurses.so.5 for external binary support + cd ${srcdir}/ncurses-build + [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long" + ../${pkgname}-${pkgver}/configure --prefix=/usr \ + --with-shared --with-normal --without-debug --without-ada \ + --with-install-prefix=${pkgdir} $CONFIGFLAG + make || return 1 +} + +package() { + cd ${srcdir}/ncursesw-build make install # move libraries needed for boot to /lib (we call tput in initscripts) @@ -47,12 +60,8 @@ build() { ln -sf libncursesw.a ${pkgdir}/usr/lib/libcursesw.a ln -sf libncurses.a ${pkgdir}/usr/lib/libcurses.a - # Install libncurses.so.5 for external binary support - ./configure --prefix=/usr \ - --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} - make || return 1 - + # non-widec compatibility library + cd ${srcdir}/ncurses-build install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver} ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5 diff --git a/abs/core/syslog-ng/PKGBUILD b/abs/core/syslog-ng/PKGBUILD index 2602964..dc66813 100644 --- a/abs/core/syslog-ng/PKGBUILD +++ b/abs/core/syslog-ng/PKGBUILD @@ -1,34 +1,56 @@ -# $Id: PKGBUILD 2319 2008-05-31 21:01:41Z eric $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 87478 2010-08-14 05:35:10Z allan $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + pkgname=syslog-ng -_pkgver=2.0.10 -pkgver=2.0.9.10 -pkgrel=11 +pkgver=3.1.2 +pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=(i686 x86_64) -license=('GPL') +arch=('i686' 'x86_64') +license=('GPL2') groups=('base') url="http://www.balabit.com/network-security/syslog-ng/" -depends=('logrotate' 'glibc') -makedepends=('flex' 'glib2' 'eventlog' 'pkgconfig' 'tcp_wrappers') +depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl') +makedepends=('flex' 'pkgconfig') +optdepends=('logrotate') provides=('logger') backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${_pkgver}/source/${pkgname}_${_pkgver}.tar.gz \ - syslog-ng.conf syslog-ng.logrotate syslog-ng) -md5sums=('e5ca55796c11899739affa417ff8a71e' - 'ee95af3a4f969f3759e477289305c8c6' - '65d52180f1762e3985168fffa1faf0a8' +source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/$pkgname\_$pkgver.tar.gz + syslog-ng.conf + syslog-ng.logrotate + syslog-ng.rc) +install=syslog-ng.install +md5sums=('b9f45d9783a4ebeb84ec5acd158502fb' + 'e02be6637d0c3b5484d4597ce049ae39' + '735636090be4582885974542d2a75855' '9bd98250cfa49e13fa3fa731b6040549') build() { - cd $startdir/src/$pkgname-${_pkgver} - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var/lib/syslog-ng --enable-tcp-wrapper \ - --disable-spoof-source - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -d $startdir/pkg/var/lib/syslog-ng - install -D -m644 ../syslog-ng.conf $startdir/pkg/etc/syslog-ng.conf - install -D -m644 ../syslog-ng.logrotate $startdir/pkg/etc/logrotate.d/syslog-ng - install -D -m755 ../syslog-ng $startdir/pkg/etc/rc.d/syslog-ng + cd $srcdir/$pkgname-$pkgver + + # NOTE - re-assess this with later releases + # FS#15787: syslog-ng does not write to files not owned by root + # Upstream: https://bugzilla.balabit.com/show_bug.cgi?id=52 + # Solution: --disable-linux-caps + + LDFLAGS="$LDFLAGS -Wl,--no-undefined" ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var/lib/syslog-ng \ + --enable-tcp-wrapper \ + --with-pidfile-dir=/var/run \ + --disable-spoof-source \ + --disable-linux-caps + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -dm755 $pkgdir/var/lib/syslog-ng + install -Dm644 $srcdir/syslog-ng.conf $pkgdir/etc/syslog-ng.conf + install -Dm644 $srcdir/syslog-ng.logrotate $pkgdir/etc/logrotate.d/syslog-ng + install -Dm755 $srcdir/syslog-ng.rc $pkgdir/etc/rc.d/syslog-ng + # remove libexec + rm -rf $pkgdir/usr/libexec } diff --git a/abs/core/syslog-ng/syslog-ng.conf b/abs/core/syslog-ng/syslog-ng.conf index d941b6a..adee0cd 100644 --- a/abs/core/syslog-ng/syslog-ng.conf +++ b/abs/core/syslog-ng/syslog-ng.conf @@ -1,9 +1,11 @@ +@version: 3.0 # # /etc/syslog-ng.conf # options { - sync (0); + stats_freq (0); + flush_lines (0); time_reopen (10); log_fifo_size (1000); long_hostnames(off); @@ -21,27 +23,27 @@ source src { file("/proc/kmsg"); }; -destination authlog { file("/var/log/auth.log"); }; -destination syslog { file("/var/log/syslog.log"); }; -destination cron { file("/var/log/crond.log"); }; -destination daemon { file("/var/log/daemon.log"); }; -destination kernel { file("/var/log/kernel.log"); }; -destination lpr { file("/var/log/lpr.log"); }; -destination user { file("/var/log/user.log"); }; -destination uucp { file("/var/log/uucp.log"); }; -destination mail { file("/var/log/mail.log"); }; -destination news { file("/var/log/news.log"); }; -destination ppp { file("/var/log/ppp.log"); }; -destination debug { file("/var/log/debug.log"); }; -destination messages { file("/var/log/messages.log"); }; -destination errors { file("/var/log/errors.log"); }; -destination everything { file("/var/log/everything.log"); }; -destination iptables { file("/var/log/iptables.log"); }; -destination acpid { file("/var/log/acpid.log"); }; -destination console { usertty("root"); }; +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; -# Log everything to vc12 -destination console_all { file("/dev/vc/12"); }; +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; filter f_auth { facility(auth); }; filter f_authpriv { facility(auth, authpriv); }; @@ -65,27 +67,27 @@ filter f_notice { level(notice); }; filter f_warn { level(warn); }; filter f_crit { level(crit); }; filter f_err { level(err); }; -filter f_iptables { match("IN=.*OUT="); }; -filter f_acpid { match("acpid"); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; -log { source(src); filter(f_acpid); destination(acpid); flags(final); }; -log { source(src); filter(f_authpriv); destination(authlog); }; -log { source(src); filter(f_syslog); destination(syslog); }; -log { source(src); filter(f_cron); destination(cron); }; -log { source(src); filter(f_daemon); destination(daemon); }; -log { source(src); filter(f_kernel); destination(kernel); }; -log { source(src); filter(f_lpr); destination(lpr); }; -log { source(src); filter(f_mail); destination(mail); }; -log { source(src); filter(f_news); destination(news); }; -log { source(src); filter(f_ppp); destination(ppp); }; -log { source(src); filter(f_user); destination(user); }; -log { source(src); filter(f_uucp); destination(uucp); }; -#log { source(src); filter(f_debug); destination(debug); }; -log { source(src); filter(f_messages); destination(messages); }; -log { source(src); filter(f_err); destination(errors); }; -log { source(src); filter(f_emergency); destination(console); }; -log { source(src); filter(f_everything); destination(everything); }; -log { source(src); filter(f_iptables); destination(iptables); }; +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; -# Log everything to vc12 +# Log everything to tty12 #log { source(src); destination(console_all); }; diff --git a/abs/core/syslog-ng/syslog-ng.install b/abs/core/syslog-ng/syslog-ng.install new file mode 100644 index 0000000..96f5dd8 --- /dev/null +++ b/abs/core/syslog-ng/syslog-ng.install @@ -0,0 +1,10 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 2.1.3-3)" -lt 0 -a -e /etc/syslog-ng.conf.pacnew ]; then + echo "Attention syslog-ng update:" + echo "Configuration file syntax has changed. Make sure to update /etc/syslog-ng.conf" + + fi +} diff --git a/abs/core/syslog-ng/syslog-ng.logrotate b/abs/core/syslog-ng/syslog-ng.logrotate index b26dfb4..e0e6929 100644 --- a/abs/core/syslog-ng/syslog-ng.logrotate +++ b/abs/core/syslog-ng/syslog-ng.logrotate @@ -1,7 +1,7 @@ -/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log { +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { missingok sharedscripts postrotate - /usr/bin/killall -HUP -q syslog-ng + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true endscript } diff --git a/abs/core/syslog-ng/syslog-ng b/abs/core/syslog-ng/syslog-ng.rc index f9d14c7..f9d14c7 100755 --- a/abs/core/syslog-ng/syslog-ng +++ b/abs/core/syslog-ng/syslog-ng.rc diff --git a/abs/core/vi/PKGBUILD b/abs/core/vi/PKGBUILD index b65cb93..83151a8 100644 --- a/abs/core/vi/PKGBUILD +++ b/abs/core/vi/PKGBUILD @@ -1,71 +1,40 @@ -# $Id: PKGBUILD 17437 2008-10-29 18:56:25Z tobias $ +# $Id: PKGBUILD 71573 2010-03-07 19:09:56Z paul $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi -_srcver=7.2 -_patchlevel=148 -pkgver=${_srcver}.${_patchlevel} +pkgver=050325 pkgrel=3 -pkgdesc="a highly configurable, improved version of the vi text editor (basic version)" -arch=(i686 x86_64) -license=('custom:vim') -url="http://www.vim.org" +pkgdesc='The original ex/vi text editor.' +arch=('i686' 'x86_64') +url='http://ex-vi.sourceforge.net/' +license=('custom:ex') +depends=('ncurses') groups=('base') -depends=('glibc' 'ncurses' 'coreutils') -makedepends=('wget' 'sed' 'grep' 'gettext') -backup=(etc/virc) -install=${pkgname}.install -# we need the extra-stuff to get all patches applied smoothly -source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \ - ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \ - ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \ - fetch_patches.sh fetch_runtime.sh) - -build() -{ - # pull in patches from vim.org (or the src cache alternatively) - . ${startdir}/src/fetch_patches.sh - . ${startdir}/src/fetch_runtime.sh - get_patches || return 1 - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - # set the virc different from vimrc - sed -i 's|^.*\(#define SYS_VIMRC_FILE.*"\) .*$|\1|' src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' src/feature.h - sed -i 's|^.*\(#define USR_VIMRC_FILE\t"\).*$|\1$HOME/.virc"|' src/feature.h - sed -i 's|/etc/vimrc|/etc/virc|' src/feature.h - sed -i 's|\.vimrc|.virc|' src/feature.h - # build party - ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \ - --with-compiledby=ArchLinux --with-features=normal \ - --with-global-runtime=/usr/share/vim --with-vim-name=vi \ - --disable-gpm --disable-acl --with-x=no --disable-gui --enable-multibyte - make || return 1 - make VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install - cd ${startdir}/pkg/usr/bin - rm -f vim rvim view rview vidiff - ln -s vi evi - - # delete the manpages for vidiff, we don't bother with that symlink since vidiff doesn't work - find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \ - while read mandir; do - cd ${mandir} - rm -f vidiff.1 - done - - _runtimedir="${startdir}/pkg/usr/share/vim/" - update_runtime - install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \ - ${startdir}/pkg/etc/virc - rm -f ${startdir}/pkg/usr/share/vim/gvimrc_example.vim - install -dm755 ${startdir}/pkg/usr/share/licenses/vim - cd ${startdir}/pkg/usr/share/licenses/vim - ln -s ../../vim/doc/uganda.txt license.txt - -# Changes to remove mouse support VERY IMPORTANT! - ######################################################################################## - sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/virc - - - ############################################################################ - +options=(force strip !libtool emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2 + navkeys.patch increase-tube.patch exrc.sample) +md5sums=('e668595254233e4d96811083a3e4e2f3' 'aac133930047eafa4f28736cfaf976b3' + 'e596e05a00a24187b576e389fa1de45d' 'd3b483c994d859232ce369b82a4b5668') + +build() { + cd ${srcdir}/ex-${pkgver} || return 1 + + # apply patches + patch -Np1 -i ../navkeys.patch || return 1 + patch -Np0 -i ../increase-tube.patch || return 1 + + # correct paths in manpages + sed -i -e 's/^\.B \/usr\/libexec/.B \/usr\/lib\/ex/' vi.1 \ + || return 1 + sed -i -e 's/^\.B \/var\/preserve$/.B \/var\/lib\/ex/' vi.1 \ + || return 1 + + make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \ + 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses \ + || return 1 + make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \ + "DESTDIR=$pkgdir" install || return 1 + + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE \ + || return 1 } diff --git a/abs/core/vi/__changelog b/abs/core/vi/__changelog deleted file mode 100644 index 47cbb5f..0000000 --- a/abs/core/vi/__changelog +++ /dev/null @@ -1,3 +0,0 @@ -Remove mouse support from /etc/vimrc. This new found ability is truely annoying. - - diff --git a/abs/core/vi/exrc.sample b/abs/core/vi/exrc.sample new file mode 100644 index 0000000..44b3045 --- /dev/null +++ b/abs/core/vi/exrc.sample @@ -0,0 +1,5 @@ +" A sample .exrc file. Copy it to your home dir as ~/.exrc in order to work. +set showmode +set noflash +set autoindent +set shiftwidth=2 diff --git a/abs/core/vi/fetch_patches.sh b/abs/core/vi/fetch_patches.sh deleted file mode 100644 index 2ce1019..0000000 --- a/abs/core/vi/fetch_patches.sh +++ /dev/null @@ -1,61 +0,0 @@ -# the external logic for pulling in patches - -get_patches() { - _patchdir=${startdir}/src/patches - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - if [ -d ${_patchdir} ]; then - rm -rf ${_patchdir} - echo -e "\tremove patches from old build" - fi - mkdir ${_patchdir} && cd ${_patchdir} - _rpath=ftp://ftp.vim.org/pub/vim/patches/${_srcver} - - # change IFS to loop line-by-line - _OLDIFS=$IFS - IFS=" -" - echo -e "\tfetching checksumfile for patches" - wget ${_rpath}/MD5SUMS >/dev/null 2>&1 - - downloads=-1 - for _line in $(/bin/cat MD5SUMS); do - downloads=$((${downloads} + 1)) - _md5=$(echo $_line | cut -d ' ' -f1) - _file=$(echo $_line | cut -d ' ' -f3) - if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then - echo -e "\thaving patch file:${_file}" - cp ${SRCDEST}/vim-${_srcver}/${_file} ./ - else - echo -n -e "\t... fetching patch file: ${_file} ..." - wget ${_rpath}/${_file} >/dev/null 2>&1 - if [ -w ${SRCDEST} ]; then - if [ ! -d ${SRCDEST}/vim-${_srcver} ]; then - mkdir -p ${SRCDEST}/vim-${_srcver} - fi - cp ${_file} ${SRCDEST}/vim-${_srcver}/ - echo " done!" - fi - fi - - if [ $(echo "${_md5} ${_file}" | md5sum --status -c -) ]; then - echo ${_file} md5sums do not match - return 1 - fi - done - cd $startdir/src/patches - rm 7.2.001-100.gz - ######## - - if [ ${downloads} != ${_patchlevel} ]; then - echo -e "Number of patches does not match the patchlevel!\nEdit the PKGBUILD accordingly!" - return 1 - fi - IFS=$_OLDIFS - rm MD5SUMS - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - for _patch in $(/bin/ls ${_patchdir}); do - patch -Np0 -i ${_patchdir}/${_patch} || return 1 - done - rm -rf ${_patchdir} - return 0 -} diff --git a/abs/core/vi/fetch_runtime.sh b/abs/core/vi/fetch_runtime.sh deleted file mode 100644 index f244ea5..0000000 --- a/abs/core/vi/fetch_runtime.sh +++ /dev/null @@ -1,117 +0,0 @@ -# the purpose of this magic is to pull in the latest runtime files for vim -# we start withe theruntime provoded by the tarballs and compare MD5s against -# the latest runtime -# if this fails we look in the local source cache if they have been fetched -# for an earlier build and compare those MD5 files -# if this fails, we fetch the stuff from online and store it in the local src -# cache. -# The local cache has to be set (makepkg.conf) AND it has to be writable - -update_runtime() { - _OLDDIR=$(pwd) #get absolute path - _errors=0 - _ftp="ftp://ftp.vim.org/pub/vim/runtime" - - # we're gonna be sneaky and grok the A-A-P recipe for the files we need - _recipe="getunix.aap" - _srccache="${SRCDEST}/vim-${_srcver}/" - - echo "getting runtime recipe" - cd ${startdir}/src - [ -f "${_recipe}" ] && rm "${_recipe}" - wget "${_ftp}/${_recipe}" >/dev/null 2>&1 - - cd "${_runtimedir}" - _runtimedir=$(pwd) #get absolute path - - # change IFS to loop line-by-line - _OLDIFS=$IFS - IFS=" -" - echo "begin fetching updated runtime files..." - for _file in $(grep "file = " "${startdir}/src/${_recipe}"); do - _file=$(echo ${_file} | sed "s|.*file = \(.*\)|\1|") - _md5=$(grep -A2 "file = ${_file} *$" "${startdir}/src/${_recipe}" | \ - grep "get_md5" | \ - sed 's|@if get_md5(file) != "\(.*\)":|\1|g') - _dir=$(dirname "${_file}") - - mkdir -p "${_dir}" - - echo -e "\t${_file}" - _havefile=0 - # if we have the file and the MD5sum fails, we technically don't have the file - if [ -f ${_file} ]; then - # MD5 fails ? ... we don't have the file - if [ $(echo "${_md5} ${_file}" | md5sum --status -c -) ]; then - rm ${_file} - else - _havefile=1 - fi - fi - # look files that were not copied from the unzipped sources - _cachefile=${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")/runtime/${_file} - if [ ${_havefile} -ne 1 -a -f ${_cachefile} ]; then - # MD5 fails ? ... we lookup if we downloaded another version earlier - if [ $(echo "${_md5} ${_cachefile}" | md5sum --status -c -) ]; then - _cachefile=${_srccache}/${_file} - if [ -f ${_cachefile} ]; then - if [ $(echo "${_md5} ${_cachefile}" | md5sum --status -c -) ]; then - rm ${_cachefile} - else - cp ${_cachefile} ${_dir} - _havefile=1 - fi - fi - else - cp ${_cachefile} ${_dir} - _havefile=1 - fi - fi - # look up the local $SRCDEST - _cachefile=${_srccache}/${_file} - if [ ${_havefile} -ne 1 -a -f ${_cachefile} ]; then - # MD5 fails ? ... we don't have the file - if [ $(echo "${_md5} ${_cachefile}" | md5sum --status -c -) ]; then - rm ${_cachefile} - else - cp ${_cachefile} ${_dir} - _havefile=1 - fi - fi - # so we finally have to fetch it and store it to $SRCDEST (cache) - if [ ${_havefile} -ne 1 ]; then - echo -n -e "\t ... fetching file ${_file} ..." - cd "${_dir}" - wget "${_ftp}/${_file}" >/dev/null 2>&1 - cd "${_runtimedir}" - # store freshly downloaded file in SRCDEST - mkdir -p ${_srccache}/${_dir} - cp ${_file} ${_srccache}/${_dir} - echo -e " done!" - fi - - # check the MD5 sum finally - if [ $(echo "${_md5} ${_file}" | md5sum --status -c -) ]; then - echo "!!!! md5sum check for ${_file} failed !!!!" - errors=$((${_errors} + 1)) - fi - done - IFS=${_OLDIFS} - - echo "vim runtime got updated" - - if [ ${_errors} -gt 0 ]; then - echo "${_errors} failed MD5 checks while updating runtime files -> build can't be completed" - return 1 - else - echo -e "\tpatching filetype.vim for better handling of pacman related files ..." - sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" ftplugin/changelog.vim - fi - # make Aaron happy - wget http://www.vim.org/scripts/download_script.php\?src_id=7766 \ - -O autoload/pythoncomplete.vim - cd "${_OLDDIR}" - return 0 -} diff --git a/abs/core/vi/increase-tube.patch b/abs/core/vi/increase-tube.patch new file mode 100644 index 0000000..5010798 --- /dev/null +++ b/abs/core/vi/increase-tube.patch @@ -0,0 +1,13 @@ +--- config.h 2005-02-19 05:25:39.000000000 -0500 ++++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500 +@@ -95,8 +95,8 @@ + #define TUBESIZE 6000 /* Maximum screen size for visual */ + #else /* VMUNIX */ + #define TUBELINES 100 +-#define TUBECOLS 160 +-#define TUBESIZE 16000 ++#define TUBECOLS 320 ++#define TUBESIZE 32000 + #endif /* VMUNIX */ + + /* diff --git a/abs/core/vi/navkeys.patch b/abs/core/vi/navkeys.patch new file mode 100644 index 0000000..4692437 --- /dev/null +++ b/abs/core/vi/navkeys.patch @@ -0,0 +1,55 @@ +diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c +--- ex-050325/ex_tty.c 2005-03-04 13:42:58.000000000 +0100 ++++ ex-050325-du/ex_tty.c 2009-06-25 20:06:57.000000000 +0200 +@@ -132,7 +132,8 @@ + &ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9, + &HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL, + &xPC, &RC, &SC, &SE, &SF, &SO, &SR, &TA, &TE, &TI, &UP, &VB, &VS, &VE, +- &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM ++ &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM, ++ &kI, &kD, &kh, &at7, &kP, &kN + }; + bool *sflags[] = { + &AM, &BS, &DA, &DB, &EO, &HC, +@@ -170,7 +171,12 @@ + addmac1(KD, "j", "down", arrows, 1); + addmac1(KL, "h", "left", arrows, 1); + addmac1(KR, "l", "right", arrows, 1); +- addmac1(KH, "H", "home", arrows, 1); ++ addmac1(kI, "i", "insert", arrows, 1); ++ addmac1(kD, "x", "delete", arrows, 1); ++ addmac1(kh, "^", "home", arrows, 1); ++ addmac1(at7, "$", "end", arrows, 1); ++ addmac1(kP, "", "pgup", arrows, 1); ++ addmac1(kN, "", "pgdn", arrows, 1); + + /* + * Handle funny termcap capabilities +@@ -341,7 +347,7 @@ + *(*fp++) = flag; + namp += 2; + } while (*namp); +- namp = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI"; ++ namp = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN"; + sp = sstrs; + do { + string = tgetstr(namp, &aoftspace); +diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h +--- ex-050325/ex_tty.h 2004-12-01 19:21:06.000000000 +0100 ++++ ex-050325-du/ex_tty.h 2009-06-25 20:06:05.000000000 +0200 +@@ -183,6 +183,15 @@ + var bool XX; /* Tektronix 4025 insert line */ + /* X? is reserved for severely nauseous glitches */ + /* If there are enough of these we may need bit masks! */ ++/* ++ * Insert, Delete, Home, End, PgUp an PgDown keys ++ */ ++var char *kI; ++var char *kD; ++var char *kh; ++var char *at7; ++var char *kP; ++var char *kN; + + /* + * From the tty modes... diff --git a/abs/core/vi/vi.install b/abs/core/vi/vi.install deleted file mode 100644 index ebb73c0..0000000 --- a/abs/core/vi/vi.install +++ /dev/null @@ -1,37 +0,0 @@ -post_install() { - # if we have vim installed create view/rview symlinks to vim - if [ ! -f usr/bin/vim ] ; then - cd usr/bin - ln -s vi view - ln -s vi rview - cd ${OLDPWD} - echo "Create vi related symlinks..." - fi - echo -n "Updating vi help tags..." - usr/bin/vi --noplugins -u NONE -U NONE \ - --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1 - echo "done." -} - -pre_remove() { - # if vi is a binary instead of a symlink we have an intact gvim installation - # with a different binary/symlink structure - # we recover what pacmans database knows about Vim - if [ ! -f usr/bin/vim ] ; then - rm -f usr/bin/view usr/bin/rview - echo "Remove vi related symlinks ..." - fi -} - -post_upgrade() { - post_install $1 -} - -pre_upgrade() { - pre_remove $2 -} - - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" diff --git a/abs/extra/gvim/PKGBUILD b/abs/extra/gvim/PKGBUILD deleted file mode 100644 index 63c901a..0000000 --- a/abs/extra/gvim/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 17439 2008-10-29 19:05:16Z tobias $ -# Maintainer: tobias [ tobias at archlinux org ] - -pkgname=gvim -_srcver=7.2 -_patchlevel=132 -pkgver=${_srcver}.${_patchlevel} -pkgrel=1 -pkgdesc="the vim text editor with advanced features enabled, such as a gui mode" -arch=(i686 x86_64) -license=('custom:vim') -url="http://www.vim.org" -depends=("vim>=${pkgver}" 'perl' 'python' 'acl' 'libxt' 'gtk2' ) -makedepends=('pkgconfig') -backup=(etc/gvimrc) -conflicts=('gvim-devel') -provides=('gvim-devel') -install=${pkgname}.install -source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \ - ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \ - ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \ - ${pkgname}.desktop fetch_patches.sh) - -build() -{ - # patch party - # pull in patches from vim.org (or the src cache alternatively) - . ${startdir}/src/fetch_patches.sh - get_patches || return 1 - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h - ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \ - --with-compiledby=ArchLinux --with-features=big \ - --with-x=yes --disable-gpm --with-x=yes --enable-gui=gtk2 \ - --with-global-runtime=/usr/share/vim --with-vim-name=gvim \ - --enable-multibyte --enable-cscope \ - --enable-perlinterp --enable-pythoninterp - make || return 1 - # install everything first ... - make VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install - - # ... and clean up what vim already has for us - # move the binary and fix the (g)* related symlinks - find ${startdir}/pkg/usr/bin -type l 2> /dev/null | while read symlink; do - rm ${symlink} - done - cd ${startdir}/pkg/usr/bin - rm -f gvimtutor xxd - ln -s gvim evim - ln -s gvim egview - ln -s gvim gview - ln -s gvim gvimdiff - ln -s gvim rgview - ln -s gvim rgvim - - # delete the manpages/symlinks provided by vi package - find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \ - while read mandir; do - cd ${mandir} - rm -f *.1 - ln -s evi.1.gz evim.1.gz - ln -s vi.1.gz egview.1.gz - ln -s vi.1.gz gview.1.gz - ln -s vi.1.gz gvim.1.gz - ln -s vimdiff.1.gz gvimdiff.1.gz - ln -s vi.1.gz rgvim.1.gz - ln -s vi.1.gz rgview.1.gz - done - - install -Dm644 ${startdir}/pkg/usr/share/vim/gvimrc_example.vim \ - ${startdir}/pkg/etc/gvimrc - # clean all settings and controls - served by vi package - rm -rf ${startdir}/pkg/usr/share/vim - # freedesktop links - install -D -m644 ${startdir}/src/${pkgname}.desktop \ - ${startdir}/pkg/usr/share/applications/gvim.desktop - install -D -m644 ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")/runtime/vim48x48.png \ - ${startdir}/pkg/usr/share/pixmaps/gvim.png - - ############################################################## - sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/gvimrc - ################################################################# -} diff --git a/abs/extra/gvim/fetch_patches.sh b/abs/extra/gvim/fetch_patches.sh deleted file mode 100644 index 2ce1019..0000000 --- a/abs/extra/gvim/fetch_patches.sh +++ /dev/null @@ -1,61 +0,0 @@ -# the external logic for pulling in patches - -get_patches() { - _patchdir=${startdir}/src/patches - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - if [ -d ${_patchdir} ]; then - rm -rf ${_patchdir} - echo -e "\tremove patches from old build" - fi - mkdir ${_patchdir} && cd ${_patchdir} - _rpath=ftp://ftp.vim.org/pub/vim/patches/${_srcver} - - # change IFS to loop line-by-line - _OLDIFS=$IFS - IFS=" -" - echo -e "\tfetching checksumfile for patches" - wget ${_rpath}/MD5SUMS >/dev/null 2>&1 - - downloads=-1 - for _line in $(/bin/cat MD5SUMS); do - downloads=$((${downloads} + 1)) - _md5=$(echo $_line | cut -d ' ' -f1) - _file=$(echo $_line | cut -d ' ' -f3) - if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then - echo -e "\thaving patch file:${_file}" - cp ${SRCDEST}/vim-${_srcver}/${_file} ./ - else - echo -n -e "\t... fetching patch file: ${_file} ..." - wget ${_rpath}/${_file} >/dev/null 2>&1 - if [ -w ${SRCDEST} ]; then - if [ ! -d ${SRCDEST}/vim-${_srcver} ]; then - mkdir -p ${SRCDEST}/vim-${_srcver} - fi - cp ${_file} ${SRCDEST}/vim-${_srcver}/ - echo " done!" - fi - fi - - if [ $(echo "${_md5} ${_file}" | md5sum --status -c -) ]; then - echo ${_file} md5sums do not match - return 1 - fi - done - cd $startdir/src/patches - rm 7.2.001-100.gz - ######## - - if [ ${downloads} != ${_patchlevel} ]; then - echo -e "Number of patches does not match the patchlevel!\nEdit the PKGBUILD accordingly!" - return 1 - fi - IFS=$_OLDIFS - rm MD5SUMS - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - for _patch in $(/bin/ls ${_patchdir}); do - patch -Np0 -i ${_patchdir}/${_patch} || return 1 - done - rm -rf ${_patchdir} - return 0 -} diff --git a/abs/extra/gvim/gvim.install b/abs/extra/gvim/gvim.install deleted file mode 100644 index f49c345..0000000 --- a/abs/extra/gvim/gvim.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - echo "Updating desktop and mime database..." - update-desktop-database -q - echo -n "Updating vim help tags..." - usr/bin/vim --noplugins -u NONE -U NONE \ - --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1 - echo "done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - echo -n "Updating desktop and mime database..." - update-desktop-database - echo "done." -} - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" - -# vim:set ts=2 sw=2 et ft=sh: diff --git a/abs/extra/icu/PKGBUILD b/abs/extra/icu/PKGBUILD new file mode 100644 index 0000000..14cd4aa --- /dev/null +++ b/abs/extra/icu/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 92974 2010-10-02 16:39:18Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Art Gramlich <art@gramlich-net.com> + +pkgname=icu +pkgver=4.4.2 +pkgrel=1 +pkgdesc="International Components for Unicode library" +arch=(i686 x86_64) +url="http://www.icu-project.org/" +license=('custom:"icu"') +depends=('gcc-libs' 'sh') +source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz + #http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz +) +md5sums=('314e582264c36b3735466c522899aa07') + + +build() { + cd ${srcdir}/icu/source + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/icu/source + make -j1 DESTDIR=${pkgdir} install + + # Install license + install -Dm644 ${srcdir}/icu/license.html ${pkgdir}/usr/share/licenses/icu/license.html +} diff --git a/abs/extra/vim/Adding b/abs/extra/vim/Adding new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/extra/vim/Adding diff --git a/abs/extra/vim/Computing b/abs/extra/vim/Computing new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/extra/vim/Computing diff --git a/abs/extra/vim/Creating b/abs/extra/vim/Creating new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/extra/vim/Creating diff --git a/abs/extra/vim/Extracting b/abs/extra/vim/Extracting new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/extra/vim/Extracting diff --git a/abs/extra/vim/PKGBUILD b/abs/extra/vim/PKGBUILD index 7e3db29..ab6d010 100644 --- a/abs/extra/vim/PKGBUILD +++ b/abs/extra/vim/PKGBUILD @@ -1,66 +1,204 @@ -# $Id: PKGBUILD 17696 2008-10-31 17:28:10Z allan $ +# $Id: PKGBUILD 89882 2010-09-04 16:50:25Z ibiru $ +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -pkgname=vim -_srcver=7.2 -_patchlevel=132 -pkgver=${_srcver}.${_patchlevel} -pkgrel=1.5 -pkgdesc="a highly configurable, improved version of the vi text editor" -arch=(i686 x86_64) +pkgbase=vim +pkgname=(vim gvim vim-runtime) +_topver=7.3 +_patchlevel=3 +pkgver=${_topver}.${_patchlevel} +__hgrev=073ff46fe3 +pkgrel=2 +arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" -depends=("vi>=${pkgver}" 'perl' 'python' 'acl' 'gpm>=1.20.4' 'libxt') -makedepends=('wget' 'sed' 'grep') -backup=(etc/vimrc) -install=${pkgname}.install -# we need the extra-stuff to get all patches applied smoothly -source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \ - ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \ - ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \ - fetch_patches.sh) - -build() -{ - # pull in patches from vim.org (or the src cache alternatively) - . ${startdir}/src/fetch_patches.sh - get_patches || return 1 - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h - # build party - ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \ - --with-compiledby=ArchLinux --with-features=big \ - --with-x=yes --disable-gui \ - --with-global-runtime=/usr/share/vim --with-vim-name=vim \ - --enable-multibyte --enable-cscope \ - --enable-perlinterp --enable-pythoninterp - make || return 1 - make VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install - cd ${startdir}/pkg/usr/bin - rm -f ex view rview xxd vimtutor - ln -s vitutor vimtutor - - # delete the manpages/symlinks provided by vi package - find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \ - while read mandir; do - cd ${mandir} - mv vimdiff.1 vimdiff.org - rm -f *.1 - ln -s rvi.1.gz rvim.1.gz - ln -s vi.1.gz vim.1.gz - ln -s vitutor.1.gz vimtutor.1.gz - mv vimdiff.org vimdiff.1 +makedepends=('gpm' 'perl' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' + 'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed') +options=(force) +source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 + vimrc archlinux.vim gvim.desktop) +md5sums=('6e7adfbd5d26c1d161030ec203a7f243' + 'e57777374891063b9ca48a1fe392ac05' + '10353a61aadc3f276692d0e17db1478e' + '2be104c0372dd6dae19cb7968c03cd4f') + +__hgroot='http://vim.googlecode.com/hg/' +__hgrepo='vim' +__hgbranch='default' + +_versiondir="vim${_topver//./}" + +##### Build ##### + +build() { + cd ${srcdir} + + msg2 'Checking out source from Mercurial...' + + if [[ -d ${__hgrepo} ]]; then + cd ${__hgrepo} + hg pull -b ${__hgbranch}|| warning 'hg pull failed!' + hg update -r ${__hgrev} + else + hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} + cd ${__hgrepo} + fi + + if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then + warning 'You are not building the latest revision!' + warning "Consider updating __hgrev to $(hg id -r ${__hgbranch})." + sleep 10 + fi + + cd .. + rm -rf vim-build gvim-build + rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build + + msg2 'Patching...' + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + # fix python name + sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \ + vim-build/src/configure.in + (cd vim-build/src && autoconf) + + msg2 'Building...' + + cp -a vim-build gvim-build + + cd ${srcdir}/vim-build + + ./configure --prefix=/usr --localstatedir=/var/lib/vim \ + --mandir=/usr/share/man --with-compiledby=ArchLinux \ + --with-features=big --enable-gpm --enable-acl --with-x=no \ + --disable-gui --enable-multibyte --enable-cscope \ + --disable-netbeans --enable-perlinterp --disable-pythoninterp \ + --disable-rubyinterp + + make + + cd ${srcdir}/gvim-build + + ./configure --prefix=/usr --localstatedir=/var/lib/vim \ + --mandir=/usr/share/man --with-compiledby=ArchLinux \ + --with-features=big --enable-gpm --enable-acl --with-x=yes \ + --enable-gui=gtk2 --enable-multibyte --enable-cscope \ + --enable-netbeans --enable-perlinterp --enable-pythoninterp \ + --enable-rubyinterp + + make +} + +##### Packaging ##### + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl') + conflicts=('gvim') + + cd ${srcdir}/vim-build + make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install + + # provided by (n)vi in core + rm ${pkgdir}/usr/bin/{ex,view} + + # delete some manpages + find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + rm -f evim.1 # this does not make sense if we have no GUI done - # kill the nobackup parts - sed -i '/vms/,+4 d' ${startdir}/pkg/usr/share/vim/vimrc_example.vim - install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \ - ${startdir}/pkg/etc/vimrc - # clean all settings and controls - served by vi package - rm -rf ${startdir}/pkg/usr/share/vim - -# Changes to remove mouse support VERY IMPORTANT! -############################################################## - sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/vimrc -################################################################# + # Runtime provided by runtime package + rm -r ${pkgdir}/usr/share/vim + + # license + install -dm755 ${pkgdir}/usr/share/licenses/vim + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/vim/license.txt +} + +package_gvim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl' 'python2' 'ruby' 'libxt' + 'desktop-file-utils' 'gtk2') + provides=("vim=${pkgver}-${pkgrel}") + conflicts=('vim') + install=gvim.install + + cd ${srcdir}/gvim-build + make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install + + # provided by (n)vi in core + rm ${pkgdir}/usr/bin/{ex,view} + + # delete some manpages + find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # Move the runtime for later packaging + mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install + + # freedesktop links + install -Dm644 ${srcdir}/gvim.desktop \ + ${pkgdir}/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png + + # license + install -dm755 ${pkgdir}/usr/share/licenses/gvim + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/gvim/license.txt } + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim' + backup=(etc/vimrc) + + # Install the runtime split from gvim + install -dm755 ${pkgdir}/usr/share + mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim + + # Don't forget logtalk.dict + install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \ + ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim + + # make Aaron happy + install -Dm644 ${srcdir}/pythoncomplete.vim \ + ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim + + # rc files + install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc + install -Dm644 ${srcdir}/archlinux.vim \ + ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim + + # license + install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/vim-runtime/license.txt +} + +# vim:set sw=2 sts=2 et: +md5sums=('6e7adfbd5d26c1d161030ec203a7f243' + '4ebb9bafd2e31542daff1ed17e327758' + '10353a61aadc3f276692d0e17db1478e' + '2be104c0372dd6dae19cb7968c03cd4f') + diff --git a/abs/extra/vim/Removing b/abs/extra/vim/Removing new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/abs/extra/vim/Removing diff --git a/abs/extra/vim/__changelog b/abs/extra/vim/__changelog index 47cbb5f..4cce0eb 100644 --- a/abs/extra/vim/__changelog +++ b/abs/extra/vim/__changelog @@ -1,3 +1,7 @@ Remove mouse support from /etc/vimrc. This new found ability is truely annoying. +# Changes to remove mouse support VERY IMPORTANT! +############################################################## + sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/vimrc +################################################################# diff --git a/abs/extra/vim/archlinux.vim b/abs/extra/vim/archlinux.vim new file mode 100644 index 0000000..148bb93 --- /dev/null +++ b/abs/extra/vim/archlinux.vim @@ -0,0 +1,26 @@ +" The ArchLinux global vimrc - setting only a few sane defaults +" +" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc + + +if has('gui_running') + " Make shift-insert work like in Xterm + map <S-Insert> <MiddleMouse> + map! <S-Insert> <MiddleMouse> +endif diff --git a/abs/extra/vim/fetch_patches.sh b/abs/extra/vim/fetch_patches.sh deleted file mode 100644 index 2ce1019..0000000 --- a/abs/extra/vim/fetch_patches.sh +++ /dev/null @@ -1,61 +0,0 @@ -# the external logic for pulling in patches - -get_patches() { - _patchdir=${startdir}/src/patches - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - if [ -d ${_patchdir} ]; then - rm -rf ${_patchdir} - echo -e "\tremove patches from old build" - fi - mkdir ${_patchdir} && cd ${_patchdir} - _rpath=ftp://ftp.vim.org/pub/vim/patches/${_srcver} - - # change IFS to loop line-by-line - _OLDIFS=$IFS - IFS=" -" - echo -e "\tfetching checksumfile for patches" - wget ${_rpath}/MD5SUMS >/dev/null 2>&1 - - downloads=-1 - for _line in $(/bin/cat MD5SUMS); do - downloads=$((${downloads} + 1)) - _md5=$(echo $_line | cut -d ' ' -f1) - _file=$(echo $_line | cut -d ' ' -f3) - if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then - echo -e "\thaving patch file:${_file}" - cp ${SRCDEST}/vim-${_srcver}/${_file} ./ - else - echo -n -e "\t... fetching patch file: ${_file} ..." - wget ${_rpath}/${_file} >/dev/null 2>&1 - if [ -w ${SRCDEST} ]; then - if [ ! -d ${SRCDEST}/vim-${_srcver} ]; then - mkdir -p ${SRCDEST}/vim-${_srcver} - fi - cp ${_file} ${SRCDEST}/vim-${_srcver}/ - echo " done!" - fi - fi - - if [ $(echo "${_md5} ${_file}" | md5sum --status -c -) ]; then - echo ${_file} md5sums do not match - return 1 - fi - done - cd $startdir/src/patches - rm 7.2.001-100.gz - ######## - - if [ ${downloads} != ${_patchlevel} ]; then - echo -e "Number of patches does not match the patchlevel!\nEdit the PKGBUILD accordingly!" - return 1 - fi - IFS=$_OLDIFS - rm MD5SUMS - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - for _patch in $(/bin/ls ${_patchdir}); do - patch -Np0 -i ${_patchdir}/${_patch} || return 1 - done - rm -rf ${_patchdir} - return 0 -} diff --git a/abs/extra/gvim/gvim.desktop b/abs/extra/vim/gvim.desktop index 8c99660..8c99660 100644 --- a/abs/extra/gvim/gvim.desktop +++ b/abs/extra/vim/gvim.desktop diff --git a/abs/extra/vim/gvim.install b/abs/extra/vim/gvim.install new file mode 100644 index 0000000..0a8d3b0 --- /dev/null +++ b/abs/extra/vim/gvim.install @@ -0,0 +1,13 @@ +post_install() { + echo -n "Updating desktop and mime database..." + update-desktop-database -q + echo "done." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/abs/extra/vim/vim.install b/abs/extra/vim/vim.install deleted file mode 100644 index 1d46e19..0000000 --- a/abs/extra/vim/vim.install +++ /dev/null @@ -1,38 +0,0 @@ -post_install() { - # if we have an existing gvim installation - relocate binaries and symlinks - if [ -f usr/bin/vim ] ; then - cd usr/bin - rm -f view rview - ln -s vim view - ln -s vim rview - cd ${OLDPWD} - echo "Create vim related symlinks..." - fi - echo -n "Updating vim help tags..." - usr/bin/vim --noplugins -u NONE -U NONE \ - --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1 - echo "done." -} - -pre_remove() { - cd usr/bin - rm -f view rview - if [ -f usr/bin/vi ] ; then - ln -s vi view - ln -s vi rview - echo "Create vi related symlinks..." - fi - cd ${OLDPWD} -} - -post_upgrade() { - post_install $1 -} - -pre_upgrade() { - pre_remove $2 -} - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" diff --git a/abs/extra/vim/vimrc b/abs/extra/vim/vimrc new file mode 100644 index 0000000..9b4eaac --- /dev/null +++ b/abs/extra/vim/vimrc @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just +" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing archlinux.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! archlinux.vim +set mouse-=a +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual +" and configure vim to your own liking! + |