uppkg

2 files changed, 15 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1721a7566ce..eb2a023e19d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = xfig
 	pkgdesc = An interactive drawing tool
-	pkgver = 3.2.7
-	pkgrel = 2
+	pkgver = 3.2.7b
+	pkgrel = 1
 	url = http://mcj.sourceforge.net/
 	arch = x86_64
 	arch = i686
 	license = custom
+	makedepends = fig2dev
 	depends = libjpeg
 	depends = xaw3d
 	depends = xorg-fonts-75dpi
@@ -15,11 +16,11 @@ pkgbase = xfig
 	optdepends = fig2dev: to use the frontend to convert fig files
 	options = !makeflags
 	options = !emptydirs
-	source = http://downloads.sourceforge.net/mcj/xfig-3.2.7.tar.xz
+	source = http://downloads.sourceforge.net/mcj/xfig-3.2.7b.tar.xz
 	source = xfig-aspell.patch
 	source = xfig-3.2.5-color-resources.patch
 	source = LICENSE
-	sha1sums = bc426557aafb1ef9af462578d1f63c77da2858d5
+	sha1sums = c8e4426194b8860b5d5e568eb2a94a790ad62f72
 	sha1sums = a57fcc3c8396d58b19061f9cdd93beea728e38e5
 	sha1sums = dd41e0a007bb74b74e1af50b6b04aa6aec61ab22
 	sha1sums = 31edf4cfab708820ea3f114d095dfef5aa88e5aa
diff --git a/PKGBUILD b/PKGBUILD
index 2b70e6a64348..b412881e93de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,47 +2,39 @@
 # Contirbutor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xfig
-pkgver=3.2.7
-_pkgver=3.2.7
-pkgrel=2
+pkgver=3.2.7b
+pkgrel=1
 pkgdesc="An interactive drawing tool"
 arch=('x86_64' 'i686')
 url="http://mcj.sourceforge.net/"
 license=('custom')
 depends=('libjpeg' 'xaw3d' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi' 'libpng' 'libxpm')
 optdepends=('fig2dev: to use the frontend to convert fig files')
+makedepends=('fig2dev')
 options=('!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}-${_pkgver}.tar.xz
+source=(http://downloads.sourceforge.net/mcj/${pkgname}-${pkgver}.tar.xz
 	xfig-aspell.patch xfig-3.2.5-color-resources.patch
         LICENSE)
-sha1sums=('bc426557aafb1ef9af462578d1f63c77da2858d5'
+sha1sums=('c8e4426194b8860b5d5e568eb2a94a790ad62f72'
           'a57fcc3c8396d58b19061f9cdd93beea728e38e5'
           'dd41e0a007bb74b74e1af50b6b04aa6aec61ab22'
           '31edf4cfab708820ea3f114d095dfef5aa88e5aa')
 
 prepare() {
-  cd ${pkgname}-${_pkgver}
+  cd ${pkgname}-${pkgver}
    patch -p1 -i "${srcdir}/xfig-aspell.patch"
    patch -p1 -i "${srcdir}/xfig-3.2.5-color-resources.patch"
 }
 
 build() {
-  cd ${pkgname}-${_pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \
-    XAPPLOADDIR=/usr/share/X11/app-defaults
+  make
 }
 
 package() {
-  cd ${pkgname}-${_pkgver}
-
-  make DESTDIR="${pkgdir}" XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \
-    MANDIR=/usr/share/man/man1 XAPPLOADDIR=/usr/share/X11/app-defaults install
-
-#  find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \;
-#  find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \;
-#  find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \;
-#  find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \;
+  cd ${pkgname}-${pkgver}
 
+  make DESTDIR="${pkgdir}" install
   install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"	
 }