Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27367
Modified Files:
fondu.info fondu.patch
Log Message:
Copy from unstable
Index: fondu.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/fondu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fondu.patch 27 Jan 2006 17:15:35 -0000 1.1
+++ fondu.patch 19 Nov 2007 23:54:28 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uNbr fondu/Makefile.Mac fondu-new/Makefile.Mac
---- fondu/Makefile.Mac Sat Dec 21 22:58:25 2002
-+++ fondu-new/Makefile.Mac Mon Dec 30 16:28:37 2002
+diff -ru fondu-orig/Makefile.Mac fondu/Makefile.Mac
+--- fondu-orig/Makefile.Mac 2006-09-18 21:36:13.000000000 -0700
++++ fondu/Makefile.Mac 2006-09-19 00:09:00.000000000 -0700
@@ -1,10 +1,13 @@
+prefix=/usr/local
+bindir=$(prefix)/bin
@@ -13,22 +13,149 @@
WFLAGS = -Wmissing-prototypes -Wunused -Wimplicit -Wreturn-type -Wparentheses
-CFLAGS = -g $(WFLAGS) -D__Mac -I/Developer/Headers/FlatCarbon/
+CFLAGS = -Os $(WFLAGS) -D__Mac -I/Developer/Headers/FlatCarbon/
- FONDUOBJS = fondu.o readnfnt.o
+ FONDUOBJS = fondu.o readnfnt.o fondups.o
UFONDOBJS = ufond.o ufondbdf.o ufondpfb.o ufondttf.o crctab.o
DFONT2RESOBJS = dfont2res.o crctab.o
-@@ -14,8 +17,6 @@
+@@ -16,8 +19,6 @@
#CORE =
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/CarbonCore
CORE = /System/Library/Frameworks/CoreServices.framework/CoreServices
-bindir = /usr/local/bin
-
- all: fondu ufond showfond dfont2res tobin frombin
+ all: fondu ufond showfond dfont2res tobin frombin lumper setfondname
fondu: $(FONDUOBJS)
-@@ -43,4 +44,5 @@
+@@ -51,4 +52,5 @@
-rm Makefile
install: all
-- cp fondu ufond showfond dfont2res tobin frombin $(bindir)
+- cp fondu ufond showfond dfont2res tobin frombin lumper setfondname
$(bindir)
+ install -d -m 755 $(DESTDIR)$(bindir)
-+ install -c -m 755 fondu ufond showfond dfont2res tobin frombin
$(DESTDIR)$(bindir)
++ install -c -m 755 fondu ufond showfond dfont2res tobin frombin lumper
setfondname $(DESTDIR)$(bindir)
+Only in fondu: Makefile.Mac.orig
+Only in fondu: Makefile.Mac.rej
+diff -ru fondu-orig/fondu.c fondu/fondu.c
+--- fondu-orig/fondu.c 2006-09-18 21:36:12.000000000 -0700
++++ fondu/fondu.c 2006-09-19 00:03:49.000000000 -0700
+@@ -940,12 +940,12 @@
+ #ifndef OldMacintosh
+ /* OS/X and linux with appropriate drivers */
+ static int HasResourceFork(char *filename,PSFONT *psfont) {
+- char *respath = malloc(strlen(filename)+strlen("/rsrc")+1);
++ char *respath = malloc(strlen(filename)+strlen("/..namedfork/rsrc")+1);
+ FILE *temp;
+ int ret=false;
+
+ strcpy(respath,filename);
+- strcat(respath,"/rsrc");
++ strcat(respath,"/..namedfork/rsrc");
+ temp = fopen(respath,"r");
+ free(respath);
+ if ( temp!=NULL ) {
+diff -ru fondu-orig/frommacbinary.c fondu/frommacbinary.c
+--- fondu-orig/frommacbinary.c 2006-09-18 21:36:12.000000000 -0700
++++ fondu/frommacbinary.c 2006-09-19 00:03:49.000000000 -0700
+@@ -158,7 +158,7 @@
+
+ if ( rlen>0 ) {
+ fseek(binfile,128 + ((dlen+127)&~127),SEEK_SET);
+- strcpy(name+header[1],"/rsrc");
++ strcpy(name+header[1],"/..namedfork/rsrc");
+ resfile = fopen(name,"w");
+ if ( resfile==NULL )
+ fprintf( stderr, "Cannot open output file: %s\n", name
);
+diff -ru fondu-orig/lumper.c fondu/lumper.c
+--- fondu-orig/lumper.c 2006-09-18 21:36:13.000000000 -0700
++++ fondu/lumper.c 2006-09-19 00:03:49.000000000 -0700
+@@ -501,12 +501,12 @@
+ /* If we're on a mac, we can try to see if we've got a real resource fork
*/
+ /* linux has an HFS+ driver (or whatever) too, so we might as well always
*/
+ /* do this check */
+- char *respath = malloc(strlen(filename)+strlen("/rsrc")+1);
++ char *respath = malloc(strlen(filename)+strlen("/..namedfork/rsrc")+1);
+ FILE *temp;
+ int ret = false;
+
+ strcpy(respath,filename);
+- strcat(respath,"/rsrc");
++ strcat(respath,"/..namedfork/rsrc");
+ temp = fopen(respath,"r");
+ free(respath);
+ if ( temp!=NULL )
+diff -ru fondu-orig/res2data.c fondu/res2data.c
+--- fondu-orig/res2data.c 2006-09-18 21:36:13.000000000 -0700
++++ fondu/res2data.c 2006-09-19 00:03:49.000000000 -0700
+@@ -42,9 +42,9 @@
+ FILE *res, *temp;
+ int cnt;
+
+- respath = malloc(strlen(filename)+strlen("/rsrc")+1);
++ respath = malloc(strlen(filename)+strlen("/..namedfork/rsrc")+1);
+ strcpy(respath,filename);
+- strcat(respath,"/rsrc");
++ strcat(respath,"/..namedfork/rsrc");
+ res = fopen(respath,"r");
+ free(respath);
+
+diff -ru fondu-orig/setfondname.c fondu/setfondname.c
+--- fondu-orig/setfondname.c 2006-09-18 21:36:13.000000000 -0700
++++ fondu/setfondname.c 2006-09-19 00:03:49.000000000 -0700
+@@ -167,12 +167,12 @@
+ /* If we're on a mac, we can try to see if we've got a real resource fork
*/
+ /* linux has an HFS+ driver (or whatever) too, so we might as well always
*/
+ /* do this check */
+- char *respath = malloc(strlen(filename)+strlen("/rsrc")+1);
++ char *respath = malloc(strlen(filename)+strlen("/..namedfork/rsrc")+1);
+ FILE *temp;
+ int ret = false;
+
+ strcpy(respath,filename);
+- strcat(respath,"/rsrc");
++ strcat(respath,"/..namedfork/rsrc");
+ temp = fopen(respath,"r+");
+ free(respath);
+ if ( temp!=NULL ) {
+diff -ru fondu-orig/showfond.c fondu/showfond.c
+--- fondu-orig/showfond.c 2006-09-18 21:36:13.000000000 -0700
++++ fondu/showfond.c 2006-09-19 00:03:49.000000000 -0700
+@@ -619,12 +619,12 @@
+ /* If we're on a mac, we can try to see if we've got a real resource fork
*/
+ /* linux has an HFS+ driver (or whatever) too, so we might as well always
*/
+ /* do this check */
+- char *respath = malloc(strlen(filename)+strlen("/rsrc")+1);
++ char *respath = malloc(strlen(filename)+strlen("/..namedfork/rsrc")+1);
+ FILE *temp;
+ int ret = false;
+
+ strcpy(respath,filename);
+- strcat(respath,"/rsrc");
++ strcat(respath,"/..namedfork/rsrc");
+ temp = fopen(respath,"r");
+ free(respath);
+ if ( temp!=NULL ) {
+diff -ru fondu-orig/tomacbinary.c fondu/tomacbinary.c
+--- fondu-orig/tomacbinary.c 2006-09-18 21:36:13.000000000 -0700
++++ fondu/tomacbinary.c 2006-09-19 00:03:49.000000000 -0700
+@@ -50,7 +50,7 @@
+ /* MacBinary files use the same CRC that binhex does (in the MacBinary
header) */
+ extern unsigned long binhex_crc(unsigned char *buffer,int size);
+
+-/* the resource fork may be opened (on Mac OS/X) by <filename>/rsrc */
++/* the resource fork may be opened (on Mac OS/X) by
<filename>/..namedfork/rsrc */
+
+
+ /* tobin [-res rfilename] filename {[-res filename] rfilename} */
+@@ -81,11 +81,11 @@
+ static FILE *ResForkOfDataFile(char *dataname) {
+ #ifndef OldMacintosh
+ /* OS/X and linux with appropriate drivers */
+- char *respath = malloc(strlen(dataname)+strlen("/rsrc")+1);
++ char *respath = malloc(strlen(dataname)+strlen("/..namedfork/rsrc")+1);
+ FILE *temp;
+
+ strcpy(respath,dataname);
+- strcat(respath,"/rsrc");
++ strcat(respath,"/..namedfork/rsrc");
+ temp = fopen(respath,"r");
+ free(respath);
+ return( temp );
Index: fondu.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/fondu.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fondu.info 27 Jan 2006 17:15:35 -0000 1.1
+++ fondu.info 19 Nov 2007 23:54:28 -0000 1.2
@@ -1,22 +1,18 @@
Package: fondu
-Version: 021223
+Version: 051010
Revision: 1
+Epoch: 1
SourceDirectory: %n
Patch: %n.patch
CompileScript: make -f Makefile.Mac prefix=%p
InstallScript: make -f Makefile.Mac install DESTDIR=%d prefix=%p
-CustomMirror: <<
- nam-US: http://ranger.befunk.com/fink
- nam-US: http://astrange.ithinksw.net/ranger-fink
- nam-CA: http://www.southofheaven.net/befunk
-<<
-Source: mirror:custom:%N_src-%v.tgz
-Source-MD5: 2f37dc4e4a3c58fe3add45cfcf874725
+Source: mirror:sourceforge:%N/%N_src-%v.tgz
+Source-MD5: 669ad6f39c10e9e5a455dfc302685b1c
Description: Convert between Mac and UNIX font formats
DescDetail: <<
Fondu is a set of programs to interconvert between mac font
formats and pfb, ttf, otf and bdf files on unix.
<<
License: BSD
-Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
Homepage: http://fondu.sourceforge.net/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
