merging...

4 files changed, 27 insertions, 29 deletions

diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 96c0f3537..1dc040d92 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,37 +1,38 @@
-# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $
+# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=xscreensaver
 pkgname=xscreensaver-libre
-pkgver=5.21
+pkgver=5.22
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
-depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \
-         'perl-libwww' 'perl-http-message')
-makedepends=('bc' 'libxpm' 'gdm' 'mesa')
+depends=('libglade' 'xorg-appres' 'perl-libwww')
+makedepends=('bc' 'libxpm' 'gdm')
 optdepends=('gdm: for login manager support')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 backup=('etc/pam.d/xscreensaver')
 source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \
-        add-electricsheep.diff xscreensaver.pam LICENSE)
-sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077'
-          '677496218b81a42d90bee400026e94dd87fb8ffb'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+        xscreensaver-add-electricsheep.diff LICENSE)
+sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec'
+          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
           '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/add-electricsheep.diff"
-  
-  # Deleting dmsc.asm file due that don't have source code supplied
+prepare() {
+  cd ${_pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
+
+  # Deleting dmsc.asm file due which don't have source code supplied
   rm -v hacks/images/m6502/dmsc.asm
+}
 
+build() {
+  cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
     --with-pam --with-login-manager --with-gtk --with-gl \
@@ -40,10 +41,10 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
+  install -d "${pkgdir}/etc/pam.d"
   make install_prefix="${pkgdir}" install
   install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_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"
 }
diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff
deleted file mode 100644
index 18b4dea97..000000000
--- a/libre/xscreensaver-libre/add-electricsheep.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- driver/XScreenSaver.ad.in-orig	2009-10-17 02:19:06.000000000 -0400
-+++ driver/XScreenSaver.ad.in	2009-10-17 02:21:16.000000000 -0400
-@@ -347,7 +347,8 @@
- @GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
- @GL_KLUDGE@ GL: 				companioncube -root			    \n\
- @GL_KLUDGE@ GL: 				hilbert -root				    \n\
--@GL_KLUDGE@ GL: 				tronbit -root				    \n
-+@GL_KLUDGE@ GL: 				tronbit -root				    \n\
-+				electricsheep --root 1				    \n
- 
- 
- 
diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
new file mode 100644
index 000000000..0c5c3ff40
--- /dev/null
+++ b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
@@ -0,0 +1,10 @@
+--- driver/XScreenSaver.ad.in-orig	2013-07-16 16:47:10.183068023 -0400
++++ driver/XScreenSaver.ad.in	2013-07-16 16:48:23.293473297 -0400
+@@ -157,6 +157,7 @@
+ !
+ *programs:								      \
+ 				maze -root				    \n\
++				electricsheep --root 1			    \n\
+ @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
+ 				attraction -root			    \n\
+ 				blitspin -root				    \n\
diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/libre/xscreensaver-libre/xscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so