Sat Apr 7 00:01:16 UTC 2012

13 files changed, 115 insertions, 83 deletions

diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD
new file mode 100644
index 000000000..2885e3ca4
--- /dev/null
+++ b/community/cdrtools/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 68902 2012-04-05 11:43:49Z stativ $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+pkgname=cdrtools
+pkgver=3.01a07
+pkgrel=2
+pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
+arch=('i686' 'x86_64')
+url="http://cdrecord.berlios.de/private/cdrecord.html"
+license=('CDDL')
+depends=('acl')
+conflicts=('cdrkit')
+provides=('cdrkit')
+options=(!makeflags)
+backup=('etc/default/cdrecord' 'etc/default/rscsi')
+install=cdrtools.install
+source=(ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz)
+md5sums=('b690d11ee6c9464b89d8684172807b51')
+
+build() {
+  cd "$srcdir"/cdrtools-${pkgver%%a*}
+  sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
+  sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
+  
+  export GMAKE_NOWARN=true
+  make INS_BASE=/usr INS_RBASE=/
+}
+
+package() {
+  cd "$srcdir"/cdrtools-${pkgver%%a*}
+  export GMAKE_NOWARN=true
+
+  make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir"/usr/include
+  rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
+  find "$pkgdir" -type d -perm 775 -exec chmod 755 '{}' ';'
+  find "$pkgdir" -type f -perm 4711 -exec chmod 755 '{}' ';'
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/cdrtools/cdrtools.install b/community/cdrtools/cdrtools.install
new file mode 100644
index 000000000..af3800716
--- /dev/null
+++ b/community/cdrtools/cdrtools.install
@@ -0,0 +1,10 @@
+
+post_install() {
+  echo "To allow other users than root execute rscsi add an entry"
+  echo "to /etc/default/rscsi or use an \"rscsi\" user"
+  echo ""
+  echo "If you get folowing error while executing \"cdrecord --scanbus\":"
+  echo "  No such file or directory. Cannot open '/dev/pg*'. Cannot open or use SCSI driver."
+  echo "you may need to load the sg module manually using \"modprobe sg\"."
+}
+
diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD
index a5916c2f0..fc8ca5598 100644
--- a/community/lomoco/PKGBUILD
+++ b/community/lomoco/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67826 2012-03-14 16:31:38Z spupykin $
+# $Id: PKGBUILD 68931 2012-04-06 00:04:27Z dreisner $
 # Maintainer: Jeff Mickey <j@codemac.net>
 # Contributor: Shadowhand <woody.gilk@gmail.com>
 
 pkgname=lomoco
 pkgver=1.0
-pkgrel=7
+pkgrel=8
 url="http://www.lomoco.org/"
 pkgdesc="Logitech USB mouse configuration program"
 license=('GPL')
@@ -34,7 +34,7 @@ build() {
   sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco
   sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules
   sed -i 's|SYSFS|ATTR|' udev/lomoco.rules
-  install -D -m 644 udev/lomoco.rules ${pkgdir}/etc/udev/rules.d/80-lomoco.rules
-  install -D -m 755 ../lomoco.sh ${pkgdir}/lib/udev/lomoco.sh
-  install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/
+  install -D -m 644 udev/lomoco.rules ${pkgdir}/usr/lib/udev/rules.d/80-lomoco.rules
+  install -D -m 755 ../lomoco.sh ${pkgdir}/usr/lib/udev/lomoco.sh
+  install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/lomoco_mouse.conf
 }
diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD
index bf4c18da8..7d9c38e2d 100644
--- a/community/multipath-tools/PKGBUILD
+++ b/community/multipath-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64893 2012-02-18 19:44:21Z bpiotrowski $
+# $Id: PKGBUILD 68933 2012-04-06 00:04:44Z dreisner $
 # Maintainer:
 # Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
 # Contributor: Michael P <ptchinster@archlinux.us>
@@ -6,42 +6,39 @@
 
 pkgname=multipath-tools
 pkgver=0.4.9
-pkgrel=5
+pkgrel=6
 pkgdesc="Multipath Tools For Linux"
 arch=('i686' 'x86_64')
 url="http://christophe.varoqui.free.fr/"
 license=('GPL')
 depends=('libaio' 'device-mapper')
-backup=('etc/multipath.conf' 'etc/multipath.conf.annotated' 'etc/rc.d/multipathd' )
+backup=('etc/multipath.conf' 'etc/multipath.conf.annotated')
 install=multipath-tools.install
+options=('!emptydirs')
 source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2"
-        "multipath.conf"
-        "multipath.conf.annotated"
-        "multipathd.rc"
-        'fix-build.patch')
+        "multipath.conf" "multipath.conf.annotated" "multipathd.rc" 'fix-build.patch')
 md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765'
