Synced with extra/xscreensaver

diff --git a/xscreensaver-arch-logo/PKGBUILD b/xscreensaver-arch-logo/PKGBUILD
index 86c0e5f72523f6d9fb7b7ab588a27da41407c535..6bfec26f5f770840fb4bd0041618b2f3954359ae 100644 (file)
--- a/xscreensaver-arch-logo/PKGBUILD
+++ b/xscreensaver-arch-logo/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc="Screen saver and locker for the X Window System. Version with replaced
 arch=('i686' 'x86_64')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
-depends=('libxxf86misc' 'libglade' 'mesa' 'pam' 'xorg-res-utils')
+depends=('libglade' 'mesa' 'pam' 'xorg-res-utils')
 makedepends=('bc')
 conflicts=('xscreensaver')
 provides=('xscreensaver')
@@ -32,7 +32,7 @@ md5sums=('80f981b86734ccb31c5b3b24af3930ae'
 
 build() {
        cd "${srcdir}/${_original_pkgname}-${pkgver}"
-       patch -Np0 -i "${srcdir}/add-electricsheep.diff" || return 1
+       patch -Np0 -i "${srcdir}/add-electricsheep.diff"
 
        cd ${srcdir}
        cp -f logo-180.xpm ${_original_pkgname}-${pkgver}/utils/images/
@@ -40,18 +40,18 @@ build() {
   cd "${srcdir}/${_original_pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
-    --with-pam --without-motif --with-gtk --without-gnome --with-xml --with-gl \
-    --without-gle --with-xpm --with-pixbuf --with-jpeg || return 1
-  (cd hacks ; make m6502.h)
-  (cd hacks/glx ; make molecules.h)
-  make || return 1
+    --with-pam --without-motif --with-gtk --with-gl \
+    --without-gle --with-xpm --with-pixbuf --with-jpeg
+  #(cd hacks ; make m6502.h)
+  #(cd hacks/glx ; make molecules.h)
+  make
 }
 
 package() {
   cd "${srcdir}/${_original_pkgname}-${pkgver}"
-  make install_prefix="${pkgdir}" install || return 1
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_original_pkgname}/LICENSE" || return 1
-  install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" || return 1
-  chmod 755 "${pkgdir}/usr/bin/xscreensaver" || return 1
-  #echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" || return 1
+  make install_prefix="${pkgdir}" install
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_original_pkgname}/LICENSE"
+  install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver"
+  chmod 755 "${pkgdir}/usr/bin/xscreensaver"
+  #echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
 }