[arch-commits] Commit in transfig/repos (4 files)

[Eric Bélanger]

    Date: Friday, August 14, 2009 @ 00:05:21
  Author: eric
Revision: 49622

Merged revisions 49590 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/transfig/trunk

........
  r49590 | eric | 2009-08-13 22:50:17 -0400 (Thu, 13 Aug 2009) | 2 lines
  
  upgpkg: transfig 3.2.5a-1
      Upstream update, Added force option
........

Modified:
  transfig/repos/extra-i686/	(properties)
  transfig/repos/extra-i686/ChangeLog
  transfig/repos/extra-i686/PKGBUILD
Deleted:
  transfig/repos/extra-i686/remove-stderr-msg.patch

-------------------------+
 ChangeLog               |    6 ++++++
 PKGBUILD                |   20 +++++++++-----------
 remove-stderr-msg.patch |   20 --------------------
 3 files changed, 15 insertions(+), 31 deletions(-)


Property changes on: transfig/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /transfig/trunk:1-30756
   + /transfig/trunk:1-49621

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-08-14 03:35:55 UTC (rev 49621)
+++ extra-i686/ChangeLog	2009-08-14 04:05:21 UTC (rev 49622)
@@ -1,3 +1,9 @@
+2009-08-12  Eric Belanger  <eric at archlinux.org>
+
+	* transfig 3.2.5a-1
+	* Upstream update
+	* Added force option
+
 2009-03-21  Eric Belanger  <eric at archlinux.org>
 
 	* transfig 3.2.5-2

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-14 03:35:55 UTC (rev 49621)
+++ extra-i686/PKGBUILD	2009-08-14 04:05:21 UTC (rev 49622)
@@ -3,29 +3,27 @@
 # Contributor: J. Santiago Hirschfeld <jsantiagoh at yahoo.com.ar>
 
 pkgname=transfig
-pkgver=3.2.5
-pkgrel=2
+pkgver=3.2.5a
+pkgrel=1
 pkgdesc="Format conversion utility that can be used with xfig"
 arch=('i686' 'x86_64')
 url="http://www.xfig.org"
 license=('custom')
 depends=('libpng' 'libxpm')
 makedepends=('imake')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE remove-stderr-msg.patch)
-md5sums=('3b2cffdd25529ae5877e305f29aae6d1' 'a0b2ea903821c46dbc77afefc06d1aa4'\
-         '38f8c8701191c2b54fc9f3a3baee8ee2')
-sha1sums=('2657c104d0099dcb4565a8762a9543310e55e767' 'b8b712871615308b8b6add92f86d218437d652f2'\
-          '1c35e72455fe899a7a232d3c2a5ff98f33973be6')
+options=('force')
+source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE)
+md5sums=('c3e4259d0b5b263baa2d8d5e811b2ef1' 'a0b2ea903821c46dbc77afefc06d1aa4')
+sha1sums=('65f772a51389be2b1cfebdb1354130aa71609739' 'b8b712871615308b8b6add92f86d218437d652f2')
 
 build() {
-  cd ${srcdir}/${pkgname}.${pkgver}
-  patch -p1 < ../remove-stderr-msg.patch || return 1
+  cd "${srcdir}/${pkgname}.${pkgver}"
   sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile || return 1
   sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile || return 1
 
   xmkmf || return 1
   make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles || return 1
   make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig || return 1
-  make DESTDIR=${pkgdir} XFIGLIBDIR=/usr/share/xfig FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man install install.man || return 1
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man install install.man || return 1
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }

Deleted: extra-i686/remove-stderr-msg.patch
===================================================================
--- extra-i686/remove-stderr-msg.patch	2009-08-14 03:35:55 UTC (rev 49621)
+++ extra-i686/remove-stderr-msg.patch	2009-08-14 04:05:21 UTC (rev 49622)
@@ -1,20 +0,0 @@
---- old/fig2dev/dev/genpstex.c	2005-12-19 02:57:40.000000000 +0100
-+++ new/fig2dev/dev/genpstex.c	2009-03-16 16:18:06.000000000 +0100
-@@ -85,7 +85,7 @@
- F_compound	*objects;
- {
- 	/* Put PostScript Image if any*/
--fprintf(stderr,"here pstex_file[0] = %d\n",pstex_file[0]);
-+/*fprintf(stderr,"here pstex_file[0] = %d\n",pstex_file[0]);*/
-         if (pstex_file[0] != '\0') {
- 		fprintf(tfp, "\\begin{picture}(0,0)%%\n");
- /* newer includegraphics directive suggested by Stephen Harker 1/13/99 */
-@@ -98,7 +98,7 @@
- #else
- 		fprintf(tfp, "\\special{psfile=%s}%%\n",pstex_file);
- #endif
--fprintf(stderr,"end picture\n");
-+/*fprintf(stderr,"end picture\n");*/
- 		fprintf(tfp, "\\end{picture}%%\n");
- 	}
-         genlatex_start(objects);