[arch-commits] Commit in hpoj/trunk (PKGBUILD hpoj.install)

[Eric Bélanger]

    Date: Saturday, March 5, 2011 @ 02:01:59
  Author: eric
Revision: 112539

upgpkg: hpoj 0.91-16
Rebuilt for net-snmp 5.6.1, Removed obsolete post-upgrade function in .install file, Removed reference to startdir

Modified:
  hpoj/trunk/PKGBUILD
  hpoj/trunk/hpoj.install

--------------+
 PKGBUILD     |   40 ++++++++++++++++++++++------------------
 hpoj.install |    4 ----
 2 files changed, 22 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-05 06:50:57 UTC (rev 112538)
+++ PKGBUILD	2011-03-05 07:01:59 UTC (rev 112539)
@@ -4,12 +4,12 @@
 
 pkgname=hpoj
 pkgver=0.91
-pkgrel=15
+pkgrel=16
 pkgdesc="Hewlett-Packard OfficeJet, PSC, LaserJet, and PhotoSmart printer multi-function peripherals (MFPs) drivers"
 arch=('i686' 'x86_64')
 url="http://hpoj.sourceforge.net"
 license=('GPL' 'custom')
-depends=('perl' 'libusb-compat' 'net-snmp>=5.5' 'hplip>=1.7.2')
+depends=('perl' 'libusb-compat' 'net-snmp>=5.6.1' 'hplip>=1.7.2')
 makedepends=('qt3')
 optdepends=('qt3: for using xojpanel')
 install=hpoj.install
@@ -24,25 +24,29 @@
          '22409b96d7bc67a10384a88c6b710981c0b90078' '4827cfa319bcd74ff8956e1bc69360f319a26c6a')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   # adding various patches
-   patch -Np1 -i ../hpoj-gcc4.patch || return 1
-   patch -Np1 -i ../hpoj-kernel26.patch || return 1
-   patch -Np1 -i ../hpoj-pack.patch  || return 1
-   patch -Np1 -i ../hpoj_gcc43.diff || return 1
-   patch -Np1 -i ../hpoj0.91-snmp5.5.patch || return 1
-  ./configure --prefix=/usr || return 1
-   make || return 1
-   make prefix=$startdir/pkg/usr/ user_install || return 1
-   mkdir -p $startdir/pkg/etc/rc.d
-   mkdir -p $startdir/pkg/usr/lib/sane
-   mkdir -p $startdir/pkg/usr/lib/cups/backend
-   install -m 644 lib/sane/libsane-hpoj.so.1.0 $startdir/pkg/usr/lib/sane
+   patch -Np1 -i ../hpoj-gcc4.patch
+   patch -Np1 -i ../hpoj-kernel26.patch
+   patch -Np1 -i ../hpoj-pack.patch
+   patch -Np1 -i ../hpoj_gcc43.diff
+   patch -Np1 -i ../hpoj0.91-snmp5.5.patch
+  ./configure --prefix=/usr
+   make
+}
+
+package() {
+   cd "$srcdir"/$pkgname-$pkgver
+   make prefix="$pkgdir"/usr/ user_install
+   mkdir -p "$pkgdir"/etc/rc.d
+   mkdir -p "$pkgdir"/usr/lib/sane
+   mkdir -p "$pkgdir"/usr/lib/cups/backend
+   install -m 644 lib/sane/libsane-hpoj.so.1.0 "$pkgdir"/usr/lib/sane
    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
    install -D -m644 LICENSE.OpenSSL $pkgdir/usr/share/licenses/$pkgname/LICENSE.OpenSSL
-   cd $startdir/pkg/usr/lib/sane  
+   cd "$pkgdir"/usr/lib/sane  
    ln -s libsane-hpoj.so.1.0 libsane-hpoj.so
    ln -s libsane-hpoj.so.1.0 libsane-hpoj.so.1
-   ln -s /usr/sbin/ptal-init $startdir/pkg/etc/rc.d
-   ln -s /usr/sbin/ptal-cups $startdir/pkg/usr/lib/cups/backend/ptal
+   ln -s /usr/sbin/ptal-init "$pkgdir"/etc/rc.d
+   ln -s /usr/sbin/ptal-cups "$pkgdir"/usr/lib/cups/backend/ptal
  }

Modified: hpoj.install
===================================================================
--- hpoj.install	2011-03-05 06:50:57 UTC (rev 112538)
+++ hpoj.install	2011-03-05 07:01:59 UTC (rev 112539)
@@ -5,7 +5,3 @@
 ==> To access scanner enable in /etc/sane.d/dll.conf hpoj line.
 EOF
 }
-
-post_upgrade() {
- post_install $1
-}