Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Sep 2016 20:06:28 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
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
Message-ID:  <201609132006.u8DK6SqP035886@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <coder@tuxfamily.org>
+# Created by: Tobias C. Berner <tcberner@FreeBSD.org>
 # $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 <bsd.port.mk>
+.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}|' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609132006.u8DK6SqP035886>