gentoo resync : 29.08.2018

5 files changed, 359 insertions, 6 deletions

diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 8e99e47e2d1f..3c62edbdc6a7 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,6 +1,8 @@
 AUX 01_fix_perl_script_path.patch 8946 BLAKE2B 76f69ab764a150539732cfa71014bf8b4d50ae5f43352c244ee3eb8bf3048a6cd213198f12e89a560206dfb465d9a02416d8490b099bf2792865415d4b5a74ad SHA512 002b6fe72068a185ecf87ecf04990e8b085593aeee1faa399aacc64de2810f45ecfb181cac9651a37a07719b41cf0029176404ce33264e196350ff701b51f18a
 AUX 02_dcmtk_3.6.0-1.patch 3245 BLAKE2B 0aa7fae29baeacfddf676324ed13f8386be94129e45e3e8e5e4355491e2418177600b102b9b47e2969277b095f0d4d7c0d7c07ad931f788290c4ff8a69acb695 SHA512 369ee28f0d30f7aaa6f204aa45a4314218eb6ed070dc1e3a557802d62956ec3bdf8dcc1490c0b7b879d1a2e9145aa8bf0de691ef32e2bc7dd9270f63cc31f68a
 AUX 04_nostrip.patch 7339 BLAKE2B 1ff0efe77ba2d277e5d3eceec6de5ed3bd9bc0df415909584d95c74b2d40507b8a1a10eed0956182c944190c8f70fec2ecf68528b4f2f6916ae4c4064a311eb1 SHA512 7f8fb30a4ad4b2b0ab6ace37afb618efc3faed6af3dbed6793ff8c61dfd0a99aa26b880e6c0cc7addfffa008044ba8e81e622f94bebf6152cb0bd273da023e29
+AUX dcmtk-3.6.3-dcmqrdb-cfg.patch 3031 BLAKE2B 9fd21949e42c7f0c479db7d9b81c133837bec4ba68554e463d253c47b451ded6e1d74aa8d545ca10220570be48021f8640eb47f63706ad517ee0ae6c6b2fa2cf SHA512 2487f88a650e299cc6a2011ba12f74bd2c305c4d8aad57034b04f99f4c0095505f6e000cada9fcafe466590719c0678735cafec0254d473c48e171c3adc91d9a
+AUX dcmtk-3.6.3-nostrip.patch 7049 BLAKE2B 57d7b4d2cc3bdd683cb6c51c6d9c7e37023ddaf255655cf3f6c1473484d4e41d4a75b3bcb452a3caa06b8c751cfca47a14b0cd10372c1ebde936f7dec3046ed0 SHA512 00f28de0995c2d38b32b59298ac1c97878248647d403df86244d16a16cfd4c7ba47e7fe400592e5ac0f935a3704733a768fa3b94c9625903e86ab5f714d093bd
 AUX dcmtk-asneeded.patch 4403 BLAKE2B 14323df7dccad5de0f4746a025c25ed9fb92964c0acecacd25a9aed9d00e655e9681800cc4eb6fef562fbc2b941542d119b3f0531ec2dd0670c4c768be2a96ec SHA512 629b6cc819c0440b9173ca09343309399abaa1cd23b92f7a2a78b732508140c9b6f9885f38c18328dc9b3dc5e86534940595380fac9223c2fb45c901c9f1222c
 AUX dcmtk-fix_doc_install.patch 877 BLAKE2B 70b85d1e1747b309413c5ba2c201eaccf52dadf93e84a18bfd0dd8a202b1fa5f1a10755c6cca7b2dd8feb5df10bd6c3565de6bae4ec83d997ec17213f8fe2903 SHA512 243d4fe9c3259f852de3e662e5b3914a9ea8e22ebdd7992b61561f9e26d04fc2b78a1045eca63791d13ad34dcc26c3e9a76b750a1b7b1cc1040151cb454903b2
 AUX dcmtk-gcc472-error.patch 13994 BLAKE2B d9f376ea78c181c24caddb7fddcdf2a83fbee587e98152fd47048f84c8871611004fb01903e66fdfd054b92bae79c13f616e734be54436e8abda918d09e7abd8 SHA512 d408a83cd7b1de08041ff2c3df7ee3a766ffa31a7085c8a1e853de6fd3d4d871557a5b2a2a417c52953a4bcc4ed2d5f813cd3a5170fb27482caec60ff1361eac
