meta: PKGBUILD cleanup

3 files changed, 17 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index c83ab2f7877f..8d78c8370330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 pkg/
 src/
-*.tar
-*.tar.bz2
+*.tar*
diff --git a/PKGBUILD b/PKGBUILD
index dec9d738e978..6378287c6eae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,45 +2,37 @@
 # Contributor: masutu <masutu dot arch at gmail dot com>
 pkgname=ezthumb
 pkgver=3.6.7
-pkgrel=2
+pkgrel=3
 pkgdesc='A video thumbnail generator based on ffmpeg.'
 arch=('i686' 'x86_64')
 url='https://sourceforge.net/projects/ezthumb/'
 license=('GPL3')
 depends=('ffmpeg' 'gd' 'gtk2')
-source=("${pkgname}-${pkgver}.tar.bz2::https://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("$pkgname-$pkgver.tar.bz2::https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2"
         'harfbuzz.patch')
 sha256sums=('1d04a1521204b25454b8a2cedf4150df9c3c7d68059ed5742d03f7a30060674e'
-            '25737e5e60c4f4e7ec7132db480b0166d4ecbd4b1b9bdd6b3e9fb75f691b2bbc')
+            '6708116d34b648e486952867326d2dee607000a65d56bf715ee9ba1f163eec92')
 
-prepare()
-{
-    cd "${pkgname}-${pkgver}"
-
-    patch --forward --strip=1 --input="${srcdir}/harfbuzz.patch"
+prepare() {
+    cd "$pkgname-$pkgver"
+    patch -Np1 < "$srcdir/harfbuzz.patch"
 }
 
-build()
-{
-    cd "${pkgname}-${pkgver}"
-
+build() {
+    cd "$pkgname-$pkgver"
     ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --disable-debug-build \
-        --with-gui=gtk2 \
-
+        --with-gui=gtk2
     make
 }
 
-package()
-{
-    cd "${pkgname}-${pkgver}"
-
-    install -Dm644 "external/icons/SMirC-thumbsup.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-    install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
-    install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+package() {
+    cd "$pkgname-$pkgver"
+    install -Dm644 "external/icons/SMirC-thumbsup.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
+    install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+    install -Dm644 "$pkgname.1" "$pkgdir/usr/share/man/man1/$pkgname.1"
+    install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
 
-# vim:set ts=4 sw=4 et:
diff --git a/harfbuzz.patch b/harfbuzz.patch
index 3316ed885689..3e1961b5c558 100644
--- a/harfbuzz.patch
+++ b/harfbuzz.patch
@@ -4,7 +4,7 @@
      
      STDINCS += $(GTK)/include/atk-1.0 $(GTK)/include/gtk-$(GTKSFX).0 $(GTK)/include/gdk-pixbuf-2.0 
      STDINCS += $(GTK)/include/cairo $(GTK)/include/pango-1.0 $(GTK)/include/glib-2.0
-+    STDINCS += /usr/include/harfbuzz
++    STDINCS += $(GTK)/include/harfbuzz
  
      ifeq ($(TEC_SYSARCH), x64)
        STDINCS += $(GTK)/lib64/glib-2.0/include