-         'd0fb11398cc628c7997111efdc5d52e5'
-         '5a93f993ec05fc99094d5139aabd3925'
-         '1c2dcf43a6b5ae84ec1fae0fee071336'
+         '9324ff0ba8330dcb21b2fcf64988026f'
+         'be11462922eeeb9fcd2ba5f3f137b7d9'
+         '7c04ef96441363b0d43a2ebb13a87659'
          '2576fc535d7fa767837b1c7827013e52')
 
 build() {
-  #Needs to be fixed upstream. Refer to
-  # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814
-  cd "$srcdir"
-
-  patch -p1 -i "${srcdir}"/fix-build.patch
+  patch -p1 -i fix-build.patch
 
-  env LDFLAGS=${LDFLAGS//-Wl,--as-needed}\
-    make
+  sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile
+  sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules
+  
+  # Needs to be fixed upstream. Refer to
+  # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814
+  export LDFLAGS=${LDFLAGS/-Wl,--as-needed}
+  
+  make
 }
 
 package() {
-  cd "$srcdir"
-  
-  make LIB="lib" DESTDIR="$pkgdir" install
-
-  install -D -m 644 "$srcdir"/multipath.conf "$pkgdir"/etc/multipath.conf
-  install -D -m 644 "$srcdir"/multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
-  install -D -m 755 "$srcdir"/multipathd.rc "$pkgdir"/etc/rc.d/multipathd
+  make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install
+  install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf
+  install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
+  install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd
 }
diff --git a/community/multipath-tools/multipath.conf b/community/multipath-tools/multipath.conf
index ba9f788ae..6dacf093d 100644
--- a/community/multipath-tools/multipath.conf
+++ b/community/multipath-tools/multipath.conf
@@ -3,6 +3,6 @@
 #
 
 defaults {
-	getuid_callout"/lib/udev/scsi_id -g -u -d /dev/%n"
+	getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n"
 }
 
diff --git a/community/multipath-tools/multipath.conf.annotated b/community/multipath-tools/multipath.conf.annotated
index e6cfe9a1a..b79488413 100644
--- a/community/multipath-tools/multipath.conf.annotated
+++ b/community/multipath-tools/multipath.conf.annotated
@@ -47,9 +47,9 @@
 #	# scope   : multipath
 #	# desc    : the default program and args to callout to obtain a unique 
 #	#           path identifier. Absolute path required
-#	# default : /lib/udev/scsi_id -g -u -s
+#	# default : /usr/lib/udev/scsi_id -g -u -s
 #	#
-#	getuid_callout	"/lib/udev/scsi_id -g -u -s /block/%n"
+#	getuid_callout	"/usr/lib/udev/scsi_id -g -u -s /block/%n"
 #
 #	#
 #	# name    : prio_callout
@@ -291,9 +291,9 @@
 #		# scope   : multipath
 #		# desc    : the program and args to callout to obtain a unique 
 #		#           path identifier. Absolute path required
-#		# default : /lib/udev/scsi_id -g -u -s
+#		# default : /usr/lib/udev/scsi_id -g -u -s
 #		#
-#		getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
+#		getuid_callout          "/usr/lib/udev/scsi_id -g -u -s /block/%n"
 #
 #		#
 #		# name    : prio_callout
diff --git a/community/multipath-tools/multipathd.rc b/community/multipath-tools/multipathd.rc
index 21ffcaa5a..7f5ef5d6a 100644
--- a/community/multipath-tools/multipathd.rc
+++ b/community/multipath-tools/multipathd.rc
@@ -6,7 +6,7 @@
 case "$1" in
   start)
     stat_busy "Starting multipathd"
-    /sbin/multipathd
+    /usr/bin/multipathd
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index cb30236db..296fe740b 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63728 2012-02-05 12:09:41Z ibiru $
+# $Id: PKGBUILD 68906 2012-04-05 13:36:30Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.7
+pkgver=4.0.8
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
@@ -14,41 +14,19 @@ license=('GPL3')
 depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('mercurial' 'cmake')
 install=rawtherapee.install
