From owner-svn-ports-all@freebsd.org Sat Feb 6 23:40:48 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7215A9FD68; Sat, 6 Feb 2016 23:40:47 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id BAA8B1E38; Sat, 6 Feb 2016 23:40:47 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u16NekMw027035; Sat, 6 Feb 2016 23:40:46 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u16Nekjj027032; Sat, 6 Feb 2016 23:40:46 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602062340.u16Nekjj027032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 6 Feb 2016 23:40:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408331 - in head/graphics/meshviewer: . files X-SVN-Group: ports-head 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Feb 2016 23:40:48 -0000 Author: amdmi3 Date: Sat Feb 6 23:40:46 2016 New Revision: 408331 URL: https://svnweb.freebsd.org/changeset/ports/408331 Log: - Fix LICENSE - Simplify docs installation - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/graphics/meshviewer/Makefile head/graphics/meshviewer/files/patch-qt4__glmesh.cpp head/graphics/meshviewer/files/patch-qt4__glmesh_common.cpp Modified: head/graphics/meshviewer/Makefile ============================================================================== --- head/graphics/meshviewer/Makefile Sat Feb 6 23:29:38 2016 (r408330) +++ head/graphics/meshviewer/Makefile Sat Feb 6 23:40:46 2016 (r408331) @@ -9,9 +9,10 @@ MASTER_SITES= SF/mview/mview/${PORTVERSI DISTNAME= mview-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Mesh Viewer +COMMENT= Mesh viewer -LICENSE= GPLv2 +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING WRKSRC= ${WRKDIR}/mview-${PORTVERSION} @@ -25,31 +26,21 @@ MAKE_ARGS= QTDIR="${QT_PREFIX}" CC="${CX CXXFLAGS="${CXXFLAGS}" \ LIBPATH="" LIBS_QT4="${LDFLAGS}" -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= AUTHORS README TODO - -DOCSRCDIR2= ${WRKSRC}/Documentation/pics -DOCSDIR2= ${DOCSDIR}/Documentation/pics -DOC_FILES2= *.jpg - -DOCSRCDIR3= ${WRKSRC}/Documentation -DOCSDIR3= ${DOCSDIR}/Documentation -DOC_FILES3= *.html *.ico - PLIST_FILES= bin/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|make |$$(MAKE) |g' -e 's|CPPFLAGS|CXXFLAGS|g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|make |$$(MAKE) |g' -e 's|CPPFLAGS|CXXFLAGS|g' \ + ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|||g' ${WRKSRC}/mesh/mesh.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mview ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - @${MKDIR} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3} + +do-install-DOCS-on: + @cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS README TODO Documentation" \ + ${STAGEDIR}${DOCSDIR} .include Modified: head/graphics/meshviewer/files/patch-qt4__glmesh.cpp ============================================================================== --- head/graphics/meshviewer/files/patch-qt4__glmesh.cpp Sat Feb 6 23:29:38 2016 (r408330) +++ head/graphics/meshviewer/files/patch-qt4__glmesh.cpp Sat Feb 6 23:40:46 2016 (r408331) @@ -1,5 +1,5 @@ ---- qt4/glmesh.cpp~ 2012-05-20 00:04:04.000000000 -0300 -+++ qt4/glmesh.cpp 2012-05-20 00:04:21.000000000 -0300 +--- qt4/glmesh.cpp.orig 2008-09-09 21:38:45 UTC ++++ qt4/glmesh.cpp @@ -21,6 +21,8 @@ #include "mview.h" #include "coordinates.h" Modified: head/graphics/meshviewer/files/patch-qt4__glmesh_common.cpp ============================================================================== --- head/graphics/meshviewer/files/patch-qt4__glmesh_common.cpp Sat Feb 6 23:29:38 2016 (r408330) +++ head/graphics/meshviewer/files/patch-qt4__glmesh_common.cpp Sat Feb 6 23:40:46 2016 (r408331) @@ -1,5 +1,5 @@ ---- qt4/glmesh_common.cpp~ 2012-05-20 00:04:54.000000000 -0300 -+++ qt4/glmesh_common.cpp 2012-05-20 00:05:03.000000000 -0300 +--- qt4/glmesh_common.cpp.orig 2010-10-15 15:35:52 UTC ++++ qt4/glmesh_common.cpp @@ -10,6 +10,8 @@ #include "glmesh.h"