Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31036/10.4/unstable/main/finkinfo/sci
Modified Files:
dcmtk.info
Added Files:
dcmtk.patch
Log Message:
New version from tracker (Submissions #1388718) claims to fix gcc4
Index: dcmtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/dcmtk.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dcmtk.info 16 Feb 2006 16:56:21 -0000 1.1
+++ dcmtk.info 7 Mar 2006 20:01:58 -0000 1.2
@@ -1,42 +1,29 @@
Package: dcmtk
-Version: 3.5.2
-Revision: 1011
+Version: 3.5.4
+Revision: 1001
Maintainer: Bernd Kuemmerlen <[EMAIL PROTECTED]>
-Depends: libtiff-bin
-BuildDepends: libtiff
+Depends: libjpeg-shlibs, libtiff-shlibs, libpng3-shlibs, libxml2-shlibs
+BuildDepends: gcc4.0, libjpeg, libtiff, libpng3, libxml2
Conflicts: dcmtk-ssl
Replaces: dcmtk-ssl
-Source: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk352.tar.gz
-SourceDirectory: dcmtk
-ConfigureParams: --with-libtiff --enable-std-includes
+Source:
ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/dcmtk-%v.tar.gz
+Patch: %n.patch
+ConfigureParams: --with-libtiff --with-libpng --with-libxml --without-openssl
GCC: 4.0
+SetCXX: g++-4.0
NoSetLDFLAGS: true
+SetLIBS: -L%p/lib
CompileScript: <<
cd config; ./rootconf
./configure %c
make all
<<
InstallScript: <<
-make install prefix=%i
+make install prefix=%i mandir=%i/share/man docdir=%i/share/doc/%n
datadir=%i/share/%n
make install-lib prefix=%i
-mv -f %i/include %i/dcmtk
-mkdir -p %i/include
-mv -f %i/dcmtk %i/include/
<<
DocFiles: <<
-CHANGES.352 COPYRIGHT FAQ HISTORY README
-config/docs/*.txt
-dcmdata/docs/*.txt
-dcmimage/docs/*.txt
-dcmimgle/docs/*.txt
-dcmjpeg/docs/*.txt
-dcmnet/docs/*.txt
-dcmpstat/docs/*.txt
-dcmsign/docs/*.txt
-dcmsr/docs/*.txt
-dcmtls/docs/*.txt
-dcmwlm/docs/*.txt
-imagectn/docs/*.txt
+CHANGES.354 README
<<
Description: Collection of DICOM libs and applications
DescDetail: <<
@@ -55,8 +42,10 @@
information.
<<
DescPort: <<
-Natively supports Mac OSX.
+This port includes a patch from the Debian distribution to correctly
+install the dicom.dic file into share/ instead of lib/, see
+http://forum.dcmtk.org/viewtopic.php?t=572 for more information.
<<
Homepage: http://dicom.offis.de/dcmtk/
License: BSD
-Source-MD5: 6b2e792fa91a785b65483f809e383013
+Source-MD5: 0afd971cdf976a5b336722ef2f68e6d7
\ No newline at end of file
--- NEW FILE: dcmtk.patch ---
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
@@ -73,13 +73,18 @@
done
install-support:
- $(configdir)/mkinstalldirs $(libdir)
+ if [ "x$(prefix)" = "x" ] ; then \
+ SUPPORTPATH="$(libdir)" ;\
+ else \
+ SUPPORTPATH="$(datadir)" ;\
+ fi ; \
+ $(configdir)/mkinstalldirs $$SUPPORTPATH ;\
for file in $(support_lib); do \
- $(INSTALL_DATA) $$file $(libdir) ;\
- done
- $(configdir)/mkinstalldirs $(datadir)
+ $(INSTALL_DATA) $$file $$SUPPORTPATH ;\
+ done ;\
+ $(configdir)/mkinstalldirs $$SUPPORTPATH ;\
for file in $(support_data); do \
- $(INSTALL_DATA) $$file $(datadir) ;\
+ $(INSTALL_DATA) $$file $$SUPPORTPATH ;\
done
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
@@ -56,12 +56,17 @@
$(INSTALL_DATA) $(library) $(libdir)/$(library)
install-support: $(DICTFILE) $(PRIVDICTFILE)
- $(configdir)/mkinstalldirs $(libdir)
+ if [ "x$(prefix)" = "x" ] ; then \
+ DICTPATH="$(libdir)" ; \
+ else \
+ DICTPATH="$(datadir)" ; \
+ fi ; \
+ $(configdir)/mkinstalldirs $$DICTPATH ; \
if [ "x$(INSTALL_PRIVATE_DICTIONARY)" = "xYES" ] ; then \
cat $(DICTFILE) $(PRIVDICTFILE) >dicom.tmp ; \
- $(INSTALL_DATA) dicom.tmp $(libdir)/dicom.dic ; \
+ $(INSTALL_DATA) dicom.tmp $$DICTPATH/dicom.dic ; \
else \
- $(INSTALL_DATA) $(DICTFILE) $(libdir)/dicom.dic ; \
+ $(INSTALL_DATA) $(DICTFILE) $$DICTPATH/dicom.dic ; \
fi
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
@@ -49,9 +49,14 @@
done
install-support:
- $(configdir)/mkinstalldirs $(libdir)
+ if [ "x$(prefix)" = "x" ] ; then \
+ SUPPORTPATH="$(libdir)" ;\
+ else \
+ SUPPORTPATH="$(datadir)" ;\
+ fi ; \
+ $(configdir)/mkinstalldirs $$SUPPORTPATH ;\
for file in $(support); do \
- $(INSTALL_DATA) $$file $(libdir) ;\
+ $(INSTALL_DATA) $$file $$SUPPORTPATH ;\
done
clean:
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
