- Enable OpenSSL support

- Convert to new LIB_DEPENDS format
- STAGE-clean
- Fix COMMENT

devel/dcmtk/Makefile

@@ -8,16 +8,18 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNAME}${PORTVERSION:S/.//g}/
 
 MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	A toolkit to work with DICOM files
+COMMENT=	Toolkit to work with DICOM objects
 
-LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-    		png15:${PORTSDIR}/graphics/png \
+    		libpng15.so:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg
+		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
 USES=		cmake:outsource
-CMAKE_ARGS+=	-DDCMTK_WITH_DOXYGEN:BOOL=OFF
+CMAKE_ARGS+=	-DDCMTK_WITH_DOXYGEN:BOOL=OFF \
+    		-DDCMTK_WITH_OPENSSL:BOOL=ON
 
 SHLIBS=		dcmdata dcmdsig dcmimage dcmimgle dcmjpeg dcmnet \
 		dcmpstat dcmqrdb dcmsr dcmtls dcmwlm ijg8 ijg12 \
@@ -28,7 +30,6 @@ PLIST_SUB=	SHLIBVER=${SHLIBVER}
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
@@ -43,10 +44,10 @@ post-patch:
 .endif
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/doxygen/manpages/man1/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 .for shlib in ${SHLIBS}
-	@${MV} ${PREFIX}/lib/lib${shlib}.so ${PREFIX}/lib/lib${shlib}.so.${SHLIBVER}
+	@${MV} ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so.${SHLIBVER}
-	@${LN} -sf ${PREFIX}/lib/lib${shlib}.so.${SHLIBVER} ${PREFIX}/lib/lib${shlib}.so
+	@${LN} -sf ${PREFIX}/lib/lib${shlib}.so.${SHLIBVER} ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so
 .endfor
 
-#.include "Makefile.man"
 .include <bsd.port.post.mk>

devel/dcmtk/Makefile.man

@@ -1,9 +0,0 @@
-MAN1=	dcm2pnm.1 dcmcrle.1 dcmdump.1 dcmmkcrv.1 dcmp2pgm.1 dcmpsmk.1 \
-	dcmqridx.1 dcmscale.1 dsr2html.1 echoscu.1 storescp.1 xml2dcm.1 \
-	dcm2xml.1 dcmdjpeg.1 dcmftest.1 dcmmkdir.1 dcmprscp.1 dcmpsprt.1 \
-	dcmqrscp.1 dcmsign.1 dsr2xml.1 findscu.1 storescu.1 xml2dsr.1 \
-	dcmcjpeg.1 dcmdrle.1 dcmgpdir.1 dcmmklut.1 dcmprscu.1 dcmpsrcv.1 \
-	dcmqrti.1 dcod2lum.1 dsrdump.1 movescu.1 termscu.1 dcmconv.1 \
-	dcmdspfn.1 dcmj2pnm.1 dcmodify.1 dcmpschk.1 dcmpssnd.1 dcmquant.1 \
-	dconvlum.1 dump2dcm.1 pdf2dcm.1 wlmscpfs.1 dcm2pdf.1 dcmcjpls.1 \
-	dcmdjpls.1 dcml2pnm.1 img2dcm.1

devel/dcmtk/pkg-plist

@@ -573,6 +573,57 @@ lib/liboflog.so.%%SHLIBVER%%
 lib/libofstd.a
 lib/libofstd.so
 lib/libofstd.so.%%SHLIBVER%%
+man/man1/dcm2pdf.1.gz
+man/man1/dcm2pnm.1.gz
+man/man1/dcm2xml.1.gz
+man/man1/dcmcjpeg.1.gz
+man/man1/dcmcjpls.1.gz
+man/man1/dcmconv.1.gz
+man/man1/dcmcrle.1.gz
+man/man1/dcmdjpeg.1.gz
+man/man1/dcmdjpls.1.gz
+man/man1/dcmdrle.1.gz
+man/man1/dcmdspfn.1.gz
+man/man1/dcmdump.1.gz
+man/man1/dcmftest.1.gz
+man/man1/dcmgpdir.1.gz
+man/man1/dcmj2pnm.1.gz
+man/man1/dcml2pnm.1.gz
+man/man1/dcmmkcrv.1.gz
+man/man1/dcmmkdir.1.gz
+man/man1/dcmmklut.1.gz
+man/man1/dcmodify.1.gz
+man/man1/dcmp2pgm.1.gz
+man/man1/dcmprscp.1.gz
+man/man1/dcmprscu.1.gz
+man/man1/dcmpschk.1.gz
+man/man1/dcmpsmk.1.gz
+man/man1/dcmpsprt.1.gz
+man/man1/dcmpsrcv.1.gz
+man/man1/dcmpssnd.1.gz
+man/man1/dcmqridx.1.gz
+man/man1/dcmqrscp.1.gz
+man/man1/dcmqrti.1.gz
+man/man1/dcmquant.1.gz
+man/man1/dcmscale.1.gz
+man/man1/dcmsign.1.gz
+man/man1/dcod2lum.1.gz
+man/man1/dconvlum.1.gz
+man/man1/dsr2html.1.gz
+man/man1/dsr2xml.1.gz
+man/man1/dsrdump.1.gz
+man/man1/dump2dcm.1.gz
+man/man1/echoscu.1.gz
+man/man1/findscu.1.gz
+man/man1/img2dcm.1.gz
+man/man1/movescu.1.gz
+man/man1/pdf2dcm.1.gz
+man/man1/storescp.1.gz
+man/man1/storescu.1.gz
+man/man1/termscu.1.gz
+man/man1/wlmscpfs.1.gz
+man/man1/xml2dcm.1.gz
+man/man1/xml2dsr.1.gz
 %%DATADIR%%/SC.dump
 %%DATADIR%%/VLP.dump
 %%DATADIR%%/camera.lut
@@ -618,7 +669,6 @@ lib/libofstd.so.%%SHLIBVER%%
 @dirrm %%DATADIR%%/wlistqry
 @dirrm %%DATADIR%%/wlistdb
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
 @dirrm etc/dcmtk
 @dirrm bin/dcmtk
 @dirrm include/dcmtk/ofstd