Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8560/utils
Modified Files:
diffutils.info dosbox.info dosbox.patch grep.info less.info
unshield.info
Added Files:
grep.patch unshield.patch
Log Message:
Moving a bunch of my packages to stable
--- NEW FILE: unshield.patch ---
diff -ru unshield-0.5.1/lib/file.c unshield-0.5.1-patched/lib/file.c
--- unshield-0.5.1/lib/file.c 2009-05-26 00:42:18.000000000 +0200
+++ unshield-0.5.1-patched/lib/file.c 2009-05-26 00:43:00.000000000 +0200
@@ -266,7 +266,7 @@
if (err != Z_OK)
return err;
- err = inflate(&stream, Z_BLOCK);
+ err = inflate(&stream, Z_SYNC_FLUSH);
if (err != Z_OK)
{
inflateEnd(&stream);
diff -ru unshield-0.5.1/lib/libunshield.c
unshield-0.5.1-patched/lib/libunshield.c
--- unshield-0.5.1/lib/libunshield.c 2009-05-26 00:42:18.000000000 +0200
+++ unshield-0.5.1-patched/lib/libunshield.c 2009-05-26 00:42:54.000000000
+0200
@@ -271,7 +271,7 @@
header->major_version = (header->common.version >> 12) & 0xf;
-#if 0
+#if 1
if (header->major_version < 5)
header->major_version = 5;
#endif
Index: dosbox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/dosbox.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dosbox.patch 27 Sep 2008 23:04:44 -0000 1.1
+++ dosbox.patch 22 Oct 2010 22:57:40 -0000 1.2
@@ -1,158 +1,11 @@
-diff -ruN dosbox-0.72/configure dosbox-0.72-patched/configure
---- dosbox-0.72/configure 2007-08-26 19:45:35.000000000 +0200
-+++ dosbox-0.72-patched/configure 2008-04-04 23:11:57.000000000 +0200
-@@ -12439,7 +12439,7 @@
- #define MACOSX 1
- _ACEOF
-
-- LIBS="$LIBS -framework AudioUnit"
-+ LIBS="$LIBS -framework AudioUnit -framework AudioToolbox"
-
- cat >>confdefs.h <<\_ACEOF
- #define C_DIRECTSERIAL 1
-diff -ruN dosbox-0.72/src/gui/midi_coreaudio.h
dosbox-0.72-patched/src/gui/midi_coreaudio.h
---- dosbox-0.72/src/gui/midi_coreaudio.h 2007-06-13 14:58:25.000000000
+0200
-+++ dosbox-0.72-patched/src/gui/midi_coreaudio.h 2008-04-04
22:34:23.000000000 +0200
-@@ -16,73 +16,90 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+diff -ruN dosbox-0.73/src/gui/midi_coreaudio.h
dosbox-0.73-patched/src/gui/midi_coreaudio.h
+--- dosbox-0.73/src/gui/midi_coreaudio.h 2009-05-25 20:44:46.000000000
+0200
++++ dosbox-0.73-patched/src/gui/midi_coreaudio.h 2010-03-03
13:53:44.000000000 +0100
+@@ -17,6 +17,7 @@
*/
--#include <AudioUnit/AudioUnit.h>
-+#include <AudioToolbox/AUGraph.h>
-+
-+// A macro to simplify error handling a bit.
-+#define RequireNoErr(error) \
-+do { \
-+ err = error; \
-+ if (err != noErr) \
-+ goto bail; \
-+} while (false)
-
- class MidiHandler_coreaudio : public MidiHandler {
- private:
-- AudioUnit m_musicDevice;
-- AudioUnit m_outputUnit;
-+ AUGraph m_auGraph;
-+ AudioUnit m_synth;
- public:
-- MidiHandler_coreaudio() : m_musicDevice(0), m_outputUnit(0) {}
-+ MidiHandler_coreaudio() : m_auGraph(0), m_synth(0) {}
- const char * GetName(void) { return "coreaudio"; }
- bool Open(const char * conf) {
-- int err;
-- AudioUnitConnection auconnect;
-- ComponentDescription compdesc;
-- Component compid;
--
-- if (m_outputUnit)
-+ OSStatus err = 0;
-+
-+ if (m_auGraph)
- return false;
--
-- // Open the Music Device
-- compdesc.componentType = kAudioUnitComponentType;
-- compdesc.componentSubType = kAudioUnitSubType_MusicDevice;
-- compdesc.componentManufacturer = kAudioUnitID_DLSSynth;
-- compdesc.componentFlags = 0;
-- compdesc.componentFlagsMask = 0;
-- compid = FindNextComponent(NULL, &compdesc);
-- m_musicDevice = (AudioUnit) OpenComponent(compid);
--
-- // open the output unit
-- m_outputUnit = (AudioUnit)
OpenDefaultComponent(kAudioUnitComponentType, kAudioUnitSubType_Output);
--
-- // connect the units
-- auconnect.sourceAudioUnit = m_musicDevice;
-- auconnect.sourceOutputNumber = 0;
-- auconnect.destInputNumber = 0;
-- err =
-- AudioUnitSetProperty(m_outputUnit,
kAudioUnitProperty_MakeConnection, kAudioUnitScope_Input, 0,
--
(void *)&auconnect, sizeof(AudioUnitConnection));
--
-- // initialize the units
-- AudioUnitInitialize(m_musicDevice);
-- AudioUnitInitialize(m_outputUnit);
--
-- // start the output
-- AudioOutputUnitStart(m_outputUnit);
--
-+
-+ // Open the Music Device.
-+ RequireNoErr(NewAUGraph(&m_auGraph));
-+
-+ AUNode outputNode, synthNode;
-+ ComponentDescription desc;
-+
-+ // The default output device
-+ desc.componentType = kAudioUnitType_Output;
-+ desc.componentSubType = kAudioUnitSubType_DefaultOutput;
-+ desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-+ desc.componentFlags = 0;
-+ desc.componentFlagsMask = 0;
-+ RequireNoErr(AUGraphNewNode(m_auGraph, &desc, 0, NULL,
&outputNode));
-+
-+ // The built-in default (softsynth) music device
-+ desc.componentType = kAudioUnitType_MusicDevice;
-+ desc.componentSubType = kAudioUnitSubType_DLSSynth;
-+ desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-+ RequireNoErr(AUGraphNewNode(m_auGraph, &desc, 0, NULL,
&synthNode));
-+
-+ // Connect the softsynth to the default output
-+ RequireNoErr(AUGraphConnectNodeInput(m_auGraph, synthNode, 0,
outputNode, 0));
-+
-+ // Open and initialize the whole graph
-+ RequireNoErr(AUGraphOpen(m_auGraph));
-+ RequireNoErr(AUGraphInitialize(m_auGraph));
-+
-+ // Get the music device from the graph.
-+ RequireNoErr(AUGraphGetNodeInfo(m_auGraph, synthNode, NULL,
NULL, NULL, &m_synth));
-+
-+ // Finally: Start the graph!
-+ RequireNoErr(AUGraphStart(m_auGraph));
-+
- return true;
-+
-+ bail:
-+ if (m_auGraph) {
-+ AUGraphStop(m_auGraph);
-+ DisposeAUGraph(m_auGraph);
-+ m_auGraph = 0;
-+ }
-+ return false;
- }
--
-+
- void Close(void) {
-- if (m_outputUnit) {
-- AudioOutputUnitStop(m_outputUnit);
-- CloseComponent(m_outputUnit);
-- m_outputUnit = 0;
-- }
-- if (m_musicDevice) {
-- CloseComponent(m_musicDevice);
-- m_musicDevice = 0;
-+ if (m_auGraph) {
-+ AUGraphStop(m_auGraph);
-+ DisposeAUGraph(m_auGraph);
-+ m_auGraph = 0;
- }
- }
--
-+
- void PlayMsg(Bit8u * msg) {
-- MusicDeviceMIDIEvent(m_musicDevice,msg[0],msg[1],msg[2],0);
-- }
--
-+ MusicDeviceMIDIEvent(m_synth, msg[0], msg[1], msg[2], 0);
-+ }
-+
- void PlaySysex(Bit8u * sysex, Bitu len) {
-- MusicDeviceSysEx(m_musicDevice, sysex, len);
-+ MusicDeviceSysEx(m_synth, sysex, len);
- }
- };
+ #include <AudioToolbox/AUGraph.h>
++#include <CoreServices/CoreServices.h>
-+#undef RequireNoErr
-+
- MidiHandler_coreaudio Midi_coreaudio;
+ // A macro to simplify error handling a bit.
+ #define RequireNoErr(error) \
Index: unshield.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/unshield.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unshield.info 10 Mar 2009 23:20:48 -0000 1.1
+++ unshield.info 22 Oct 2010 22:57:40 -0000 1.2
@@ -16,21 +16,28 @@
Package: unshield
Version: 0.5.1
-Revision: 1
+Revision: 3
Maintainer: Max Horn <[email protected]>
Depends: %N-shlibs (=%v-%r)
+BuildDepends: fink (>= 0.24.12)
Source: mirror:sourceforge:synce/%n-%v.tar.gz
Source-MD5: cc06e5573a4d5095871bf1bb14f3da1f
+PatchFile: %n.patch
+PatchFile-MD5: d2ea90b41cd85fdc586287f90efacc5e
ConfigureParams: --disable-dependency-tracking
InstallScript: make install DESTDIR=%d
DocFiles: LICENSE README
-Description: Extracts CAB files from InstallShield installers
+Description: Extracts InstallShield CAB files
DescDetail: <<
This software extracts CAB (cabinet) files from InstallShield installers
used to be installed on Windows CE devices or Windows desktop machines.
See also the cabextract package, which does a similar thing for
Microsoft cabinet files files
<<
+DescPort: <<
+ The patch allows unshield to extract some CAB files the stock version does
+ not support (e.g. of the game "The Feeble Files").
+<<
License: BSD
Homepage: http://synce.sourceforge.net/synce/unshield.php
Index: dosbox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/dosbox.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dosbox.info 1 Feb 2010 12:43:06 -0000 1.6
+++ dosbox.info 22 Oct 2010 22:57:40 -0000 1.7
@@ -15,17 +15,14 @@
# maintainership of) the affected package.
Package: dosbox
-Version: 0.73
-Revision: 2
+Version: 0.74
+Revision: 1
Maintainer: Max Horn <[email protected]>
-BuildDepends: sdl, sdl-net, sdl-sound (>= 1.0.1-4), libpng3, fink (>=
0.24.12-1)
-Depends: sdl-shlibs, sdl-net-shlibs, sdl-sound-shlibs (>= 1.0.1-4),
libpng3-shlibs
+BuildDepends: sdl, sdl-net, sdl-sound (>= 1.0.1-4), libpng14, fink (>=
0.24.12-1)
+Depends: sdl-shlibs, sdl-net-shlibs, sdl-sound-shlibs (>= 1.0.1-4),
libpng14-shlibs
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 0823a11242db711ac3d6ebfff6aff572
-#PatchFile: %n.patch
-#PatchFile-MD5: 8f5a647f893311a9ee6861fe72c879be
+Source-MD5: b9b240fa87104421962d14eee71351e8
ConfigureParams: <<
- --enable-core-inline \
--build=%m-apple-darwin`uname -r|cut -f1 -d.` \
--mandir=%p/share/man \
--disable-sdltest
@@ -47,8 +44,6 @@
old dosgames on platforms which don't have dos(win2K/XP/linux/FreeBSD)
<<
DescPackaging: <<
- Use --enable-core-inline for a huge speed boost at the cost of an increased
compile time.
-
-mdynamic-no-pic required to build on i386, okay for ppc, too.
See: http://bugzilla.opendarwin.org/show_bug.cgi?id=6856
Index: diffutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/diffutils.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- diffutils.info 13 Jan 2007 19:45:43 -0000 1.2
+++ diffutils.info 22 Oct 2010 22:57:40 -0000 1.3
@@ -1,12 +1,33 @@
+# DISCLAIMER: Max Horn is the sole maintainer of this package.
+# Please DO NOT MAKE MODIFICATIONS without informing the maintainer.
+# Preferably, send a patch to me instead of making changes yourself!
+# If that is not possible due to extra urgency, at least send me a mail.
+#
+# Explanation: I am sick and tired of getting back to my packages and
+# discovering that people have messed with it. I am then forced to
+# retrace their steps, find out who, when and why did make a certain
+# change etc. -- i.e. it makes my life as maintainer harder.
+# Furthermore, as maintainer I am responsible for problems caused by my
+# packages. But I am not willing to take responsibility for something I
+# did not do. In particular, for changes that other people introduced
+# behind my back, no matter how good and noble their intentions were. As
+# such, I may see myself forced to drop responsibility for (and hence,
+# maintainership of) the affected package.
+
Package: diffutils
-Version: 2.8.1
+Version: 3.0
Revision: 1
-Maintainer: None <[email protected]>
+Maintainer: Max Horn <[email protected]>
Source: gnu
-Source-MD5: 71f9c5ae19b60608f6c7f162da86a428
-InstallScript: <<
-make install prefix=%i infodir=%i/share/info mandir=%i/share/man
+Source-MD5: 684aaba1baab743a2a90e52162ff07da
+BuildDepends: libgettext8-dev
+Depends: libgettext8-shlibs
+ConfigureParams: <<
+ --mandir=%p/share/man \
+ --infodir=%p/share/info \
+ --disable-dependency-tracking
<<
+InstallScript: make install DESTDIR=%d
DocFiles: ChangeLog README COPYING NEWS THANKS
InfoDocs: diff.info
Description: Tools to compare files
@@ -15,7 +36,7 @@
generate patch files which list the differences.
<<
DescPackaging: <<
- Previous versions by Christoph Pfisterer and Matt Stephenson.
+Previous versions by Christoph Pfisterer and Matt Stephenson.
<<
License: GPL
Homepage: http://www.gnu.org/software/diffutils/diffutils.html
--- NEW FILE: grep.patch ---
diff -ru grep-2.6.3/po/Makefile.in.in grep-2.6.3-patched/po/Makefile.in.in
--- grep-2.6.3/po/Makefile.in.in 2009-11-30 16:59:05.000000000 +0100
+++ grep-2.6.3-patched/po/Makefile.in.in 2010-04-04 02:37:37.000000000
+0200
@@ -30,6 +30,7 @@
datadir = @datadir@
localedir = @localedir@
gettextsrcdir = $(datadir)/gettext/po
+top_builddir = @top_builddir@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
Index: less.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/less.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- less.info 3 Feb 2010 11:18:42 -0000 1.4
+++ less.info 22 Oct 2010 22:57:40 -0000 1.5
@@ -15,13 +15,13 @@
# maintainership of) the affected package.
Package: less
-Version: 429
+Version: 436
Revision: 1001
Maintainer: Max Horn <[email protected]>
BuildDepends: libncursesw5 (>= 5.4-20041023-1001)
Depends: libncursesw5-shlibs (>= 5.4-20041023-1001)
Source: http://www.greenwoodsoftware.com/less/%n-%v.tar.gz
-Source-MD5: 206f2f13b9b0a35e45df660fcb6af31d
+Source-MD5: 817bf051953ad2dea825a1cdf460caa4
InstallScript: make install-strip prefix=%i mandir=%i/share/man
DocFiles: README COPYING LICENSE NEWS
#
Index: grep.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/grep.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- grep.info 25 Feb 2007 13:52:54 -0000 1.2
+++ grep.info 22 Oct 2010 22:57:40 -0000 1.3
@@ -15,12 +15,18 @@
# maintainership of) the affected package.
Package: grep
-Version: 2.5.1
-Revision: 3
+Version: 2.6.3
+Revision: 1
Maintainer: Max Horn <[email protected]>
Source: gnu
-Source-MD5: 85df024edc9f9689035f6b3de28c7731
-BuildDepends: pcre, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev,
libgettextpo2-dev
+Source-MD5: 3095b57837b312f087c0680559de7f13
+PatchFile: %n.patch
+PatchFile-MD5: 01d98aa5dd00007b7bce77a44f8bfdf9
+BuildDepends: <<
+ pcre, libgettext8-dev, gettext-tools,
+ libiconv-dev, libgettextpo2-dev,
+ fink (>= 0.24.12)
+<<
Depends: pcre-shlibs, libgettextpo2-shlibs
ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
InstallScript: make install DESTDIR=%d
@@ -32,5 +38,9 @@
GNU grep lets you search for specific words or patterns in text
files.
<<
+DescPackaging: <<
+Patch po/Makefile.in.in to avoid a build error (which only occurs if
+the coreutils package is *not* installed).
+<<
License: GPL
Homepage: http://www.gnu.org/software/grep/grep.html
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
