Sun Jun 14 06:33:44 2009 UTC ()
Make these actually build.


(hasso)
diff -r1.6 -r1.7 pkgsrc/x11/qt4-pgsql/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/qt4-sqlite3/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/x11/qt4-tiff/Makefile

cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-pgsql/Makefile 2008/10/26 14:02:33 1.6
+++ pkgsrc/x11/qt4-pgsql/Makefile 2009/06/14 06:33:44 1.7
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.6 2008/10/26 14:02:33 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2009/06/14 06:33:44 hasso Exp $
2 2
3.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
4 4
5PKGNAME= qt4-pgsql-${QTVERSION} 5PKGNAME= qt4-pgsql-${QTVERSION}
6COMMENT= QT postgresql driver 6COMMENT= QT postgresql driver
7 7
8CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
9CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server 9CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server
10CONFIGURE_ARGS+= -L${QTDIR}/lib 10CONFIGURE_ARGS+= -L${QTDIR}/lib
11 11
12BUILD_QT4= yes 12BUILD_QT4= yes
13 13
14do-build: 14do-build:
 15 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
15 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
16 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE}
17 18
18SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 19SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
19 20
20do-install: 21do-install:
21 ${INSTALL_DATA_DIR} ${SQLDRVDIR} 22 ${INSTALL_DATA_DIR} ${SQLDRVDIR}
22 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \ 23 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
23 ${SQLDRVDIR} 24 ${SQLDRVDIR}
24 25
25.include "../../x11/qt4-libs/buildlink3.mk" 26.include "../../x11/qt4-libs/buildlink3.mk"
26.include "../../x11/qt4-tools/buildlink3.mk" 27.include "../../x11/qt4-tools/buildlink3.mk"
27.include "../../mk/pgsql.buildlink3.mk" 28.include "../../mk/pgsql.buildlink3.mk"

cvs diff -r1.1 -r1.2 pkgsrc/x11/qt4-sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-sqlite3/Makefile 2007/09/03 09:35:18 1.1
+++ pkgsrc/x11/qt4-sqlite3/Makefile 2009/06/14 06:33:44 1.2
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.1 2007/09/03 09:35:18 drochner Exp $ 1# $NetBSD: Makefile,v 1.2 2009/06/14 06:33:44 hasso Exp $
2 2
3.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
4 4
5PKGNAME= qt4-sqlite3-${QTVERSION} 5PKGNAME= qt4-sqlite3-${QTVERSION}
6COMMENT= QT sqlite3 driver 6COMMENT= QT sqlite3 driver
7 7
8CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
9CONFIGURE_ARGS+= -L${QTDIR}/lib 9CONFIGURE_ARGS+= -L${QTDIR}/lib
10CONFIGURE_ARGS+= -system-sqlite 10CONFIGURE_ARGS+= -system-sqlite
11 11
12BUILD_QT4= yes 12BUILD_QT4= yes
13 13
14do-build: 14do-build:
 15 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
15 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
16 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE}
17 18
18SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 19SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
19 20
20do-install: 21do-install:
21 ${INSTALL_DATA_DIR} ${SQLDRVDIR} 22 ${INSTALL_DATA_DIR} ${SQLDRVDIR}
22 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \ 23 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \
23 ${SQLDRVDIR} 24 ${SQLDRVDIR}
24 25
25.include "../../x11/qt4-libs/buildlink3.mk" 26.include "../../x11/qt4-libs/buildlink3.mk"
26.include "../../x11/qt4-tools/buildlink3.mk" 27.include "../../x11/qt4-tools/buildlink3.mk"
27.include "../../databases/sqlite3/buildlink3.mk" 28.include "../../databases/sqlite3/buildlink3.mk"

cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/qt4-tiff/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tiff/Makefile 2007/11/22 18:54:47 1.1.1.1
+++ pkgsrc/x11/qt4-tiff/Makefile 2009/06/14 06:33:44 1.2
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.1.1.1 2007/11/22 18:54:47 drochner Exp $ 1# $NetBSD: Makefile,v 1.2 2009/06/14 06:33:44 hasso Exp $
2 2
3.include "../../x11/qt4-libs/Makefile.common" 3.include "../../x11/qt4-libs/Makefile.common"
4 4
5PKGNAME= qt4-tiff-${QTVERSION} 5PKGNAME= qt4-tiff-${QTVERSION}
6COMMENT= QT TIFF image format plugin 6COMMENT= QT TIFF image format plugin
7 7
8CONFIGURE_ARGS+= -I${QTDIR}/include 8CONFIGURE_ARGS+= -I${QTDIR}/include
9CONFIGURE_ARGS+= -L${QTDIR}/lib 9CONFIGURE_ARGS+= -L${QTDIR}/lib
10 10
11BUILD_QT4= yes 11BUILD_QT4= yes
12 12
13do-build: 13do-build:
 14 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
14 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 15 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
15 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE}
16 17
17IMGFMTDIR= ${QTPREFIX}/plugins/imageformats 18IMGFMTDIR= ${QTPREFIX}/plugins/imageformats
18 19
19do-install: 20do-install:
20 ${INSTALL_DATA_DIR} ${IMGFMTDIR} 21 ${INSTALL_DATA_DIR} ${IMGFMTDIR}
21 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqtiff.la \ 22 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqtiff.la \
22 ${IMGFMTDIR} 23 ${IMGFMTDIR}
23 24
24# up to 4.3.2 a builtin libtiff is used 25# up to 4.3.2 a builtin libtiff is used
25BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1 26BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1
26.include "../../x11/qt4-libs/buildlink3.mk" 27.include "../../x11/qt4-libs/buildlink3.mk"