Author: sten Date: 2006-05-07 05:23:42 +0200 (Sun, 07 May 2006) New Revision: 1362 Modified: crux-2.2/ports/opt/xfig/.md5sum crux-2.2/ports/opt/xfig/Pkgfile crux-2.2/ports/opt/xfig/README crux-2.2/ports/opt/xfig/xfig.3.2.5-alpha5.patch Log: xfig: integrate Fedora GCC4 patch. Fix broken I18N addon fonts support--thanks for the fix, Wawrzyniec Modified: crux-2.2/ports/opt/xfig/.md5sum =================================================================== --- crux-2.2/ports/opt/xfig/.md5sum 2006-05-06 08:01:08 UTC (rev 1361) +++ crux-2.2/ports/opt/xfig/.md5sum 2006-05-07 03:23:42 UTC (rev 1362) @@ -1,2 +1,2 @@ 7547b66232569e3c12e4a0639bd92629 xfig.3.2.5-alpha5.full.tar.gz -935a7ad1ab9b78b3f3847023754fc8d3 xfig.3.2.5-alpha5.patch +b4fe323ea89e8ecee3ae0b390b288add xfig.3.2.5-alpha5.patch Modified: crux-2.2/ports/opt/xfig/Pkgfile =================================================================== --- crux-2.2/ports/opt/xfig/Pkgfile 2006-05-06 08:01:08 UTC (rev 1361) +++ crux-2.2/ports/opt/xfig/Pkgfile 2006-05-07 03:23:42 UTC (rev 1362) @@ -1,18 +1,18 @@ # Description: Vector drawing program for X # URL: http://www.xfig.org # Maintainer: sten, nick dot steeves at shaw dot ca -# Packager: J�rgen Daubert, juergen dot daubert at t-online dot de +# Packager: # Depends on: xaw3d, libjpeg, libpng name=xfig version=3.2.5-alpha5 -release=1 +release=2 source=(http://xfig.org/software/$name/3.2.5-alpha/$name.$version.full.tar.gz \ $name.$version.patch) build () { cd $name.$version - patch -p1 < ../$name.$version.patch + patch -p1 -i ../$name.$version.patch xmkmf make depend make Modified: crux-2.2/ports/opt/xfig/README =================================================================== --- crux-2.2/ports/opt/xfig/README 2006-05-06 08:01:08 UTC (rev 1361) +++ crux-2.2/ports/opt/xfig/README 2006-05-07 03:23:42 UTC (rev 1362) @@ -3,11 +3,5 @@ REQUIREMENTS 1. Xaw3d -PRE-INSTALL - POST-INSTALL 1. Append '*customization: -color' to ~/.Xdefaults - -PRECAUTION - - Modified: crux-2.2/ports/opt/xfig/xfig.3.2.5-alpha5.patch =================================================================== --- crux-2.2/ports/opt/xfig/xfig.3.2.5-alpha5.patch 2006-05-06 08:01:08 UTC (rev 1361) +++ crux-2.2/ports/opt/xfig/xfig.3.2.5-alpha5.patch 2006-05-07 03:23:42 UTC (rev 1362) @@ -1,6 +1,6 @@ -diff -Nru xfig.3.2.5-alpha5.orig/Imakefile xfig.3.2.5-alpha5/Imakefile ---- xfig.3.2.5-alpha5.orig/Imakefile 2004-05-23 12:13:21.735576758 +0200 -+++ xfig.3.2.5-alpha5/Imakefile 2004-05-23 13:04:48.021102703 +0200 +diff -ru ../xfig.3.2.5-alpha5.orig/Imakefile ./Imakefile +--- ../xfig.3.2.5-alpha5.orig/Imakefile 2006-05-06 20:56:58.000000000 -0600 ++++ ./Imakefile 2006-05-06 21:02:09.000000000 -0600 @@ -30,8 +30,8 @@ XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks XCOMM for it relative to the BINDIR variable. @@ -62,15 +62,6 @@ #endif XCOMM Uncomment the following definiton if you want to use the small icons -@@ -146,7 +146,7 @@ - XCOMM If your setlocale() doesn't support the locale, you should - XCOMM add -DSETLOCALE to I18N_DEFS. - --#define I18N -+XCOMM #define I18N - - XCOMM If using an input tablet uncomment the following - @@ -157,19 +157,19 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures @@ -95,4 +86,30 @@ 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 -Binary files xfig.3.2.5-alpha5.orig/LATEX.AND.XFIG and xfig.3.2.5-alpha5/LATEX.AND.XFIG differ +diff -ru ../xfig.3.2.5-alpha5.orig/u_fonts.h ./u_fonts.h +--- ../xfig.3.2.5-alpha5.orig/u_fonts.h 2006-05-06 20:57:00.000000000 -0600 ++++ ./u_fonts.h 2006-05-06 20:58:49.000000000 -0600 +@@ -30,11 +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, +@@ -61,5 +56,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 */