@@ -8,5 +10,7 @@ AUX dcmtk_version_number.patch 5439 BLAKE2B 91f3a39227bb7c6a70005dca060709a5e976
 AUX png_tiff.patch 620 BLAKE2B a4bf8a55581723131f27a513f7e16550be70012b85f709bc54e4a4404a72f2211571f41be00e64042a520f7a51740a3d09a76e7889ff7fbc925102ac7a618892 SHA512 b6c30e40ffcabf77f3dd04dbf5ba76ac0e86972e06eec81a1833c472099e7b207c4343208dc756f650f5b5ff77df6b950b0acb24c43029f30e2d67a3f882fab2
 AUX regression_stacksequenceisodd.patch 4989 BLAKE2B 4a2ab9cb535d6d643b6b92134e5ebb53f25d600e6e744ee6ab51ee66b4fd1d37570c321c4b957678d28f5c0c94dfc112faafb07de01beccb45ad6152fd30f916 SHA512 bb126c947646ca3274863b8517478e738fcbe16f3e1e0bb75b8601ad2b5e6492400f96a89aaf25f683b06f6f3f9dad76391d5adc62177496cbffc0309aa7dc72
 DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c
-EBUILD dcmtk-3.6.0.ebuild 2344 BLAKE2B 6180ee0edfe4536ac962d506a25a0a615fbf20b776bd4c0867f393b3db37a910fc1f64c277b433d0d07e695e987d3b67bf0e8e483f9f09e1ec07970c307e2f2a SHA512 61db7e555592693e1eab72421148d9d7bb725dad6b944f52ca543dd93a1817e7e8beed7368e62e0896a6c212cc465d3e3befd56b640db7cd2616edf2df4727d6
+DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
+EBUILD dcmtk-3.6.0.ebuild 2337 BLAKE2B ba98732e46fe8a25081bb6e2bc633b492e1fdb9c8180735a5516cd077faf298be5b022e8265d2b1f30ec4ad1c8a12eb1d0df7aa248c8991024cfbf22773ff1d0 SHA512 2af5f13e108f90614fb59da36887b49ca3adb5bfc4676997b9adbf75c770406af41588747c821cac2a731ebde1bf3540a9d6ae781495d6cc21304040d921302e
+EBUILD dcmtk-3.6.3.ebuild 2001 BLAKE2B 86e238bd4e5c4c407b586d00ba35647b76a90d115627950449a34da2b6ba22b2731317763c52fd5297a2f9cb7bfbd875aa2578620e938d9bed4a821f0458d666 SHA512 a2ffe250b409318886005a092c349dc510d754c46629fa23cfbdef1ab423876e43141c721784a6d19e3ddbbfdd829398731c88a4684c2a549fddd36dcf4d5ff1
 MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68
diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index 414724b2e234..1a94d20b5063 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 	# fix -D deprecation warnings
 	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
 		"${S}"/config/configure.in \
-		"${S}"/CMakeLists.txt
+		"${S}"/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -74,7 +74,7 @@ src_configure() {
 	cmake-utils_src_configure
 
 	if use doc; then
-		cd "${S}"/doxygen
+		cd "${S}"/doxygen || die
 		econf
 	fi
 }
