[arch-commits] CVS update of extra/multimedia/xfig (6 files)

Mon Oct 15 00:42:30 UTC 2007

Date: Sunday, October 14, 2007 @ 20:42:30
  Author: damir
    Path: /home/cvs-extra/extra/multimedia/xfig

   Added: Imakefile.archlinux.patch (1.1) LICENSE (1.1) xfig.desktop (1.1)
          xfig.png (1.1)
Modified: PKGBUILD (1.7 -> 1.8)
 Removed: xfig-gcc4.patch (1.1)

upgpkg: xfig 3.2.5-1


---------------------------+
 Imakefile.archlinux.patch |   55 ++++++++++++++++++++++++++++++++++++++++++++
 LICENSE                   |   33 ++++++++++++++++++++++++++
 PKGBUILD                  |   38 ++++++++++++++++++++++--------
 xfig-gcc4.patch           |   28 ----------------------
 xfig.desktop              |   10 ++++++++
 xfig.png                  |    <<Binary file>>
 6 files changed, 127 insertions(+), 38 deletions(-)


Index: extra/multimedia/xfig/Imakefile.archlinux.patch
diff -u /dev/null extra/multimedia/xfig/Imakefile.archlinux.patch:1.1

--- /dev/null	Sun Oct 14 20:42:30 2007
+++ extra/multimedia/xfig/Imakefile.archlinux.patch	Sun Oct 14 20:42:29 2007
@@ -0,0 +1,55 @@
+--- Imakefile	2006-10-11 01:19:22.000000000 +0200
++++ Imakefile.archlinux	2007-10-15 02:32:13.000000000 +0200
+@@ -45,7 +45,7 @@
+ XCOMM different tree than the "correct" tree that your X system expects. The usual
+ XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
+ 
+-XCOMM XAPPLOADDIR = /home/user/xfig
++XCOMM XAPPLOADDIR = /usr/share/X11/app-defaults
+ 
+ XCOMM Uncomment the following definition for XAW3D if you want to use
+ XCOMM the 3d Athena Widget Set (highly recommended!)
+@@ -73,7 +73,7 @@
+ XCOMM are in different places
+ 
+ PNGLIBDIR = $(USRLIBDIR)
+-PNGINC = -I/usr/local/include
++PNGINC = -I/usr/include
+ ZLIBDIR = $(USRLIBDIR)
+ 
+ XCOMM If don't want JPEG support, comment out the #define USEJPEG line
+@@ -93,7 +93,7 @@
+ 
+ #ifdef USEJPEG
+ #ifdef USEINSTALLEDJPEG
+-JPEGLIBDIR = /usr/local/lib
++JPEGLIBDIR = /usr/lib
+ JPEGINC = -I/usr/include/X11
+ #else
+ JPEGLIBDIR = ../jpeg
+@@ -116,8 +116,8 @@
+ #define USEXPM_ICON
+ 
+ #ifdef USEXPM
+-XPMLIBDIR = /usr/local/lib
+-XPMINC = -I/usr/local/include/X11
++XPMLIBDIR = /usr/lib
++XPMINC = -I/usr/include/X11
+ #endif
+ 
+ XCOMM Uncomment the following definiton if you want to use the small icons
+@@ -170,12 +170,12 @@
+ 
+ XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
+ XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
+-XFIGDOCDIR = /usr/local/xfig/doc
++XFIGDOCDIR = /usr/share/xfig/doc
+ 
+ XCOMM MANDIR tells where the standard man pages should go (no need to change it
+ XCOMM if you want the man pages installed in the standard place on your system
+ XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+-MANDIR = /usr/local/xfig/man
++MANDIR = /usr/man/man1/
+ 
+ XCOMM If your system doesn't have strstr undefine the following definition
+ XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
Index: extra/multimedia/xfig/LICENSE
diff -u /dev/null extra/multimedia/xfig/LICENSE:1.1
--- /dev/null	Sun Oct 14 20:42:30 2007
+++ extra/multimedia/xfig/LICENSE	Sun Oct 14 20:42:29 2007
@@ -0,0 +1,33 @@
+Excerpt of the README from xfig/transfig - legal notice:
+---------------------------------------------------------------------------
+
+THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+***************************************************************************
+NEW COPYRIGHT/PERMISSION NOTICE:
+
+The xfig copyright and permission notice has changed (again) slightly in
+version 3.2.5.  It now states that:
+
+	FIG : Facility for Interactive Generation of figures
+	Copyright (c) 1985-1988 by Supoj Sutanthavibul
+	Parts Copyright (c) 1989-2002 by Brian V. Smith
+	Parts Copyright (c) 1991 by Paul King
+
+	Any party obtaining a copy of these files is granted, free of charge, a
+	full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+	nonexclusive right and license to deal in this software and documentation 
+	files (the "Software"), including without limitation the rights to use, 
+	copy, modify, merge, publish distribute, sublicense and/or sell copies of
+	the Software, and to permit persons who receive copies from any such 
+	party to do so, with the only requirement being that the above copyright 
+	and this permission notice remain intact.
+
+The license for 3.2.4 didn't allow selling xfig unless it was simply included in a
+collection of programs (e.g. a CD) that one was selling.
Index: extra/multimedia/xfig/PKGBUILD
diff -u extra/multimedia/xfig/PKGBUILD:1.7 extra/multimedia/xfig/PKGBUILD:1.8
--- extra/multimedia/xfig/PKGBUILD:1.7	Thu Jul 20 17:18:59 2006
+++ extra/multimedia/xfig/PKGBUILD	Sun Oct 14 20:42:29 2007
@@ -1,29 +1,47 @@
-# $Id: PKGBUILD,v 1.7 2006/07/20 21:18:59 andyrtr Exp $
+# $Id: PKGBUILD,v 1.8 2007/10/15 00:42:29 damir Exp $
 # Maintainer: damir <damir at archlinux.org>
 # TU: Ben <ben at benmazer.net>
 # Contributor: ipqw
 
 pkgname=xfig
-pkgver=3.2.4
-pkgrel=3
+pkgver=3.2.5
+pkgrel=1
 pkgdesc="Xfig drawing tool"
-arch=(i686 x86_64)
+arch=("i686" "x86_64")
 url="http://www.xfig.org"
 depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'libxaw')
 makedepends=('imake')
