for graphics/dcmtk: Vadim has pushed a whole bunch of stuff. I made sure to pull in the Libtool stuff that other porters found out and merged them carefully a few weeks ago.
the strigi diff is straightforward. please review and commit. after this is committed: multimedia/{phonon, phonon-backend} ? strigi.diff Index: Makefile =================================================================== RCS file: /cvs/ports/databases/strigi/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 29 Mar 2012 13:38:13 -0000 1.14 +++ Makefile 13 Nov 2012 21:04:57 -0000 @@ -1,45 +1,52 @@ -# $OpenBSD: Makefile,v 1.14 2012/03/29 13:38:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2011/07/07 01:06:59 ajacoutot Exp $ -SHARED_ONLY = Yes COMMENT = document indexer CATEGORIES = databases devel textproc sysutils -HOMEPAGE = http://strigi.sourceforge.net -DISTNAME = strigi-0.7.2 - -REVISION = 0 +HOMEPAGE = https://projects.kde.org/projects/kdesupport/strigi/ +DISTNAME = strigi-0.7.7pl1 +SHARED_ONLY = Yes -EXTRACT_SUFX = .tar.bz2 -MASTER_SITES = http://www.vandenoever.info/software/strigi/ \ - http://spacehopper.org/mirrors/ +MASTER_SITES = ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \ + http://malcolm.ecentrum.hu/distfiles/ \ + http://spacehopper.org/mirrors/ \ + http://www.ohvost.ru/dnl/kde/src/ # LGPLv2+ -PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes - -SHARED_LIBS += searchclient 1.0 # .0.5 -SHARED_LIBS += streamanalyzer 1.0 # .0.5 -SHARED_LIBS += streams 1.0 # .0.5 -SHARED_LIBS += strigihtmlgui 1.0 # .0.5 -SHARED_LIBS += strigiqtdbusclient 1.0 # .0.5 +PERMIT_DISTFILES_FTP = Yes -LIB_DEPENDS = clucene-core->=0.9.21:textproc/clucene \ - archivers/bzip2 \ +SHARED_LIBS += searchclient 1.2 # .0.5 +SHARED_LIBS += streamanalyzer 1.2 # .0.5 +SHARED_LIBS += streams 1.2 # .0.5 +SHARED_LIBS += strigihtmlgui 1.2 # .0.5 +SHARED_LIBS += strigiqtdbusclient 1.2 # .0.5 + +BUILD_DEPENDS = devel/cppunit \ + devel/boost + +LIB_DEPENDS = archivers/bzip2 \ + graphics/exiv2 \ + graphics/ffmpeg \ + sysutils/gamin \ + textproc/clucene>=2.3 \ textproc/libxml \ - x11/qt4 \ - x11/dbus \ - graphics/exiv2 - -WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender bz2 c clucene>=1 dbus-1 exiv2 \ - fontconfig freetype glib-2.0 gthread-2.0 lib/qt4/QtCore \ - lib/qt4/QtDBus lib/qt4/QtGui m png pthread stdc++ xml2 z ${MODLIBICONV_WANTLIB} - -MODULES += devel/cmake converters/libiconv -CONFIGURE_STYLE = cmake -SEPARATE_BUILD = Yes + x11/dbus + +WANTLIB = lib/qt4/QtDBus lib/qt4/QtGui +WANTLIB += bz2 c clucene-core clucene-shared dbus-1 exiv2 fam m pthread +WANTLIB += stdc++ xml2 z avcodec avformat avutil swscale + +MODULES = devel/cmake \ + converters/libiconv \ + x11/qt4 + +# Not ported +CONFIGURE_ARGS = -DENABLE_LOG4CXX:Bool=No -CONFIGURE_ARGS += -DHyperEstraier_FOUND:BOOL=0 +# Depends on Java +CONFIGURE_ARGS += -DENABLE_REGENERATEXSD:Bool=No .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/databases/strigi/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 18 Jun 2010 15:09:41 -0000 1.6 +++ distinfo 13 Nov 2012 21:04:57 -0000 @@ -1,5 +1,2 @@ -MD5 (strigi-0.7.2.tar.bz2) = ygm6F2zz/+mvzk2S84+ahQ== -RMD160 (strigi-0.7.2.tar.bz2) = dJcZUzX3bzCSL1xqyq44PhRLM8c= -SHA1 (strigi-0.7.2.tar.bz2) = tMFHLvBoU2rPnFxMjwM6l/nGn58= -SHA256 (strigi-0.7.2.tar.bz2) = HKQhu+Qg0YObvmv+fEtSoFWQqben7ad5JLVUyY5gKrg= -SIZE (strigi-0.7.2.tar.bz2) = 936320 +SHA256 (strigi-0.7.7pl1.tar.gz) = eLltb5+Jw4xu5iBdYv4MPyjYyS0gRCAZOvFK8Rq7IaM= +SIZE (strigi-0.7.7pl1.tar.gz) = 908466 Index: test.sh =================================================================== RCS file: test.sh diff -N test.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ test.sh 13 Nov 2012 21:04:57 -0000 @@ -0,0 +1 @@ +ls /usr/ports/openbsd-wip/databases/$1 Index: patches/patch-cmake_FindQt4_cmake =================================================================== RCS file: patches/patch-cmake_FindQt4_cmake diff -N patches/patch-cmake_FindQt4_cmake --- patches/patch-cmake_FindQt4_cmake 24 Oct 2007 22:49:38 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,189 +0,0 @@ -$OpenBSD: patch-cmake_FindQt4_cmake,v 1.2 2007/10/24 22:49:38 espie Exp $ ---- cmake/FindQt4.cmake.orig Mon Jul 16 13:26:59 2007 -+++ cmake/FindQt4.cmake Thu Oct 25 00:10:55 2007 -@@ -184,6 +184,19 @@ - # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. - # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - -+## macro for asking qmake to process pro files -+MACRO(QT_QUERY_QMAKE outvar invar) -+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro -+ "message(CMAKE_MESSAGE<$$${invar}>)") -+ EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE} -+ WORKING_DIRECTORY -+ ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake -+ OUTPUT_VARIABLE _qmake_query_output -+ ERROR_VARIABLE _qmake_query_output ) -+ FILE(REMOVE_RECURSE -+ "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake") -+ STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}") -+ENDMACRO(QT_QUERY_QMAKE) - - INCLUDE(CheckSymbolExists) - INCLUDE(MacroAddFileDependencies) -@@ -217,7 +230,7 @@ MACRO(QT_QUERY_QMAKE outvar invar) - ENDMACRO(QT_QUERY_QMAKE) - - # check for qmake --FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS -+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" - $ENV{QTDIR}/bin -@@ -557,7 +570,7 @@ IF (QT4_QMAKE_FOUND) - MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR) - - # Set QT_INCLUDES -- SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ) -+ SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default) - - - ######################################## -@@ -1190,7 +1203,142 @@ IF (QT4_QMAKE_FOUND) - SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(UNIX) - -+ IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") -+ FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents) -+ STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents}) -+ STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents}) -+ ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") - -+ SET(QT_GUI_LIB_DEPENDENCIES "") -+ SET(QT_CORE_LIB_DEPENDENCIES "") -+ SET(QT_DBUS_LIB_DEPENDENCIES "") -+ -+ ## system png -+ IF(QT_QCONFIG MATCHES "system-png") -+ FIND_LIBRARY(QT_PNG_LIBRARY NAMES png) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY}) -+ MARK_AS_ADVANCED(QT_PNG_LIBRARY) -+ FIND_PATH(QT_PNG_INCLUDE_DIR png.h -+ /usr/local/include -+ /usr/include -+ /usr/local/include/libpng # OpenBSD -+ ) -+ MARK_AS_ADVANCED(QT_PNG_INCLUDE_DIR) -+ SET(QT_INCLUDES ${QT_INCLUDES} ${QT_PNG_INCLUDE_DIR}) -+ -+ ENDIF(QT_QCONFIG MATCHES "system-png") -+ -+ IF(QT_QCONFIG MATCHES "glib") -+ FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0) -+ FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0) -+ MARK_AS_ADVANCED(QT_GLIB_LIBRARY) -+ MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) -+ ENDIF(QT_QCONFIG MATCHES "glib") -+ -+ IF(QT_QCONFIG MATCHES "gnu-libiconv") -+ FIND_LIBRARY(QT_LIBINTL NAMES intl) -+ FIND_LIBRARY(QT_LIBICONV NAMES iconv) -+ MARK_AS_ADVANCED(QT_LIBICONV) -+ MARK_AS_ADVANCED(QT_LIBINTL) -+ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBICONV} ${QT_LIBICONV}) -+ ENDIF(QT_QCONFIG MATCHES "gnu-libiconv") -+ -+ IF(QT_QCONFIG MATCHES "qdbus") -+ FIND_LIBRARY(QT_DBUS NAMES dbus-1) -+ MARK_AS_ADVANCED(QT_DBUS) -+ SET(QT_DBUS_LIB_DEPENDENCIES ${QT_DBUS_LIB_DEPENDENCIES} ${QT_DBUS}) -+ ENDIF(QT_QCONFIG MATCHES "qdbus") -+ # for X11, get X11 library directory -+ IF(Q_WS_X11) -+ SET(QMAKE_LIBDIR_X11 "/usr/X11R6/lib") -+ ENDIF(Q_WS_X11) -+ -+ ## X11 SM -+ IF(QT_QCONFIG MATCHES "x11sm") -+ # ask qmake where the x11 libs are -+ FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11}) -+ FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY}) -+ MARK_AS_ADVANCED(QT_X11_SM_LIBRARY) -+ MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "x11sm") -+ -+ ## Xi -+ IF(QT_QCONFIG MATCHES "tablet") -+ FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XI_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "tablet") -+ -+ ## Xrender -+ IF(QT_QCONFIG MATCHES "xrender") -+ FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XRENDER_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xrender") -+ -+ ## Xrandr -+ IF(QT_QCONFIG MATCHES "xrandr") -+ FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XRANDR_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xrandr") -+ -+ ## Xcursor -+ IF(QT_QCONFIG MATCHES "xcursor") -+ FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xcursor") -+ -+ ## Xinerama -+ IF(QT_QCONFIG MATCHES "xinerama") -+ FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xinerama") -+ -+ ## system-freetype -+ IF(QT_QCONFIG MATCHES "system-freetype") -+ FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY}) -+ MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "system-freetype") -+ -+ ## fontconfig -+ IF(QT_QCONFIG MATCHES "fontconfig") -+ FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY}) -+ MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "fontconfig") -+ -+ ## system-zlib -+ IF(QT_QCONFIG MATCHES "system-zlib") -+ FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z) -+ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY}) -+ MARK_AS_ADVANCED(QT_ZLIB_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "system-zlib") -+ -+ IF(Q_WS_X11) -+ # X11 libraries Qt absolutely depends on -+ QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11") -+ SEPARATE_ARGUMENTS(QT_LIBS_X11) -+ FOREACH(QT_X11_LIB ${QT_LIBS_X11}) -+ STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}") -+ SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY") -+ FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}}) -+ ENDFOREACH(QT_X11_LIB) -+ -+ QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD") -+ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD}) -+ -+ QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD") -+ SET (QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD}) -+ -+ ENDIF(Q_WS_X11) -+ - ####################################### - # - # compatibility settings -@@ -1218,4 +1366,3 @@ ELSE(QT4_QMAKE_FOUND) - ENDIF(Qt4_FIND_REQUIRED) - - ENDIF (QT4_QMAKE_FOUND) -- Index: patches/patch-libstreamanalyzer_lib_saxeventanalyzer_cpp =================================================================== RCS file: patches/patch-libstreamanalyzer_lib_saxeventanalyzer_cpp diff -N patches/patch-libstreamanalyzer_lib_saxeventanalyzer_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libstreamanalyzer_lib_saxeventanalyzer_cpp 13 Nov 2012 21:04:57 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libstreamanalyzer/lib/saxeventanalyzer.cpp.orig Thu Nov 10 13:28:11 2011 ++++ libstreamanalyzer/lib/saxeventanalyzer.cpp Thu Nov 10 13:28:35 2011 +@@ -27,7 +27,7 @@ + #include <cstring> + + #ifndef LIBXML_THREAD_ENABLED +-#error Strigi needs a thread safe version of libxml2 ++#warning Strigi needs a thread safe version of libxml2 + #endif + + using namespace Strigi; Index: patches/patch-libstreams_lib_textutils_cpp =================================================================== RCS file: patches/patch-libstreams_lib_textutils_cpp diff -N patches/patch-libstreams_lib_textutils_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libstreams_lib_textutils_cpp 13 Nov 2012 21:04:57 -0000 @@ -0,0 +1,31 @@ +$OpenBSD$ +Do not use home-grown swapXX macros instead of system ones. +--- libstreams/lib/textutils.cpp.orig Sun Feb 5 17:08:27 2012 ++++ libstreams/lib/textutils.cpp Tue Oct 9 14:07:24 2012 +@@ -163,12 +163,18 @@ Strigi::convertNewLines(char* p) { + } + } + ++#ifndef swap16 + #define swap16(x) \ + ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) ++#endif + ++#ifndef swap32 + #define swap32(x) \ + ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) \ + | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) ++#endif ++ ++#ifndef swap64 + #define swap64(x) \ + ((((x) & 0xff00000000000000ull) >> 56) \ + | (((x) & 0x00ff000000000000ull) >> 40) \ +@@ -178,6 +184,7 @@ Strigi::convertNewLines(char* p) { + | (((x) & 0x0000000000ff0000ull) << 24) \ + | (((x) & 0x000000000000ff00ull) << 40) \ + | (((x) & 0x00000000000000ffull) << 56)) ++#endif + + #ifdef __BIG_ENDIAN__ + int16_t Index: patches/patch-src_archiveengine_CMakeLists_txt =================================================================== RCS file: patches/patch-src_archiveengine_CMakeLists_txt diff -N patches/patch-src_archiveengine_CMakeLists_txt --- patches/patch-src_archiveengine_CMakeLists_txt 16 Jun 2010 13:35:43 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -$OpenBSD: patch-src_archiveengine_CMakeLists_txt,v 1.3 2010/06/16 13:35:43 espie Exp $ ---- src/archiveengine/CMakeLists.txt.orig Sun Feb 1 20:56:04 2009 -+++ src/archiveengine/CMakeLists.txt Fri May 28 22:32:13 2010 -@@ -15,4 +15,4 @@ add_library(archiveengine STATIC - streamengine.cpp - ) - --target_link_libraries(archiveengine ${QT_QTCORE_LIBRARY} streams) -+target_link_libraries(archiveengine ${QT_QTCORE_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} streams) Index: patches/patch-src_archivereader_qclient_CMakeLists_txt =================================================================== RCS file: patches/patch-src_archivereader_qclient_CMakeLists_txt diff -N patches/patch-src_archivereader_qclient_CMakeLists_txt --- patches/patch-src_archivereader_qclient_CMakeLists_txt 10 Jun 2007 21:46:27 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ -$OpenBSD: patch-src_archivereader_qclient_CMakeLists_txt,v 1.1.1.1 2007/06/10 21:46:27 espie Exp $ ---- src/archivereader/qclient/CMakeLists.txt.orig Fri Jun 8 23:00:40 2007 -+++ src/archivereader/qclient/CMakeLists.txt Fri Jun 8 23:01:00 2007 -@@ -13,5 +13,5 @@ set(qclient_MOC_HDRS filebrowser.h) - qt4_wrap_cpp(qclient_MOC_SRCS ${qclient_MOC_HDRS}) - add_executable(qclient ${qclient_SRCS} ${qclient_MOC_SRCS}) - target_link_libraries(qclient streams -- ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}) -+ ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) - Index: patches/patch-src_daemon_dbus_dbuscpp_makecode_pl =================================================================== RCS file: patches/patch-src_daemon_dbus_dbuscpp_makecode_pl diff -N patches/patch-src_daemon_dbus_dbuscpp_makecode_pl --- patches/patch-src_daemon_dbus_dbuscpp_makecode_pl 18 Jun 2010 15:09:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_daemon_dbus_dbuscpp_makecode_pl,v 1.1 2010/06/18 15:09:41 sthen Exp $ ---- src/daemon/dbus/dbuscpp/makecode.pl.orig Wed Feb 3 19:03:07 2010 -+++ src/daemon/dbus/dbuscpp/makecode.pl Fri Jun 18 14:50:45 2010 -@@ -325,7 +325,7 @@ print FH "#include \"$relativeinterfaceheader\"\n"; - print FH "#define DBUS_API_SUBJECT_TO_CHANGE 1\n"; - print FH "#include <dbus/dbus.h>\n"; - print FH "#include <exception>\n"; --print FH "#ifdef __APPLE__ \n"; -+print FH "#if defined(__APPLE__) || defined(__OpenBSD__)\n"; - print FH "#define uint64_t dbus_uint64_t\n"; - print FH "#endif\n"; - print FH "class DBusObjectInterface;\n"; Index: patches/patch-src_daemon_strigithread_cpp =================================================================== RCS file: patches/patch-src_daemon_strigithread_cpp diff -N patches/patch-src_daemon_strigithread_cpp --- patches/patch-src_daemon_strigithread_cpp 18 Jun 2010 15:09:41 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_daemon_strigithread_cpp,v 1.4 2010/06/18 15:09:41 sthen Exp $ ---- src/daemon/strigithread.cpp.orig Wed Feb 3 19:03:07 2010 -+++ src/daemon/strigithread.cpp Fri Jun 18 13:51:02 2010 -@@ -119,12 +119,14 @@ threadstarter(void *d) { - + ".threadstarter", - string("error setting priority: ") + strerror(errno)); - } -+#ifndef __OpenBSD__ - r = sched_setscheduler(0, SCHED_BATCH, ¶m); - if (r != 0) { - STRIGI_LOG_INFO (string("strigi.daemon.") + thread->name - + ".threadstarter", - string("error setting to batch: ") + strerror(errno)); - } -+#endif - #ifdef SYS_ioprio_set - if (syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, 0, - IOPRIO_CLASS_IDLE<<IOPRIO_CLASS_SHIFT ) < 0 ) { Index: patches/patch-src_qclient_CMakeLists_txt =================================================================== RCS file: patches/patch-src_qclient_CMakeLists_txt diff -N patches/patch-src_qclient_CMakeLists_txt --- patches/patch-src_qclient_CMakeLists_txt 28 Oct 2008 17:11:43 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_qclient_CMakeLists_txt,v 1.2 2008/10/28 17:11:43 espie Exp $ ---- src/qclient/CMakeLists.txt.orig Sun Jun 1 23:45:16 2008 -+++ src/qclient/CMakeLists.txt Wed Jul 30 16:58:05 2008 -@@ -8,15 +8,15 @@ set(qclientold_MOC_HDRS filebrowser.h) - qt4_wrap_cpp(qclientold_MOC_SRCS ${qclientold_MOC_HDRS}) - add_executable(qclientold ${qclientold_SRCS} ${qclientold_MOC_SRCS}) - --target_link_libraries(qclientold streams archiveengine ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+target_link_libraries(qclientold streams archiveengine ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) - - # qclientarchivecat - add_executable(qclientarchivecat archivecat.cpp) - --target_link_libraries(qclientarchivecat streams archiveengine ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+target_link_libraries(qclientarchivecat streams archiveengine ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) - - # archivedialog - add_executable(archivedialog archivedialog.cpp) - --target_link_libraries(archivedialog streams archiveengine ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+target_link_libraries(archivedialog streams archiveengine ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) - Index: patches/patch-src_searchclient_filterwidget_CMakeLists_txt =================================================================== RCS file: patches/patch-src_searchclient_filterwidget_CMakeLists_txt diff -N patches/patch-src_searchclient_filterwidget_CMakeLists_txt --- patches/patch-src_searchclient_filterwidget_CMakeLists_txt 16 Jun 2010 13:35:43 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_searchclient_filterwidget_CMakeLists_txt,v 1.2 2010/06/16 13:35:43 espie Exp $ ---- src/searchclient/filterwidget/CMakeLists.txt.orig Sun Feb 1 20:56:02 2009 -+++ src/searchclient/filterwidget/CMakeLists.txt Fri May 28 22:32:13 2010 -@@ -7,7 +7,7 @@ qt4_wrap_cpp(filterwidget_MOC_SRCS ${filterwidget_MOC_ - - add_library(filterwidget STATIC ${filterwidget_SRCS} ${filterwidget_MOC_SRCS}) - --target_link_libraries(filterwidget ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+target_link_libraries(filterwidget ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) - - add_executable(filterwidgettest filterwidgettest.cpp) - Index: patches/patch-src_searchclient_qtdbus_CMakeLists_txt =================================================================== RCS file: patches/patch-src_searchclient_qtdbus_CMakeLists_txt diff -N patches/patch-src_searchclient_qtdbus_CMakeLists_txt --- patches/patch-src_searchclient_qtdbus_CMakeLists_txt 18 Jun 2010 15:09:41 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_searchclient_qtdbus_CMakeLists_txt,v 1.4 2010/06/18 15:09:41 sthen Exp $ ---- src/searchclient/qtdbus/CMakeLists.txt.orig Wed Feb 3 19:03:07 2010 -+++ src/searchclient/qtdbus/CMakeLists.txt Fri Jun 18 13:51:02 2010 -@@ -20,7 +20,7 @@ qt4_wrap_cpp(strigiqtdbusclient_MOC_SRCS ${strigiqtdbu - add_library(strigiqtdbusclient SHARED ${strigiqtdbusclient_SRCS} - ${strigiqtdbusclient_MOC_SRCS}) - --target_link_libraries(strigiqtdbusclient ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY}) -+target_link_libraries(strigiqtdbusclient ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) - set_target_properties(strigiqtdbusclient - PROPERTIES VERSION ${STRIGI_VERSION_STRING} - SOVERSION ${STRIGI_VERSION_MAJOR} -@@ -40,4 +40,4 @@ set(strigiasynctest_SRCS strigiasynctest.cpp strigiasy - set(strigiasynctest_MOC_HDRS strigiasyncwidget.h) - qt4_wrap_cpp(strigiasynctest_MOC_SRCS ${strigiasynctest_MOC_HDRS}) - add_executable(strigiasynctest ${strigiasynctest_SRCS} ${strigiasynctest_MOC_SRCS}) --target_link_libraries(strigiasynctest strigiqtdbusclient ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+target_link_libraries(strigiasynctest strigiqtdbusclient ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) Index: patches/patch-src_sqliteindexer_CMakeLists_txt =================================================================== RCS file: patches/patch-src_sqliteindexer_CMakeLists_txt diff -N patches/patch-src_sqliteindexer_CMakeLists_txt --- patches/patch-src_sqliteindexer_CMakeLists_txt 18 Jun 2010 15:09:41 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_sqliteindexer_CMakeLists_txt,v 1.3 2010/06/18 15:09:41 sthen Exp $ ---- src/sqliteindexer/CMakeLists.txt.orig Wed Feb 3 19:03:07 2010 -+++ src/sqliteindexer/CMakeLists.txt Fri Jun 18 13:51:02 2010 -@@ -20,7 +20,7 @@ add_library(sqlite MODULE - sqliteindexwriter.cpp - ) - set_target_properties(sqlite PROPERTIES PREFIX ${prefix}) --target_link_libraries(sqlite ${SQLITE_LIBRARIES}) -+target_link_libraries(sqlite ${SQLITE_LIBRARIES} pthread) - install(TARGETS sqlite LIBRARY DESTINATION ${LIB_DESTINATION}/strigi) - - if (CppUnit_FOUND) Index: patches/patch-src_streamanalyzer_saxeventanalyzer_cpp =================================================================== RCS file: patches/patch-src_streamanalyzer_saxeventanalyzer_cpp diff -N patches/patch-src_streamanalyzer_saxeventanalyzer_cpp --- patches/patch-src_streamanalyzer_saxeventanalyzer_cpp 18 Jun 2010 15:09:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_streamanalyzer_saxeventanalyzer_cpp,v 1.1 2010/06/18 15:09:41 sthen Exp $ ---- src/streamanalyzer/saxeventanalyzer.cpp.orig Wed Feb 3 19:03:07 2010 -+++ src/streamanalyzer/saxeventanalyzer.cpp Fri Jun 18 15:07:00 2010 -@@ -27,7 +27,7 @@ - #include <cstring> - - #ifndef LIBXML_THREAD_ENABLED --#error Strigi needs a thread safe version of libxml2 -+#warning Strigi needs a thread safe version of libxml2 - #endif - - using namespace Strigi; Index: patches/patch-src_streams_textutils_cpp =================================================================== RCS file: patches/patch-src_streams_textutils_cpp diff -N patches/patch-src_streams_textutils_cpp --- patches/patch-src_streams_textutils_cpp 16 Jun 2010 13:36:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-src_streams_textutils_cpp,v 1.1 2010/06/16 13:36:16 espie Exp $ ---- src/streams/textutils.cpp.orig Wed Jul 30 16:59:33 2008 -+++ src/streams/textutils.cpp Wed Jul 30 17:00:07 2008 -@@ -159,12 +159,17 @@ Strigi::convertNewLines(char* p) { - } - } - -+#ifndef swap16 - #define swap16(x) \ - ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) -+#endif - -+#ifndef swap32 - #define swap32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) \ - | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) -+#endif -+#ifndef swap64 - #define swap64(x) \ - ((((x) & 0xff00000000000000ull) >> 56) \ - | (((x) & 0x00ff000000000000ull) >> 40) \ -@@ -174,6 +179,7 @@ Strigi::convertNewLines(char* p) { - | (((x) & 0x0000000000ff0000ull) << 24) \ - | (((x) & 0x000000000000ff00ull) << 40) \ - | (((x) & 0x00000000000000ffull) << 56)) -+#endif - - #ifdef __BIG_ENDIAN__ - int16_t Index: patches/patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl =================================================================== RCS file: patches/patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl diff -N patches/patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl 13 Nov 2012 21:04:57 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- strigidaemon/bin/daemon/dbus/dbuscpp/makecode.pl.orig Thu Nov 10 13:39:46 2011 ++++ strigidaemon/bin/daemon/dbus/dbuscpp/makecode.pl Thu Nov 10 13:38:07 2011 +@@ -325,7 +325,7 @@ print FH "#include \"$relativeinterfaceheader\"\n"; + print FH "#define DBUS_API_SUBJECT_TO_CHANGE 1\n"; + print FH "#include <dbus/dbus.h>\n"; + print FH "#include <exception>\n"; +-print FH "#ifdef __APPLE__ \n"; ++print FH "#if defined(__APPLE__) || defined(__OpenBSD__)\n"; + print FH "#define uint64_t dbus_uint64_t\n"; + print FH "#endif\n"; + print FH "class DBusObjectInterface;\n"; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/strigi/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 18 Jun 2010 15:09:41 -0000 1.7 +++ pkg/PLIST 13 Nov 2012 21:04:57 -0000 @@ -1,7 +1,7 @@ @comment $OpenBSD: PLIST,v 1.7 2010/06/18 15:09:41 sthen Exp $ @bin bin/deepfind @bin bin/deepgrep -@bin bin/luceneindexer +@bin bin/lucene2indexer @bin bin/rdfindexer @bin bin/strigiclient @bin bin/strigicmd @@ -12,17 +12,23 @@ include/strigi/analysisresult.h include/strigi/analyzerconfiguration.h include/strigi/analyzerplugin.h include/strigi/archivereader.h +include/strigi/arinputstream.h include/strigi/asyncsocket.h include/strigi/asyncsocketclient.h include/strigi/bufferedstream.h +include/strigi/bz2inputstream.h include/strigi/classproperties.h include/strigi/clientinterface.h +include/strigi/cpioinputstream.h +include/strigi/dataeventinputstream.h include/strigi/diranalyzer.h include/strigi/encodinginputstream.h include/strigi/fieldproperties.h include/strigi/fieldpropertiesdb.h include/strigi/fieldtypes.h include/strigi/fileinputstream.h +include/strigi/filelister.h +include/strigi/gzipinputstream.h include/strigi/indexeddocument.h include/strigi/indexmanager.h include/strigi/indexplugin.h @@ -31,6 +37,11 @@ include/strigi/indexreader.h include/strigi/indexwriter.h include/strigi/inputstream.h include/strigi/inputstreamreader.h +include/strigi/kmpsearcher.h +include/strigi/lzmainputstream.h +include/strigi/mailinputstream.h +include/strigi/oleinputstream.h +include/strigi/processinputstream.h include/strigi/qtdbus/ include/strigi/qtdbus/strigiasyncclient.h include/strigi/qtdbus/strigiclient.h @@ -38,7 +49,9 @@ include/strigi/qtdbus/strigidbus.h include/strigi/qtdbus/strigitypes.h include/strigi/query.h include/strigi/queryparser.h +include/strigi/rpminputstream.h include/strigi/sdfinputstream.h +include/strigi/socketclient.h include/strigi/streamanalyzer.h include/strigi/streamanalyzerfactory.h include/strigi/streambase.h @@ -48,6 +61,7 @@ include/strigi/streameventanalyzer.h include/strigi/streamlineanalyzer.h include/strigi/streamsaxanalyzer.h include/strigi/streamthroughanalyzer.h +include/strigi/strigi_thread.h include/strigi/strigiconfig.h include/strigi/strigihtmlgui.h include/strigi/stringstream.h @@ -55,19 +69,32 @@ include/strigi/stringterminatedsubstream include/strigi/subinputstream.h include/strigi/substreamprovider.h include/strigi/substreamproviderprovider.h +include/strigi/tarinputstream.h include/strigi/textutils.h include/strigi/variant.h +include/strigi/zipinputstream.h +lib/libsearchclient/ @lib lib/libsearchclient.so.${LIBsearchclient_VERSION} +lib/libsearchclient/LibSearchClientConfig.cmake +lib/libstreamanalyzer/ @lib lib/libstreamanalyzer.so.${LIBstreamanalyzer_VERSION} +lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake +lib/libstreams/ @lib lib/libstreams.so.${LIBstreams_VERSION} +lib/libstreams/LibStreamsConfig.cmake +lib/libstreams/LibStreamsTargets-noconfig.cmake +lib/libstreams/LibStreamsTargets.cmake @lib lib/libstrigihtmlgui.so.${LIBstrigihtmlgui_VERSION} @lib lib/libstrigiqtdbusclient.so.${LIBstrigiqtdbusclient_VERSION} lib/pkgconfig/libstreamanalyzer.pc lib/pkgconfig/libstreams.pc lib/strigi/ lib/strigi/StrigiConfig.cmake +lib/strigi/strigiea_digest.so +lib/strigi/strigiea_ffmpeg.so lib/strigi/strigiea_jpeg.so -lib/strigi/strigiindex_clucene.so +lib/strigi/strigiea_riff.so +lib/strigi/strigiindex_cluceneng.so lib/strigi/strigila_cpp.so lib/strigi/strigila_deb.so lib/strigi/strigila_namespaceharvester.so ? dcmtk.diff Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/dcmtk/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 17 Jun 2012 21:55:20 -0000 1.10 +++ Makefile 13 Nov 2012 21:21:32 -0000 @@ -1,14 +1,28 @@ -# $OpenBSD: Makefile,v 1.10 2012/06/17 21:55:20 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2011/09/16 10:02:36 espie Exp $ COMMENT= DICOM toolkit DISTNAME= dcmtk-3.5.4 -REVISION= 1 +REVISION= 2 CATEGORIES= graphics HOMEPAGE= http://www.dcmtk.org/dcmtk.php.en +# Add libraries here manually, after checking PLIST for .a changes +SHARED_LIBS += dcmdata 0.0 +SHARED_LIBS += dcmimage 0.0 +SHARED_LIBS += dcmimgle 0.0 +SHARED_LIBS += dcmjpeg 0.0 +SHARED_LIBS += dcmnet 0.0 +SHARED_LIBS += dcmpstat 0.0 +SHARED_LIBS += dcmqrdb 0.0 +SHARED_LIBS += dcmsign 0.0 +SHARED_LIBS += dcmsr 0.0 +SHARED_LIBS += dcmtls 0.0 +SHARED_LIBS += dcmwlm 0.0 +SHARED_LIBS += ofstd 0.0 + MASTER_SITES= ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk354/ # Several ISC and BSDish @@ -17,6 +31,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= c crypto m ssl stdc++ wrap z jpeg>=62 png>=4 \ tiff>=36 xml2>=9 @@ -27,6 +42,7 @@ LIB_DEPENDS= graphics/jpeg \ RUN_DEPENDS= graphics/netpbm +MODULES= lang/tcl CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --disable-threads \ --with-libtiff --with-libtiffinc=${LOCALBASE} \ @@ -35,15 +51,53 @@ CONFIGURE_ARGS= --disable-threads \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_prog_LIBTOOL=: + MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config +FAKE_TARGET= install install-include install-lib FAKE_FLAGS= DESTDIR=${WRKINST} \ etcdir=${WRKINST}${PREFIX}/share/examples/dcmtk \ datadir=${WRKINST}${PREFIX}/share/dcmtk \ docdir=${WRKINST}${PREFIX}/share/doc/dcmtk -USE_GROFF = Yes +USE_GROFF = Yes -NO_REGRESS= Yes +# based on MODPY_BIN_ADJ from python.port.mk +PERL_BIN_ADJ= perl -pi \ + -e '$$. == 1 && s|^.*env perl.*$$|\#!/usr/bin/perl|;' \ + -e '$$. == 1 && s|^.*bin/perl.*$$|\#!/usr/bin/perl|;' \ + -e 'close ARGV if eof;' + +REGRESS_IS_INTERACTIVE = X11 + +.include <bsd.port.arch.mk> + +.if ${NO_SHARED_LIBS:L} != "yes" +COPTS = -fPIC + +# Add paths to all directories where we have libraries built +.for l v in ${SHARED_LIBS} +REGRESS_LD_PATH += ${WRKBUILD}/$l/libsrc +.endfor + +post-configure: +.for l v in ${SHARED_LIBS} + cp ${WRKSRC}/$l/libsrc/Makefile{,.beforeaddso} + LIBFILE=lib$l.so.$v awk -f ${FILESDIR}/addso.awk \ + <${WRKSRC}/$l/libsrc/Makefile \ + >${WRKSRC}/$l/libsrc/Makefile.new + mv ${WRKSRC}/$l/libsrc/Makefile{.new,} +.endfor +.endif # ${NO_SHARED_LIBS:L} != "yes" + +do-regress: + ${PERL_BIN_ADJ} \ + ${WRKSRC}/dcmpstat/tests/dcmpsprt.pl \ + ${WRKSRC}/dcmtls/tests/dcmtk_ca.pl + ${MODTCL_WISH_ADJ} \ + ${WRKSRC}/dcmdata/tests/dcmpsdmp.tcl \ + ${WRKSRC}/dcmpstat/tests/dcmpschk.tcl + cd ${WRKBUILD} && \ + LD_LIBRARY_PATH="`echo '${REGRESS_LD_PATH}' | sed -e 's/ /:/g'`" \ + sh ${FILESDIR}/regress.sh .include <bsd.port.mk> - Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/dcmtk/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 10 Apr 2008 10:09:56 -0000 1.1.1.1 +++ distinfo 13 Nov 2012 21:21:32 -0000 @@ -1,5 +1,2 @@ -MD5 (dcmtk-3.5.4.tar.gz) = Cv2XHN+XalszZyLvL2jm1w== -RMD160 (dcmtk-3.5.4.tar.gz) = 0VWMnGjlPg6jsID9L7ULnY4w7ro= -SHA1 (dcmtk-3.5.4.tar.gz) = FpBWh0lHCD5o65QfzVP6rryGKuU= SHA256 (dcmtk-3.5.4.tar.gz) = e4V1umCVFtdraBwN6MEyjPI+V96yxwhaaqN9QpI1TXY= SIZE (dcmtk-3.5.4.tar.gz) = 3756374 Index: files/addso.awk =================================================================== RCS file: files/addso.awk diff -N files/addso.awk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/addso.awk 13 Nov 2012 21:21:32 -0000 @@ -0,0 +1,34 @@ +#!/usr/bin/awk -f + +BEGIN { + LIBFILE = ENVIRON["LIBFILE"] +} + +/^all:/ { + print $0, "$(solibrary)" + next +} + +/^library[[:space:]]*=/ { + print "solibrary = " LIBFILE +} + +/^\$\(library\):/ { + POS = index($0, ":") + OBJS = substr($0, POS + 1) +} + +# do not worry about adding multiple times +/install(-lib)?:/, /^$/ { + if ($0 == "") + print "\t$(INSTALL_DATA) $(solibrary) $(libdir)/$(solibrary)" +} + +{ + print +} + +END { + print "$(solibrary):" OBJS + print "\t$(CXX) -shared -fPIC $(LDFLAGS) -o $@ " OBJS +} Index: files/regress.sh =================================================================== RCS file: files/regress.sh diff -N files/regress.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/regress.sh 13 Nov 2012 21:21:32 -0000 @@ -0,0 +1,22 @@ +#!/bin/sh + +MODS_HAVE_TESTS="dcmwlm ofstd" + +set -e + +test_ofstd() { + ls | while read f; do + file "$f" | fgrep executable >/dev/null || continue + echo "=====> Running test $f" + ./"$f" + done +} + +test_dcmwlm() { +# ls ../wlistqry/*.dump | +} + +for m in ${MODS_HAVE_TESTS}; do + echo "====> Running tests for module $m" + (eval "cd $m/tests && test_$m") +done Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PFRAG.shared 13 Nov 2012 21:21:32 -0000 @@ -0,0 +1,13 @@ +@comment $OpenBSD$ +@lib lib/libdcmdata.so.${LIBdcmdata_VERSION} +@lib lib/libdcmimage.so.${LIBdcmimage_VERSION} +@lib lib/libdcmimgle.so.${LIBdcmimgle_VERSION} +@lib lib/libdcmjpeg.so.${LIBdcmjpeg_VERSION} +@lib lib/libdcmnet.so.${LIBdcmnet_VERSION} +@lib lib/libdcmpstat.so.${LIBdcmpstat_VERSION} +@lib lib/libdcmqrdb.so.${LIBdcmqrdb_VERSION} +@lib lib/libdcmsign.so.${LIBdcmsign_VERSION} +@lib lib/libdcmsr.so.${LIBdcmsr_VERSION} +@lib lib/libdcmtls.so.${LIBdcmtls_VERSION} +@lib lib/libdcmwlm.so.${LIBdcmwlm_VERSION} +@lib lib/libofstd.so.${LIBofstd_VERSION} 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 13 Nov 2012 21:21:32 -0000 @@ -1,51 +1,460 @@ @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 +%%SHARED%% +@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 +include/dcmtk/ +include/dcmtk/config/ +include/dcmtk/config/cfunix.h +include/dcmtk/config/osconfig.h +include/dcmtk/dcmdata/ +include/dcmtk/dcmdata/cmdlnarg.h +include/dcmtk/dcmdata/dcbytstr.h +include/dcmtk/dcmdata/dcchrstr.h +include/dcmtk/dcmdata/dccodec.h +include/dcmtk/dcmdata/dcdatset.h +include/dcmtk/dcmdata/dcddirif.h +include/dcmtk/dcmdata/dcdebug.h +include/dcmtk/dcmdata/dcdefine.h +include/dcmtk/dcmdata/dcdeftag.h +include/dcmtk/dcmdata/dcdicdir.h +include/dcmtk/dcmdata/dcdicent.h +include/dcmtk/dcmdata/dcdict.h +include/dcmtk/dcmdata/dcdirrec.h +include/dcmtk/dcmdata/dcelem.h +include/dcmtk/dcmdata/dcerror.h +include/dcmtk/dcmdata/dcfilefo.h +include/dcmtk/dcmdata/dchashdi.h +include/dcmtk/dcmdata/dcistrma.h +include/dcmtk/dcmdata/dcistrmb.h +include/dcmtk/dcmdata/dcistrmf.h +include/dcmtk/dcmdata/dcistrmz.h +include/dcmtk/dcmdata/dcitem.h +include/dcmtk/dcmdata/dclist.h +include/dcmtk/dcmdata/dcmetinf.h +include/dcmtk/dcmdata/dcobject.h +include/dcmtk/dcmdata/dcofsetl.h +include/dcmtk/dcmdata/dcostrma.h +include/dcmtk/dcmdata/dcostrmb.h +include/dcmtk/dcmdata/dcostrmf.h +include/dcmtk/dcmdata/dcostrmz.h +include/dcmtk/dcmdata/dcovlay.h +include/dcmtk/dcmdata/dcpcache.h +include/dcmtk/dcmdata/dcpixel.h +include/dcmtk/dcmdata/dcpixseq.h +include/dcmtk/dcmdata/dcpxitem.h +include/dcmtk/dcmdata/dcrleccd.h +include/dcmtk/dcmdata/dcrlecce.h +include/dcmtk/dcmdata/dcrlecp.h +include/dcmtk/dcmdata/dcrledec.h +include/dcmtk/dcmdata/dcrledrg.h +include/dcmtk/dcmdata/dcrleenc.h +include/dcmtk/dcmdata/dcrleerg.h +include/dcmtk/dcmdata/dcrlerp.h +include/dcmtk/dcmdata/dcsequen.h +include/dcmtk/dcmdata/dcstack.h +include/dcmtk/dcmdata/dcswap.h +include/dcmtk/dcmdata/dctag.h +include/dcmtk/dcmdata/dctagkey.h +include/dcmtk/dcmdata/dctk.h +include/dcmtk/dcmdata/dctypes.h +include/dcmtk/dcmdata/dcuid.h +include/dcmtk/dcmdata/dcvm.h +include/dcmtk/dcmdata/dcvr.h +include/dcmtk/dcmdata/dcvrae.h +include/dcmtk/dcmdata/dcvras.h +include/dcmtk/dcmdata/dcvrat.h +include/dcmtk/dcmdata/dcvrcs.h +include/dcmtk/dcmdata/dcvrda.h +include/dcmtk/dcmdata/dcvrds.h +include/dcmtk/dcmdata/dcvrdt.h +include/dcmtk/dcmdata/dcvrfd.h +include/dcmtk/dcmdata/dcvrfl.h +include/dcmtk/dcmdata/dcvris.h +include/dcmtk/dcmdata/dcvrlo.h +include/dcmtk/dcmdata/dcvrlt.h +include/dcmtk/dcmdata/dcvrobow.h +include/dcmtk/dcmdata/dcvrof.h +include/dcmtk/dcmdata/dcvrpn.h +include/dcmtk/dcmdata/dcvrpobw.h +include/dcmtk/dcmdata/dcvrsh.h +include/dcmtk/dcmdata/dcvrsl.h +include/dcmtk/dcmdata/dcvrss.h +include/dcmtk/dcmdata/dcvrst.h +include/dcmtk/dcmdata/dcvrtm.h +include/dcmtk/dcmdata/dcvrui.h +include/dcmtk/dcmdata/dcvrul.h +include/dcmtk/dcmdata/dcvrulup.h +include/dcmtk/dcmdata/dcvrus.h +include/dcmtk/dcmdata/dcvrut.h +include/dcmtk/dcmdata/dcxfer.h +include/dcmtk/dcmimage/ +include/dcmtk/dcmimage/diargimg.h +include/dcmtk/dcmimage/diargpxt.h +include/dcmtk/dcmimage/dicmyimg.h +include/dcmtk/dcmimage/dicmypxt.h +include/dcmtk/dcmimage/dicocpt.h +include/dcmtk/dcmimage/dicoflt.h +include/dcmtk/dcmimage/dicoimg.h +include/dcmtk/dcmimage/dicomot.h +include/dcmtk/dcmimage/dicoopx.h +include/dcmtk/dcmimage/dicoopxt.h +include/dcmtk/dcmimage/dicopx.h +include/dcmtk/dcmimage/dicopxt.h +include/dcmtk/dcmimage/dicorot.h +include/dcmtk/dcmimage/dicosct.h +include/dcmtk/dcmimage/dihsvimg.h +include/dcmtk/dcmimage/dihsvpxt.h +include/dcmtk/dcmimage/dipalimg.h +include/dcmtk/dcmimage/dipalpxt.h +include/dcmtk/dcmimage/dipipng.h +include/dcmtk/dcmimage/dipitiff.h +include/dcmtk/dcmimage/diqtcmap.h +include/dcmtk/dcmimage/diqtctab.h +include/dcmtk/dcmimage/diqtfs.h +include/dcmtk/dcmimage/diqthash.h +include/dcmtk/dcmimage/diqthitl.h +include/dcmtk/dcmimage/diqthitm.h +include/dcmtk/dcmimage/diqtid.h +include/dcmtk/dcmimage/diqtpbox.h +include/dcmtk/dcmimage/diqtpix.h +include/dcmtk/dcmimage/diqtstab.h +include/dcmtk/dcmimage/diqttype.h +include/dcmtk/dcmimage/diquant.h +include/dcmtk/dcmimage/diregist.h +include/dcmtk/dcmimage/dirgbimg.h +include/dcmtk/dcmimage/dirgbpxt.h +include/dcmtk/dcmimage/diybrimg.h +include/dcmtk/dcmimage/diybrpxt.h +include/dcmtk/dcmimage/diyf2img.h +include/dcmtk/dcmimage/diyf2pxt.h +include/dcmtk/dcmimage/diyp2img.h +include/dcmtk/dcmimage/diyp2pxt.h +include/dcmtk/dcmimgle/ +include/dcmtk/dcmimgle/dcmimage.h +include/dcmtk/dcmimgle/dibaslut.h +include/dcmtk/dcmimgle/diciefn.h +include/dcmtk/dcmimgle/dicielut.h +include/dcmtk/dcmimgle/dicrvfit.h +include/dcmtk/dcmimgle/didislut.h +include/dcmtk/dcmimgle/didispfn.h +include/dcmtk/dcmimgle/didocu.h +include/dcmtk/dcmimgle/diflipt.h +include/dcmtk/dcmimgle/digsdfn.h +include/dcmtk/dcmimgle/digsdlut.h +include/dcmtk/dcmimgle/diimage.h +include/dcmtk/dcmimgle/diinpx.h +include/dcmtk/dcmimgle/diinpxt.h +include/dcmtk/dcmimgle/diluptab.h +include/dcmtk/dcmimgle/dimo1img.h +include/dcmtk/dcmimgle/dimo2img.h +include/dcmtk/dcmimgle/dimocpt.h +include/dcmtk/dcmimgle/dimoflt.h +include/dcmtk/dcmimgle/dimoimg.h +include/dcmtk/dcmimgle/dimoipxt.h +include/dcmtk/dcmimgle/dimomod.h +include/dcmtk/dcmimgle/dimoopx.h +include/dcmtk/dcmimgle/dimoopxt.h +include/dcmtk/dcmimgle/dimopx.h +include/dcmtk/dcmimgle/dimopxt.h +include/dcmtk/dcmimgle/dimorot.h +include/dcmtk/dcmimgle/dimosct.h +include/dcmtk/dcmimgle/diobjcou.h +include/dcmtk/dcmimgle/diovdat.h +include/dcmtk/dcmimgle/diovlay.h +include/dcmtk/dcmimgle/diovlimg.h +include/dcmtk/dcmimgle/diovpln.h +include/dcmtk/dcmimgle/dipixel.h +include/dcmtk/dcmimgle/diplugin.h +include/dcmtk/dcmimgle/dipxrept.h +include/dcmtk/dcmimgle/diregbas.h +include/dcmtk/dcmimgle/dirotat.h +include/dcmtk/dcmimgle/discalet.h +include/dcmtk/dcmimgle/displint.h +include/dcmtk/dcmimgle/ditranst.h +include/dcmtk/dcmimgle/diutils.h +include/dcmtk/dcmjpeg/ +include/dcmtk/dcmjpeg/ddpiimpl.h +include/dcmtk/dcmjpeg/dipijpeg.h +include/dcmtk/dcmjpeg/djcodecd.h +include/dcmtk/dcmjpeg/djcodece.h +include/dcmtk/dcmjpeg/djcparam.h +include/dcmtk/dcmjpeg/djdecabs.h +include/dcmtk/dcmjpeg/djdecbas.h +include/dcmtk/dcmjpeg/djdecext.h +include/dcmtk/dcmjpeg/djdeclol.h +include/dcmtk/dcmjpeg/djdecode.h +include/dcmtk/dcmjpeg/djdecpro.h +include/dcmtk/dcmjpeg/djdecsps.h +include/dcmtk/dcmjpeg/djdecsv1.h +include/dcmtk/dcmjpeg/djdijg12.h +include/dcmtk/dcmjpeg/djdijg16.h +include/dcmtk/dcmjpeg/djdijg8.h +include/dcmtk/dcmjpeg/djeijg12.h +include/dcmtk/dcmjpeg/djeijg16.h +include/dcmtk/dcmjpeg/djeijg8.h +include/dcmtk/dcmjpeg/djencabs.h +include/dcmtk/dcmjpeg/djencbas.h +include/dcmtk/dcmjpeg/djencext.h +include/dcmtk/dcmjpeg/djenclol.h +include/dcmtk/dcmjpeg/djencode.h +include/dcmtk/dcmjpeg/djencpro.h +include/dcmtk/dcmjpeg/djencsps.h +include/dcmtk/dcmjpeg/djencsv1.h +include/dcmtk/dcmjpeg/djrplol.h +include/dcmtk/dcmjpeg/djrploss.h +include/dcmtk/dcmjpeg/djutils.h +include/dcmtk/dcmnet/ +include/dcmtk/dcmnet/assoc.h +include/dcmtk/dcmnet/cond.h +include/dcmtk/dcmnet/dcasccff.h +include/dcmtk/dcmnet/dcasccfg.h +include/dcmtk/dcmnet/dccfenmp.h +include/dcmtk/dcmnet/dccfpcmp.h +include/dcmtk/dcmnet/dccfprmp.h +include/dcmtk/dcmnet/dccfrsmp.h +include/dcmtk/dcmnet/dccftsmp.h +include/dcmtk/dcmnet/dccfuidh.h +include/dcmtk/dcmnet/dcmlayer.h +include/dcmtk/dcmnet/dcmsmap.h +include/dcmtk/dcmnet/dcmtrans.h +include/dcmtk/dcmnet/dcompat.h +include/dcmtk/dcmnet/dicom.h +include/dcmtk/dcmnet/dimse.h +include/dcmtk/dcmnet/diutil.h +include/dcmtk/dcmnet/dul.h +include/dcmtk/dcmnet/extneg.h +include/dcmtk/dcmnet/lst.h +include/dcmtk/dcmpstat/ +include/dcmtk/dcmpstat/dcmpstat.h +include/dcmtk/dcmpstat/dvcache.h +include/dcmtk/dcmpstat/dviface.h +include/dcmtk/dcmpstat/dvpsab.h +include/dcmtk/dcmpstat/dvpsabl.h +include/dcmtk/dcmpstat/dvpsal.h +include/dcmtk/dcmpstat/dvpsall.h +include/dcmtk/dcmpstat/dvpscf.h +include/dcmtk/dcmpstat/dvpscu.h +include/dcmtk/dcmpstat/dvpscul.h +include/dcmtk/dcmpstat/dvpsda.h +include/dcmtk/dcmpstat/dvpsdal.h +include/dcmtk/dcmpstat/dvpsdef.h +include/dcmtk/dcmpstat/dvpsfs.h +include/dcmtk/dcmpstat/dvpsga.h +include/dcmtk/dcmpstat/dvpsgal.h +include/dcmtk/dcmpstat/dvpsgl.h +include/dcmtk/dcmpstat/dvpsgll.h +include/dcmtk/dcmpstat/dvpsgr.h +include/dcmtk/dcmpstat/dvpsgrl.h +include/dcmtk/dcmpstat/dvpshlp.h +include/dcmtk/dcmpstat/dvpsib.h +include/dcmtk/dcmpstat/dvpsibl.h +include/dcmtk/dcmpstat/dvpsmsg.h +include/dcmtk/dcmpstat/dvpsov.h +include/dcmtk/dcmpstat/dvpsovl.h +include/dcmtk/dcmpstat/dvpspl.h +include/dcmtk/dcmpstat/dvpspll.h +include/dcmtk/dcmpstat/dvpspr.h +include/dcmtk/dcmpstat/dvpsprt.h +include/dcmtk/dcmpstat/dvpsri.h +include/dcmtk/dcmpstat/dvpsril.h +include/dcmtk/dcmpstat/dvpsrs.h +include/dcmtk/dcmpstat/dvpsrsl.h +include/dcmtk/dcmpstat/dvpssp.h +include/dcmtk/dcmpstat/dvpsspl.h +include/dcmtk/dcmpstat/dvpssv.h +include/dcmtk/dcmpstat/dvpssvl.h +include/dcmtk/dcmpstat/dvpstat.h +include/dcmtk/dcmpstat/dvpstx.h +include/dcmtk/dcmpstat/dvpstxl.h +include/dcmtk/dcmpstat/dvpstyp.h +include/dcmtk/dcmpstat/dvpsvl.h +include/dcmtk/dcmpstat/dvpsvll.h +include/dcmtk/dcmpstat/dvpsvw.h +include/dcmtk/dcmpstat/dvpsvwl.h +include/dcmtk/dcmpstat/dvsighdl.h +include/dcmtk/dcmqrdb/ +include/dcmtk/dcmqrdb/dcmqrcbf.h +include/dcmtk/dcmqrdb/dcmqrcbg.h +include/dcmtk/dcmqrdb/dcmqrcbm.h +include/dcmtk/dcmqrdb/dcmqrcbs.h +include/dcmtk/dcmqrdb/dcmqrcnf.h +include/dcmtk/dcmqrdb/dcmqrdba.h +include/dcmtk/dcmqrdb/dcmqrdbi.h +include/dcmtk/dcmqrdb/dcmqrdbs.h +include/dcmtk/dcmqrdb/dcmqridx.h +include/dcmtk/dcmqrdb/dcmqropt.h +include/dcmtk/dcmqrdb/dcmqrptb.h +include/dcmtk/dcmqrdb/dcmqrsrv.h +include/dcmtk/dcmqrdb/dcmqrtis.h +include/dcmtk/dcmsign/ +include/dcmtk/dcmsign/dcsignat.h +include/dcmtk/dcmsign/sialgo.h +include/dcmtk/dcmsign/siautopr.h +include/dcmtk/dcmsign/sibrsapr.h +include/dcmtk/dcmsign/sicert.h +include/dcmtk/dcmsign/sicertvf.h +include/dcmtk/dcmsign/sicreapr.h +include/dcmtk/dcmsign/sidsa.h +include/dcmtk/dcmsign/simac.h +include/dcmtk/dcmsign/simaccon.h +include/dcmtk/dcmsign/simd5.h +include/dcmtk/dcmsign/sinullpr.h +include/dcmtk/dcmsign/siprivat.h +include/dcmtk/dcmsign/siripemd.h +include/dcmtk/dcmsign/sirsa.h +include/dcmtk/dcmsign/sisha1.h +include/dcmtk/dcmsign/sisprof.h +include/dcmtk/dcmsign/sitstamp.h +include/dcmtk/dcmsign/sitypes.h +include/dcmtk/dcmsr/ +include/dcmtk/dcmsr/dsrbascc.h +include/dcmtk/dcmsr/dsrchecc.h +include/dcmtk/dcmsr/dsrcitem.h +include/dcmtk/dcmsr/dsrcodtn.h +include/dcmtk/dcmsr/dsrcodvl.h +include/dcmtk/dcmsr/dsrcomcc.h +include/dcmtk/dcmsr/dsrcomtn.h +include/dcmtk/dcmsr/dsrcomvl.h +include/dcmtk/dcmsr/dsrcontn.h +include/dcmtk/dcmsr/dsrcsidl.h +include/dcmtk/dcmsr/dsrdattn.h +include/dcmtk/dcmsr/dsrdoc.h +include/dcmtk/dcmsr/dsrdoctn.h +include/dcmtk/dcmsr/dsrdoctr.h +include/dcmtk/dcmsr/dsrdtitn.h +include/dcmtk/dcmsr/dsrenhcc.h +include/dcmtk/dcmsr/dsrimgfr.h +include/dcmtk/dcmsr/dsrimgtn.h +include/dcmtk/dcmsr/dsrimgvl.h +include/dcmtk/dcmsr/dsriodcc.h +include/dcmtk/dcmsr/dsrkeycc.h +include/dcmtk/dcmsr/dsrmamcc.h +include/dcmtk/dcmsr/dsrnumtn.h +include/dcmtk/dcmsr/dsrnumvl.h +include/dcmtk/dcmsr/dsrpnmtn.h +include/dcmtk/dcmsr/dsrprocc.h +include/dcmtk/dcmsr/dsrreftn.h +include/dcmtk/dcmsr/dsrscogr.h +include/dcmtk/dcmsr/dsrscotn.h +include/dcmtk/dcmsr/dsrscovl.h +include/dcmtk/dcmsr/dsrsoprf.h +include/dcmtk/dcmsr/dsrstrvl.h +include/dcmtk/dcmsr/dsrtcodt.h +include/dcmtk/dcmsr/dsrtcosp.h +include/dcmtk/dcmsr/dsrtcotn.h +include/dcmtk/dcmsr/dsrtcoto.h +include/dcmtk/dcmsr/dsrtcovl.h +include/dcmtk/dcmsr/dsrtextn.h +include/dcmtk/dcmsr/dsrtimtn.h +include/dcmtk/dcmsr/dsrtlist.h +include/dcmtk/dcmsr/dsrtncsr.h +include/dcmtk/dcmsr/dsrtree.h +include/dcmtk/dcmsr/dsrtypes.h +include/dcmtk/dcmsr/dsruidtn.h +include/dcmtk/dcmsr/dsrwavch.h +include/dcmtk/dcmsr/dsrwavtn.h +include/dcmtk/dcmsr/dsrwavvl.h +include/dcmtk/dcmsr/dsrxmlc.h +include/dcmtk/dcmsr/dsrxmld.h +include/dcmtk/dcmsr/dsrxrdcc.h +include/dcmtk/dcmtls/ +include/dcmtk/dcmtls/tlslayer.h +include/dcmtk/dcmtls/tlstrans.h +include/dcmtk/dcmwlm/ +include/dcmtk/dcmwlm/wlds.h +include/dcmtk/dcmwlm/wldsfs.h +include/dcmtk/dcmwlm/wlfsim.h +include/dcmtk/dcmwlm/wlmactmg.h +include/dcmtk/dcmwlm/wltypdef.h +include/dcmtk/ofstd/ +include/dcmtk/ofstd/ofalgo.h +include/dcmtk/ofstd/ofbmanip.h +include/dcmtk/ofstd/ofcast.h +include/dcmtk/ofstd/ofcmdln.h +include/dcmtk/ofstd/ofconapp.h +include/dcmtk/ofstd/ofcond.h +include/dcmtk/ofstd/ofconfig.h +include/dcmtk/ofstd/ofconsol.h +include/dcmtk/ofstd/ofcrc32.h +include/dcmtk/ofstd/ofdate.h +include/dcmtk/ofstd/ofdatime.h +include/dcmtk/ofstd/offname.h +include/dcmtk/ofstd/ofglobal.h +include/dcmtk/ofstd/oflist.h +include/dcmtk/ofstd/oflogfil.h +include/dcmtk/ofstd/ofoset.h +include/dcmtk/ofstd/ofset.h +include/dcmtk/ofstd/ofsetit.h +include/dcmtk/ofstd/ofstack.h +include/dcmtk/ofstd/ofstd.h +include/dcmtk/ofstd/ofstdinc.h +include/dcmtk/ofstd/ofstream.h +include/dcmtk/ofstd/ofstring.h +include/dcmtk/ofstd/ofthread.h +include/dcmtk/ofstd/oftime.h +include/dcmtk/ofstd/oftimer.h +include/dcmtk/ofstd/oftypes.h +include/dcmtk/ofstd/ofuoset.h lib/dcm2xml.dtd +lib/libdcmdata.a +lib/libdcmdsig.a +lib/libdcmimage.a +lib/libdcmimgle.a +lib/libdcmjpeg.a +lib/libdcmnet.a +lib/libdcmpstat.a +lib/libdcmqrdb.a +lib/libdcmsr.a +lib/libdcmtls.a +lib/libdcmwlm.a +lib/libijg12.a +lib/libijg16.a +lib/libijg8.a +lib/libofstd.a @man man/man1/dcm2pnm.1 @man man/man1/dcm2xml.1 @man man/man1/dcmcjpeg.1