diff options
| author | wiz <wiz> | 2014-12-25 13:51:13 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-12-25 13:51:13 +0000 |
| commit | 3eaff9b289d6ecd1a5d90297cf44f8e614426e12 (patch) | |
| tree | a38f49f3c5cd679f5cd6fadac00b46abba7ffc3c /x11/qt5-odbc | |
| parent | 3109d7b09d3c5c48760372986dec54b82b120849 (diff) | |
| download | pkgsrc-3eaff9b289d6ecd1a5d90297cf44f8e614426e12.tar.gz | |
Improve qt5 build structure, from Niclas Rosenvik:
Allow multiple BUILD_DIRS (but Makefile.common must be included later)
Adds installation of some cmake files and gets rid of many manual
installation rules.
Bump PKGREVISION where PLIST changed.
Diffstat (limited to 'x11/qt5-odbc')
| -rw-r--r-- | x11/qt5-odbc/Makefile | 12 | ||||
| -rw-r--r-- | x11/qt5-odbc/PLIST | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/x11/qt5-odbc/Makefile b/x11/qt5-odbc/Makefile index e7e07c7340e..cd20fd19048 100644 --- a/x11/qt5-odbc/Makefile +++ b/x11/qt5-odbc/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2014/04/23 07:05:31 adam Exp $ +# $NetBSD: Makefile,v 1.8 2014/12/25 13:51:13 wiz Exp $ PKGNAME= qt5-odbc-${QTVERSION} +PKGREVISION= 1 COMMENT= Qt5 odbc plugin -.include "../../x11/qt5-qtbase/Makefile.common" - USE_LIBTOOL= yes CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib CONFIGURE_ARGS+= -no-dbus @@ -16,20 +15,17 @@ BUILD_DIRS= qtbase/src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} -INSTALLATION_DIRS+= qt5/plugins/sqldrivers LIBS+= -lltdl +.include "../../x11/qt5-qtbase/Makefile.common" + qmake-odbc-configure: cd ${WRKSRC}/${BUILD_DIRS} && \ ${QTDIR}/bin/qmake "sql-plugins=odbc" -o Makefile post-configure: qmake-odbc-configure -do-install: - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ - ${WRKSRC}/qtbase/plugins/sqldrivers/libqsqlodbc.la \ - ${DESTDIR}${QTPREFIX}/plugins/sqldrivers .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" diff --git a/x11/qt5-odbc/PLIST b/x11/qt5-odbc/PLIST index 0a8cbe626a4..fc736dfcdc1 100644 --- a/x11/qt5-odbc/PLIST +++ b/x11/qt5-odbc/PLIST @@ -1,2 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/12/25 13:51:13 wiz Exp $ +qt5/lib/cmake/Qt5Sql/Qt5Sql_QODBCDriverPlugin.cmake qt5/plugins/sqldrivers/libqsqlodbc.la |