Update of /cvsroot/fink/experimental/costabel/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18005
Modified Files:
xfig.info
Added Files:
xmkmf.info xfig.patch
Log Message:
First draft of an xmkmf package. Needs testing and probably some polishing.
In particular, it needs testing on systems that do have /usr/X11/bin/xmkmf.
Also perhaps some *.cf files need more attention.
So far tested by building
- xaw3d (builds OK) and
- xfig (needs a little tweak in the patchfile, also supplied here).
Index: xfig.info
===================================================================
RCS file: /cvsroot/fink/experimental/costabel/finkinfo/xfig.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xfig.info 26 Mar 2005 20:04:50 -0000 1.1
+++ xfig.info 6 Apr 2008 21:46:05 -0000 1.2
@@ -1,27 +1,34 @@
Package: xfig
Version: 3.2.5
-# package for 3.2.5 alpha 5
-Revision: 2.0
-BuildDepends: libjpeg (>= 6b-3), libpng3, libtiff, xaw3d (>= 1.5-5), x11-dev
-Depends: x11, xaw3d-shlibs (>= 1.5-5), libjpeg-bin, app-defaults,
x-ghostscript-fonts, transfig (>= 3.2.5-2), libjpeg-shlibs, libpng3-shlibs,
x11-shlibs
-#Source: http://www.xfig.org/xfigdist/%n.%v.full.tar.gz
-Source: http://www.xfig.org/alpha/%n.%v-alpha5.full.tar.gz
-Source-MD5: 7547b66232569e3c12e4a0639bd92629
-#SourceDirectory: %n.%v
-SourceDirectory: %n.%v-alpha5
-Patch: %n.patch
-PatchScript:<<
- perl -pi -e 's|(XCOMM )(.*XAW3D1_5E.*)|$2|g;s|lXaw3d15e|lXaw3d|g' Imakefile
+Revision: 1010
+BuildDepends: libjpeg (>= 6b-3), libpng3, libtiff, xaw3d (>= 1.5-11), x11-dev,
fink (>= 0.24.12)
+Depends: x11, xaw3d-shlibs (>= 1.5-11), libjpeg-bin, app-defaults,
x-ghostscript-fonts, transfig-graphicx (>= 3.2.5-1008) | transfig-epsfig (>=
3.2.5-1008), libjpeg-shlibs, libpng3-shlibs, x11-shlibs
+Source: http://www.xfig.org/software/%n/%v/%n.%v.full.tar.gz
+Source-MD5: fae0c67a3951bd41c057deb63b6aa47a
+SourceDirectory: %n.%v
+PatchFile: %n.patch
+PatchFile-MD5: 279b047efb39492345b5f0774bc02dca
+#PatchFile-MD5: a159861a49c3858ac480a842190a959a
+PatchScript: <<
+ rm -f Libraries/*/*.bak
+ patch -p1 < %{PatchFile}
+ chmod 644 CHANGES FIGAPPS LATEX.AND.XFIG README
<<
CompileScript: <<
xmkmf
- make xfig CCOPTIONS=-no-cpp-precomp PREFIX=%p
+ make PREFIX=%p
<<
InstallScript: <<
- make install PREFIX=%p DESTDIR=%d
- make install.all PREFIX=%p DESTDIR=%d MANDIR=%p/share/man/man1
DOCDIR=%p/share/doc/xfig
+ make install PREFIX=%p DESTDIR=%d INSTALLFLAGS=-c
+ make install.all PREFIX=%p DESTDIR=%d MANDIR=%p/share/man/man1
DOCDIR=%p/share/doc/xfig INSTALLFLAGS=-c
rm -Rf %d/usr
rm -Rf %d/etc
+ chmod 644 %i/share/doc/xfig/html/*.*
+ chmod 644 %i/share/doc/xfig/html/images/*.*
+ chmod 644 %i/share/xfig/Libraries/*/README %i/share/xfig/Libraries/*/AUTHOR
%i/share/xfig/Libraries/*/LICENSE %i/share/xfig/Libraries/*/*.*
+ chmod 644 %i/share/xfig/Libraries/*/*/README %i/share/xfig/Libraries/*/AUTHOR
%i/share/xfig/Libraries/*/LICENSE %i/share/xfig/Libraries/*/*/*.*
+ chmod 644 %i/share/xfig/Libraries/*/*/*/README
%i/share/xfig/Libraries/*/*/*/*.*
+ chmod 644 %i/share/xfig/Libraries/*/*/*/*/*.fig
<<
DocFiles: CHANGES FIGAPPS LATEX.AND.XFIG README
License: BSD
@@ -29,6 +36,11 @@
DescPort: <<
There have been reports that this package does not compile succesfully when
xtools is intalled rather than xfree86.
+
+ Patched an 'install' command to fix installation of filenames
+ beginning with hyphens (may not be needed in future upstream
+ releases) and an internal system(gunzip) to be able to read the
+ installed files.
<<
DescPackaging: <<
XFIGLIBDIR was set to %p/share/xfig. Looks in /etc/printcap
@@ -45,7 +57,7 @@
compiled in.
<<
Homepage: http://www.xfig.org/
-Maintainer: Dave Morrison <[EMAIL PROTECTED]>
+Maintainer: Dave Morrison <[EMAIL PROTECTED]>
--- NEW FILE: xfig.patch ---
diff -ruN xfig.3.2.5/Imakefile xfig.3.2.5-patched/Imakefile
--- xfig.3.2.5/Imakefile 2006-10-10 16:19:22.000000000 -0700
+++ xfig.3.2.5-patched/Imakefile 2007-05-11 17:36:09.000000000 -0700
@@ -30,9 +30,9 @@
XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make"
looks
XCOMM for it relative to the BINDIR variable.
XCOMM
-BINDIR = /usr/bin
-XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
-MKDIRHIER = mkdirhier
+BINDIR = $(PREFIX)/bin
+XCOMM MKDIRHIER = /bin/sh /usr/X11R6/bin/mkdirhier
+MKDIRHIER = mkdirhier
XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
XCOMM app-defaults resource files to go. You will have to use the environment
@@ -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
+XAPPLOADDIR = $(PREFIX)/etc/app-defaults
XCOMM Uncomment the following definition for XAW3D if you want to use
XCOMM the 3d Athena Widget Set (highly recommended!)
@@ -55,11 +55,11 @@
XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E
which has
XCOMM some new features, including "Tips", which replace xfig's "help balloons"
-XCOMM #define XAW3D1_5E
+#define XAW3D1_5E
#ifdef XAW3D1_5E
DUSEXAW3D = -DXAW3D -DXAW3D1_5E
- XAWLIB = -lXaw3d15e
+ XAWLIB = -lXaw3d
#else
XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
@@ -72,8 +72,8 @@
XCOMM Redefine the following if your PNG library, zlib library and/or include
file
XCOMM are in different places
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGLIBDIR = $(PREFIX)/lib
+PNGINC = -I$(PREFIX)/include
ZLIBDIR = $(USRLIBDIR)
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
@@ -93,8 +93,8 @@
#ifdef USEJPEG
#ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINC = -I/usr/include/X11
+JPEGLIBDIR = $(PREFIX)/lib
+JPEGINC = -I$(PREFIX)/include
#else
JPEGLIBDIR = ../jpeg
JPEGINC = -I$(JPEGLIBDIR)
@@ -116,8 +116,8 @@
#define USEXPM_ICON
#ifdef USEXPM
-XPMLIBDIR = /usr/local/lib
-XPMINC = -I/usr/local/include/X11
+XPMLIBDIR = /usr/X11R6/lib
+XPMINC = -I/usr/X11R6/include/X11
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -163,14 +163,14 @@
XCOMM use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
XCOMM be sure to comment out the second copy of XFIGLIBDIR if you use this one
-XCOMM XFIGLIBDIR = $(LIBDIR)
+XFIGLIBDIR = $(PREFIX)/share/xfig
XCOMM use this if you want the multi-key data base file in the standard X11
tree
-XFIGLIBDIR = $(LIBDIR)/xfig
+XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/local/xfig/doc
+XFIGDOCDIR = $(PREFIX)/share/doc/xfig
+XCOMM XFIGDOCDIR = /usr/local/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
diff -Nurd -x'*~' xfig.3.2.5-alpha5.orig/f_util.c xfig.3.2.5-alpha5/f_util.c
--- xfig.3.2.5-alpha5.orig/f_util.c 2004-01-06 14:46:08.000000000 -0500
+++ xfig.3.2.5-alpha5/f_util.c 2005-10-26 02:17:42.000000000 -0400
@@ -782,7 +782,7 @@
else strcpy(dirname, ".");
if (access(dirname, W_OK) == 0) { /* OK - the directory is writable */
- sprintf(unc, "gunzip -q %s", name);
+ sprintf(unc, "gunzip -q -- %s", name);
if (system(unc) != 0)
file_msg("Couldn't uncompress the file: \"%s\"", unc);
strcpy(name, plainname);
@@ -793,7 +793,7 @@
sprintf(tmpfile, "%s%s", TMPDIR, c);
else
sprintf(tmpfile, "%s/%s", TMPDIR, plainname);
- sprintf(unc, "gunzip -q -c %s > %s", name, tmpfile);
+ sprintf(unc, "gunzip -q -c -- %s > %s", name, tmpfile);
if (system(unc) != 0)
file_msg("Couldn't uncompress the file: \"%s\"", unc);
file_msg ("Uncompressing file %s in %s because it is in a read-only
directory",
--- xfig.3.2.5/fig.h 2006-02-24 12:15:16.000000000 -0800
+++ xfig.3.2.5-patched/fig.h 2007-05-12 10:07:56.000000000 -0700
@@ -383,6 +383,9 @@
extern long random();
extern void srandom(unsigned int);
+#elif defined(__DARWIN__)
+extern void srandom();
+
#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux)
extern void srandom(int);
diff -ruN xfig.3.2.5/w_keyboard.c xfig.3.2.5-patched/w_keyboard.c
--- xfig.3.2.5/w_keyboard.c 2004-11-09 13:10:22.000000000 -0800
+++ xfig.3.2.5-patched/w_keyboard.c 2007-05-28 08:24:15.000000000 -0700
@@ -37,6 +37,10 @@
#define REG_NOERROR REG_OKAY
#endif
+#ifndef REG_NOERROR
+#define REG_NOERROR 0
+#endif
+
Boolean keyboard_input_available = False;
int keyboard_x;
int keyboard_y;
diff -ruN xfig.3.2.5/w_library.c xfig.3.2.5-patched/w_library.c
--- xfig.3.2.5/w_library.c 2006-04-03 09:27:30.000000000 -0700
+++ xfig.3.2.5-patched/w_library.c 2007-05-28 10:11:06.000000000 -0700
@@ -1029,8 +1029,8 @@
Widget menu, entry;
#ifndef XAW3D1_5E
Widget submenu;
- char submenu_name[200];
#endif /* XAW3D1_5E */
+ char submenu_name[200];
char menu_name[200];
int i;
--- NEW FILE: xmkmf.info ---
Package: xmkmf
Version: 1.0.2
Revision: 1
Distribution: 10.5
Description: X11 utilities missing from latest xorg
License: BSD
#Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
GCC: 4.0
CustomMirror: <<
Primary: http://ftp.x.org/pub
nam-US: ftp://ftp.x.org/pub
nam-US: http://xorg.freedesktop.org/releases
nam-US: ftp://ftp.freedesktop.org/pub/xorg
nam-US: ftp://mirror.sg.depaul.edu/pub/x.org
nam-US: http://mirror.sg.depaul.edu/pub/x.org
nam-US: http://x.paracoda.com/
nam-US: http://x.hostingzero.com/
asi-JP: http://ftp.yz.yamagata-u.ac.jp/pub/X11/x.org/
asi-CN: http://www.qtopia.org.cn/ftp/mirror/ftp.x.org/pub/
eur-BE: http://x.mirrors.skynet.be/pub/x.org
eur-DE: http://ftp.gwdg.de/pub/x11/x.org/pub
eur-DE: ftp://ftp.gwdg.de/pub/x11/x.org/pub/
eur-ES: ftp://ftp.cica.es/pub/X/pub/
eur-FR: http://miroir.cict.fr/x.org/pub
eur-GR: ftp://ftp.ntua.gr/pub/X11/X.org/
eur-RU: http://ftp.chg.ru/pub/X11/x.org/pub/
eur-UK: http://www.mirrorservice.org/sites/ftp.x.org/pub/
<<
Source: mirror:custom:/X11R7.3/src/util/imake-%v.tar.bz2
Source2: mirror:custom:/X11R7.3/src/util/xorg-cf-files-%v.tar.bz2
Source-MD5: 02fea5a02ba2857c7d81820c8e8b8e6f
Source2-MD5: 5f62dd5545b782c74f6e4e70d0e6552c
PatchScript: <<
perl -pi -e 's|/usr/local|/usr/X11|' ../xorg-cf-files-%v/site.def
<<
ConfigureParams: --mandir=%p/share/man
CompileScript: <<
#!/bin/sh -ev
./configure %c
make
cd ../xorg-cf-files-%v
./configure %c
perl -pi -e 's|%p|/usr/X11|' site.def
<<
InstallScript: <<
#!/bin/sh -ev
make install DESTDIR=%d
cd ../xorg-cf-files-%v
make install DESTDIR=%d
<<
DocFiles: COPYING ChangeLog README
Homepage: http://xorg.freedesktop.org/
DescDetail: <<
This package provides the xmkmf script and the imake executable
and their supporting config files that are no longer supplied
with the latest X11R7 release from x.org.
<<
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
