Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16554
Modified Files:
gd2.info
Added Files:
transfig-3.2.4-6.info transfig-3.2.4-6.patch
Removed Files:
transfig.info transfig.patch
Log Message:
new revision works with gcc3.3 and later
--- NEW FILE: transfig-3.2.4-6.patch ---
diff -ruN transfig.3.2.4/fig2dev/Imakefile
transfig.3.2.4-patched/fig2dev/Imakefile
--- transfig.3.2.4/fig2dev/Imakefile Thu Dec 19 12:33:44 2002
+++ transfig.3.2.4-patched/fig2dev/Imakefile Sat Apr 2 15:43:28 2005
@@ -20,13 +20,13 @@
XCOMM You should point XFIGLIBDIR to the same directory you did when you
compiled
XCOMM and installed xfig.
-XFIGLIBDIR = /usr/local/lib/X11/xfig
+XFIGLIBDIR = $(PREFIX)/share/xfig
XCOMM ******
XCOMM If your system has the strerror() function (doesn't have sys_errlist)
then
XCOMM comment out NEED_STRERROR with an XCOMM comment.
-NEED_STRERROR = -DNEED_STRERROR
+XCOMM NEED_STRERROR = -DNEED_STRERROR
XCOMM The following probably only applies to Windows 9x/NT:
XCOMM If your system can open files in text and binary modes and has the
@@ -60,8 +60,8 @@
XCOMM are in different places
#ifdef USEPNG
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/include/X11
+PNGLIBDIR = $(PREFIX)/lib
+PNGINC = -I$(PREFIX)/include
#endif
XCOMM ****************
@@ -73,11 +73,11 @@
XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
XCOMM
-XCOMM #define USEXPM
+#define USEXPM
#ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = /usr/X11R6/lib
+XPMINC = -I/usr/X11R6/include/X11
#endif
XCOMM ****************
@@ -102,7 +102,7 @@
DDNFSS = -DNFSS
DDLATEX2E_GRAPHICS = -DLATEX2E_GRAPHICS
-XCOMM DDEPSFIG = -DEPSFIG
+DDEPSFIG = -DEPSFIG
XCOMM ****************
XCOMM Comment out the DDDVIPS to NOT use dvips for the DVI-to-PostScript driver
@@ -126,11 +126,11 @@
#ifdef I18N
I18N_DEFS = -DI18N
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+FIG2DEV_LIBDIR = $(PREFIX)/lib/fig2dev
I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
install::
- [ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
+ [ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir -p
$(DESTDIR)$(FIG2DEV_LIBDIR)
$(INSTALL) -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \
diff -ruN transfig.3.2.4/fig2dev/fig2dev.h
transfig.3.2.4-patched/fig2dev/fig2dev.h
--- transfig.3.2.4/fig2dev/fig2dev.h Wed Dec 18 17:45:28 2002
+++ transfig.3.2.4-patched/fig2dev/fig2dev.h Sat Apr 2 15:45:20 2005
@@ -22,7 +22,7 @@
#include <sys/file.h>
#include <signal.h>
#include <string.h>
-#include <varargs.h>
+#include <stdarg.h>
#include <pwd.h>
#include <errno.h>
#include <time.h>
diff -ruN transfig.3.2.4/transfig/Imakefile
transfig.3.2.4-patched/transfig/Imakefile
--- transfig.3.2.4/transfig/Imakefile Wed Dec 18 17:44:03 2002
+++ transfig.3.2.4-patched/transfig/Imakefile Sat Apr 2 15:43:28 2005
@@ -18,7 +18,7 @@
XCOMM \\usepackage{} command for LaTeX2e.
XCOMM The default is to use \\documentstyle{} for LaTeX209.
-XCOMM USELATEX2E = -DLATEX2E
+USELATEX2E = -DLATEX2E
XCOMM ******* DON'T CHANGE ANYTHIN BELOW THIS POINT *******
diff -ruN transfig.3.2.4.orig/fig2dev/dev/gensvg.c
transfig.3.2.4/fig2dev/dev/gensvg.c
--- transfig.3.2.4.orig/fig2dev/dev/gensvg.c 2003-06-24 23:13:43.000000000
+0200
+++ transfig.3.2.4/fig2dev/dev/gensvg.c 2003-06-24 23:18:55.000000000 +0200
@@ -692,16 +692,17 @@
if (t->angle != 0) {
fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
(int) (t->base_x * mag), (int) (t->base_y * mag), degrees
(t->angle));
- fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"
font-family=\"%s\"
- font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
+ fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\" "
+ "font-family=\"%s\" font-style=\"%s\" font-weight=\"%s\" "
+ "font-size=\"%d\" text-anchor=\"%s\" >\n",
rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)],
(t->font % 2 == 0 ? "normal" : "italic"),
(t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size *
12 * mag)),
anchor[t->type]);
}
else
- fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"
font-family=\"%s\"
- font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
+ fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"
font-family=\"%s\" "
+ "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\" >\n",
(int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal
(t->color),
family[(int) ceil ((t->font + 1) / 4)],
(t->font % 2 == 0 ? "normal" : "italic"),
--- transfig.info DELETED ---
--- NEW FILE: transfig-3.2.4-6.info ---
Package: transfig
Version: 3.2.4
Revision: 6
Depends: x11, xaw3d-shlibs (>= 1.5-11), libjpeg-bin, libpng3-shlibs,
libtiff-bin, netpbm-bin
BuildDepends: libjpeg (>= 6b-3), xaw3d (>= 1.5-11), libpng3, libtiff (>=
3.5.7-5), netpbm (>= 9.24-2), x11-dev
Source: http://www.xfig.org/xfigdist/%n.%v.tar.gz
Source-MD5: 742de0f7a3cae74d247bbd0c70dd9dd7
Patch: %f.patch
CompileScript: <<
xmkmf
make Makefiles
make CCOPTIONS=-no-cpp-precomp PREFIX=%p
<<
InstallScript: <<
make install PREFIX=%p DESTDIR=%d BINDIR=%p/bin
make install.man PREFIX=%p DESTDIR=%d MANPATH=%p/share/man
DOCDIR=%p/share/doc/transfig
<<
DocFiles: CHANGES LATEX.AND.XFIG NOTES README
License: BSD
Description: Converts xfig objects to various graphics formats
DescPort: <<
We don't need xpm since it is already in XFree86 4.1.
Patch for gcc3.3 borrowed from gentoo.
<<
DescPackaging: <<
Compiled with LaTeX 2e options chosen rather than LaTeX
2.09. XFIGLIBDIR was set to %p/share/xfig (as in xfig).
<<
DescUsage: <<
This package is automatically called by xfig, although it is
also possible to invoke "fig2dev" directly from the command line.
<<
Homepage: http://www.xfig.org/
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
--- transfig.patch DELETED ---
Index: gd2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/graphics/gd2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gd2.info 26 Aug 2004 01:43:31 -0000 1.1
+++ gd2.info 4 May 2005 01:07:01 -0000 1.2
@@ -1,21 +1,17 @@
Package: gd2
-Version: 2.0.23
-Revision: 25
+Version: 2.0.33
+Revision: 2
Depends: %N-shlibs (= %v-%r)
BuildDepends: libpng3, libjpeg (>= 6b-3), fink (>= 0.9.9-1), x11,
libiconv-dev, x11-dev
Conflicts: gd
Replaces: gd, gd209
Source: http://www.boutell.com/gd/http/gd-%v.tar.gz
-Source-MD5: 3bcd6daef3eb7b31ddc68a7d54b98c15
-Patch: %n.patch
+Source-MD5: be0a6d326cd8567e736fbc75df0a5c45
+PatchScript: perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
NoSetCPPFLAGS: True
SetCPPFLAGS: -fno-common -I%p/include
SetLDFLAGS: -liconv
ConfigureParams: --with-freetype=/usr/X11R6
-CompileScript: <<
- ./configure %c
- make CCLD="gcc -L./.libs"
-<<
DocFiles: COPYING INSTALL index.html README-JPEG.TXT README.TXT readme.jpn
BuildDependsOnly: True
SplitOff: <<
@@ -23,7 +19,7 @@
Depends: libpng3-shlibs, libjpeg-bin, x11-shlibs, x11
Replaces: gd209-shlibs
Files: lib/libgd.2*.dylib
- Shlibs: %p/lib/libgd.2.dylib 3.0.0 %n (>= 2.0.23-25)
+ Shlibs: %p/lib/libgd.2.dylib 3.0.0 %n (>= 2.0.28-1)
Description: Shared libraries for gd2 package
DocFiles: COPYING index.html
<<
@@ -46,11 +42,7 @@
The dynamic library needs the -fno-common switch.
For some reason, libiconv is not found at link time, so we explicitly
invoke it.
- When an older version is installed, the wrong library version may be
- linked against; the CCLD="gcc -L./.libs" is a workaround for this.
- A small patch is needed in order to allow this to link to the version
- of the freetype2 library supplied with Panther. (Patch sent upstream
- on 21 May 2004.)
+ The PatchScript prevents linking against the wrong copy of the library.
<<
DescPackaging: <<
This package is based on previous work by Chris Pepper, Jeremy Higgs
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
