Christian Weisgerber <[email protected]> writes:
> I don't know how far ahead or behind sthen@'s and espie@'s builds
> are, but here's some of the current ports breakage I'm seeing:
>
> llvm update:
> www/mozilla-firefox
> www/seamonkey
>
> RAND_egd(_bytes) removal:
> graphics/dcmtk
This fixes the build for me.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/dcmtk/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 24 Mar 2014 17:00:08 -0000 1.13
+++ Makefile 21 Apr 2014 17:56:42 -0000
@@ -3,7 +3,7 @@
COMMENT= DICOM toolkit
DISTNAME= dcmtk-3.5.4
-REVISION= 2
+REVISION= 3
CATEGORIES= graphics
Index: patches/patch-dcmtls_libsrc_tlslayer_cc
===================================================================
RCS file: /cvs/ports/graphics/dcmtk/patches/patch-dcmtls_libsrc_tlslayer_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-dcmtls_libsrc_tlslayer_cc
--- patches/patch-dcmtls_libsrc_tlslayer_cc 7 Oct 2010 04:19:47 -0000
1.1
+++ patches/patch-dcmtls_libsrc_tlslayer_cc 21 Apr 2014 17:56:26 -0000
@@ -1,7 +1,9 @@
$OpenBSD: patch-dcmtls_libsrc_tlslayer_cc,v 1.1 2010/10/07 04:19:47 benoit Exp
$
---- dcmtls/libsrc/tlslayer.cc.orig Wed Oct 6 22:10:42 2010
-+++ dcmtls/libsrc/tlslayer.cc Wed Oct 6 22:10:53 2010
-@@ -188,7 +188,7 @@
+- picky g++ is picky
+- we don't have RAND_egd anymore
+--- dcmtls/libsrc/tlslayer.cc.orig Thu Dec 8 16:48:28 2005
++++ dcmtls/libsrc/tlslayer.cc Mon Apr 21 19:55:40 2014
+@@ -188,7 +188,7 @@ DcmTLSTransportLayer::DcmTLSTransportLayer(int network
SSLeay_add_all_algorithms();
seedPRNG(randFile);
@@ -10,3 +12,12 @@ $OpenBSD: patch-dcmtls_libsrc_tlslayer_c
switch (networkRole)
{
case DICOM_APPLICATION_ACCEPTOR:
+@@ -375,7 +375,7 @@ void DcmTLSTransportLayer::seedPRNG(const char *randFi
+ #endif
+ if (randFile)
+ {
+- if (RAND_egd(randFile) <= 0)
++ if (1)
+ {
+ RAND_load_file(randFile ,-1);
+ }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/dcmtk/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 10 Apr 2008 10:09:56 -0000 1.1.1.1
+++ pkg/PLIST 21 Apr 2014 18:23:48 -0000
@@ -1,50 +1,50 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/04/10 10:09:56 djm Exp $
-bin/dcm2pnm
-bin/dcm2xml
-bin/dcmcjpeg
-bin/dcmconv
-bin/dcmcrle
-bin/dcmdjpeg
-bin/dcmdrle
-bin/dcmdspfn
-bin/dcmdump
-bin/dcmftest
-bin/dcmgpdir
-bin/dcmj2pnm
-bin/dcmmkcrv
-bin/dcmmkdir
-bin/dcmmklut
-bin/dcmodify
-bin/dcmp2pgm
-bin/dcmprscp
-bin/dcmprscu
-bin/dcmpschk
-bin/dcmpsmk
-bin/dcmpsprt
-bin/dcmpsrcv
-bin/dcmpssnd
-bin/dcmqridx
-bin/dcmqrscp
-bin/dcmqrti
-bin/dcmquant
-bin/dcmscale
-bin/dcmsign
-bin/dcod2lum
-bin/dconvlum
-bin/dsr2html
-bin/dsr2xml
-bin/dsrdump
-bin/dump2dcm
-bin/echoscu
-bin/findscu
-bin/movescu
-bin/pdf2dcm
-bin/storescp
-bin/storescu
-bin/termscu
-bin/wlmscpfs
-bin/xml2dcm
-bin/xml2dsr
+@bin bin/dcm2pnm
+@bin bin/dcm2xml
+@bin bin/dcmcjpeg
+@bin bin/dcmconv
+@bin bin/dcmcrle
+@bin bin/dcmdjpeg
+@bin bin/dcmdrle
+@bin bin/dcmdspfn
+@bin bin/dcmdump
+@bin bin/dcmftest
+@bin bin/dcmgpdir
+@bin bin/dcmj2pnm
+@bin bin/dcmmkcrv
+@bin bin/dcmmkdir
+@bin bin/dcmmklut
+@bin bin/dcmodify
+@bin bin/dcmp2pgm
+@bin bin/dcmprscp
+@bin bin/dcmprscu
+@bin bin/dcmpschk
+@bin bin/dcmpsmk
+@bin bin/dcmpsprt
+@bin bin/dcmpsrcv
+@bin bin/dcmpssnd
+@bin bin/dcmqridx
+@bin bin/dcmqrscp
+@bin bin/dcmqrti
+@bin bin/dcmquant
+@bin bin/dcmscale
+@bin bin/dcmsign
+@bin bin/dcod2lum
+@bin bin/dconvlum
+@bin bin/dsr2html
+@bin bin/dsr2xml
+@bin bin/dsrdump
+@bin bin/dump2dcm
+@bin bin/echoscu
+@bin bin/findscu
+@bin bin/movescu
+@bin bin/pdf2dcm
+@bin bin/storescp
+@bin bin/storescu
+@bin bin/termscu
+@bin bin/wlmscpfs
+@bin bin/xml2dcm
+@bin bin/xml2dsr
lib/dcm2xml.dtd
@man man/man1/dcm2pnm.1
@man man/man1/dcm2xml.1
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
