From owner-svn-ports-head@FreeBSD.ORG  Fri Mar 15 13:28:14 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DF603143;
 Fri, 15 Mar 2013 13:28:14 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B9FDBF7C;
 Fri, 15 Mar 2013 13:28:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2FDSER3026297;
 Fri, 15 Mar 2013 13:28:14 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2FDSEIT026295;
 Fri, 15 Mar 2013 13:28:14 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201303151328.r2FDSEIT026295@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 15 Mar 2013 13:28:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314302 - head/devel/dcmtk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2013 13:28:14 -0000

Author: gahr
Date: Fri Mar 15 13:28:13 2013
New Revision: 314302
URL: http://svnweb.freebsd.org/changeset/ports/314302

Log:
  - Respect NOPORTDOCS [1]
  - Trim Makefile header
  - Remove shared library version from LIB_DEPENDS
  
  Reported by:	bapt [1]

Modified:
  head/devel/dcmtk/Makefile   (contents, props changed)
  head/devel/dcmtk/pkg-plist   (contents, props changed)

Modified: head/devel/dcmtk/Makefile
==============================================================================
--- head/devel/dcmtk/Makefile	Fri Mar 15 13:28:09 2013	(r314301)
+++ head/devel/dcmtk/Makefile	Fri Mar 15 13:28:13 2013	(r314302)
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:	dcmtk
-# Date created:				26 July 2010
-# Whom:					gahr
-#
+# Created by: gahr
 # $FreeBSD$
-#
 
 PORTNAME=	dcmtk
 DISTVERSION=	3.6.0
@@ -14,14 +10,15 @@ MASTER_SITES=	ftp://dicom.offis.de/pub/d
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A toolkit to work with DICOM files
 
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
     		png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+		jpeg:${PORTSDIR}/graphics/jpeg
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 CMAKE_OUTSOURCE=yes
+CMAKE_ARGS+=	-DDCMTK_WITH_DOXYGEN:BOOL=OFF
 
 SHLIBS=		dcmdata dcmdsig dcmimage dcmimgle dcmjpeg dcmnet \
 		dcmpstat dcmqrdb dcmsr dcmtls dcmwlm ijg8 ijg12 \
@@ -30,6 +27,8 @@ SHLIBS=		dcmdata dcmdsig dcmimage dcmimg
 SHLIBVER=	${PORTVERSION:R:R}
 PLIST_SUB=	SHLIBVER=${SHLIBVER}
 
+PORTDOCS=	*
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
@@ -38,6 +37,10 @@ CFLAGS+=	-fPIC
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.h.orig" -delete
+.if !${PORT_OPTIONS:MDOCS}
+	${FIND} ${WRKSRC} -name CMakeLists.txt | ${XARGS} \
+	    ${REINPLACE_CMD} -e '/INSTALL_DOCDIR/d'
+.endif
 
 post-install:
 .for shlib in ${SHLIBS}

Modified: head/devel/dcmtk/pkg-plist
==============================================================================
--- head/devel/dcmtk/pkg-plist	Fri Mar 15 13:28:09 2013	(r314301)
+++ head/devel/dcmtk/pkg-plist	Fri Mar 15 13:28:13 2013	(r314302)
@@ -614,30 +614,10 @@ lib/libofstd.so.%%SHLIBVER%%
 %%DATADIR%%/wlistqry/wlistqry7.dump
 %%DATADIR%%/wlistqry/wlistqry8.dump
 %%DATADIR%%/wlistqry/wlistqry9.dump
-%%DOCSDIR%%/config.txt
-%%DOCSDIR%%/envvars.txt
-%%DOCSDIR%%/modules.txt
-%%DOCSDIR%%/dirstruc.txt
-%%DOCSDIR%%/macros.txt
-%%DOCSDIR%%/datadict.txt
-%%DOCSDIR%%/ciphers.txt
-%%DOCSDIR%%/randseed.txt
-%%DOCSDIR%%/asconfig.txt
-%%DOCSDIR%%/testing.txt
-%%DOCSDIR%%/dcmqrcnf.txt
-%%DOCSDIR%%/dcmqrset.txt
-%%DOCSDIR%%/wwwapp.txt
-%%DOCSDIR%%/ANNOUNCE.360
-%%DOCSDIR%%/CHANGES.360
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/FAQ
-%%DOCSDIR%%/HISTORY
-%%DOCSDIR%%/VERSION
 @dirrm %%DATADIR%%/wlistdb/OFFIS
 @dirrm %%DATADIR%%/wlistqry
 @dirrm %%DATADIR%%/wlistdb
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
 @dirrm etc/dcmtk
 @dirrm bin/dcmtk