-source=(http://xfig.org/software/xfig/$pkgver/$pkgname.$pkgver.full.tar.gz xfig-gcc4.patch)
-md5sums=('1911fc0f733cb2f40336a8d0e82513de')
+license=('custom')
+source=("http://xfig.org/software/xfig/$pkgver/$pkgname.$pkgver.full.tar.gz" \
+	"LICENSE" \
+	"${pkgname}.desktop" \
+	"${pkgname}.png" \
+	"Imakefile.archlinux.patch")
 install=$pkgname.install
 
 build() {
         cd $startdir/src/$pkgname.$pkgver
-	patch -Np1 -i ../xfig-gcc4.patch
+
+	# change paths to archlinux standards:
+	patch -Np0 -i $startdir/src/Imakefile.archlinux.patch || return 1
+
+	# make makefile with imake
         xmkmf || return 1
-        make XAPPLOADDIR=/usr/share/X11/app-defaults || return 1
-        make XAPPLOADDIR=/usr/share/X11/app-defaults \
-		DESTDIR=$startdir/pkg install.all || return 1
+
+	# build
+        make  || return 1
+        make DESTDIR=$startdir/pkg install.all || return 1
         make DESTDIR=$startdir/pkg install.man || return 1
 	rm -f ${startdir}/pkg/usr/lib/X11/app-defaults
 	rmdir ${startdir}/pkg/etc/X11/app-defaults
+
+	# freedesktop entry
+	install -D -m644 $startdir/src/$pkgname.desktop \
+  		$startdir/pkg/usr/share/applications/$pkgname.desktop
+  	install -D -m644 $startdir/src/$pkgname.png \
+  		$startdir/pkg/usr/share/pixmaps/$pkgname.png
+
+	# install custom license
+  	install -D -m644 ../LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE	
 }
 
Index: extra/multimedia/xfig/xfig-gcc4.patch
diff -u extra/multimedia/xfig/xfig-gcc4.patch:1.1 extra/multimedia/xfig/xfig-gcc4.patch:removed
--- extra/multimedia/xfig/xfig-gcc4.patch:1.1	Sun Mar  5 02:10:12 2006
+++ extra/multimedia/xfig/xfig-gcc4.patch	Sun Oct 14 20:42:30 2007
@@ -1,28 +0,0 @@
-diff -ru xfig.3.2.4/u_fonts.h xfig.3.2.4.new/u_fonts.h
---- xfig.3.2.4/u_fonts.h	2002-03-27 01:18:23.000000000 +0100
-+++ xfig.3.2.4.new/u_fonts.h	2005-12-03 15:21:02.054250392 +0100
-@@ -30,12 +30,6 @@
- /* font number for the "nil" font (when user wants tiny text) */
- #define NILL_FONT NUM_FONTS
- 
--extern int		psfontnum();
--extern int		latexfontnum();
--extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
--extern struct _fstruct	ps_fontinfo[];
--extern struct _fstruct	latex_fontinfo[];
--
- /* element of linked list for each font
-    The head of list is for the different font NAMES,
-    and the elements of this list are for each different
-@@ -61,5 +55,11 @@
- 				 * sizes */
- };
- 
-+extern int		psfontnum();
-+extern int		latexfontnum();
-+extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
-+extern struct _fstruct	ps_fontinfo[];
-+extern struct _fstruct	latex_fontinfo[];
-+
- int		x_fontnum();
- #endif /* U_FONTS_H */
Index: extra/multimedia/xfig/xfig.desktop
diff -u /dev/null extra/multimedia/xfig/xfig.desktop:1.1
--- /dev/null	Sun Oct 14 20:42:30 2007
+++ extra/multimedia/xfig/xfig.desktop	Sun Oct 14 20:42:30 2007
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Xfig
+Comment=Diagram editor
+Exec=xfig
+Icon=xfig
+Icon=/usr/share/pixmaps/xfig.png
+Terminal=false
+Type=Application
+Categories=Application;Graphics;
Index: extra/multimedia/xfig/xfig.png
<<Binary file>>


