Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv876
Modified Files:
osxutils.info osxutils.patch
Log Message:
Fix build, now 64-bit ok!
Index: osxutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/osxutils.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- osxutils.info 12 Jan 2009 02:47:03 -0000 1.3
+++ osxutils.info 24 Oct 2010 00:01:59 -0000 1.4
@@ -1,70 +1,63 @@
Package: osxutils
-Version: 1.6
-Revision: 13
+Version: 1.7
+Revision: 1
License: GPL
Replaces: lsmac
HomePage: http://sourceforge.net/projects/osxutils/
-Source: mirror:sourceforge:%n/%n-%v.src.tar.bz2
-Source-MD5: 07ecfb4141dd0dabd7b79cdc3312f5ee
-SourceDirectory: %n-%v
-DocFiles: doc/CHANGES.txt doc/LICENSE.txt doc/README.txt doc/TODO.txt
+Source: mirror:sourceforge:%n/%v/%n-%v-src-xcode.zip
+Source-MD5: 7f404befd8909fa4b06adcd71c5afe22
+SourceDirectory: %n
+DocFiles: CHANGES.txt
Description: Mac-specific command-line file utilities
DescDetail: <<
osxutils is a package of potentially useful Mac-oriented command-line
- utilities for Mac OS X version 10.0 or later (although the
- functionality of some tools may be specific to later versions). These
- tools represent an effort to bring command-line control over certain
- aspects of the Mac OS, particularly file meta-data such as Finder
- flags, heritage file Type and Creator codes, icons, comments, labels
- and suffixes / file extensions. See 'man osxutils' for details.
+ utilities for Mac OS X. These tools represent an effort to bring command-line
+ control over certain aspects of the Mac OS, particularly file meta-data such
+ as Finder flags, heritage file Type and Creator codes, icons, comments, labels
+ and suffixes / file extensions.
<<
DescPackaging: <<
- uninstall.command is included for those who previously installed
- osxutils manually or via a pkg, and now wish to install it via Fink
- instead. It will not remove any osxutils components installed and
- managed by Fink.
-
- Fixes included to allow building on Tiger, make getfcomment aware of
- Spotlight comments, make rcmac compatible with GNU find, make fileinfo
- work with GCC 4.
+ - Fix 64-bit compilation.
+ - Completely rewrite 'trash' so it doesn't produce filenames like
+ 'foo copy 1 copy 1 copy 1'.
+ - Getting OS 9 comments doesn't seem to work on 10.5 and higher, so make
+ it just print a warning.
+ - The wsupdate command is probably unnecessary on 10.4 and higher, since
+ the Finder now watches for directory update notifications. But
+ perhaps there's still some situation in which it's useful, so
keep
+ it around.
+ - Use update-alternatives to resolve conflict with surfraw.
+
+ Previous version maintained by Carsten Klapp.
<<
BuildDepends: fink (>= 0.24.12-1)
PatchFile: %n.patch
-PatchFile-MD5: 823d0d45b87bde1a9fcae5403a057245
+PatchFile-MD5: d79489e3684784704572c7a9e76cb146
CompileScript: <<
- make prefix=%p
+ #!/bin/sh -ev
+ for d in fileinfo getfcomment hfsdata lsmac mkalias setfcomment
setfctypes setfflags setlabel setsuffix; do
+ pushd $d
+ gcc -fpascal-strings -framework Carbon -o $d *.c
+ popd
+ done
+ for d in geticon seticon wsupdate; do
+ pushd $d
+ gcc -fpascal-strings -framework Cocoa -o $d *.m
+ popd
+ done
<<
-NoSetCC: true
InstallScript: <<
#!/bin/sh -ev
-
- xcver=$(xcodebuild -version | grep DevToolsCore | \
- sed 's/.*DevToolsCore-//' | sed 's/\..*//')
- if [ -z "$xcver" ]
- then echo "Couldn't determine xcodebuild version" 2>&1
- exit 1
- elif [ $xcver -lt 620 ]
- then builddir="build"
- else
- builddir="build/Deployment"
- fi
-
-
- install -d -m 0755 %i/bin %i/share/man/man1 %i/share/doc/%n
- for proj in cpath fileinfo get{fcomment,icon} lsmac mkalias rcmac
set{fcomment,fctypes,fflags,icon,label,suffix} trash wiki; do
- install -m 0755 $builddir/$proj %i/bin
- install -m 0644 build/$proj.1 %i/share/man/man1
+ mkdir -p %i/bin
+ for d in *; do
+ if [ "$d" != osxutils -a -f "$d/$d" ]; then
+ cp "$d/$d" %i/bin
+ fi
done
- install -m 0755 $builddir/google %i/bin/google-osxutils
- install -m 0644 build/google.1 %i/share/man/man1/google-osxutils.1
- install -m 0644 build/osxutils.1 %i/share/man/man1/osxutils.1
- install -m 0755 $builddir/uninstall.command %i/share/doc/%n
+ mv %i/bin/google %i/bin/google-osxutils
<<
PostInstScript: <<
-update-alternatives --install %p/bin/google google %p/bin/google-osxutils -10
--slave %p/share/man/man1/google.1 google.1 %p/share/man/man1/google-osxutils.1
+update-alternatives --install %p/bin/google google %p/bin/google-osxutils -10
<<
PreRmScript: if [ $1 != "upgrade" ]; then update-alternatives --remove google
%p/bin/google-osxutils; fi
-DescPort: <<
-Previous version maintained by Carsten Klapp. Uses update-alternatives to
resolve conflict with surfraw.
-<<
-Maintainer: Dave Vasilevsky <[email protected]>
+Maintainer: Dave Vasilevsky <[email protected]>
Index: osxutils.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/osxutils.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- osxutils.patch 20 Jan 2006 20:32:32 -0000 1.1
+++ osxutils.patch 24 Oct 2010 00:01:59 -0000 1.2
@@ -1,9 +1,19 @@
-diff -Naur osxutils-old/src/fileinfo.c osxutils-new/src/fileinfo.c
---- osxutils-old/src/fileinfo.c 2004-12-19 17:57:45.000000000 -0500
-+++ osxutils-new/src/fileinfo.c 2005-06-06 04:36:41.000000000 -0400
-@@ -199,6 +199,15 @@
-
+diff -Naur osxutils/cpath/cpath osxutils-new/cpath/cpath
+--- osxutils/cpath/cpath 2005-06-12 10:37:41.000000000 -0400
++++ osxutils-new/cpath/cpath 2010-10-23 19:46:12.000000000 -0400
+@@ -1,3 +1,3 @@
+ #!/bin/sh
[...1783 lines suppressed...]
+-foreach $argnum ($cnt .. $#ARGV)
+-{
+- $cnt = 1;
+- @path_segs = split(/\//, $ARGV[$argnum]);
+- while (-e "$ENV{HOME}/.Trash/$path_segs[$#path_segs]")
+- {
+- $path_segs[$#path_segs] .= " copy $cnt";
++my $trash = catfile($ENV{HOME}, '.Trash');
++foreach my $arg (@ARGV) {
++ my $cnt = 1;
++ my $base = basename($arg);
++ my $tname = catfile($trash, $base);
++ while (-e $tname) {
++ $tname = catfile($trash, "$base copy $cnt");
++ ++$cnt;
+ }
+- system("mv '$ARGV[$argnum]' '$ENV{HOME}/.Trash/$path_segs[$#path_segs]'");
++ move($arg, $tname);
+ }
+\ No newline at end of file
------------------------------------------------------------------------------
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
