summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/facile/PKGBUILD23
-rw-r--r--extra/gimp/PKGBUILD6
-rw-r--r--extra/lftp/PKGBUILD6
-rw-r--r--extra/oxygen-gtk2/PKGBUILD14
-rw-r--r--extra/oxygen-gtk2/fix-regression.patch48
-rw-r--r--extra/postgresql-old-upgrade/PKGBUILD12
-rw-r--r--extra/postgresql/PKGBUILD26
-rw-r--r--extra/postgresql/postgresql.tmpfiles.conf2
-rw-r--r--extra/ruby/PKGBUILD4
-rw-r--r--extra/sbcl/PKGBUILD6
-rw-r--r--extra/usermin/PKGBUILD48
-rw-r--r--extra/vim/PKGBUILD20
-rw-r--r--extra/webmin/PKGBUILD50
13 files changed, 154 insertions, 111 deletions
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD
index 6048b3f72..af1da96fe 100644
--- a/extra/facile/PKGBUILD
+++ b/extra/facile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168478 2012-10-12 13:06:17Z tpowa $
+# $Id: PKGBUILD 177541 2013-02-07 05:32:46Z eric $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=facile
@@ -7,23 +7,24 @@ pkgrel=15
pkgdesc="A Functional Constraint Library"
arch=(i686 x86_64)
url="http://www.recherche.enac.fr/opti/facile/"
-license="LGPL"
+license=("LGPL")
makedepends=('ocaml')
depends=()
source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz
ocaml-facile-ocaml-4.patch)
-
-md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e')
+md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e'
+ '1ffc2f08c9f1db8ef0d444ec06f82b79')
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
# fix ocaml4
patch -Np1 -i ../ocaml-facile-ocaml-4.patch
./configure
- make || return 1
- mkdir -p $startdir/pkg/usr/lib/ocaml/facile
- cd src
- install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a $startdir/pkg/usr/lib/ocaml/facile
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/src"
+ install -d "$pkgdir/usr/lib/ocaml/facile"
+ install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a "$pkgdir/usr/lib/ocaml/facile"
}
-md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e'
- '1ffc2f08c9f1db8ef0d444ec06f82b79')
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index f60ef6263..c31913967 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166463 2012-09-08 07:14:12Z daniel $
+# $Id: PKGBUILD 177592 2013-02-07 18:51:36Z daniel $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
pkgname=gimp
-pkgver=2.8.2
+pkgver=2.8.4
pkgrel=1
pkgdesc="GNU Image Manipulation Program"
arch=('i686' 'x86_64')
@@ -22,7 +22,7 @@ conflicts=('gimp-devel')
install=gimp.install
source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl
uri-backend-libcurl.patch)
-md5sums=('b542138820ca3a41cbd63fc331907955'
+md5sums=('392592e8755d046317878d226145900f'
'bb27bc214261d36484093e857f015f38'
'e894f4b2ffa92c71448fdd350e9b78c6')
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index c127b4448..090e15b78 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176998 2013-02-03 16:13:46Z andyrtr $
+# $Id: PKGBUILD 177576 2013-02-07 16:27:21Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=lftp
-pkgver=4.4.2
+pkgver=4.4.3
pkgrel=1
pkgdesc="Sophisticated command line based FTP client"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
url="http://lftp.yar.ru/"
backup=('etc/lftp.conf')
source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8e974cd87c9d4362031f61351cfe742e')
+md5sums=('59351bc6fd71e65485cb0b5dd6dbf07a')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 53f8e7933..4c84a7685 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176330 2013-01-30 13:08:58Z andrea $
+# $Id: PKGBUILD 177572 2013-02-07 13:44:31Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: birdflesh <antkoul at gmail dot com>
pkgname=oxygen-gtk2
pkgver=1.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
@@ -13,10 +13,16 @@ depends=('gtk2')
conflicts=('oxygen-gtk')
replaces=('oxygen-gtk')
makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7c4ecfca330102b7ff50e472a62dfc60')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+ 'fix-regression.patch')
+md5sums=('7c4ecfca330102b7ff50e472a62dfc60'
+ 'bced3ab820c3eafbb4e40a279d05bff6')
build() {
+ cd ${pkgname}-${pkgver}/
+ patch -p1 -i "${srcdir}"/fix-regression.patch
+ cd ../
+
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
diff --git a/extra/oxygen-gtk2/fix-regression.patch b/extra/oxygen-gtk2/fix-regression.patch
new file mode 100644
index 000000000..466b53c17
--- /dev/null
+++ b/extra/oxygen-gtk2/fix-regression.patch
@@ -0,0 +1,48 @@
+diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp
+index f2ad1af..9965086 100644
+--- a/src/oxygenqtsettings.cpp
++++ b/src/oxygenqtsettings.cpp
+@@ -102,6 +102,9 @@ namespace Oxygen
+
+ const bool forced( flags&Forced );
+
++ // no attempt at initializing if gtk settings is not yet set
++ if( !gtk_settings_get_default() ) return false;
++
+ if( _initialized && !forced ) return false;
+ else if( !forced ) _initialized = true;
+
+diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp
+index ff0666b..a2572b0 100644
+--- a/src/oxygenstylewrapper.cpp
++++ b/src/oxygenstylewrapper.cpp
+@@ -3741,6 +3741,10 @@ namespace Oxygen
+ #endif
+
+ // style initialization
++ /*
++ this is normally achieved in theme_init, but is somehow not working with gnome shell
++ so that it is redone here, since duplication is avoided when initialization is called twice without modifications
++ */
+ Style::instance().initialize();
+
+ // hooks
+diff --git a/src/oxygentheme.cpp b/src/oxygentheme.cpp
+index 50b04e2..9bc49e1 100644
+--- a/src/oxygentheme.cpp
++++ b/src/oxygentheme.cpp
+@@ -52,12 +52,8 @@ void theme_init( GTypeModule* module )
+ Oxygen::RCStyle::registerType( module );
+ Oxygen::StyleWrapper::registerType( module );
+
+- // initialize oxygen here, for XUL applications
+- // special care is taken to not initialize everything
+- Oxygen::ApplicationName applicationName;
+- applicationName.initialize();
+- if( applicationName.isXul() )
+- { Oxygen::Style::instance().initialize( Oxygen::QtSettings::Forced | Oxygen::QtSettings::Colors ); }
++ // style initialization
++ Oxygen::Style::instance().initialize();
+
+ }
+
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index b6134b23d..14044f911 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 173844 2012-12-25 00:34:31Z foutrelis $
+# $Id: PKGBUILD 177586 2013-02-07 18:35:35Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=postgresql-old-upgrade
-pkgver=9.1.6
+pkgver=9.1.8
_majorver=${pkgver%.*}
-pkgrel=2
+pkgrel=1
pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade"
arch=('i686' 'x86_64')
url="http://www.postgresql.org/"
license=('custom:PostgreSQL')
depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0')
makedepends=('krb5' 'python2' 'perl' 'tcl>=8.6.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
+source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
build() {
cd "${srcdir}/postgresql-${pkgver}"
@@ -47,5 +47,5 @@ package() {
rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
}
-md5sums=('000755f66c0de58bbd4cd2b89b45b8e2')
-sha256sums=('6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7')
+md5sums=('54783b516880a586dcd7c07992d8c0b3')
+sha256sums=('1d88f9dda24062dbfcc09aca9a316981f2aa93322613b853cf32d7a431b44c6d')
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 50923c5c4..be2977ecf 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,36 +1,32 @@
-# $Id: PKGBUILD 173843 2012-12-25 00:34:29Z foutrelis $
+# $Id: PKGBUILD 177590 2013-02-07 18:51:10Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgbase=postgresql
pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.2.2
+pkgver=9.2.3
_majorver=${pkgver%.*}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.postgresql.org/"
license=('custom:PostgreSQL')
makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0')
source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
postgresql-run-socket.patch
- postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate
+ postgresql.pam postgresql.logrotate
postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-md5sums=('1cc388988e69bf75c6b55d59070100f6'
+md5sums=('59f42a93695b0186ed5eb03c2653a7d4'
'75c579eed03ffb2312631f0b649175b4'
- '1ddd1df8010549f237e7983bb326025e'
- 'a54d09a20ab1672adf08f037df188d53'
'96f82c38f3f540b53f3e5144900acf17'
'd28e443f9f65a5712c52018b84e27137'
'89b48774b0dae7c37fbb0e907c3c1db8'
- 'd34e4ab6d589aa819a1e2829290a3b7c'
+ '1c5a1f99e8e93776c593c468e2612985'
'505e0e4abfc746cae9558584d471a03c')
-sha256sums=('e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3'
+sha256sums=('c4f5a63290c0c32d8d9899edee8188d0c8ab124a7199b154fac75e62eec35f7f'
'8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
- '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
- '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
- 'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07'
+ '7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4'
'3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669')
build() {
@@ -143,8 +139,6 @@ package_postgresql() {
find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
rmdir "${pkgdir}/usr/share/doc/postgresql/html"
- # install launch script
- install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql"
install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \
"${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
install -D -m644 "${srcdir}/postgresql.service" \
@@ -152,10 +146,6 @@ package_postgresql() {
install -D -m755 "${srcdir}/postgresql-check-db-dir" \
"${pkgdir}/usr/bin/postgresql-check-db-dir"
- # install conf file
- install -D -m644 "${srcdir}/postgresql.confd" \
- "${pkgdir}/etc/conf.d/postgresql"
-
install -D -m644 "${srcdir}/postgresql.pam" \
"${pkgdir}/etc/pam.d/postgresql"
diff --git a/extra/postgresql/postgresql.tmpfiles.conf b/extra/postgresql/postgresql.tmpfiles.conf
index 6c48e34ed..c2e0747da 100644
--- a/extra/postgresql/postgresql.tmpfiles.conf
+++ b/extra/postgresql/postgresql.tmpfiles.conf
@@ -1 +1 @@
-d /run/postgresql 0755 postgres postgres -
+d /run/postgresql 0775 postgres postgres -
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 72dbffeca..b960373e6 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Jeramy Rutley <jrutley@gmail.com>
pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p374
+pkgver=1.9.3_p385
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.ruby-lang.org/en/'
@@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
options=('!emptydirs' '!makeflags')
source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
'gemrc')
-md5sums=('944e73eba9ee9e1f2647ff32ec0b14b2'
+md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c'
'6fb8e7a09955e0f64be3158fb4a27e7a')
build() {
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 19bd580ca..04a3dbeaf 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174261 2013-01-03 12:31:28Z juergen $
+# $Id: PKGBUILD 177550 2013-02-07 05:42:47Z eric $
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: Daniel White <daniel@whitehouse.id.au>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
@@ -49,8 +49,8 @@ package() {
INSTALL_ROOT="$pkgdir/usr" sh install.sh
- src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/arch-fixes.lisp
- mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core
+ src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp"
+ mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core"
# sources
mkdir -p "$pkgdir/usr/share/sbcl-source"
diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD
index 04b7e7235..6a8640a5f 100644
--- a/extra/usermin/PKGBUILD
+++ b/extra/usermin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172026 2012-11-26 16:13:58Z tpowa $
+# $Id: PKGBUILD 177553 2013-02-07 05:50:05Z eric $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=usermin
pkgver=1.530
@@ -48,8 +48,8 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t
usermin.service
ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2)
-build() {
- cd $startdir/src/$pkgname-$pkgver
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
# remove modules we do not support
@@ -67,26 +67,26 @@ build() {
(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
# create dirs
- mkdir -p $startdir/pkg/opt/usermin
- mkdir -p $startdir/pkg/var/log/usermin
- mkdir -p $startdir/pkg/etc/usermin
+ mkdir -p "$pkgdir"/opt/usermin
+ mkdir -p "$pkgdir"/var/log/usermin
+ mkdir -p "$pkgdir"/etc/usermin
# install pam stuff
- install -D -m 644 usermin-pam $startdir/pkg/etc/pam.d/usermin
+ install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin
# remove other distros and add only Archlinux don't change next line else it will not work!
rm os_list.txt
echo 'Archlinux Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt
# copy stuff to right dirs
- cd $startdir/src/$pkgname-$pkgver
- cp -rp * $startdir/pkg/opt/usermin
- cd $startdir/src/usermin-config
- cp -rfp * $startdir/pkg/opt/usermin
+ cd "$srcdir"/$pkgname-$pkgver
+ cp -rp * "$pkgdir"/opt/usermin
+ cd "$srcdir"/usermin-config
+ cp -rfp * "$pkgdir"/opt/usermin
# define parameters for setup.sh
- config_dir=$startdir/pkg/etc/usermin
- var_dir=$startdir/pkg/var/log/usermin
+ config_dir="$pkgdir"/etc/usermin
+ var_dir="$pkgdir"/var/log/usermin
perl=/usr/bin/perl
autoos=1
port=20000
@@ -100,33 +100,33 @@ build() {
nouninstall=1
noperlpath=1
atbootyn=n
- tempdir=$startdir/pkg/tmp
+ tempdir="$pkgdir"/tmp
export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
# Fix setup.sh
- sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/usermin/setup.sh
- $startdir/pkg/opt/usermin/setup.sh
+ sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh
+ "$pkgdir"/opt/usermin/setup.sh
# Fixup the config files to use their real locations
- sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' $startdir/pkg/etc/usermin/miniserv.conf
- find $startdir/pkg/etc/usermin -type f -exec sed -i "s:$startdir/pkg::g" {} \;
+ sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf
+ find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \;
# make it only accessible by localhost
- echo 'allow=127.0.0.1' >> $startdir/pkg/etc/usermin/miniserv.conf
+ echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf
# enable user and password login
- sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf
+ sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf
#install systemd service file
- install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service
+ install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service
#install rc file
- install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin
+ install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin
# delete temp dir
- rm -r $startdir/pkg/tmp
+ rm -r "$pkgdir"/tmp
#install license
- install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE
+ install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
}
md5sums=('5a00ec2d294935676efc12f607446fb4'
'cfef4490cd1ef9517c0b39a7bd75c968'
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 8b44815b3..e96680658 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,8 +6,8 @@
pkgbase=vim
pkgname=('vim' 'gvim' 'vim-runtime')
_topver=7.3
-_patchlevel=754
-__hgrev=52bfa939fc07
+_patchlevel=798
+__hgrev=30b3b1da0350
_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
'vimrc'
'archlinux.vim'
'gvim.desktop')
-md5sums=('187bec934962a7b5418dbe233e606eef'
- '3a41d935a372c712088cdee997e1287f'
+md5sums=('e4a759fdb7cf91d91fd4f8e4f44d5d9c'
+ 'ff8221082bdd0f9b63f57e5cc7773ee7'
'6e7adfbd5d26c1d161030ec203a7f243'
'20fceda56badf201695c57999b0bc609'
'10353a61aadc3f276692d0e17db1478e'
@@ -53,8 +53,8 @@ mksource() {
gpg --detach-sign ${pkgname}-${pkgver}.tar.xz
- scp ${pkgname}-${pkgver}.tar.xz ger:/srv/ftp/other/vim/
- scp ${pkgname}-${pkgver}.tar.xz.sig ger:/srv/ftp/other/vim/
+ scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/
+ scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/
}
build() {
@@ -65,9 +65,7 @@ build() {
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)
cp -a vim-build gvim-build
@@ -77,7 +75,7 @@ build() {
./configure \
--prefix=/usr \
--localstatedir=/var/lib/vim \
- --with-features=big \
+ --with-features=huge \
--with-compiledby=ArchLinux \
--enable-gpm \
--enable-acl \
@@ -99,7 +97,7 @@ build() {
./configure \
--prefix=/usr \
--localstatedir=/var/lib/vim \
- --with-features=big \
+ --with-features=huge \
--with-compiledby=ArchLinux \
--enable-gpm \
--enable-acl \
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index f83690fe1..eb7ab19b2 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172025 2012-11-26 16:13:54Z tpowa $
+# $Id: PKGBUILD 177556 2013-02-07 05:57:24Z eric $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
pkgver=1.610
@@ -90,9 +90,9 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t
webmin.service)
options=(!strip)
-build() {
+package() {
# NOTE: USE --asroot build option to avoid fakeroot error!
- cd $startdir/src/$pkgname-$pkgver
+ cd "$srcdir"/$pkgname-$pkgver
# add patches from webmin.com
#for i in ../*.wbm
#do tar xvf $i
@@ -131,12 +131,12 @@ build() {
(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
# create dirs
- mkdir -p $startdir/pkg/opt/webmin
- mkdir -p $startdir/pkg/var/log/webmin
- mkdir -p $startdir/pkg/etc/webmin
+ mkdir -p "$pkgdir"/opt/webmin
+ mkdir -p "$pkgdir"/var/log/webmin
+ mkdir -p "$pkgdir"/etc/webmin
# install pam stuff
- install -D -m 644 webmin-pam $startdir/pkg/etc/pam.d/webmin
+ install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
# remove other distros and add only Archlinux don't change next line else it will not work!
rm os_list.txt
@@ -151,7 +151,7 @@ build() {
sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl
# Add pacman menu
- cd $startdir/src/$pkgname-$pkgver
+ cd "$srcdir"/$pkgname-$pkgver
cp -rf custom/ pacman
cp -rf mscstyle3/custom mscstyle3/pacman
sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
@@ -162,14 +162,14 @@ build() {
sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
# copy stuff to right dirs
- cd $startdir/src/$pkgname-$pkgver
- cp -rp * $startdir/pkg/opt/webmin
- cd $startdir/src/webmin-config
- cp -rfp * $startdir/pkg/opt/webmin
+ cd "$srcdir"/$pkgname-$pkgver
+ cp -rp * "$pkgdir"/opt/webmin
+ cd "$srcdir"/webmin-config
+ cp -rfp * "$pkgdir"/opt/webmin
# define parameters for setup.sh
- config_dir=$startdir/pkg/etc/webmin
- var_dir=$startdir/pkg/var/log/webmin
+ config_dir="$pkgdir"/etc/webmin
+ var_dir="$pkgdir"/var/log/webmin
perl=/usr/bin/perl
autoos=1
port=10000
@@ -183,36 +183,36 @@ build() {
nouninstall=1
noperlpath=1
atbootyn=n
- tempdir=$startdir/pkg/tmp
+ tempdir="$pkgdir"/tmp
export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
# Fix setup.sh
- sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/webmin/setup.sh
- $startdir/pkg/opt/webmin/setup.sh
+ sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
+ "$pkgdir"/opt/webmin/setup.sh
# Fixup the config files to use their real locations
- sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' $startdir/pkg/etc/webmin/miniserv.conf
- find $startdir/pkg/etc/webmin -type f -exec sed -i "s:$startdir/pkg::g" {} \;
+ sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
+ find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \;
# make it only accessible by localhost
- echo 'allow=127.0.0.1' >> $startdir/pkg/etc/webmin/miniserv.conf
+ echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf
# install pacman menu
- cd $startdir/src/webmin-pacman/config
- cp -rfp * $startdir/pkg/etc/webmin/pacman
+ cd "$srcdir"/webmin-pacman/config
+ cp -rfp * "$pkgdir"/etc/webmin/pacman
#install rc file
- install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin
+ install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin
# install systemd files
install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
# delete temp dir
- rm -r $startdir/pkg/tmp
+ rm -r "$pkgdir"/tmp
# change sticky bit
chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
# install license
- install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
+ install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
}
md5sums=('e5f51402c09558ee688efea3d03a3d83'
'b0b3e3fb231a12e60165b6b4d604dcfa'
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-13 20:22:13 +0000