Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22835/main/finkinfo/base
Modified Files:
Tag: pangocairo-branch
unzip.info
Added Files:
Tag: pangocairo-branch
unzip.patch
Log Message:
merge from HEAD
Index: unzip.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/unzip.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- unzip.info 20 Jan 2006 20:19:36 -0000 1.1
+++ unzip.info 22 Feb 2007 13:09:22 -0000 1.1.2.1
@@ -1,21 +1,23 @@
Package: unzip
Version: 5.52
-Revision: 11
+Revision: 12
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
License: BSD
Essential: yes
-CustomMirror: <<
+#CustomMirror: <<
#nam-US:
http://uiarchive.uiuc.edu/mirrors/ftp/ftp.info-zip.org/pub/infozip/src/
#nam-US: ftp://uiarchive.cso.uiuc.edu/pub/ftp/ftp.info-zip.org/pub/infozip/src/
-eur-UK: http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/
-eur-PL: ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/
-eur-CH: http://sunsite.cnlab-switch.ch/ftp/mirror/infozip/src/
-eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/infozip/src/
-Primary: ftp://ftp.info-zip.org/pub/infozip/src/
-<<
-Source: mirror:custom:%n552.tar.gz
+#eur-UK: http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/
+#eur-PL: ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/
+#eur-CH: http://sunsite.cnlab-switch.ch/ftp/mirror/infozip/src/
+#eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/infozip/src/
+#Primary: ftp://ftp.info-zip.org/pub/infozip/src/
+#<<
+#Source: mirror:custom:%n552.tar.gz
+Source: mirror:sourceforge:fink/%n552.tar.gz
Source-MD5: 9d23919999d6eac9217d1f41472034a9
SourceDirectory: %n-%v
+BuildDepends: fink (>= 0.24.12)
DocFiles: BUGS INSTALL LICENSE README ToDo WHERE
Homepage: http://www.info-zip.org/pub/infozip/UnZip.html
Description: Decompression compatible with pkunzip
@@ -31,3 +33,6 @@
InstallScript: make -f unix/Makefile install BINDIR=%i/bin
MANDIR=%i/share/man/man1
Suggests: zip
+# prevent 'struct direntry' name conflict
+PatchFile: %n.patch
+PatchFile-MD5: a7476ebe93118a849634d80f47e25478
--- NEW FILE: unzip.patch ---
--- unzip-5.52/unix/unix.c 2005-02-26 14:43:42.000000000 -0500
+++ unzip-5.52/new 2007-02-08 08:05:58.000000000 -0500
@@ -53,7 +53,13 @@
#endif
#ifdef DIRENT
+# ifdef __APPLE__
+# define direntry apple_direntry
+# endif
# include <dirent.h>
+# ifdef __APPLE__
+# undef direntry
+# endif
#else
# ifdef SYSV
# ifdef SYSNDIR
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
