From owner-svn-ports-all@freebsd.org Mon Dec 18 10:51:32 2017 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 307EDE83401; Mon, 18 Dec 2017 10:51:32 +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 082D074700; Mon, 18 Dec 2017 10:51:31 +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 vBIApVae041803; Mon, 18 Dec 2017 10:51:31 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBIApUJl041798; Mon, 18 Dec 2017 10:51:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712181051.vBIApUJl041798@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 18 Dec 2017 10:51:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456609 - in head/graphics/autoq3d: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/graphics/autoq3d: . files X-SVN-Commit-Revision: 456609 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 10:51:32 -0000 Author: amdmi3 Date: Mon Dec 18 10:51:30 2017 New Revision: 456609 URL: https://svnweb.freebsd.org/changeset/ports/456609 Log: - Fix LICENSE - Add LICENSE_FILE - Switch to options helpers - Regenerate patches Modified: head/graphics/autoq3d/Makefile head/graphics/autoq3d/files/patch-AutoQ3D.pro head/graphics/autoq3d/files/patch-src__cmds__cmds.cpp head/graphics/autoq3d/files/patch-src__fgui__cadform.cpp head/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp Modified: head/graphics/autoq3d/Makefile ============================================================================== --- head/graphics/autoq3d/Makefile Mon Dec 18 10:50:21 2017 (r456608) +++ head/graphics/autoq3d/Makefile Mon Dec 18 10:51:30 2017 (r456609) @@ -11,8 +11,8 @@ DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4sou MAINTAINER= ports@FreeBSD.org COMMENT= Qt 4 quick 3D model editor -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/docs/license.txt USES= dos2unix qmake zip DOS2UNIX_FILES= *.pro src/cmds/*.cpp src/fgui/*.cpp docs/*.txt @@ -21,11 +21,12 @@ USE_GL= glu USE_QT4= corelib gui opengl moc_build PORTDOCS= 3DQformat.txt ChangeLog.txt -OPTIONS_DEFINE= DOCS DESKTOP_ENTRIES="AutoQ3D" "" "AutoQ3D" \ "AutoQ3D" "Graphics;3DGraphics;Qt;" "" +OPTIONS_DEFINE= DOCS + post-patch: .for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp @${REINPLACE_CMD} \ @@ -40,6 +41,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/autoq3d/files/patch-AutoQ3D.pro ============================================================================== --- head/graphics/autoq3d/files/patch-AutoQ3D.pro Mon Dec 18 10:50:21 2017 (r456608) +++ head/graphics/autoq3d/files/patch-AutoQ3D.pro Mon Dec 18 10:51:30 2017 (r456609) @@ -1,6 +1,6 @@ ---- ./AutoQ3D.pro.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./AutoQ3D.pro 2012-12-02 18:48:47.000000000 -0500 -@@ -8,6 +8,7 @@ +--- AutoQ3D.pro.orig 2016-03-24 23:43:09 UTC ++++ AutoQ3D.pro +@@ -8,6 +8,7 @@ RC_FILE=AutoQ3D.rc win32:LIBS+= -L$(QTDIR)/plugins/imageformats -lqjpeg4 QT += opengl Modified: head/graphics/autoq3d/files/patch-src__cmds__cmds.cpp ============================================================================== --- head/graphics/autoq3d/files/patch-src__cmds__cmds.cpp Mon Dec 18 10:50:21 2017 (r456608) +++ head/graphics/autoq3d/files/patch-src__cmds__cmds.cpp Mon Dec 18 10:51:30 2017 (r456609) @@ -1,6 +1,6 @@ ---- ./src/cmds/cmds.cpp.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./src/cmds/cmds.cpp 2012-12-02 18:54:38.000000000 -0500 -@@ -89,9 +89,9 @@ +--- src/cmds/cmds.cpp.orig 2016-03-24 23:43:09 UTC ++++ src/cmds/cmds.cpp +@@ -89,9 +89,9 @@ cmds::cmds( QWidget* parent) QPalette newPalette = QPalette(); Modified: head/graphics/autoq3d/files/patch-src__fgui__cadform.cpp ============================================================================== --- head/graphics/autoq3d/files/patch-src__fgui__cadform.cpp Mon Dec 18 10:50:21 2017 (r456608) +++ head/graphics/autoq3d/files/patch-src__fgui__cadform.cpp Mon Dec 18 10:51:30 2017 (r456609) @@ -1,6 +1,6 @@ ---- ./src/fgui/cadform.cpp.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./src/fgui/cadform.cpp 2012-12-02 18:51:14.000000000 -0500 -@@ -475,9 +475,9 @@ +--- src/fgui/cadform.cpp.orig 2016-03-24 23:43:09 UTC ++++ src/fgui/cadform.cpp +@@ -475,9 +475,9 @@ CadForm::CadForm() QPalette newPalette = palette(); @@ -13,7 +13,7 @@ -@@ -800,7 +800,7 @@ +@@ -800,7 +800,7 @@ GLApp* CadForm::newViewPort() w->GLThisArea->cscalari=hcmd->cscalari; w->GLThisArea->View=View; Modified: head/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp ============================================================================== --- head/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp Mon Dec 18 10:50:21 2017 (r456608) +++ head/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp Mon Dec 18 10:51:30 2017 (r456609) @@ -1,5 +1,5 @@ ---- ./src/fgui/glapparea.cpp.orig 2012-12-02 18:48:47.000000000 -0500 -+++ ./src/fgui/glapparea.cpp 2012-12-02 18:58:20.000000000 -0500 +--- src/fgui/glapparea.cpp.orig 2016-03-24 23:43:09 UTC ++++ src/fgui/glapparea.cpp @@ -23,6 +23,7 @@ #include #include