libre/xscreensaver: cleanup and rebuild

1 files changed, 10 insertions, 17 deletions

diff --git a/libre/xscreensaver/PKGBUILD b/libre/xscreensaver/PKGBUILD
index a234da964..6c72c662e 100644
--- a/libre/xscreensaver/PKGBUILD
+++ b/libre/xscreensaver/PKGBUILD
@@ -1,40 +1,33 @@
-# $Id: PKGBUILD 278485 2016-10-12 11:49:10Z arojas $
+# $Id$
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
-# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+
+# parabola changes and rationale:
+#  removed nonfree asm files
 
 pkgname=xscreensaver
-_pkgname=$pkgname-libre
 pkgver=5.38
 pkgrel=1.parabola1
 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h')
 url="http://www.jwz.org/xscreensaver/"
 license=('BSD')
 depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
 makedepends=('bc' 'intltool' 'libxpm' 'gdm')
 optdepends=('gdm: for login manager support')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
 backup=('etc/pam.d/xscreensaver')
-mksource=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz)
-source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
         xscreensaver-add-electricsheep.diff
-        LICENSE)
-mksha1sums=('b4e6b6799e8e244c894db277d6ff2bf5ee48290c')
-sha1sums=('0c13447e00875cdbdb65da4bf54f88b4aeac9bb4'
+	LICENSE)
+sha1sums=('b4e6b6799e8e244c894db277d6ff2bf5ee48290c'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
           '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
 
-mksource() {
+prepare() {
   cd ${pkgname}-${pkgver}
-
   # Deleting dmsc.asm file due which don't have source code supplied
   rm -v hacks/images/m6502/dmsc.asm
-}
-
-prepare() {
-  cd ${pkgname}-${pkgver}
   patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
 }