Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31003/sci
Modified Files:
dcmtk.info dcmtk.patch
Log Message:
Update from maintainer to fix build on 10.6.
https://sourceforge.net/tracker/?func=detail&aid=3072852&group_id=17203&atid=414256
Worked for me on 10.6/i386 and 10.5/powerpc
Index: dcmtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/dcmtk.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dcmtk.info 29 May 2009 01:24:35 -0000 1.4
+++ dcmtk.info 21 Sep 2010 19:53:10 -0000 1.5
@@ -1,14 +1,14 @@
Package: dcmtk
Version: 3.5.4
-Revision: 1002
+Revision: 1003
Maintainer: Bernd Kuemmerlen <bkuem...@mevis.de>
Depends: libjpeg-shlibs, libtiff-shlibs, libpng3-shlibs, libxml2-shlibs
BuildDepends: libjpeg, libtiff, libpng3, libxml2, system-openssl-dev, fink (>=
0.24.12)
-Conflicts: dcmtk-ssl (<< 3.5.4-1001)
-Replaces: dcmtk-ssl (<< 3.5.4-1001)
+Conflicts: dcmtk-ssl (<< 3.5.4-1002)
+Replaces: dcmtk-ssl (<< 3.5.4-1002)
Source:
ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/dcmtk-%v.tar.gz
PatchFile: %n.patch
-PatchFile-MD5: a099214d76c70c468cb9ab7216737dd1
+PatchFile-MD5: eb11f0e4911c10635f622bf0f860f773
ConfigureParams: --with-libtiff --with-libpng --with-libxml --with-openssl
--with-libs=%p/lib/system-openssl
GCC: 4.0
NoSetLDFLAGS: true
Index: dcmtk.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/dcmtk.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dcmtk.patch 29 May 2009 01:24:35 -0000 1.2
+++ dcmtk.patch 21 Sep 2010 19:53:10 -0000 1.3
@@ -1,31 +1,27 @@
diff -urN dcmtk-3.5.4/config/configure.in
dcmtk-3.5.4-patched/config/configure.in
--- dcmtk-3.5.4/config/configure.in 2005-12-14 18:33:38.000000000 +0100
-+++ dcmtk-3.5.4-patched/config/configure.in 2007-11-15 23:56:21.000000000
+0100
-@@ -496,6 +496,10 @@
++++ dcmtk-3.5.4-patched/config/configure.in 2010-09-20 17:54:48.000000000
+0200
+@@ -492,7 +492,7 @@
+ ;;
+ *-*-netbsdelf2*)
+ ;;
+- *-*-darwin8.*)
++ *-*-darwin[[8-9]].*|*-*-darwin10.*)
CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CXXFLAGS"
CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CFLAGS"
;;
-+ *-*-darwin9.*)
-+ CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CXXFLAGS"
-+ CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CFLAGS"
-+ ;;
- *)
- CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
- CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
-@@ -532,6 +536,10 @@
+@@ -528,7 +528,7 @@
+ CXXFLAGS="-D_POSIX_C_SOURCE=199506L $CXXFLAGS"
+ CFLAGS="-D_POSIX_C_SOURCE=199506L $CFLAGS"
+ ;;
+- *-*-darwin8.*)
++ *-*-darwin[[8-9]].*|*-*-darwin10.*)
CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CXXFLAGS"
CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CFLAGS"
;;
-+ *-*-darwin9.*)
-+ CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CXXFLAGS"
-+ CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -D_BSD_COMPAT
-D_OSF_SOURCE $CFLAGS"
-+ ;;
- *)
- CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
- CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
diff -urN dcmtk-3.5.4/dcmdata/apps/Makefile.in
dcmtk-3.5.4-patched/dcmdata/apps/Makefile.in
--- dcmtk-3.5.4/dcmdata/apps/Makefile.in 2005-10-25 15:01:02.000000000
+0200
-+++ dcmtk-3.5.4-patched/dcmdata/apps/Makefile.in 2007-11-16
00:00:06.000000000 +0100
++++ dcmtk-3.5.4-patched/dcmdata/apps/Makefile.in 2010-09-20
17:53:30.000000000 +0200
@@ -73,13 +73,18 @@
done
@@ -52,7 +48,7 @@
clean:
diff -urN dcmtk-3.5.4/dcmdata/libsrc/Makefile.in
dcmtk-3.5.4-patched/dcmdata/libsrc/Makefile.in
--- dcmtk-3.5.4/dcmdata/libsrc/Makefile.in 2005-12-09 16:04:37.000000000
+0100
-+++ dcmtk-3.5.4-patched/dcmdata/libsrc/Makefile.in 2007-11-16
00:00:06.000000000 +0100
++++ dcmtk-3.5.4-patched/dcmdata/libsrc/Makefile.in 2010-09-20
17:53:30.000000000 +0200
@@ -56,12 +56,17 @@
$(INSTALL_DATA) $(library) $(libdir)/$(library)
@@ -76,7 +72,7 @@
diff -urN dcmtk-3.5.4/dcmsr/apps/Makefile.in
dcmtk-3.5.4-patched/dcmsr/apps/Makefile.in
--- dcmtk-3.5.4/dcmsr/apps/Makefile.in 2004-05-05 15:37:17.000000000 +0200
-+++ dcmtk-3.5.4-patched/dcmsr/apps/Makefile.in 2007-11-16 00:00:06.000000000
+0100
++++ dcmtk-3.5.4-patched/dcmsr/apps/Makefile.in 2010-09-20 17:53:30.000000000
+0200
@@ -49,9 +49,14 @@
done
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
