Mon Jan 6 11:21:18 2014 UTC ()
Don't override post-configure, just add to it.


(joerg)
diff -r1.2 -r1.3 pkgsrc/x11/qt5-odbc/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt5-odbc/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-odbc/Makefile 2014/01/04 11:58:39 1.2
+++ pkgsrc/x11/qt5-odbc/Makefile 2014/01/06 11:21:18 1.3
@@ -1,38 +1,40 @@ @@ -1,38 +1,40 @@
1# $NetBSD: Makefile,v 1.2 2014/01/04 11:58:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2014/01/06 11:21:18 joerg Exp $
2 2
3PKGNAME= qt5-odbc-${QTVERSION} 3PKGNAME= qt5-odbc-${QTVERSION}
4PKGREVISION= 1 4PKGREVISION= 1
5COMMENT= Qt5 odbc plugin 5COMMENT= Qt5 odbc plugin
6 6
7.include "../../x11/qt5-qtbase/Makefile.common" 7.include "../../x11/qt5-qtbase/Makefile.common"
8 8
9USE_LIBTOOL= yes 9USE_LIBTOOL= yes
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 11CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
12CONFIGURE_ARGS+= -no-dbus 12CONFIGURE_ARGS+= -no-dbus
13CONFIGURE_ARGS+= -no-sql-mysql 13CONFIGURE_ARGS+= -no-sql-mysql
14CONFIGURE_ARGS+= -no-sql-psql 14CONFIGURE_ARGS+= -no-sql-psql
15CONFIGURE_ARGS+= -no-sql-sqlite 15CONFIGURE_ARGS+= -no-sql-sqlite
16 16
17BUILD_DIRS+= qtbase/src/plugins/sqldrivers 17BUILD_DIRS+= qtbase/src/plugins/sqldrivers
18MAKE_ENV+= QTDIR=${QTDIR} 18MAKE_ENV+= QTDIR=${QTDIR}
19 19
20INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 20INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
21INSTALLATION_DIRS+= qt5/plugins/sqldrivers 21INSTALLATION_DIRS+= qt5/plugins/sqldrivers
22 22
23LIBS+= -lltdl 23LIBS+= -lltdl
24 24
25post-configure: 25qmake-odbc-configure:
26 cd ${WRKSRC}/${BUILD_DIRS} && \ 26 cd ${WRKSRC}/${BUILD_DIRS} && \
27 ${QTDIR}/bin/qmake "sql-plugins=odbc" -o Makefile 27 ${QTDIR}/bin/qmake "sql-plugins=odbc" -o Makefile
28 28
 29post-configure: qmake-odbc-configure
 30
29do-install: 31do-install:
30 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ 32 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
31 ${WRKSRC}/qtbase/plugins/sqldrivers/libqsqlodbc.la \ 33 ${WRKSRC}/qtbase/plugins/sqldrivers/libqsqlodbc.la \
32 ${DESTDIR}${QTPREFIX}/plugins/sqldrivers 34 ${DESTDIR}${QTPREFIX}/plugins/sqldrivers
33 35
34.include "../../devel/gettext-lib/buildlink3.mk" 36.include "../../devel/gettext-lib/buildlink3.mk"
35.include "../../devel/libltdl/buildlink3.mk" 37.include "../../devel/libltdl/buildlink3.mk"
36.include "../../databases/unixodbc/buildlink3.mk" 38.include "../../databases/unixodbc/buildlink3.mk"
37.include "../../x11/qt5-qtbase/buildlink3.mk" 39.include "../../x11/qt5-qtbase/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"