Attachment 172076 Details for Bug 210794 – graphics_aeskulap.diff

[patch] graphics_aeskulap.diff

graphics_aeskulap.diff (text/plain), 55.49 KB, created by tkato432 on 2016-07-03 19:33:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-07-03 19:33:33 UTC

Size: 55.49 KB

patch

obsolete

>diff -urN /usr/ports/graphics/aeskulap/Makefile graphics/aeskulap/Makefile
>--- /usr/ports/graphics/aeskulap/Makefile	2016-06-04 03:45:00.468964000 +0900
>+++ graphics/aeskulap/Makefile	2016-07-04 00:00:00.000000000 +0900
>@@ -2,34 +2,31 @@
> # $FreeBSD: head/graphics/aeskulap/Makefile 416324 2016-06-03 16:44:58Z antoine $
> 
> PORTNAME=	aeskulap
>-PORTVERSION=	0.2.1
>-PORTREVISION=	5
>+PORTVERSION=	0.2.2.20140119
> CATEGORIES=	graphics
>-MASTER_SITES=	http://www.sourcefiles.org/Home_and_Education/Health/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Medical image viewer
> 
>-BROKEN=		unfetchable
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2016-07-04
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24
>+LIB_DEPENDS=	libdcmimage.so:devel/dcmtk \
>+		libglademm-2.4.so:devel/libglademm24
> 
>-USES=		desktop-file-utils gettext libtool pkgconfig
>-USE_GNOME=	gconfmm26 gtkmm24 intltool
>-GCONF_SCHEMAS=	aeskulap.schemas
>-USE_LDCONFIG=	${PREFIX}/lib/aeskulap
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	pipelka
>+GH_TAGNAME=	ea0a119
> 
>+USES=		autoreconf desktop-file-utils gettext gmake libtool localbase \
>+		pkgconfig
>+USE_GNOME=	gconfmm26 gtkmm24 intltool
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-static
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>+USE_LDCONFIG=	${PREFIX}/lib/aeskulap
>+INSTALLS_ICONS=	yes
> 
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/aeskulap/*.so
>+GCONF_SCHEMAS=	aeskulap.schemas
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/aeskulap/distinfo graphics/aeskulap/distinfo
>--- /usr/ports/graphics/aeskulap/distinfo	2015-08-24 03:53:49.023662000 +0900
>+++ graphics/aeskulap/distinfo	2016-07-04 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (aeskulap-0.2.1.tar.gz) = 6bbf1a26466ba190b1807e06f3d682575439668d6f11d7a5fa6b3fb1049fab50
>-SIZE (aeskulap-0.2.1.tar.gz) = 4272339
>+SHA256 (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = a98e07b31cf6d73b0cb2e4788a04f3e9bfdca856da709f01819fba0b58d21e89
>+SIZE (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = 4323281
>diff -urN /usr/ports/graphics/aeskulap/files/patch-configuration_aconfiguration.cpp graphics/aeskulap/files/patch-configuration_aconfiguration.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-configuration_aconfiguration.cpp	2015-08-24 03:53:49.044160000 +0900
>+++ graphics/aeskulap/files/patch-configuration_aconfiguration.cpp	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- configuration/aconfiguration.cpp.orig	2010-07-26 18:34:00.000000000 +0000
>-+++ configuration/aconfiguration.cpp	2010-07-26 18:34:14.000000000 +0000
>-@@ -27,6 +27,7 @@
>- */
>- 
>- #include "aconfiguration.h"
>-+#include <libintl.h>
>- 
>- namespace Aeskulap {
>- 
>diff -urN /usr/ports/graphics/aeskulap/files/patch-configure.in graphics/aeskulap/files/patch-configure.in
>--- /usr/ports/graphics/aeskulap/files/patch-configure.in	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-configure.in	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,41 @@
>+--- configure.in.orig	2014-01-19 07:38:17 UTC
>++++ configure.in
>+@@ -104,17 +104,8 @@ DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -
>+ 
>+ else
>+ 
>+-DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
>+-AC_SUBST(DCMJPEG_LIBS)
>+-
>+-DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
>+-DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
>+--L../dcmtk/dcmdata/libsrc \
>+--L../dcmtk/dcmnet/libsrc \
>+--L../dcmtk/dcmjpeg/libsrc \
>+--L../dcmtk/dcmimage/libsrc \
>+--L../dcmtk/dcmimgle/libsrc \
>+-\$(DCMJPEG_LIBS) -ldcmjpeg -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
>++DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
>++DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -loflog -lofstd"
>+ 
>+ fi
>+ 
>+@@ -130,8 +121,7 @@ fi
>+ 
>+ DCMTK_SUBDIR=""
>+ if test x"$MINGW32" = xno ; then
>+-DCMTK_SUBDIR="dcmtk"
>+-LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
>++LDFLAGS_AESKULAP_LIBS="-avoid-version"
>+ else
>+ LDFLAGS_MINGW32="-mwindows"
>+ LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
>+@@ -161,7 +151,7 @@ packaging/win32/aeskulap.iss
>+ ])
>+ 
>+ 
>+-if test x"$MINGW32" = xno ; then
>++if false ; then
>+ 
>+ cd $srcdir/dcmtk
>+ export CFLAGS="$CFLAGS"
>diff -urN /usr/ports/graphics/aeskulap/files/patch-dcmtk-clang graphics/aeskulap/files/patch-dcmtk-clang
>--- /usr/ports/graphics/aeskulap/files/patch-dcmtk-clang	2015-08-24 03:53:49.082939000 +0900
>+++ graphics/aeskulap/files/patch-dcmtk-clang	1970-01-01 09:00:00.000000000 +0900
>@@ -1,289 +0,0 @@
>---- dcmtk/dcmimage/include/diargpxt.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/diargpxt.h	2012-06-08 20:02:18.531310065 +0400
>-@@ -91,7 +91,7 @@
>-                  const unsigned long planeSize,
>-                  const int bits)
>-     {                                             // not very much optimized, but no one really uses ARGB !!
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             register T2 value;
>-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
>---- dcmtk/dcmimage/include/dicmypxt.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/dicmypxt.h	2012-06-08 20:03:41.696298705 +0400
>-@@ -87,7 +87,7 @@
>-                  const unsigned long planeSize,
>-                  const int bits)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             // use the number of input pixels derived from the length of the 'PixelData'
>-             // attribute), but not more than the size of the intermediate buffer
>---- dcmtk/dcmimage/include/dicocpt.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/dicocpt.h	2012-06-08 20:07:13.211298345 +0400
>-@@ -86,7 +86,7 @@
>-     inline void copy(const T *pixel[3],
>-                      const unsigned long offset)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             for (int j = 0; j < 3; j++)
>-                 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
>---- dcmtk/dcmimage/include/dicoflt.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/dicoflt.h	2012-06-08 20:08:27.084301025 +0400
>-@@ -98,14 +98,14 @@
>-                      const int horz,
>-                      const int vert)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             if (horz && vert)
>--                flipHorzVert(pixel, this->Data);
>-+                this->flipHorzVert(pixel, this->Data);
>-             else if (horz)
>--                flipHorz(pixel, this->Data);
>-+                this->flipHorz(pixel, this->Data);
>-             else if (vert)
>--                flipVert(pixel, this->Data);
>-+                this->flipVert(pixel, this->Data);
>-         }
>-     }
>- };
>---- dcmtk/dcmimage/include/dicorot.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/dicorot.h	2012-06-08 20:04:43.917297785 +0400
>-@@ -98,14 +98,14 @@
>-     inline void rotate(const T *pixel[3],
>-                        const int degree)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             if (degree == 90)
>--                rotateRight(pixel, this->Data);
>-+                this->rotateRight(pixel, this->Data);
>-             else if (degree == 180)
>--                rotateTopDown(pixel, this->Data);
>-+                this->rotateTopDown(pixel, this->Data);
>-             else  if (degree == 270)
>--                rotateLeft(pixel, this->Data);
>-+                this->rotateLeft(pixel, this->Data);
>-         }
>-     }
>- };
>---- dcmtk/dcmimage/include/dicosct.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/dicosct.h	2012-06-08 20:05:53.268297505 +0400
>-@@ -107,8 +107,8 @@
>-     inline void scale(const T *pixel[3],
>-                       const int interpolate)
>-     {
>--        if (Init(pixel))
>--            scaleData(pixel, this->Data, interpolate);
>-+        if (this->Init(pixel))
>-+            this->scaleData(pixel, this->Data, interpolate);
>-     }
>- };
>- 
>---- dcmtk/dcmimage/include/dihsvpxt.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/dihsvpxt.h	2012-06-08 20:09:41.902298105 +0400
>-@@ -87,7 +87,7 @@
>-                  const unsigned long planeSize,
>-                  const int bits)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             register T2 *r = this->Data[0];
>-             register T2 *g = this->Data[1];
>---- dcmtk/dcmimage/include/dipalpxt.h	2010-10-14 17:16:29.000000000 +0400
>-+++ dcmtk/dcmimage/include/dipalpxt.h	2012-06-08 20:10:20.035298545 +0400
>-@@ -92,7 +92,7 @@
>-     void convert(const T1 *pixel,
>-                  DiLookupTable *palette[3])
>-     {                                                                // can be optimized if necessary !
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             register const T1 *p = pixel;
>-             register T2 value = 0;
>---- dcmtk/dcmimage/include/dirgbpxt.h	2010-10-14 17:16:30.000000000 +0400
>-+++ dcmtk/dcmimage/include/dirgbpxt.h	2012-06-08 20:11:05.988298185 +0400
>-@@ -87,7 +87,7 @@
>-                  const unsigned long planeSize,
>-                  const int bits)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             // use the number of input pixels derived from the length of the 'PixelData'
>-             // attribute), but not more than the size of the intermediate buffer
>---- dcmtk/dcmimage/include/diybrpxt.h	2010-10-14 17:16:30.000000000 +0400
>-+++ dcmtk/dcmimage/include/diybrpxt.h	2012-06-08 20:11:45.316297345 +0400
>-@@ -91,7 +91,7 @@
>-                  const int bits,
>-                  const OFBool rgb)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
>-             // use the number of input pixels derived from the length of the 'PixelData'
>---- dcmtk/dcmimage/include/diyf2pxt.h	2010-10-14 17:16:30.000000000 +0400
>-+++ dcmtk/dcmimage/include/diyf2pxt.h	2012-06-08 20:12:19.882296744 +0400
>-@@ -95,7 +95,7 @@
>-                  const int bits,
>-                  const OFBool rgb)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
>-             register unsigned long i;
>---- dcmtk/dcmimage/include/diyp2pxt.h	2010-10-14 17:16:30.000000000 +0400
>-+++ dcmtk/dcmimage/include/diyp2pxt.h	2012-06-08 20:13:10.632301225 +0400
>-@@ -91,7 +91,7 @@
>-     void convert(const T1 *pixel,
>-                  const int bits)
>-     {
>--        if (Init(pixel))
>-+        if (this->Init(pixel))
>-         {
>-             register T2 *r = this->Data[0];
>-             register T2 *g = this->Data[1];
>---- dcmtk/dcmimgle/include/diflipt.h	2010-10-14 17:16:26.000000000 +0400
>-+++ dcmtk/dcmimgle/include/diflipt.h	2012-06-08 19:22:38.840297986 +0400
>-@@ -129,7 +129,7 @@
>-             else if (vert)
>-                 flipVert(src, dest);
>-             else
>--                copyPixel(src, dest);
>-+                this->copyPixel(src, dest);
>-         }
>-     }
>- 
>---- dcmtk/dcmimgle/include/dimoflt.h	2010-10-14 17:16:26.000000000 +0400
>-+++ dcmtk/dcmimgle/include/dimoflt.h	2012-06-08 19:17:52.632300786 +0400
>-@@ -106,11 +106,11 @@
>-             if (this->Data != NULL)
>-             {
>-                 if (horz && vert)
>--                    flipHorzVert(&pixel, &this->Data);
>-+                    this->flipHorzVert(&pixel, &this->Data);
>-                 else if (horz)
>--                    flipHorz(&pixel, &this->Data);
>-+                    this->flipHorz(&pixel, &this->Data);
>-                 else if (vert)
>--                    flipVert(&pixel, &this->Data);
>-+                    this->flipVert(&pixel, &this->Data);
>-             }
>-         }
>-     }
>---- dcmtk/dcmimgle/include/dimoipxt.h	2010-10-14 17:16:26.000000000 +0400
>-+++ dcmtk/dcmimgle/include/dimoipxt.h	2012-06-08 19:19:50.210297466 +0400
>-@@ -76,10 +76,10 @@
>-             else if ((this->Modality != NULL) && this->Modality->hasRescaling())
>-             {
>-                 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
>--                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
>-+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
>-             } else {
>-                 rescale(pixel);                     // "copy" or reference pixel data
>--                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
>-+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
>-             }
>-         }
>-     }
>---- dcmtk/dcmimgle/include/dimorot.h	2010-10-14 17:16:26.000000000 +0400
>-+++ dcmtk/dcmimgle/include/dimorot.h	2012-06-08 19:18:29.177297946 +0400
>-@@ -105,11 +105,11 @@
>-             if (this->Data != NULL)
>-             {
>-                 if (degree == 90)
>--                    rotateRight(&pixel, &(this->Data));
>-+                    this->rotateRight(&pixel, &(this->Data));
>-                 else if (degree == 180)
>--                    rotateTopDown(&pixel, &(this->Data));
>-+                    this->rotateTopDown(&pixel, &(this->Data));
>-                 else if (degree == 270)
>--                    rotateLeft(&pixel, &(this->Data));
>-+                    this->rotateLeft(&pixel, &(this->Data));
>-             }
>-         }
>-     }
>---- dcmtk/dcmimgle/include/dimosct.h	2010-10-14 17:16:26.000000000 +0400
>-+++ dcmtk/dcmimgle/include/dimosct.h	2012-06-08 18:55:53.254300667 +0400
>-@@ -124,7 +124,7 @@
>-             {
>-                 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
>-                     OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
>--                scaleData(&pixel, &this->Data, interpolate, value);
>-+                this->scaleData(&pixel, &this->Data, interpolate, value);
>-              }
>-         }
>-     }
>---- dcmtk/dcmimgle/include/dirotat.h	2010-10-14 17:16:27.000000000 +0400
>-+++ dcmtk/dcmimgle/include/dirotat.h	2012-06-08 19:23:11.011295866 +0400
>-@@ -132,7 +132,7 @@
>-         else if (degree == 270)
>-             rotateLeft(src, dest);
>-         else
>--            copyPixel(src, dest);
>-+            this->copyPixel(src, dest);
>-     }
>- 
>- 
>---- dcmtk/ofstd/include/ofoset.h	2010-10-14 17:15:50.000000000 +0400
>-+++ dcmtk/ofstd/include/ofoset.h	2012-06-08 20:32:10.974296904 +0400
>-@@ -146,7 +146,7 @@
>-       {
>-         // if size equals num, we need more space
>-         if( this->size == this->num )
>--          Resize( this->size * 2 );
>-+          this->Resize( this->size * 2 );
>- 
>-         // copy item
>-         T *newItem = new T( item );
>-@@ -189,7 +189,7 @@
>-         {
>-           // if size equals num, we need more space
>-           if( this->size == this->num )
>--            Resize( this->size * 2 );
>-+            this->Resize( this->size * 2 );
>- 
>-           // copy item
>-           T *newItem = new T( item );
>---- dcmtk/dcmimgle/include/discalet.h.orig	2006-03-08 10:25:21.000000000 +0100
>-+++ dcmtk/dcmimgle/include/discalet.h	2012-12-13 10:07:11.000000000 +0100
>-@@ -201,17 +201,17 @@
>-                     ofConsole.unlockCerr();
>-                 }
>- #endif
>--                fillPixel(dest, value);                                         // ... fill bitmap
>-+                this->fillPixel(dest, value);                                         // ... fill bitmap
>-             }
>-             else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y))                    // no scaling
>-             {
>-                 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
>--                    copyPixel(src, dest);                                       // copying
>-+                    this->copyPixel(src, dest);                                       // copying
>-                 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
>-                          (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
>--                    clipPixel(src, dest);                                       // clipping
>-+                    this->clipPixel(src, dest);                                       // clipping
>-                 else
>--                    clipBorderPixel(src, dest, value);                          // clipping (with border)
>-+                    this->clipBorderPixel(src, dest, value);                          // clipping (with border)
>-             }
>-             else if ((interpolate == 1) && (this->Bits <= MAX_INTERPOLATION_BITS))    // interpolation (pbmplus)
>-                 interpolatePixel(src, dest);
>-@@ -224,7 +224,7 @@
>-             else if ((this->Src_X % this->Dest_X == 0) && (this->Src_Y % this->Dest_Y == 0))            // supression
>-                 suppressPixel(src, dest);
>-             else                                                                // general scaling
>--                scalePixel(src, dest);
>-+                this->scalePixel(src, dest);
>-         }
>-     }
>- 
>diff -urN /usr/ports/graphics/aeskulap/files/patch-dcmtk-config_configure graphics/aeskulap/files/patch-dcmtk-config_configure
>--- /usr/ports/graphics/aeskulap/files/patch-dcmtk-config_configure	2015-08-24 03:53:49.093561000 +0900
>+++ graphics/aeskulap/files/patch-dcmtk-config_configure	1970-01-01 09:00:00.000000000 +0900
>@@ -1,13 +0,0 @@
>---- dcmtk/config/configure.orig	2010-08-23 17:05:16.000000000 +0200
>-+++ dcmtk/config/configure	2010-08-23 17:05:39.000000000 +0200
>-@@ -17757,8 +17757,8 @@
>- 	  CFLAGS="-D_POSIX_C_SOURCE=199506L $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"
>-+	  CXXFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
>-+	  CFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
>- 	  ;;
>-     esac
>- 
>diff -urN /usr/ports/graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h
>--- /usr/ports/graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h	2015-08-24 03:53:49.098755000 +0900
>+++ graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,12 +0,0 @@
>---- dcmtk/dcmnet/include/dcompat.h.orig	2010-08-23 16:36:30.000000000 +0200
>-+++ dcmtk/dcmnet/include/dcompat.h	2010-08-23 16:37:57.000000000 +0200
>-@@ -146,9 +146,6 @@
>- #ifdef HAVE_SYS_SELECT_H
>- #include <sys/select.h>
>- #endif
>--#ifdef HAVE_SYS_FILE_H
>--#include <sys/file.h>
>--#endif
>- 
>- END_EXTERN_C
>- 
>diff -urN /usr/ports/graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc
>--- /usr/ports/graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc	2015-08-24 03:53:49.059635000 +0900
>+++ graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc	1970-01-01 09:00:00.000000000 +0900
>@@ -1,12 +0,0 @@
>---- dcmtk/dcmnet/libsrc/dcompat.cc.orig	2010-08-23 16:38:21.000000000 +0200
>-+++ dcmtk/dcmnet/libsrc/dcompat.cc	2010-08-23 16:38:31.000000000 +0200
>-@@ -113,9 +113,6 @@
>- #ifdef HAVE_SYS_UTSNAME_H
>- #include <sys/utsname.h>
>- #endif
>--#ifdef HAVE_SYS_FILE_H
>--#include <sys/file.h>
>--#endif
>- #ifdef HAVE_IO_H
>- #include <io.h>  /* for access() on Win32 */
>- #endif
>diff -urN /usr/ports/graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h
>--- /usr/ports/graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h	2015-08-24 03:53:49.073361000 +0900
>+++ graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,45 +0,0 @@
>---- dcmtk/ofstd/include/ofthread.h.orig	2006-03-08 10:25:25.000000000 +0100
>-+++ dcmtk/ofstd/include/ofthread.h	2013-09-18 17:55:34.000000000 +0200
>-@@ -38,6 +38,7 @@
>- #ifndef OFTHREAD_H
>- #define OFTHREAD_H
>- 
>-+#include <pthread.h>
>- #include "osconfig.h"
>- #include "oftypes.h"  /* for class OFBool */
>- #include "ofstring.h" /* for class OFString */
>-@@ -118,14 +119,14 @@
>-    *  provided in this class.
>-    *  @return thread ID of target thread if started, 0 otherwise.
>-    */
>--  unsigned long threadID();
>-+  pthread_t threadID();
>- 
>-   /** checks if the given thread ID matches the thread ID of the thread
>-    *  referenced by this object.
>-    *  @param tID thread ID to be compared
>-    *  @return OFTrue if equal, OFFalse otherwise.
>-    */
>--  OFBool equal(unsigned long tID);
>-+  OFBool equal(pthread_t tID);
>- 
>-   /** converts any of the error codes returned by the methods of this class
>-    *  into a textual description, which is written into the string object.
>-@@ -158,7 +159,7 @@
>-    *  provided in this class.
>-    *  @return thread ID of the calling thread.
>-    */
>--  static unsigned long self();
>-+  static pthread_t self();
>- 
>- private:
>- 
>-@@ -177,7 +178,7 @@
>- #endif
>- 
>-   /** thread identifier */
>--  unsigned long theThread;
>-+  pthread_t theThread;
>- 
>-   /** unimplemented private copy constructor */
>-   OFThread(const OFThread& arg);
>diff -urN /usr/ports/graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc
>--- /usr/ports/graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc	2015-08-24 03:53:49.121179000 +0900
>+++ graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc	1970-01-01 09:00:00.000000000 +0900
>@@ -1,52 +0,0 @@
>---- dcmtk/ofstd/libsrc/ofthread.cc.orig	2010-08-23 16:27:34.000000000 +0200
>-+++ dcmtk/ofstd/libsrc/ofthread.cc	2010-08-23 16:32:49.000000000 +0200
>-@@ -145,7 +145,7 @@
>- #elif defined(POSIX_INTERFACE)
>-   pthread_t tid=0;
>-   int result = pthread_create(&tid, NULL, thread_stub, OFstatic_cast(void *, this));
>--  if (0 == result) theThread = static_cast<unsigned long>(tid); else theThread = 0;      
>-+  if (0 == result) theThread = tid; else theThread = 0;      
>-   return result;     
>- #elif defined(SOLARIS_INTERFACE)
>-   thread_t tid=0;
>-@@ -174,21 +174,21 @@
>- #endif
>- }
>-   
>--unsigned long OFThread::threadID()
>-+pthread_t OFThread::threadID()
>- {
>-   return theThread;
>- }
>- 
>- #if defined(WINDOWS_INTERFACE) || defined(POSIX_INTERFACE) || defined(SOLARIS_INTERFACE)
>--OFBool OFThread::equal(unsigned long tID)
>-+OFBool OFThread::equal(pthread_t tID)
>- #else
>--OFBool OFThread::equal(unsigned long /* tID */ )
>-+OFBool OFThread::equal(pthread_t /* tID */ )
>- #endif
>- {
>- #ifdef WINDOWS_INTERFACE
>-   if (theThread == tID) return OFTrue; else return OFFalse;
>- #elif defined(POSIX_INTERFACE)
>--  if (pthread_equal(static_cast<pthread_t>(theThread), static_cast<pthread_t>(tID))) return OFTrue; else return OFFalse;
>-+  if (pthread_equal(theThread, tID)) return OFTrue; else return OFFalse;
>- #elif defined(SOLARIS_INTERFACE)
>-   if (OFstatic_cast(thread_t, theThread) == OFstatic_cast(thread_t, tID)) return OFTrue; else return OFFalse;
>- #else
>-@@ -209,12 +209,12 @@
>-   return; // will never be reached
>- }
>- 
>--unsigned long OFThread::self()
>-+pthread_t OFThread::self()
>- {
>- #ifdef WINDOWS_INTERFACE
>-   return OFstatic_cast(unsigned long, GetCurrentThreadId());
>- #elif defined(POSIX_INTERFACE)
>--  return OFstatic_cast(unsigned long, pthread_self());
>-+  return pthread_self();
>- #elif defined(SOLARIS_INTERFACE)
>-   return OFstatic_cast(unsigned long, thr_self());
>- #else
>diff -urN /usr/ports/graphics/aeskulap/files/patch-dcmtk_ofstd_libsrc_oftime.cc graphics/aeskulap/files/patch-dcmtk_ofstd_libsrc_oftime.cc
>--- /usr/ports/graphics/aeskulap/files/patch-dcmtk_ofstd_libsrc_oftime.cc	2015-08-24 03:53:49.098050000 +0900
>+++ graphics/aeskulap/files/patch-dcmtk_ofstd_libsrc_oftime.cc	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- dcmtk/ofstd/libsrc/oftime.cc.orig	2006-03-08 09:25:25 UTC
>-+++ dcmtk/ofstd/libsrc/oftime.cc
>-@@ -35,6 +35,7 @@
>- 
>- #define INCLUDE_CSTDIO
>- #define INCLUDE_CTIME
>-+#define INCLUDE_OSTREAM
>- #include "ofstdinc.h"
>- 
>- BEGIN_EXTERN_C
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp graphics/aeskulap/files/patch-imagepool_dicomdir.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_dicomdir.cpp	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,89 @@
>+--- imagepool/dicomdir.cpp.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/dicomdir.cpp
>+@@ -43,7 +43,7 @@ namespace ImagePool {
>+         DcmDicomDir dir(dicomdir.c_str());
>+         OFCondition ret;
>+ 
>+-        if ( (ret=dir.error()) != ECC_Normal ) {
>++        if ( (ret=dir.error()) != EC_Normal ) {
>+             std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
>+             return;
>+         }
>+@@ -151,21 +151,21 @@ namespace ImagePool {
>+             DcmDataset study;
>+             DcmElement *el;
>+ 
>+-            if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+-            if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+-            if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+-            if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+-            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+-            if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+-            if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+-            if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == EC_Normal )
>+                 study.insert(el);
>+             resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
>+         }
>+@@ -179,7 +179,7 @@ namespace ImagePool {
>+         DcmDirectoryRecord *seriesRec;
>+         OFCondition ret;
>+ 
>+-        if ( dir.error() != ECC_Normal ) {
>++        if ( dir.error() != EC_Normal ) {
>+             std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
>+             return;
>+         }
>+@@ -191,7 +191,7 @@ namespace ImagePool {
>+                 for ( studyRec=patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
>+                     if ( studyRec->getRecordType()==ERT_Study ) {
>+                         OFString uid;
>+-                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
>++                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
>+                             if ( studyinstanceuid == uid.c_str() ) {
>+                                 open_dicomdir_series_result(dicomdir, patRec, studyRec, resultslot);
>+                                 return;
>+@@ -221,21 +221,21 @@ namespace ImagePool {
>+             DcmDataset series;
>+             DcmElement *el;
>+ 
>+-            if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+-            if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+-            if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+-            if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+-            if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+-            if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+-            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+-            if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == ECC_Normal )
>++            if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == EC_Normal )
>+                 series.insert(el);
>+ 
>+             // Count Related SOP Instances
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,41 @@
>+--- imagepool/dicomdirloader.cpp.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/dicomdirloader.cpp
>+@@ -42,7 +42,7 @@ namespace ImagePool {
>+             return false;
>+         }
>+ 
>+-        if ( (ret=dir.error()) != ECC_Normal ) {
>++        if ( (ret=dir.error()) != EC_Normal ) {
>+             std::cout << "DicomdirLoader::load Error: " << ret.text() << std::endl;
>+             return false;
>+         }
>+@@ -80,7 +80,7 @@ namespace ImagePool {
>+                 for ( studyRec = patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
>+                     if ( studyRec->getRecordType()==ERT_Study ) {
>+                         OFString uid;
>+-                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
>++                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
>+                             if ( studyinstanceuid == uid.c_str() )
>+                                 return studyRec;
>+                         }
>+@@ -107,9 +107,9 @@ namespace ImagePool {
>+         while ( seriesRec ) {
>+             OFString modality;
>+ 
>+-            if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == ECC_Normal ) {
>++            if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == EC_Normal ) {
>+                 OFString seriesinstanceuid;
>+-                if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != ECC_Normal ) {
>++                if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != EC_Normal ) {
>+                     seriesRec = studyRec->nextSub(seriesRec);
>+                     continue;
>+                 }
>+@@ -124,7 +124,7 @@ namespace ImagePool {
>+                         switch ( sopRec->getRecordType() ) {
>+                         case ERT_Image:
>+                         case ERT_StoredPrint:
>+-                            if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=ECC_Normal ) {
>++                            if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=EC_Normal ) {
>+                                 sopRec = seriesRec->nextSub(sopRec);
>+                                 continue;
>+                             }
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_imagepool.h graphics/aeskulap/files/patch-imagepool_imagepool.h
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_imagepool.h	2015-08-24 03:53:49.128807000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_imagepool.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- imagepool/imagepool.h.orig	2010-08-23 17:14:59.000000000 +0200
>-+++ imagepool/imagepool.h	2010-08-23 17:15:08.000000000 +0200
>-@@ -36,6 +36,7 @@
>- 
>- #include <glibmm/slisthandle.h>
>- #include <string>
>-+#include <libintl.h>
>- 
>- 
>- class DcmDataset;
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp graphics/aeskulap/files/patch-imagepool_poolassociation.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolassociation.cpp	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,109 @@
>+--- imagepool/poolassociation.cpp.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolassociation.cpp
>+@@ -72,24 +72,24 @@ Association::~Association()
>+ 		Drop();
>+ }
>+ 
>+-CONDITION Association::Drop(CONDITION cond) {
>++OFCondition Association::Drop(OFCondition cond) {
>+ 	// tear down association
>+-	if(cond == DIMSE_NORMAL) {
>++	if(cond == EC_Normal) {
>+ 		/* release association */
>+ 		cond = ASC_releaseAssociation(assoc);
>+ 	}
>+-	else if(cond == DIMSE_PEERREQUESTEDRELEASE) {
>++	else if(cond == DUL_PEERREQUESTEDRELEASE) {
>+ 		cond = ASC_abortAssociation(assoc);
>+-		if (SUCCESS(cond)) {
>++		if (cond.good()) {
>+ 			return cond;
>+ 		}
>+ 	}
>+-	else if(cond == DIMSE_PEERABORTEDASSOCIATION) {
>++	else if(cond == DUL_PEERABORTEDASSOCIATION) {
>+ 		return cond;
>+ 	}
>+ 	else {
>+ 		cond = ASC_abortAssociation(assoc);
>+-		if (SUCCESS(cond)) {
>++		if (cond.good()) {
>+ 			return cond;
>+ 		}
>+ 	}
>+@@ -99,7 +99,7 @@ CONDITION Association::Drop(CONDITION co
>+ }
>+ 
>+ void Association::Destroy() {
>+-	CONDITION cond = ASC_destroyAssociation(&assoc);
>++	OFCondition cond = ASC_destroyAssociation(&assoc);
>+ 
>+ 	dcmNet = NULL;
>+ 	assoc = NULL;
>+@@ -110,8 +110,8 @@ void Association::Destroy() {
>+ 
>+ }
>+ 
>+-CONDITION Association::SendObject(DcmDataset *dataset) {
>+-	CONDITION cond;
>++OFCondition Association::SendObject(DcmDataset *dataset) {
>++	OFCondition cond;
>+ 	DcmDataset *statusDetail = NULL;
>+ 
>+ 	T_DIMSE_C_StoreRQ req;
>+@@ -163,7 +163,7 @@ CONDITION Association::SendObject(DcmDat
>+ 	if(opt_oxferSyn.getXfer() != ori_oxferSyn) {
>+ 		std::cout << "Converting object to accepted transfer-syntax " << opt_oxferSyn.getXferName() << std::endl;
>+ 	
>+-		CONDITION cond;
>++		OFCondition cond;
>+ 		// create RepresentationParameter
>+ 		DJ_RPLossless rp_lossless(6, 0);
>+ 		DJ_RPLossy rp_lossy(m_CompressionQuality);
>+@@ -172,10 +172,18 @@ CONDITION Association::SendObject(DcmDat
>+ 		
>+ 		const DcmRepresentationParameter *rp = NULL;
>+ 
>++#if 0
>++		if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess14) {
>++#else
>+ 		if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess14TransferSyntax) {
>++#endif
>+ 			rp = &rp_lossless;
>+ 		}
>++#if 0
>++		else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4) {
>++#else
>+ 		else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4TransferSyntax) {
>++#endif
>+ 			rp = &rp_lossy;
>+ 		}
>+ 
>+@@ -232,15 +240,15 @@ CONDITION Association::SendObject(DcmDat
>+ 		delete statusDetail;
>+ 	}
>+ 
>+-	if (cond != DIMSE_NORMAL)
>++	if (cond != EC_Normal)
>+ 	{
>+ 		return cond;
>+ 	}
>+ 
>+-	return (rsp.DimseStatus == STATUS_Success) ? DIMSE_NORMAL : DIMSE_BADDATA;
>++	return (rsp.DimseStatus == STATUS_Success) ? EC_Normal : DIMSE_BADDATA;
>+ }
>+ 
>+-CONDITION Association::SendObject(DcmFileFormat *dcmff)
>++OFCondition Association::SendObject(DcmFileFormat *dcmff)
>+ {
>+ 	DcmDataset* dataset = dcmff->getDataset();
>+ 	return SendObject(dataset);
>+@@ -334,7 +342,7 @@ Network* Association::GetNetwork()
>+ 	return dcmNet;
>+ }
>+ 
>+-CONDITION Association::Connect(Network *network, int lossy)
>++OFCondition Association::Connect(Network *network, int lossy)
>+ {
>+ 	dcmNet = network;
>+ 	return network->ConnectAssociation(this, lossy);
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,22 @@
>+--- imagepool/poolfindassociation.cpp.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolfindassociation.cpp
>+@@ -40,8 +40,8 @@ FindAssociation::~FindAssociation() {
>+ 	DeleteResultStack();
>+ }
>+ 
>+-CONDITION FindAssociation::findSCU(T_ASC_Association *assoc, DcmDataset *query) {
>+-	CONDITION cond;
>++OFCondition FindAssociation::findSCU(T_ASC_Association *assoc, DcmDataset *query) {
>++	OFCondition cond;
>+ 	DIC_US msgId = assoc->nextMsgID++;
>+ 	T_ASC_PresentationContextID presId;
>+ 	T_DIMSE_C_FindRQ req;
>+@@ -100,7 +100,7 @@ void FindAssociation::findCallback(void*
>+ 	caller->OnResponseReceived(response);
>+ }
>+ 
>+-CONDITION FindAssociation::SendObject(DcmDataset *dataset) {
>++OFCondition FindAssociation::SendObject(DcmDataset *dataset) {
>+ 	return findSCU(assoc, dataset);
>+ }
>+ 
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h graphics/aeskulap/files/patch-imagepool_poolfindassociation.h
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolfindassociation.h	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- imagepool/poolfindassociation.h.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolfindassociation.h
>+@@ -45,7 +45,7 @@ public:
>+ 	/**
>+ 	Send a query object (C-Find) through association
>+ 	*/
>+-	CONDITION SendObject(DcmDataset *dataset);
>++	OFCondition SendObject(DcmDataset *dataset);
>+ 
>+ 	/**
>+ 	Get the result stack of the last query
>+@@ -88,7 +88,7 @@ private:
>+ 	/**
>+ 	C-Find service class user
>+ 	*/
>+-	CONDITION findSCU(T_ASC_Association * assoc, DcmDataset * query);
>++	OFCondition findSCU(T_ASC_Association * assoc, DcmDataset * query);
>+ 
>+ 	/**
>+ 	Callback function for C-Find service class user
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolinstance.h graphics/aeskulap/files/patch-imagepool_poolinstance.h
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolinstance.h	2015-08-24 03:53:49.044867000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolinstance.h	2016-07-04 00:00:00.000000000 +0900
>@@ -1,11 +1,47 @@
>---- imagepool/poolinstance.h.orig	2012-12-13 10:27:07.000000000 +0100
>-+++ imagepool/poolinstance.h	2012-12-13 10:30:33.000000000 +0100
>-@@ -49,7 +49,7 @@
>+--- imagepool/poolinstance.h.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolinstance.h
>+@@ -50,9 +50,9 @@ protected:
>  
>  	Instance(const std::string& sopinstanceuid);
>  
> -	friend void ImagePool::remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
> +	friend void remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
>  
>- 	friend class ImagePool::Loader;
>+-	friend class ImagePool::Loader;
>++	friend class Loader;
>+ 
>+ public:
>+ 
>+@@ -131,9 +131,9 @@ public:
>+ 
>+ 	int instancenumber();
>+ 
>+-	const Glib::RefPtr<ImagePool::Series>& series();
>++	const Glib::RefPtr<Series>& series();
>+ 
>+-	const Glib::RefPtr<ImagePool::Study>& study();
>++	const Glib::RefPtr<Study>& study();
>+ 
>+ 	const std::string& date();
>+ 
>+@@ -176,7 +176,7 @@ public:
>+ 
>+ 	bool has_3d_information();
>+ 
>+-	static Glib::RefPtr<ImagePool::Instance> create(DcmDataset* dset);
>++	static Glib::RefPtr<Instance> create(DcmDataset* dset);
>+ 
>+ 	int studyrelatedinstances();
>+ 
>+@@ -248,9 +248,9 @@ private:
>+ 
>+ 	std::string m_modality;
>+ 
>+-	Glib::RefPtr<ImagePool::Series> m_series;
>++	Glib::RefPtr<Series> m_series;
>+ 
>+-	Glib::RefPtr<ImagePool::Study> m_study;
>++	Glib::RefPtr<Study> m_study;
>+ 
>+ 	std::string m_date;
>  
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,64 @@
>+--- imagepool/poolmoveassociation.cpp.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolmoveassociation.cpp
>+@@ -68,7 +68,7 @@ void MoveAssociation::Create(const std::
>+ 	Association::Create(title, peer, port, ouraet, abstractSyntax);
>+ }
>+ 
>+-CONDITION MoveAssociation::SendObject(DcmDataset *dataset) {
>++OFCondition MoveAssociation::SendObject(DcmDataset *dataset) {
>+ 	return moveSCU(dataset);	
>+ }
>+ 
>+@@ -79,8 +79,8 @@ void MoveAssociation::OnAddPresentationC
>+ 	ASC_addPresentationContext(params, 5, m_abstractSyntax, mpeg_transfer, DIM_OF(mpeg_transfer));
>+ }
>+ 
>+-CONDITION MoveAssociation::moveSCU(DcmDataset *pdset) {
>+-	CONDITION cond;
>++OFCondition MoveAssociation::moveSCU(DcmDataset *pdset) {
>++	OFCondition cond;
>+ 	T_ASC_PresentationContextID presId;
>+ 	T_DIMSE_C_MoveRQ req;
>+ 	T_DIMSE_C_MoveRSP rsp;
>+@@ -161,8 +161,8 @@ void MoveAssociation::subOpCallback(void
>+ 	}
>+ }
>+ 
>+-CONDITION MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) {
>+-	CONDITION cond = ASC_NORMAL;
>++OFCondition MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) {
>++	OFCondition cond = EC_Normal;
>+ 	const char* knownAbstractSyntaxes[] = { UID_VerificationSOPClass };
>+ 	const char* transferSyntaxes[] = { UID_JPEGProcess14SV1TransferSyntax, NULL, NULL, UID_LittleEndianImplicitTransferSyntax, UID_MPEG2MainProfileAtMainLevelTransferSyntax };
>+ 
>+@@ -222,7 +222,7 @@ CONDITION MoveAssociation::acceptSubAsso
>+ 	
>+ }
>+ 
>+-CONDITION MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
>++OFCondition MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
>+ 	T_DIMSE_Message msg;
>+ 	T_ASC_PresentationContextID presID;
>+ 
>+@@ -269,8 +269,8 @@ CONDITION MoveAssociation::subOpSCP(T_AS
>+ 	return cond;
>+ }
>+ 
>+-CONDITION MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
>+-	CONDITION cond;
>++OFCondition MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
>++	OFCondition cond;
>+ 	T_DIMSE_C_StoreRQ* req;
>+ 	DcmDataset *dset = new DcmDataset;
>+ 
>+@@ -328,8 +328,8 @@ void MoveAssociation::storeSCPCallback(v
>+ 
>+ }
>+ 
>+-CONDITION MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
>+-	CONDITION cond;
>++OFCondition MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
>++	OFCondition cond;
>+ 
>+ 	// the echo succeeded !!
>+ 	cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL);
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,34 @@
>+--- imagepool/poolmoveassociation.h.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolmoveassociation.h
>+@@ -39,7 +39,7 @@ public:
>+ 
>+ 	void Create(const std::string& title, const std::string& peer, int port, const std::string& ouraet, /*int ourPort,*/ const char *abstractSyntax = UID_MOVEPatientRootQueryRetrieveInformationModel/*, const char *abstractSyntaxMove = UID_MOVEPatientRootQueryRetrieveInformationModel*/);
>+ 
>+-	CONDITION SendObject(DcmDataset *dataset);
>++	OFCondition SendObject(DcmDataset *dataset);
>+ 
>+ protected:
>+ 
>+@@ -62,17 +62,17 @@ private:
>+ 		MoveAssociation* pCaller;
>+ 	} StoreCallbackInfo;
>+ 
>+-	CONDITION moveSCU(DcmDataset *pdset);
>++	OFCondition moveSCU(DcmDataset *pdset);
>+ 	static void moveCallback(void *callbackData, T_DIMSE_C_MoveRQ *request, int responseCount, T_DIMSE_C_MoveRSP *response);
>+ 
>+-	CONDITION acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc);
>+-	CONDITION subOpSCP(T_ASC_Association **subAssoc);
>++	OFCondition acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc);
>++	OFCondition subOpSCP(T_ASC_Association **subAssoc);
>+ 	static void subOpCallback(void * pCaller, T_ASC_Network *aNet, T_ASC_Association **subAssoc);
>+ 
>+-	CONDITION storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
>++	OFCondition storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
>+ 	static void storeSCPCallback(void *callbackData, T_DIMSE_StoreProgress *progress, T_DIMSE_C_StoreRQ *req, char *imageFileName, DcmDataset **imageDataSet, T_DIMSE_C_StoreRSP *rsp, DcmDataset **statusDetail);
>+ 
>+-	CONDITION echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
>++	OFCondition echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
>+ };
>+ 
>+ #endif // IMAGEPOOL_MOVEASSOCIATION_H
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,101 @@
>+--- imagepool/poolnetwork.cpp.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolnetwork.cpp
>+@@ -42,8 +42,8 @@ Network::~Network() {
>+ 	DropNetwork();
>+ }
>+ 
>+-CONDITION Network::ConnectAssociation(Association* assoc, int lossy) {
>+-	CONDITION cond;
>++OFCondition Network::ConnectAssociation(Association* assoc, int lossy) {
>++	OFCondition cond;
>+ 
>+ 	cond = ASC_ConnectAssociation(
>+ 						assoc,
>+@@ -54,7 +54,7 @@ CONDITION Network::ConnectAssociation(As
>+ 						assoc->m_abstractSyntax,
>+ 						lossy);
>+ 
>+-	if (!SUCCESS(cond)) {
>++	if (!cond.good()) {
>+ 		assoc->Drop(cond);
>+ 		return cond;
>+ 	}
>+@@ -65,7 +65,7 @@ CONDITION Network::ConnectAssociation(As
>+ 	return cond;
>+ }
>+ 
>+-CONDITION Network::InitializeNetwork(int timeout, int port) {
>++OFCondition Network::InitializeNetwork(int timeout, int port) {
>+ #ifdef _WIN32
>+ 	WORD wVersionRequested;
>+ 	WSADATA wsaData;
>+@@ -78,9 +78,9 @@ CONDITION Network::InitializeNetwork(int
>+ 	return ASC_initializeNetwork(NET_ACCEPTORREQUESTOR, port, timeout, &net);
>+ }
>+ 
>+-CONDITION Network::DropNetwork()
>++OFCondition Network::DropNetwork()
>+ {
>+-	CONDITION cond = ASC_dropNetwork(&net);
>++	OFCondition cond = ASC_dropNetwork(&net);
>+ 	net = NULL;
>+ 
>+ #ifdef _WIN32
>+@@ -90,9 +90,9 @@ CONDITION Network::DropNetwork()
>+ 	return cond;
>+ }
>+ 
>+-CONDITION Network::ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax, int lossy)
>++OFCondition Network::ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax, int lossy)
>+ {
>+-    CONDITION cond;
>++    OFCondition cond;
>+     T_ASC_Parameters *params;
>+ 	bool bProposeCompression = assoc->GetProposeCompression();
>+ 
>+@@ -100,7 +100,7 @@ CONDITION Network::ASC_ConnectAssociatio
>+     DIC_NODENAME localHost;
>+ 
>+     cond = ASC_createAssociationParameters(&params, ASC_DEFAULTMAXPDU);
>+-    if (!SUCCESS(cond)) 
>++    if (!cond.good()) 
>+ 	{
>+ 		return cond;
>+     }
>+@@ -155,9 +155,9 @@ CONDITION Network::ASC_ConnectAssociatio
>+ 
>+     /* create association */
>+     cond = ASC_requestAssociation(net, params, &(assoc->assoc));
>+-    if (cond != ASC_NORMAL)
>++    if (cond != EC_Normal)
>+ 	{
>+-		if (cond == ASC_ASSOCIATIONREJECTED) 
>++		if (cond == DUL_ASSOCIATIONREJECTED) 
>+ 		{
>+ 			T_ASC_RejectParameters rej;
>+ 
>+@@ -178,12 +178,12 @@ CONDITION Network::ASC_ConnectAssociatio
>+ 		return cond;
>+     }
>+ 
>+-	return ASC_NORMAL;
>++	return EC_Normal;
>+ }
>+ 
>+-CONDITION Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy)
>++OFCondition Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy)
>+ {
>+-    CONDITION cond = ASC_NORMAL;
>++    OFCondition cond = EC_Normal;
>+     int i;
>+     int pid = 1;
>+ 
>+@@ -232,7 +232,7 @@ CONDITION Network::addAllStoragePresenta
>+ 	}
>+ 
>+ 	/* the array of Storage SOP Class UIDs comes from dcuid.h */
>+-	for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && SUCCESS(cond); i++) {
>++	for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && cond.good(); i++) {
>+ 		cond = ASC_addPresentationContext(params, pid, dcmAllStorageSOPClassUIDs[i], transferSyntaxes, transferSyntaxes_count);
>+ 		pid += 2;	/* only odd presentation context id's */
>+ 	}
>diff -urN /usr/ports/graphics/aeskulap/files/patch-imagepool_poolnetwork.h graphics/aeskulap/files/patch-imagepool_poolnetwork.h
>--- /usr/ports/graphics/aeskulap/files/patch-imagepool_poolnetwork.h	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/aeskulap/files/patch-imagepool_poolnetwork.h	2016-07-04 00:00:00.000000000 +0900
>@@ -0,0 +1,38 @@
>+--- imagepool/poolnetwork.h.orig	2014-01-19 07:38:17 UTC
>++++ imagepool/poolnetwork.h
>+@@ -43,17 +43,17 @@ public:
>+ 	/**
>+ 	Initialize the dicom network
>+ 	*/
>+-	CONDITION InitializeNetwork(int timeout=20, int port = 0);
>++	OFCondition InitializeNetwork(int timeout=20, int port = 0);
>+ 
>+ 	/**
>+ 	Drop the dicom network
>+ 	*/
>+-	CONDITION DropNetwork();
>++	OFCondition DropNetwork();
>+ 
>+ 	/**
>+ 	Connect an association to the specified host
>+ 	*/
>+-	CONDITION ConnectAssociation(Association* assoc, int lossy = 0);
>++	OFCondition ConnectAssociation(Association* assoc, int lossy = 0);
>+ 
>+ 	/**
>+ 	Send C-Echo request to dicom node
>+@@ -80,12 +80,12 @@ private:
>+ 	/**
>+ 	Add all possible presentation contexts to association parameters
>+ 	*/
>+-	static CONDITION addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
>++	static OFCondition addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
>+ 
>+ 	/**
>+ 	Connect to a host and try to establish an association
>+ 	*/
>+-	CONDITION ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax = NULL, int lossy = 0);
>++	OFCondition ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax = NULL, int lossy = 0);
>+ 
>+ 	/**
>+ 	THE dicom network
>diff -urN /usr/ports/graphics/aeskulap/files/patch-src_Makefile.am graphics/aeskulap/files/patch-src_Makefile.am
>--- /usr/ports/graphics/aeskulap/files/patch-src_Makefile.am	2015-08-24 03:53:49.058933000 +0900
>+++ graphics/aeskulap/files/patch-src_Makefile.am	1970-01-01 09:00:00.000000000 +0900
>@@ -1,19 +0,0 @@
>---- src/Makefile.am.orig	2010-08-23 17:40:05.000000000 +0200
>-+++ src/Makefile.am	2010-08-23 17:40:14.000000000 +0200
>-@@ -25,14 +25,14 @@
>- 
>- 
>- aeskulap_LDADD = \
>-+	$(DCMTK_LIBS) \
>- 	$(GTKMM_LIBS) \
>- 	$(GLADEMM_LIBS) \
>- 	$(GTHREAD_LIBS) \
>- 	../widgets/libgtkdicom.la \
>- 	../imagepool/libimagepool.la \
>- 	../configuration/libconfiguration.la \
>--	$(GCONFMM_LIBS) \
>--	$(DCMTK_LIBS)
>-+	$(GCONFMM_LIBS)
>- 
>- aeskulap_LDFLAGS = \
>- 	-Wl,-rpath,${prefix}/lib/aeskulap
>diff -urN /usr/ports/graphics/aeskulap/files/patch-src_Makefile.in graphics/aeskulap/files/patch-src_Makefile.in
>--- /usr/ports/graphics/aeskulap/files/patch-src_Makefile.in	2015-08-24 03:53:49.108272000 +0900
>+++ graphics/aeskulap/files/patch-src_Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,19 +0,0 @@
>---- src/Makefile.in.orig	2010-08-23 17:39:47.000000000 +0200
>-+++ src/Makefile.in	2010-08-23 17:40:00.000000000 +0200
>-@@ -286,14 +286,14 @@
>- 	main.cpp
>- 
>- aeskulap_LDADD = \
>-+	$(DCMTK_LIBS) \
>- 	$(GTKMM_LIBS) \
>- 	$(GLADEMM_LIBS) \
>- 	$(GTHREAD_LIBS) \
>- 	../widgets/libgtkdicom.la \
>- 	../imagepool/libimagepool.la \
>- 	../configuration/libconfiguration.la \
>--	$(GCONFMM_LIBS) \
>--	$(DCMTK_LIBS)
>-+	$(GCONFMM_LIBS)
>- 
>- aeskulap_LDFLAGS = \
>- 	-Wl,-rpath,${prefix}/lib/aeskulap
>diff -urN /usr/ports/graphics/aeskulap/files/patch-widgets_awindowleveltoolbutton.cpp graphics/aeskulap/files/patch-widgets_awindowleveltoolbutton.cpp
>--- /usr/ports/graphics/aeskulap/files/patch-widgets_awindowleveltoolbutton.cpp	2015-08-24 03:53:49.072653000 +0900
>+++ graphics/aeskulap/files/patch-widgets_awindowleveltoolbutton.cpp	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- widgets/awindowleveltoolbutton.cpp.orig	2010-07-27 14:58:36.000000000 +0000
>-+++ widgets/awindowleveltoolbutton.cpp	2010-07-27 14:58:44.000000000 +0000
>-@@ -2,6 +2,8 @@
>- #include "aiconfactory.h"
>- #include <iostream>
>- 
>-+#include <libintl.h>
>-+
>- namespace Aeskulap {
>- 
>- std::set<WindowLevelToolButton*> WindowLevelToolButton::m_widgetlist;
>diff -urN /usr/ports/graphics/aeskulap/pkg-descr graphics/aeskulap/pkg-descr
>--- /usr/ports/graphics/aeskulap/pkg-descr	2015-08-24 03:53:49.030612000 +0900
>+++ graphics/aeskulap/pkg-descr	2016-07-04 00:00:00.000000000 +0900
>@@ -5,4 +5,4 @@
> create a full open source replacement for commercially available DICOM
> viewers.
> 
>-WWW: https://github.com/pipelka/aeskulap/
>+WWW: https://github.com/pipelka/aeskulap
>diff -urN /usr/ports/graphics/aeskulap/pkg-plist graphics/aeskulap/pkg-plist
>--- /usr/ports/graphics/aeskulap/pkg-plist	2015-08-24 03:53:49.012105000 +0900
>+++ graphics/aeskulap/pkg-plist	2016-07-04 00:00:00.000000000 +0900
>@@ -1,18 +1,7 @@
> bin/aeskulap
> lib/aeskulap/libconfiguration.so
> lib/aeskulap/libimagepool.so
>-lib/aeskulap/libofstd.so
>-lib/aeskulap/libdcmdata.so
>-lib/aeskulap/libdcmnet.so
>-lib/aeskulap/libdcmimgle.so
>-lib/aeskulap/libdcmimage.so
>-lib/aeskulap/libijg8.so
>-lib/aeskulap/libijg12.so
>-lib/aeskulap/libijg16.so
>-lib/aeskulap/libdcmjpeg.so
>-share/applications/aeskulap.desktop
> %%DATADIR%%/glade/aeskulap.glade
>-%%DATADIR%%/images/aeskulap.png
> %%DATADIR%%/images/cursor_pan.png
> %%DATADIR%%/images/cursor_windowlevel.png
> %%DATADIR%%/images/cursor_zoom.png
>@@ -31,9 +20,13 @@
> %%DATADIR%%/images/series-4x4.png
> %%DATADIR%%/images/start-here.png
> %%DATADIR%%/images/stock-layers-24.png
>+%%DATADIR%%/images/stock-tool-color-picker-22.png
> %%DATADIR%%/images/stock-tool-eraser-22.png
> %%DATADIR%%/images/stock-tool-measure-22.png
> %%DATADIR%%/images/stock-tool-scale-22.png
>+share/applications/aeskulap.desktop
>+share/icons/hicolor/64x64/apps/aeskulap.png
>+share/icons/hicolor/scalable/apps/aeskulap.svg
> share/locale/de/LC_MESSAGES/aeskulap.mo
> share/locale/en/LC_MESSAGES/aeskulap.mo
> share/locale/es/LC_MESSAGES/aeskulap.mo

Actions: View | Diff

Attachments on bug 210794: 172076