@@ -83,16 +83,16 @@ src_compile() {
 	cmake-utils_src_compile
 
 	if use doc; then
-		emake -C "${S}"/doxygen || die
+		emake -C "${S}"/doxygen
 	fi
 }
 
 src_install() {
 	cmake-utils_src_install
 
-	doman doxygen/manpages/man1/* || die
+	doman doxygen/manpages/man1/*
 
 	if use doc; then
-		dohtml -r "${S}"/doxygen/htmldocs/* || die
+		dohtml -r "${S}"/doxygen/htmldocs/*
 	fi
 }
diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
new file mode 100644
index 000000000000..463fca72dfb1
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="The DICOM Toolkit"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
+SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/${PN}/${PN}363/${P}.tar.gz"
+
+LICENSE="OFFIS"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="doc png ssl tcpd tiff +threads xml zlib"
+
+RDEPEND="
+	dev-libs/icu:=
+	virtual/jpeg:0
+	png? ( media-libs/libpng:* )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	media-gfx/graphviz
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dcmqrdb-cfg.patch
+	"${FILESDIR}"/${P}-nostrip.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:share/doc/dcmtk:&-${PV}:" \
+		-e "s:DIR \"/:DIR \"/usr/:" \
+		-e "s:usr/etc:etc:" \
+		-e "s:/lib\":/$(get_libdir)\":" \
+		-e "s:COPYRIGHT::" \
+		-i CMakeLists.txt || die
+	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
+		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
+	# Temporary workaround: docs are not built with CMake
+	sed -i -e '/include/d' doxygen/Makefile.in || die
+
+	# fix -D deprecation warnings
+	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
+		"${S}"/config/configure.in \
+		"${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DDCMTK_WITH_ICU=ON
+		-DDCMTK_WITH_TIFF=$(usex tiff)
+		-DDCMTK_WITH_PNG=$(usex png)
+		-DDCMTK_WITH_XML=$(usex xml)
+		-DDCMTK_WITH_ZLIB=$(usex zlib)
+		-DDCMTK_WITH_OPENSSL=$(usex ssl)
+		-DDCMTK_WITH_DOXYGEN=$(usex doc)
+		-DDCMTK_WITH_THREADS=$(usex threads)
+	)
+
+	cmake-utils_src_configure
+
+	if use doc; then
+		cd "${S}"/doxygen || die
+		econf
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		emake -C "${S}"/doxygen
+	fi
+}
+
+src_install() {
+	doman doxygen/manpages/man1/*
+
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
+	fi
+	cmake-utils_src_install
+}
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
new file mode 100644
index 000000000000..4ccb58d4e34d
--- /dev/null
+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
@@ -0,0 +1,87 @@
+Author: Jürgen Salk <jsa@debian.org>
+Description: The original maintainer Jürgen Salk applied
+ a set of patches to the original code.  This file contains
+ changes to C++ code
+
+Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
+===================================================================
+--- a/dcmqrdb/etc/dcmqrscp.cfg	2010-09-09 19:20:25.000000000 +0200
++++ b/dcmqrdb/etc/dcmqrscp.cfg	2011-01-28 09:49:02.000000000 +0100
+@@ -10,7 +10,9 @@
+ NetworkTCPPort  = 104
+ MaxPDUSize      = 16384
+ MaxAssociations = 16
++UserName        = "dcmtk"
++GroupName       = "dcmtk"
+ 
+ #
+ # Default settings for specific character set behavior:
+ # SpecificCharacterSet = fallback
+@@ -28,12 +30,13 @@
+ # NOTE: in the current implementation you cannot substitute an IP address
+ # for a hostname.
+ #
+-acme1           = (ACME1, acmehost1, 5678)
+-acme2           = (ACME2, acmehost2, 5678)
+-acmeCTcompany   = acme1, acme2
+-united1         = (UNITED1, unitedhost1, 104)
+-united2         = (UNITED2, unitedhost2, 104)
+-unitedMRcompany = united1, united2
++# Example:
++#acme1           = (ACME1, acmehost1, 5678)
++#acme2           = (ACME2, acmehost2, 5678)
++#acmeCTcompany   = acme1, acme2
++#united1         = (UNITED1, unitedhost1, 104)
++#united2         = (UNITED2, unitedhost2, 104)
++#unitedMRcompany = united1, united2
+ #
+ HostTable END
+ 
+@@ -51,8 +54,9 @@
+ #       VendorName = SymbolicName
+ # The symbolic name should be defined in the HostTable.
+ #
+-"Acme CT Company"   = acmeCTcompany
+-"United MR Company" = unitedMRcompany
++# Example:
++#"Acme CT Company"   = acmeCTcompany
++#"United MR Company" = unitedMRcompany
+ #
+ VendorTable END
+ 
+@@ -70,8 +74,13 @@
+ #               Entry in HostTable                      |
+ #               ANY
+ #
+-COMMON       /home/dicom/db/COMMON       R  (200, 1024mb) ANY
+-ACME_STORE   /home/dicom/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
+-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
++# Example:
++#
++#ACME_STORE   /var/lib/dcmtk/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
++#
++# Uncomment and adjust the following lines for a common r/rw storage area:
++#READWRITE     /var/lib/dcmtk/db/READWRITE    RW (10, 1024mb)  ANY
++#READ          /var/lib/dcmtk/db/READ         R  (200, 1024mb) ANY
+ #
+ AETable END
+Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
+--- a/dcmqrdb/docs/dcmqrcnf.txt	2010-09-09 19:20:12.000000000 +0200
++++ b/dcmqrdb/docs/dcmqrcnf.txt	2011-01-28 09:46:02.000000000 +0100
+@@ -44,8 +44,8 @@
+ MaxPDUSize           = 8192
+ MaxAssociations      = 20
+ SpecificCharacterSet = fallback
+-UserName             = (do not change user)
+-GroupName            = (do not change group)
++UserName             = "dcmtk"
++GroupName            = "dcmtk"
+ 
+ Available options for specific character sets are:
+ 
+Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile	2011-01-28 09:46:02.000000000 +0100
+@@ -0,0 +1 @@
++
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
new file mode 100644
index 000000000000..83bd3a62fd90
--- /dev/null
+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
@@ -0,0 +1,171 @@
+Remove all hardcoded calls to `strip` command
+
+Index: dcmtk-3.6.0/config/templates/Makefile.src
+===================================================================
+--- a/config/templates/Makefile.src	2009-01-30 10:27:58.000000000 +0100
++++ b/config/templates/Makefile.src	2011-01-28 09:53:28.000000000 +0100
+@@ -31,7 +31,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in
+===================================================================
+--- a/dcmdata/apps/Makefile.in	2009-11-04 10:58:05.000000000 +0100
++++ b/dcmdata/apps/Makefile.in	2011-01-28 09:53:45.000000000 +0100
+@@ -76,7 +76,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in
+===================================================================
+--- a/dcmimage/apps/Makefile.in	2009-10-13 16:08:33.000000000 +0200
++++ b/dcmimage/apps/Makefile.in	2011-01-28 09:53:59.000000000 +0100
+@@ -42,7 +42,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in
+===================================================================
+--- a/dcmimgle/apps/Makefile.in	2009-10-28 10:53:39.000000000 +0100
++++ b/dcmimgle/apps/Makefile.in	2011-01-28 09:54:11.000000000 +0100
+@@ -39,7 +39,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in
+===================================================================
+--- a/dcmjpeg/apps/Makefile.in	2009-10-07 14:44:33.000000000 +0200
++++ b/dcmjpeg/apps/Makefile.in	2011-01-28 09:54:28.000000000 +0100
+@@ -72,7 +72,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ clean:
+Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in
+===================================================================
+--- a/dcmnet/apps/Makefile.in	2009-11-04 11:24:29.000000000 +0100
++++ b/dcmnet/apps/Makefile.in	2011-01-28 09:54:50.000000000 +0100
+@@ -52,7 +52,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in
+===================================================================
+--- a/dcmpstat/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
++++ b/dcmpstat/apps/Makefile.in	2011-01-28 09:55:10.000000000 +0100
+@@ -113,7 +113,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in
+===================================================================
+--- a/dcmqrdb/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
++++ b/dcmqrdb/apps/Makefile.in	2011-01-28 09:55:24.000000000 +0100
+@@ -57,7 +57,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in
+===================================================================
+--- a/dcmsign/apps/Makefile.in	2009-09-04 17:42:31.000000000 +0200
++++ b/dcmsign/apps/Makefile.in	2011-01-28 09:55:35.000000000 +0100
+@@ -33,7 +33,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in
+===================================================================
+--- a/dcmsr/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
++++ b/dcmsr/apps/Makefile.in	2011-01-28 09:55:48.000000000 +0100
+@@ -44,7 +44,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in
+===================================================================
+--- a/dcmwlm/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
++++ b/dcmwlm/apps/Makefile.in	2011-01-28 09:55:58.000000000 +0100
+@@ -49,7 +49,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in
+===================================================================
+--- a/dcmrt/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
++++ b/dcmrt/apps/Makefile.in	2011-01-28 09:56:33.000000000 +0100
+@@ -55,7 +55,7 @@
+ install-bin: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+ 
+Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in
+===================================================================
+--- a/dcmjpls/apps/Makefile.in	2011-01-28 09:56:54.000000000 +0100
++++ b/dcmjpls/apps/Makefile.in	2011-01-28 09:57:00.000000000 +0100
+@@ -71,7 +71,7 @@
+ install: all
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for prog in $(progs); do \
+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
+ 	done
+ 
+