Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2588
Modified Files:
dcmtk.info dcmtk.patch
Log Message:
Update from -submissions
https://sourceforge.net/tracker/index.php?func=detail&aid=2796355&group_id=17203&atid=414256
Tested on 10.5.7/i386
Index: dcmtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/dcmtk.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dcmtk.info 12 Jan 2009 05:05:48 -0000 1.3
+++ dcmtk.info 29 May 2009 01:24:35 -0000 1.4
@@ -1,21 +1,20 @@
Package: dcmtk
Version: 3.5.4
-Revision: 1001
+Revision: 1002
Maintainer: Bernd Kuemmerlen <bkuem...@mevis.de>
Depends: libjpeg-shlibs, libtiff-shlibs, libpng3-shlibs, libxml2-shlibs
-BuildDepends: fink (>= 0.24.12-1), gcc4.0, libjpeg, libtiff, libpng3, libxml2
-Conflicts: dcmtk-ssl
-Replaces: dcmtk-ssl
+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)
Source:
ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/dcmtk-%v.tar.gz
PatchFile: %n.patch
-PatchFile-MD5: 339f34847327788b0247c417d5a15d53
-ConfigureParams: --with-libtiff --with-libpng --with-libxml --without-openssl
+PatchFile-MD5: a099214d76c70c468cb9ab7216737dd1
+ConfigureParams: --with-libtiff --with-libpng --with-libxml --with-openssl
--with-libs=%p/lib/system-openssl
GCC: 4.0
-SetCXX: g++-4.0
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
CompileScript: <<
- cd config; ./rootconf
+ cd config; ./autoall; ./rootconf
./configure %c
make all
<<
@@ -49,4 +48,13 @@
<<
Homepage: http://dicom.offis.de/dcmtk/
License: BSD
-Source-MD5: 0afd971cdf976a5b336722ef2f68e6d7
\ No newline at end of file
+Source-MD5: 0afd971cdf976a5b336722ef2f68e6d7
+SplitOff: <<
+ Package: %N-ssl
+ Depends: %N (= %v-%r), fink-obsolete-packages
+ InstallScript: <<
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%n
+ <<
+ Description: Placeholder package to update to unified %N. (OBSOLETE)
+<<
\ No newline at end of file
Index: dcmtk.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/dcmtk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dcmtk.patch 7 Mar 2006 20:01:58 -0000 1.1
+++ dcmtk.patch 29 May 2009 01:24:35 -0000 1.2
@@ -1,6 +1,31 @@
+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 @@
+ 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 @@
+ 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 2005-12-23
13:17:49.000000000 +0100
++++ dcmtk-3.5.4-patched/dcmdata/apps/Makefile.in 2007-11-16
00:00:06.000000000 +0100
@@ -73,13 +73,18 @@
done
@@ -27,7 +52,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 2005-12-23
13:29:08.000000000 +0100
++++ dcmtk-3.5.4-patched/dcmdata/libsrc/Makefile.in 2007-11-16
00:00:06.000000000 +0100
@@ -56,12 +56,17 @@
$(INSTALL_DATA) $(library) $(libdir)/$(library)
@@ -51,7 +76,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 2005-12-23 13:19:59.000000000
+0100
++++ dcmtk-3.5.4-patched/dcmsr/apps/Makefile.in 2007-11-16 00:00:06.000000000
+0100
@@ -49,9 +49,14 @@
done
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
