From owner-svn-ports-all@freebsd.org  Thu Apr 26 20:12:25 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5753FB72E3;
 Thu, 26 Apr 2018 20:12:25 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 80E457820B;
 Thu, 26 Apr 2018 20:12:25 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7BE6A1CC7A;
 Thu, 26 Apr 2018 20:12:25 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3QKCPT0082196;
 Thu, 26 Apr 2018 20:12:25 GMT (envelope-from tcberner@FreeBSD.org)
Received: (from tcberner@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3QKCPJt082175;
 Thu, 26 Apr 2018 20:12:25 GMT (envelope-from tcberner@FreeBSD.org)
Message-Id: <201804262012.w3QKCPJt082175@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tcberner set sender to
 tcberner@FreeBSD.org using -f
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Thu, 26 Apr 2018 20:12:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r468381 - head/x11-toolkits/qwt6
X-SVN-Group: ports-head
X-SVN-Commit-Author: tcberner
X-SVN-Commit-Paths: head/x11-toolkits/qwt6
X-SVN-Commit-Revision: 468381
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2018 20:12:26 -0000

Author: tcberner
Date: Thu Apr 26 20:12:25 2018
New Revision: 468381
URL: https://svnweb.freebsd.org/changeset/ports/468381

Log:
  Fix x11-toolkits/qwt6's doc dirs
  
  Unfortunately, when flavorizing, we overlooked the dropping of DOCSDIR, which made
  qwt6 conflict with qwt5.
  
  PR:		227790
  Submitted by:	lbartoletti@tuxfamily.org (maintainer)
  Reported by:	Rainer Hurling <rhurlin@gwdg.de>

Modified:
  head/x11-toolkits/qwt6/Makefile

Modified: head/x11-toolkits/qwt6/Makefile
==============================================================================
--- head/x11-toolkits/qwt6/Makefile	Thu Apr 26 19:54:43 2018	(r468380)
+++ head/x11-toolkits/qwt6/Makefile	Thu Apr 26 20:12:25 2018	(r468381)
@@ -2,7 +2,7 @@
 
 PORTNAME=	qwt
 PORTVERSION=	6.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	6-${FLAVOR}
@@ -13,10 +13,11 @@ COMMENT=	Qt Widgets for Technical Applications
 FLAVORS=	qt4 qt5
 FLAVOR?=	${FLAVORS:[1]}
 
-USES=		gmake qmake tar:bzip2 uniquefiles:dirs
+USES=		gmake qmake tar:bzip2
 USE_GL=		gl
 USE_LDCONFIG=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/qwt6-${FLAVOR}
 PORTDOCS=	*
 PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
 		SHLIB_SHVER=${PORTVERSION:R}