Merge ssh://parabolagnulinux.org:1863/abslibre

2 files changed, 21 insertions, 26 deletions

diff --git a/libre/foomatic/PKGBUILD b/libre/foomatic/PKGBUILD
index c83ef667b..bd5f8da17 100644
--- a/libre/foomatic/PKGBUILD
+++ b/libre/foomatic/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 130674 2011-07-07 16:52:03Z andyrtr $
+# $Id: PKGBUILD 155771 2012-04-06 10:09:10Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
  
 pkgbase="foomatic"
 pkgname=('foomatic-db' 'foomatic-filters-libre' 'foomatic-db-engine')
-arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20110707
-_relver=4.0.7
-pkgver=${_relver}_${_snapdate}
+arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
+_snapdate=20120406
+_filtersver=4.0.15
+_enginever=4.0.8
+pkgver=${_filtersver}_${_snapdate}
 pkgrel=1
 epoch=1
-makedepends=('cups>=1.4.7' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
-source=(http://www.linuxprinting.org/download/foomatic/$pkgbase-db-engine-${_relver}.tar.gz
-        http://www.linuxprinting.org/download/foomatic/$pkgbase-db-4.0-${_snapdate}.tar.gz
-        http://repo.parabolagnulinux.org/other/$pkgbase-filters-libre-${_relver}.tar.gz)
+makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
+#_url=http://www.openprinting.org/download/foomatic/ # switch after build
+_url=ftp://ftp.archlinux.org/other/foomatic/
+source=(https://repo.parabolagnulinux.org/other/${pkgbase}-filters-libre-${_filtersver}.tar.gz
+        ${_url}/$pkgbase-db-engine-${_enginever}.tar.gz
+        ${_url}/$pkgbase-db-4.0-${_snapdate}.tar.gz)
 url="http://www.linuxprinting.org/foomatic.html"
 options=('!emptydirs')
-md5sums=('fcfa8eb9ce5494b81b58ae983fc2aeb5'
-         '88d467d9099188b170185564bd33d7b7'
-         'ffda5eb8ab36564e5b28190e6c5406b2')
 
 mksource() {
-    if [ ! -d ${pkgbase}-filters-libre-${_relver}/ ]; then
-        wget -O - http://www.linuxprinting.org/download/foomatic/$pkgbase-filters-${_relver}.tar.gz | \
+    if [ ! -d ${pkgbase}-filters-libre-${_filtersver}/ ]; then
+        wget -O - http://www.openprinting.org/download/foomatic/foomatic-filters-${_filtersver}.tar.gz | \
         bsdtar xzf -
 
-        mv ${pkgbase}-filters{,-libre}-${_relver}/
+        mv ${pkgbase}-filters{,-libre}-${_filtersver}/
     fi
 
-    rm -rfv ${pkgbase}-filters-libre-${_relver}/test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
-    bsdtar cvzf ${pkgbase}-filters-libre-${_relver}.tar.gz ${pkgbase}-filters-libre-${_relver}/
-}
-
-build() {
- /bin/true
+    rm -rfv ${pkgbase}-filters-libre-${_filtersver}/test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
+    bsdtar cvzf ${pkgbase}-filters-libre-${_filtersver}.tar.gz ${pkgbase}-filters-libre-${_filtersver}/
 }
 
 package_foomatic-db() {
@@ -64,8 +60,7 @@ package_foomatic-filters-libre() {
  optdepends=('perl:      for the "beh" Backend End Handler used by cups'
             'net-snmp:  certain (mostly HP) printers need it to work')
 
-#   cd ${srcdir}/${pkgname}-${pkgver}
-   cd ${srcdir}/foomatic-filters-libre-${_relver}
+   cd ${srcdir}/foomatic-filters-${_filtersver}
    ./configure --prefix=/usr --sysconfdir=/etc
    make
    make DESTDIR=${pkgdir} install
@@ -78,8 +73,7 @@ package_foomatic-db-engine() {
  license=('GPL')
  depends=('perl' 'libxml2' 'foomatic-filters' 'bash')
 
-#   cd ${srcdir}/${pkgname}-${pkgver}
-   cd ${srcdir}/foomatic-db-engine-${_relver}
+   cd ${srcdir}/foomatic-db-engine-${_enginever}
     ./configure --prefix=/usr
    make
    eval `perl -V:archname`
@@ -92,3 +86,4 @@ package_foomatic-db-engine() {
    chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
 }
 
+
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 49ae04510..50988f587 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -19,7 +19,7 @@ pre_install() {
   * Etc.
 
   Please report back to the Parabola Project on the usual channels:
-  * http://bugs.parabolagnulinux.org
+  * https://bugs.parabolagnulinux.org
   * irc://freenode.net/#parabola
   * mailto:dev@list.parabolagnulinux.org
 EOM