-source=()
-md5sums=()
-
-_root="https://rawtherapee.googlecode.com/hg/"
-_repo="rawtherapee"
+source=("http://rawtherapee.googlecode.com/files/rawtherapee-source-$pkgver.tar.xz")
+md5sums=('27b988200c5ff3f2863e1d83200657b2')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [ -d $_repo ] ; then
-    cd $_repo
-    hg pull
-    hg up "$pkgver"
-    msg "The local files are updated."
-  else
-    hg clone -u "$pkgver" $_root $_repo
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-  msg "Starting make..."
-
-  if [ -e "$srcdir/$_repo-build" ]; then
-    rm -rf "$srcdir/$_repo-build"
-  fi
-  mkdir "$srcdir/$_repo-build"
-  cd "$srcdir/$_repo-build"
+  cd "$srcdir/$pkgname-$pkgver"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-     ../$_repo
+     .
   make
 }
 
 package() {
-  cd "$srcdir/$_repo-build"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index f91a9e5d5..7e6523384 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62742 2012-01-25 15:39:27Z spupykin $
+# $Id: PKGBUILD 68925 2012-04-06 00:04:01Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
 pkgver=6.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64')
@@ -39,7 +39,7 @@ build() {
               --enable-snmp \
               --enable-gnutls \
               --enable-inet \
-              --with-systemdsystemunitdir=/lib/systemd/system
+              --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
 }
 package() {
@@ -50,4 +50,7 @@ package() {
   install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
   install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
   install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+
+  # fix location of systemctl
+  sed -i 's@/bin/systemctl@/usr&@' "$pkgdir/usr/lib/systemd/system/rsyslog.service"
 }
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 3bf09ecd3..aa7f8115a 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -6,14 +6,14 @@
 
 pkgname=task
 pkgver=2.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
 license=('MIT')
-depends=()
+depends=('lua')
 makedepends=('cmake' 'lua')
-optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'lua: for luaexport addon')
+optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon')
 source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz)
 sha256sums=('78971e366c2395de1cc4b0c4fc41dd950c309d3bc2f6e9594b4c5821ad6775bd')
 
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index 4581b2c20..43fab3af7 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67628 2012-03-13 14:39:35Z tredaelli $
+# $Id: PKGBUILD 68908 2012-04-05 15:23:32Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
 
 pkgname=tinc
-pkgver=1.0.17
+pkgver=1.0.18
 pkgrel=1
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@ backup=(etc/conf.d/tincd.conf)
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
         tincd.rc tincd.conf)
-md5sums=('cd9e94e472584f9fe96cd86b42345afe'
-         'dc30876057f888cb40b9e442ec54247b'
+md5sums=('9352d53e892df4127e839f54a0e8af2a'
+         '1c219383bff7cc57024a9a25cd7fca5d'
          '64bb53748d9051255f243003f0d511f5'
          '7c0276d4812cc5d3cc18142562a3aa82')
 
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index bc38aa87d..e71648846 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62881 2012-01-28 14:42:08Z spupykin $
+# $Id: PKGBUILD 68929 2012-04-06 00:04:17Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 _pkgdata=20120120
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
@@ -28,15 +28,12 @@ build() {
 package() {
   cd $srcdir/usb-modeswitch-$pkgver/
 
-  mkdir -p $pkgdir/lib/udev/usb_modeswitch
+  mkdir -p $pkgdir/usr/lib/udev
   mkdir -p $pkgdir/etc
   mkdir -p $pkgdir/usr/share/man/man1
 
-  make DESTDIR=${pkgdir} install
-
-  mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch.sh
-  rmdir ${pkgdir}/lib/udev/usb_modeswitch
-  mv ${pkgdir}/lib/udev/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch
+  make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install
+  
   cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup
 
   cd $srcdir/usb-modeswitch-data-${_pkgdata}
diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD
index 9a01eb7c3..1aa1927d9 100644
--- a/community/xonotic/PKGBUILD
+++ b/community/xonotic/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
 pkgname=xonotic
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A free, fast-paced crossplatform first-person shooter"
 arch=('i686' 'x86_64')
 url="http://xonotic.org"
@@ -29,6 +29,10 @@ build() {
 	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 cl-release
 	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sdl-release
 	make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sv-release
+
+  cd $srcdir/Xonotic/source/d0_blind_id
+  ./configure --prefix=/usr --disable-rijndael
+  make
 }
 
 package() {
@@ -43,6 +47,10 @@ package() {
 	mkdir -p $pkgdir/usr/share/applications
 	install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications
 	install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png
+
+  # crypto stuff
+  cd $srcdir/Xonotic/source/d0_blind_id
+  make DESTDIR=$pkgdir install
 }
 
 # vim: ts=2:sw=2 et: