From owner-svn-ports-all@freebsd.org Tue Sep 13 20:06:30 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 058B9BD7C9D; Tue, 13 Sep 2016 20:06:30 +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 mx1.freebsd.org (Postfix) with ESMTPS id D2A7CBB5; Tue, 13 Sep 2016 20:06:29 +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 u8DK6TVY035890; Tue, 13 Sep 2016 20:06:29 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DK6SqP035886; Tue, 13 Sep 2016 20:06:28 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201609132006.u8DK6SqP035886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Tue, 13 Sep 2016 20:06:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422073 - in head/databases: . sqlitebrowser sqlitebrowser-qt5 sqlitebrowser-qt5/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.23 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: Tue, 13 Sep 2016 20:06:30 -0000 Author: tcberner Date: Tue Sep 13 20:06:28 2016 New Revision: 422073 URL: https://svnweb.freebsd.org/changeset/ports/422073 Log: Add new port databases/sqlitebrowser-qt5 as slaveport of databases/sqlitebrowser Add a new port databases/sqlitebrowser-qt5 as slaveport of the existing databases/sqlitebrowser. PR: 211217 Reviewed by: mat Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D7253 Added: head/databases/sqlitebrowser-qt5/ - copied from r422070, head/databases/sqlitebrowser/ Deleted: head/databases/sqlitebrowser-qt5/distinfo head/databases/sqlitebrowser-qt5/files/ head/databases/sqlitebrowser-qt5/pkg-descr head/databases/sqlitebrowser-qt5/pkg-plist Modified: head/databases/Makefile head/databases/sqlitebrowser-qt5/Makefile head/databases/sqlitebrowser/Makefile Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Tue Sep 13 20:00:36 2016 (r422072) +++ head/databases/Makefile Tue Sep 13 20:06:28 2016 (r422073) @@ -964,6 +964,7 @@ SUBDIR += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlitebrowser + SUBDIR += sqlitebrowser-qt5 SUBDIR += sqliteman SUBDIR += sqlitemanager SUBDIR += sqliteodbc Modified: head/databases/sqlitebrowser-qt5/Makefile ============================================================================== --- head/databases/sqlitebrowser/Makefile Tue Sep 13 19:22:41 2016 (r422070) +++ head/databases/sqlitebrowser-qt5/Makefile Tue Sep 13 20:06:28 2016 (r422073) @@ -1,30 +1,12 @@ -# Created by: loïc bartoletti +# Created by: Tobias C. Berner # $FreeBSD$ PORTNAME= sqlitebrowser -PORTVERSION= 3.8.0 -DISTVERSIONPREFIX= v -CATEGORIES= databases +PORTREVERSION= 0 +PKGNAMESUFFIX= -qt5 -MAINTAINER= coder@tuxfamily.org -COMMENT= DB Browser for SQLite is a visual tool to manage SQLite databases +CONFLICTS_INSTALL= ${PORTNAME}-3.* -LICENSE= MPL GPLv3 -LICENSE_COMB= dual +MASTERDIR= ${.CURDIR:H}/sqlitebrowser -USE_GITHUB= yes - -USES= cmake desktop-file-utils sqlite -USE_QT4= corelib network gui qmake_build linguisttools_build \ - moc_build uic_build rcc_build - -INSTALLS_ICONS= yes - -post-patch: - @${ECHO} ${DATADIR} - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ - ${WRKSRC}/src/PreferencesDialog.cpp - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ - ${WRKSRC}/src/Application.cpp - -.include +.include "${MASTERDIR}/Makefile" Modified: head/databases/sqlitebrowser/Makefile ============================================================================== --- head/databases/sqlitebrowser/Makefile Tue Sep 13 20:00:36 2016 (r422072) +++ head/databases/sqlitebrowser/Makefile Tue Sep 13 20:06:28 2016 (r422073) @@ -4,24 +4,32 @@ PORTNAME= sqlitebrowser PORTVERSION= 3.8.0 DISTVERSIONPREFIX= v +PORTREVISION?= 1 CATEGORIES= databases MAINTAINER= coder@tuxfamily.org COMMENT= DB Browser for SQLite is a visual tool to manage SQLite databases +CONFLICTS_INSTALL?= ${PORTNAME}-qt5-* + LICENSE= MPL GPLv3 LICENSE_COMB= dual USE_GITHUB= yes USES= cmake desktop-file-utils sqlite + +.if empty(PKGNAMESUFFIX) USE_QT4= corelib network gui qmake_build linguisttools_build \ moc_build uic_build rcc_build - -INSTALLS_ICONS= yes +CMAKE_ARGS+= -DUSE_QT5:BOOL=FALSE +.else +USE_QT5= core gui network printsupport testlib widgets \ + buildtools_build linguisttools_build qmake_build +CMAKE_ARGS+= -DUSE_QT5:BOOL=TRUE +.endif post-patch: - @${ECHO} ${DATADIR} @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/src/PreferencesDialog.cpp @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \