summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-30 01:31:58 -0700
committerroot <root@rshg054.dnsready.net>2013-05-30 01:31:58 -0700
commit76ee9007095484a113d1856786b81e2d2fae8202 (patch)
tree5f32a600b3d22c285dba07d99e669b7c52285d95 /community
parentd267e861074512027414df29d18d9824e0faae8f (diff)
Thu May 30 01:31:56 PDT 2013
Diffstat (limited to 'community')
-rw-r--r--community/apcupsd/PKGBUILD15
-rw-r--r--community/apcupsd/apcupsd.service2
-rw-r--r--community/fcron/PKGBUILD18
-rw-r--r--community/fcron/fcron.install13
-rw-r--r--community/fcron/systabbin502 -> 0 bytes
-rw-r--r--community/freeradius-client/PKGBUILD10
-rw-r--r--community/freeradius/PKGBUILD7
-rw-r--r--community/freeradius/freeradius.service10
-rw-r--r--community/lib32-libtxc_dxtn/PKGBUILD36
-rw-r--r--community/libtxc_dxtn/PKGBUILD6
-rw-r--r--community/mailutils/PKGBUILD30
-rw-r--r--community/mailutils/build-fix.patch13
-rw-r--r--community/qcad/PKGBUILD92
-rw-r--r--community/qcad/QCad.desktop4
-rw-r--r--community/qcad/qcad-intptr.patch24
-rw-r--r--community/qcad/qcad.patch52
-rw-r--r--community/qcad/qcad.xpm132
-rw-r--r--community/rsyslog/PKGBUILD7
-rw-r--r--community/rsyslog/rsyslog.logrotate2
-rw-r--r--community/swftools/PKGBUILD12
-rw-r--r--community/tomoyo-tools/PKGBUILD8
-rw-r--r--community/uucp/PKGBUILD23
22 files changed, 198 insertions, 318 deletions
diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index 1d03de73d..7ebe951f5 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90645 2013-05-13 14:17:50Z spupykin $
+# $Id: PKGBUILD 91912 2013-05-29 10:15:12Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Todd Musall <tmusall@comcast.net>
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=apcupsd
pkgver=3.14.10
-pkgrel=4
+pkgrel=5
pkgdesc="Power mangement and controlling most of APC's UPS models"
arch=(i686 x86_64)
url="http://www.apcupsd.org"
@@ -21,16 +21,13 @@ source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
apcupsd.service
apcupsd-tmpfiles.conf)
sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
- 'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a'
- 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
- 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
-sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
- 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
+ '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7'
'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
+ --sbindir=/usr/bin \
--enable-cgi --enable-usb --enable-net \
--with-upstype=usb --with-upscable=usb \
--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
@@ -43,7 +40,7 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
- chmod 755 "$pkgdir"/sbin/*
+ chmod 755 "$pkgdir"/usr/bin/*
install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
-} \ No newline at end of file
+}
diff --git a/community/apcupsd/apcupsd.service b/community/apcupsd/apcupsd.service
index 9cec6e441..b8dfb9b4a 100644
--- a/community/apcupsd/apcupsd.service
+++ b/community/apcupsd/apcupsd.service
@@ -2,7 +2,7 @@
Description=APC UPS Monitor
[Service]
-ExecStart=/sbin/apcupsd -b
+ExecStart=/usr/bin/apcupsd -b
[Install]
WantedBy=multi-user.target
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 09ac4e51c..3e60e52d5 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91396 2013-05-21 19:34:28Z seblu $
+# $Id: PKGBUILD 91897 2013-05-29 00:39:11Z seblu $
# Contributor: Giorgio Lando <lando at imap dot cc>
# Contributor: Sergej Pupykin
# Contributor: Thomas Bächler
@@ -7,7 +7,7 @@
pkgname=fcron
pkgver=3.1.2
-pkgrel=6
+pkgrel=7
pkgdesc='Feature-rich cron implementation'
arch=(i686 x86_64)
url='http://fcron.free.fr'
@@ -20,15 +20,12 @@ provides=('cron')
conflicts=('dcron')
backup=('etc/fcron/fcron.conf'
'etc/fcron/fcron.allow'
- 'etc/fcron/fcron.deny'
- 'var/spool/fcron/systab'
- 'var/spool/fcron/systab.orig')
+ 'etc/fcron/fcron.deny')
options=('emptydirs' '!makeflags')
+install=$pkgname.install
source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"
- 'systab'
'systab.orig')
md5sums=('36bf213e15f3a480f2274f8e46cced0a'
- '5f321747d86686f351ada7dce5774803'
'afecbfd98caa49e8e4aa239fa1b19255')
build() {
@@ -58,11 +55,10 @@ package() {
install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron"
install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab"
- # Install default fcrontab so that fcron can completely replace dcron
- install -D -m640 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
- # In order to preserve the systab crontab in any case it is better to have
- # it in non-binary form too
+ # Install a default fcrontab so that fcron can completely replace dcron
+ # We doesn't use binary format which is incompatible between arch and may cause crash
+ # We regenerate the binary format at each update
install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
# Add cron.* directories
diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install
new file mode 100644
index 000000000..f7b0abddf
--- /dev/null
+++ b/community/fcron/fcron.install
@@ -0,0 +1,13 @@
+# arg 1: the new package version
+post_install() {
+ # Generate binary format which is incompatible between arch
+ fcrontab -z -u systab &>/dev/null
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/fcron/systab b/community/fcron/systab
deleted file mode 100644
index 392b2cb2c..000000000
--- a/community/fcron/systab
+++ /dev/null
Binary files differ
diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD
index b7f90a711..219995284 100644
--- a/community/freeradius-client/PKGBUILD
+++ b/community/freeradius-client/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65200 2012-02-20 10:12:30Z spupykin $
+# $Id: PKGBUILD 91904 2013-05-29 10:03:59Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Kalidarn
pkgname=freeradius-client
pkgver=1.1.6
-pkgrel=4
+pkgrel=5
pkgdesc="FreeRADIUS Client Software"
arch=('i686' 'x86_64')
url="http://wiki.freeradius.org/Radiusclient"
@@ -16,8 +16,12 @@ md5sums=('2e46564e450ae13aedb70dc133b158ac')
build() {
cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc
+ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
install -D -m0644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/license
mv $pkgdir/etc/radiusclient $pkgdir/etc/radiusclient.default
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index 1dc5afa57..6ecba36c1 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91650 2013-05-26 09:24:31Z bluewind $
+# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jason R Begley (jayray@digitalgoat.com>
pkgname=freeradius
pkgver=2.2.0
-pkgrel=7
+pkgrel=8
pkgdesc="The premier open source RADIUS server"
arch=('i686' 'x86_64')
url="http://www.freeradius.org/"
@@ -21,7 +21,7 @@ source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{
md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119'
'SKIP'
'f959e89812bedfc9f8308076f78cd74e'
- '39eba6d34f8249781e9e917646465632'
+ 'e3f18e3a25df3b692e59f60605354708'
'c6a61de7576933f59154a53bfc12a2d2')
build() {
@@ -33,6 +33,7 @@ build() {
--prefix=/usr --enable-heimdal-krb5 \
--localstatedir=/var \
--sysconfdir=/etc \
+ --sbindir=/usr/bin \
--libdir=/usr/lib/freeradius \
--with-udpfromto
make
diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service
index 635b6d6f8..220d352af 100644
--- a/community/freeradius/freeradius.service
+++ b/community/freeradius/freeradius.service
@@ -4,11 +4,11 @@ After=syslog.target network.target
[Service]
Type=forking
-PIDFile=/var/run/radiusd/radiusd.pid
-ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd
-ExecStartPre=/usr/sbin/radiusd -C
-ExecStart=/usr/sbin/radiusd -d /etc/raddb
-ExecReload=/usr/sbin/radiusd -C
+PIDFile=/run/radiusd/radiusd.pid
+ExecStartPre=-/bin/chown -R radiusd.radiusd /run/radiusd
+ExecStartPre=/usr/bin/radiusd -C
+ExecStart=/usr/bin/radiusd -d /etc/raddb
+ExecReload=/usr/bin/radiusd -C
ExecReload=/bin/kill -HUP $MAINPID
[Install]
diff --git a/community/lib32-libtxc_dxtn/PKGBUILD b/community/lib32-libtxc_dxtn/PKGBUILD
new file mode 100644
index 000000000..6306e1c7e
--- /dev/null
+++ b/community/lib32-libtxc_dxtn/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 91929 2013-05-29 16:41:31Z lcarlier $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+
+_pkgbasename=libtxc_dxtn
+pkgname=lib32-$_pkgbasename
+pkgver=1.0.1
+pkgrel=4
+arch=(x86_64)
+pkgdesc="S3 Texture Compression (S3TC) library for Mesa (32-bit)"
+url="http://dri.freedesktop.org/wiki/S3TC"
+license=(custom:BSD)
+depends=(lib32-mesa)
+makedepends=(gcc-multilib)
+options=(!libtool)
+source=(http://people.freedesktop.org/~cbrill/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2)
+md5sums=('7105107f07ac49753f4b61ba9d0c79c5')
+
+build() {
+ cd "$srcdir/$_pkgbasename-$pkgver"
+
+ CC="gcc -m32" ./configure --prefix=/usr --libdir=/usr/lib32
+ make
+}
+
+package() {
+ cd "$srcdir/$_pkgbasename-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir/usr/include"
+
+ # License
+ mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
+ sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \
+ > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community/libtxc_dxtn/PKGBUILD b/community/libtxc_dxtn/PKGBUILD
index 33f7bf0fa..b65194ec6 100644
--- a/community/libtxc_dxtn/PKGBUILD
+++ b/community/libtxc_dxtn/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81456 2012-12-21 10:04:07Z lcarlier $
+# $Id: PKGBUILD 91927 2013-05-29 16:38:35Z lcarlier $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
pkgname=libtxc_dxtn
pkgver=1.0.1
-pkgrel=3
+pkgrel=4
arch=(i686 x86_64)
-pkgdesc="Texture compression library for Mesa"
+pkgdesc="S3 Texture Compression (S3TC) library for Mesa"
url="http://dri.freedesktop.org/wiki/S3TC"
license=(custom:BSD)
depends=(mesa)
diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index 81afe7b4c..39eee461f 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 59712 2011-11-29 13:35:07Z stephane $
+# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=mailutils
pkgver=2.2
-pkgrel=4
+pkgrel=5
pkgdesc="MUA command line tool (mailx)"
arch=(i686 x86_64)
url="http://www.gnu.org/software/mailutils/"
license=('GPL')
depends=('libldap' 'pam' 'gnutls' 'guile')
-makedepends=('python2' 'emacs')
-optdepends=('python2')
+makedepends=('emacs')
conflicts=('libsieve')
install=mailutils.install
options=(zipman !emptydirs)
-source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2)
-md5sums=('834d2f616b922856127ecfe6c2de7d1a')
+source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2
+ build-fix.patch)
+md5sums=('834d2f616b922856127ecfe6c2de7d1a'
+ 'e83709ffdcdb257dfab443ef77c89574')
-build() {
+prepare() {
cd "$srcdir/mailutils-$pkgver"
+ patch -p1 <$srcdir/build-fix.patch
+}
- py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2`
- py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2`
-
- export PYTHON=/usr/bin/python2
- export PYTHON_CONFIG=/usr/bin/python2-config
- export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`"
- export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`"
-
+build() {
+ cd "$srcdir/mailutils-$pkgver"
[ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
--libexecdir=/usr/lib/$pkgname --without-fribidi \
- --without-tcp-wrappers
-# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \;
+ --without-tcp-wrappers --sbindir=/usr/bin
make -j1
}
diff --git a/community/mailutils/build-fix.patch b/community/mailutils/build-fix.patch
new file mode 100644
index 000000000..ec4afd5e3
--- /dev/null
+++ b/community/mailutils/build-fix.patch
@@ -0,0 +1,13 @@
+diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in
+--- mailutils-2.2/lib/Makefile.in 2010-09-08 13:58:58.000000000 +0400
++++ mailutils-2.2.q/lib/Makefile.in 2013-05-29 14:51:14.064888989 +0400
+@@ -1861,7 +1861,8 @@
+ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
++ -e 's|_GL_WARN_ON_USE (gets.*||'; \
+ } > $@-t && \
+ mv $@-t $@
+
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index ef2027f36..5783146ec 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,57 +1,69 @@
-# $Id: PKGBUILD 90083 2013-05-06 19:39:17Z foutrelis $
+# $Id: PKGBUILD 91930 2013-05-29 16:59:39Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: Giovanni Scafora <linuxmania@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=qcad
-pkgver=2.0.5.0
-pkgrel=12
+pkgver=3.0.14.0
+pkgrel=1
pkgdesc="A 2D CAD package based upon Qt"
arch=('i686' 'x86_64')
url="http://www.ribbonsoft.com/qcad.html"
license=('GPL2')
-depends=('qt3')
+depends=('qtwebkit')
makedepends=('glu')
options=(libtool)
-source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
- qcad.xpm
- QCad.desktop
- qcad-intptr.patch
- qcad.patch)
-md5sums=('96b6a56027782aec953c9c4e64c5998c'
- 'da32fec0d2fb85d96126bf28bb0ab9ff'
- 'b4d1eb6724b4b41f191f1ab6fd859c39'
- '92f900fe1fd3a8f841232b587b49c7da'
- '7e6779b1e3b10da1eb4daf36d93f8479')
-# http://ghost1227.com/files/misc/qm.tar.gz)
+#source=(https://github.com/qcad/qcad/archive/v${pkgver}.zip
+source=(http://cl.ly/1u1Y3H290M1S/download/qcad-v${pkgver}.zip
+ QCad.desktop)
+md5sums=('6f52fe016e915850ba942fa760909d4c'
+ '8c4288986b78b14a813b005e81b6ba53')
+
+prepare() {
+ cd ${srcdir}
+
+ sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
+ sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
+}
build() {
- cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
-
- [ "$CARCH" = "x86_64" ] && {
- patch -p1 < ../qcad-intptr.patch;
- sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp;
- }
- patch -p1 < ../qcad.patch
- sed -i "s:"-pedantic"::g" mkspecs/defs.pro
-
- cd scripts
- sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro
- sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro
- sed -i "s/qmake/qmake-qt3/" build_qcad.sh
- sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|' build_qcad.sh
- QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans
+ cd ${srcdir}
+
+ qmake-qt4
+ make PREFIX=/usr CXX="g++ -fpermissive"
}
package() {
- cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
-
- install -D -m755 qcad ${pkgdir}/usr/bin/qcad
- install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
- install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
- install -m644 ../../QCad.desktop \
- ${pkgdir}/usr/share/applications/QCad.desktop
- cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
- #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
+ cd ${srcdir}
+
+ # remove project files
+ find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete
+ find . \( -name 'Makefile' -name '.gitignore' \) -delete
+
+ install -dm755 ${pkgdir}/usr/share/{qcad,pixmaps,applications}
+ cp -r examples fonts libraries patterns plugins scripts ts ${pkgdir}/usr/share/qcad
+ cp release/* ${pkgdir}/usr/share/qcad
+
+ install -m755 qcad ${pkgdir}/usr/share/qcad/qcad
+ install -m755 readme.txt ${pkgdir}/usr/share/qcad/readme.txt
+
+ # qtwebkit
+ ln -s /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so
+ # qt
+ for sofiles in /usr/lib/qt4/plugins/imageformats/*.so
+ do
+ ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/}
+ done
+ for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so
+ do
+ ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/}
+ done
+
+ install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png
+ install -Dm644 QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
+
+ install -dm0755 $pkgdir/usr/bin
+ echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad
+ chmod 0755 $pkgdir/usr/bin/qcad
}
diff --git a/community/qcad/QCad.desktop b/community/qcad/QCad.desktop
index a55f5940f..5841b786e 100644
--- a/community/qcad/QCad.desktop
+++ b/community/qcad/QCad.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
-Exec=/usr/bin/qcad
-Icon=/usr/share/pixmaps/qcad.xpm
+Exec=/usr/share/qcad/qcad
+Icon=/usr/share/pixmaps/qcad_icon.png
Name=QCad
StartupNotify=true
Terminal=false
diff --git a/community/qcad/qcad-intptr.patch b/community/qcad/qcad-intptr.patch
deleted file mode 100644
index 6d8b6acca..000000000
--- a/community/qcad/qcad-intptr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500
-@@ -849,7 +849,7 @@
- os << " layer: NULL ";
- } else {
- os << " layer: " << e.layer->getName().latin1() << " ";
-- os << " layer address: " << (int)(e.layer) << " ";
-+ os << " layer address: " << (intptr_t)(e.layer) << " ";
- }
-
- os << e.pen << "\n";
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500
-@@ -57,7 +57,7 @@
- os << " name: " << l.getName().latin1()
- << " pen: " << l.getPen()
- << " frozen: " << (int)l.isFrozen()
-- << " address: " << (int)(&l)
-+ << " address: " << (intptr_t)(&l)
- << std::endl;
- return os;
- }
diff --git a/community/qcad/qcad.patch b/community/qcad/qcad.patch
deleted file mode 100644
index f051f29af..000000000
--- a/community/qcad/qcad.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h 2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h 2008-12-11 22:29:51.000000000 +0100
-@@ -37,6 +37,7 @@
- #endif
-
- #include <iostream>
-+#include <cstring>
-
- #include "dl_attributes.h"
- #include "dl_codes.h"
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:29:51.000000000 +0100
-@@ -23,7 +23,7 @@
- ** not clear to you.
- **
- **********************************************************************/
--
-+#include <cstdlib>
- #include "rs_actionzoompan.h"
- #include "rs_snapper.h"
- #include "rs_point.h"
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp 2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp 2008-12-11 22:30:18.000000000 +0100
-@@ -25,7 +25,7 @@
- **********************************************************************/
-
- #include "rs_information.h"
--
-+#include <cstdlib>
- #include "rs_constructionline.h"
-
-
-diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh 2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh 2008-12-11 22:31:37.000000000 +0100
-@@ -16,9 +16,6 @@
- echo " distcc use distcc for distributed compilation. DISTCC_HOSTS must be set."
- echo
-
--echo "QTDIR is: $QTDIR"
--echo "QMAKESPEC is: $QMAKESPEC"
--
- # detect system:
- if [ "x$OS" == "xWindows_NT" ]
- then
diff --git a/community/qcad/qcad.xpm b/community/qcad/qcad.xpm
deleted file mode 100644
index e747fa984..000000000
--- a/community/qcad/qcad.xpm
+++ /dev/null
@@ -1,132 +0,0 @@
-/* XPM */
-static const char * qcad_xpm[] = {
-"32 32 97 2",
-" c None",
-". c #3F3F3F",
-"+ c #010180",
-"@ c #FFFFFF",
-"# c #E0E0EF",
-"$ c #41419F",
-"% c #4545A1",
-"& c #4949A3",
-"* c #4D4DA5",
-"= c #5151A7",
-"- c #5555A9",
-"; c #5959AB",
-"> c #4444A2",
-", c #3C3C9D",
-"' c #40409F",
-") c #4444A1",
-"! c #4848A3",
-"~ c #4C4CA5",
-"{ c #5050A7",
-"] c #5454A9",
-"^ c #5858AB",
-"/ c #5D5DAD",
-"( c #6161AF",
-"_ c #6565B1",
-": c #5C5CAD",
-"< c #6060AF",
-"[ c #6464B1",
-"} c #6868B3",
-"| c #6C6CB5",
-"1 c #7070B7",
-"2 c #7474B9",
-"3 c #7878BB",
-"4 c #3F3F9E",
-"5 c #4343A0",
-"6 c #4747A3",
-"7 c #4B4BA5",
-"8 c #000000",
-"9 c #7C7CBD",
-"0 c #8080BF",
-"a c #4747A2",
-"b c #4B4BA4",
-"c c #4F4FA6",
-"d c #7B7BBD",
-"e c #7F7FBF",
-"f c #8383C1",
-"g c #5353A8",
-"h c #8787C3",
-"i c #5757AA",
-"j c #8B8BC5",
-"k c #4E4EA6",
-"l c #5252A8",
-"m c #5656AA",
-"n c #5A5AAC",
-"o c #8787C2",
-"p c #8F8FC7",
-"q c #5E5EAE",
-"r c #8B8BC4",
-"s c #8F8FC6",
-"t c #9393C8",
-"u c #6262B0",
-"v c #8E8EC6",
-"w c #9292C8",
-"x c #9696CA",
-"y c #6666B2",
-"z c #9A9ACC",
-"A c #6A6AB4",
-"B c #9E9ECE",
-"C c #6565B2",
-"D c #6969B4",
-"E c #6D6DB6",
-"F c #7171B8",
-"G c #7575BA",
-"H c #9D9DCE",
-"I c #A1A1D0",
-"J c #7171B7",
-"K c #7575B9",
-"L c #7979BC",
-"M c #7D7DBE",
-"N c #8181C0",
-"O c #8585C2",
-"P c #8989C4",
-"Q c #8D8DC6",
-"R c #9191C8",
-"S c #9595CA",
-"T c #9999CC",
-"U c #A5A5D2",
-"V c #7979BB",
-"W c #7D7DBD",
-"X c #8181BF",
-"Y c #8585C1",
-"Z c #8989C3",
-"` c #A9A9D4",
-" . c #8D8DC5",
-".. c #9191C7",
-"+. c #9595C9",
-"@. c #9999CB",
-"#. c #ADADD6",
-" ",
-" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-" . . . . . . . . ",
-" . . . + + + + + + + . . . ",
-" . @ . @ + + # # # # # # # + + @ . @ . @ . ",
-" . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . . ",
-" . . + # , ' ) ! ~ { ] ^ / ( _ > + . . ",
-" . . + # , ' ) ! ~ { ] ^ : < [ } | > + . . ",
-" . @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ . @ . ",
-" . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . . ",
-" . + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + . . ",
-" . + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + . . ",
-" . + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + . @ . ",
-" . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . . ",
-" . + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + . . ",
-" . + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + . . ",
-" . + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + . @ . ",
-" . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . . ",
-" . + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + . . ",
-" . + > C D E . . . . . . . . . 8 z B > + . . ",
-" . @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ . @ . ",
-" . . . . . + > J K L M N O P Q R S T H I U + . . . . . . . ",
-" . . + > V W X Y Z Q R S T H I U ` > + . . ",
-" . . + > > Y Z ...+.@.H > U ` #.#.> + . . ",
-" . @ . @ + + > > > > > > > + > #.#.#.> + . @ . ",
-" . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . . ",
-" . . . . . + > > + . . ",
-" . . . . . + + . . ",
-" . @ . @ . @ . @ . @ . @ . @ . ",
-" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-" ",
-" "};
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 8729200d3..05834c021 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90719 2013-05-13 14:37:04Z spupykin $
+# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=rsyslog
pkgver=7.2.7
-pkgrel=2
+pkgrel=3
pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
url="http://www.rsyslog.com/"
arch=('i686' 'x86_64')
@@ -22,12 +22,13 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
'rsyslog.logrotate'
'rsyslog.conf')
md5sums=('4a61d182acb5b5487e7b99dea8974857'
- '8065db4bef3061a4f000ba58779f6829'
+ '304bc9ea26aa1ff910870899a30512f1'
'd61dd424e660eb16401121eed20d98bc')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr \
+ --sbindir=/usr/bin \
--enable-mysql \
--enable-pgsql \
--enable-mail \
diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate
index 76306c560..354581767 100644
--- a/community/rsyslog/rsyslog.logrotate
+++ b/community/rsyslog/rsyslog.logrotate
@@ -2,6 +2,6 @@
missingok
sharedscripts
postrotate
- /usr/bin/killall -HUP /usr/sbin/rsyslogd
+ /usr/bin/killall -HUP /usr/bin/rsyslogd
endscript
}
diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD
index 7a069a04f..ffc3ea5cf 100644
--- a/community/swftools/PKGBUILD
+++ b/community/swftools/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 70956 2012-05-20 17:24:25Z jlichtblau $
+# $Id: PKGBUILD 91933 2013-05-29 20:22:20Z lcarlier $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Vinay S Shastry <vinayshastry@gmail.com>
pkgname=swftools
pkgver=0.9.2
-pkgrel=1
+pkgrel=2
pkgdesc="A collection of SWF manipulation and creation utilities"
arch=('i686' 'x86_64')
url="http://www.swftools.org/"
license=('GPL')
-depends=('avifile' 'giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig')
+depends=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig')
makedepends=('bison' 'flex' 'zlib' 'patch')
changelog=$pkgname.changelog
source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz
@@ -17,6 +17,12 @@ source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz
sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1'
'80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d')
+prepare() {
+ cd ${srcdir}/$pkgname-$pkgver
+
+ sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c
+}
+
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index c24b015e8..9fd6ccc30 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87706 2013-04-05 10:24:39Z spupykin $
+# $Id: PKGBUILD 91910 2013-05-29 10:07:22Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
@@ -7,7 +7,7 @@ _basever=2.5.0
_timestamp=20130214
_file=53357
pkgver=${_basever}.${_timestamp}
-pkgrel=2
+pkgrel=3
pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2'
arch=('i686' 'x86_64')
url='http://tomoyo.sourceforge.jp'
@@ -21,10 +21,10 @@ md5sums=('ffff6b531ed9ac32b01722a9cd749a2f')
build() {
cd "${srcdir}/${pkgname}"
- make
+ make USRSBINDIR=/usr/bin SBINDIR=/usr/bin
}
package() {
cd "${srcdir}/${pkgname}"
- make INSTALLDIR="${pkgdir}" install
+ make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install
}
diff --git a/community/uucp/PKGBUILD b/community/uucp/PKGBUILD
index 065fee173..1b0fc3394 100644
--- a/community/uucp/PKGBUILD
+++ b/community/uucp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61375 2011-12-29 09:59:32Z spupykin $
+# $Id: PKGBUILD 91914 2013-05-29 10:32:53Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jick Nan <jick.nan@gmail.com>
pkgname=uucp
pkgver=1.07
-pkgrel=3
+pkgrel=4
pkgdesc="Taylor UUCP is a free implementation of UUCP and is the standard UUCP used on the GNU system"
arch=(i686 x86_64)
url="http://www.gnu.org/software/uucp/uucp.html"
@@ -16,11 +16,25 @@ backup=('etc/uucp/config'
source=(http://ftp.gnu.org/gnu/uucp/${pkgname}-${pkgver}.tar.gz)
md5sums=('64c54d43787339a7cced48390eb3e1d0')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i 's|${CC-cc} -E|${CC-cc} -E -O2|g' configure
+# sed -i \
+# -e '1,1i#include <unistd.h>' \
+# -e '1,1i#include <fcntl.h>' \
+# -e '1,1i#include <sys/types.h>' \
+# uuconf/rdlocs.c unix/{efopen,cusub,init}.c
+# sed -i '1,1i#include <sys/statvfs.h>' unix/fsusg.c
+}
- ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp --sbindir=/usr/bin
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -D -m644 sample/config ${pkgdir}/etc/uucp/config
@@ -28,4 +42,3 @@ build() {
install -D -m644 sample/port ${pkgdir}/etc/uucp/port
mv ${pkgdir}/usr/info ${pkgdir}/usr/share/
}
-