Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils
In directory vz-cvs-3.sog:/tmp/cvs-serv1734/10.7/stable/main/finkinfo/utils
Modified Files:
dos2unix-doc.info dos2unix.info
Log Message:
dos2unix: update to upstream version 6.0 and fix of buildworld warnings.
Index: dos2unix.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/dos2unix.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dos2unix.info 15 Mar 2012 09:17:14 -0000 1.4
+++ dos2unix.info 17 May 2012 17:16:01 -0000 1.5
@@ -1,5 +1,5 @@
Package: dos2unix
-Version: 5.3.3
+Version: 6.0
Revision: 1
Description: Convert DOS or Mac text files to Unix format
License: BSD
@@ -10,17 +10,29 @@
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-# Unpack Phase.
-Source: http://www.xs4all.nl/~waterlan/%n/%n-%v.tar.gz
-Source-MD5: f352d648b97197c8a786eccc832764d8
+# Unpack Phase
+Source: http://waterlan.home.xs4all.nl/%n/%n-%v.tar.gz
+Source-MD5: 2fc8d6ebe9f1a519b15ebe0850e9aabd
PatchScript: <<
sed -i.bak 's|/usr/local|%p|g' Makefile
+# reported to upstream begin
+ sed -i.bak 's|#include <string.h>|#include <string.h>\n#include
<strings.h>|g' common.h
+ sed -i.bak 's|B<7bit>|B<E<7>bit>|g' man/man1/dos2unix.pod
+ sed -i.bak 's|B<7bit>|B<E<7>bit>|g' man/es/man1/dos2unix.pod
+ sed -i.bak 's|B<7bit>|B<E<7>bit>|g' man/nl/man1/dos2unix.pod
+# reported to upstream end
+# the changes above result in msgmerge conmmand, but this fails.
+# Fix according to
+#
http://subcommanderblog.wordpress.com/2009/05/16/msgmerge-on-macosx-and-no-such-file-or-directory/
+# If everything from above is merge upstream, this should not be required any
longer,
+# but i would leave it for later need. backpus are switched off, but not
needed as well.
+ sed -i.bak 's|--backup=numbered|--backup=off|g' Makefile
<<
# Compile Phase (NOTE: there is no configure):
CompileScript: <<
- make CFLAGS=-I/usr/include
+ make CFLAGS='-I/usr/include -Wall' HTMLEXT=html
<<
# Install Phase.
@@ -37,7 +49,7 @@
ln -s dos2unix.1 %i/share/man/man1/unix2mac.1
<<
-DocFiles: *.txt dos2unix.htm
+DocFiles: *.txt dos2unix.html
# Documentation.
DescDetail: <<
@@ -63,6 +75,7 @@
-k, --keepdate keep output file date
-L, --license display software license
-l, --newline add additional newline
+ -m, --add-bom add UTF-8 Byte Order Mark
-n, --newfile write to new file
infile original file in new file mode
outfile output file in new file mode
@@ -78,5 +91,5 @@
-V, --version display version number
<<
-Homepage: http://www.xs4all.nl/~waterlan/dos2unix.html
+Homepage: http://waterlan.home.xs4all.nl/dos2unix.html
Maintainer: Karl-Michael Schindler <karl-michael.schind...@web.de>
\ No newline at end of file
Index: dos2unix-doc.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/dos2unix-doc.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dos2unix-doc.info 15 Mar 2012 09:17:14 -0000 1.4
+++ dos2unix-doc.info 17 May 2012 17:16:01 -0000 1.5
@@ -1,12 +1,12 @@
Package: dos2unix-doc
-Version: 5.3.3
+Version: 6.0
Revision: 1
Description: Documentation for dos2unix
License: BSD
# Unpack Phase.
-Source: http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-%v-doc.tar.gz
-Source-MD5: 73038af8349bd0e74b368200f6ab88c9
+Source: http://waterlan.home.xs4all.nl/dos2unix/dos2unix-%v-doc.tar.gz
+Source-MD5: e1929282ccde49e24f373b71e6bae10c
SourceDirectory: dos2unix-%v
# Compile Phase
@@ -23,5 +23,5 @@
%p/share/doc/%n
<<
-Homepage: http://www.xs4all.nl/~waterlan/dos2unix.html
+Homepage: http://waterlan.home.xs4all.nl/dos2unix.html
Maintainer: Karl-Michael Schindler <karl-michael.schind...@web.de>
\ No newline at end of file
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
