Thu Sep 3 12:12:15 2009 UTC ()
Use --mode=install for libtool, don't dependency on the legacy
detection.


(joerg)
diff -r1.44 -r1.45 pkgsrc/x11/XmHTML/Makefile
diff -r1.25 -r1.26 pkgsrc/x11/qt3-mysql/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/qt3-pgsql/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/qt4-mysql/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/qt4-pgsql/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/qt4-sqlite3/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/qt4-tiff/Makefile
cvs diff -r1.44 -r1.45 pkgsrc/x11/XmHTML/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/XmHTML/Makefile 2009/08/26 19:56:39 1.44
+++ pkgsrc/x11/XmHTML/Makefile 2009/09/03 12:12:14 1.45
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.44 2009/08/26 19:56:39 sno Exp $ 1# $NetBSD: Makefile,v 1.45 2009/09/03 12:12:14 joerg Exp $
2# 2#
3 3
4DISTNAME= XmHTML-1.1.7 4DISTNAME= XmHTML-1.1.7
5PKGREVISION= 7 5PKGREVISION= 7
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/ 7MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.xs4all.nl/~ripley/XmHTML/ 10HOMEPAGE= http://www.xs4all.nl/~ripley/XmHTML/
11COMMENT= Motif Widget capable of displaying HTML 3.2 conforming text 11COMMENT= Motif Widget capable of displaying HTML 3.2 conforming text
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_X11BASE= YES 15USE_X11BASE= YES
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18 18
19INSTALLATION_DIRS= include/XmHTML lib 19INSTALLATION_DIRS= include/XmHTML lib
20 20
21do-install: 21do-install:
22 ${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_LIB} \ 22 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
23 ${WRKSRC}/lib/libXmHTML.la ${DESTDIR}${PREFIX}/lib 23 ${WRKSRC}/lib/libXmHTML.la ${DESTDIR}${PREFIX}/lib
24 ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${DESTDIR}${PREFIX}/include/XmHTML 24 ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${DESTDIR}${PREFIX}/include/XmHTML
25 25
26.include "../../graphics/jpeg/buildlink3.mk" 26.include "../../graphics/jpeg/buildlink3.mk"
27.include "../../graphics/png/buildlink3.mk" 27.include "../../graphics/png/buildlink3.mk"
28.include "../../x11/libXpm/buildlink3.mk" 28.include "../../x11/libXpm/buildlink3.mk"
29.include "../../mk/motif.buildlink3.mk" 29.include "../../mk/motif.buildlink3.mk"
30 30
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/x11/qt3-mysql/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt3-mysql/Attic/Makefile 2009/08/26 19:58:40 1.25
+++ pkgsrc/x11/qt3-mysql/Attic/Makefile 2009/09/03 12:12:14 1.26
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.25 2009/08/26 19:58:40 sno Exp $ 1# $NetBSD: Makefile,v 1.26 2009/09/03 12:12:14 joerg Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt3-libs/Makefile.common" 5.include "../../x11/qt3-libs/Makefile.common"
6 6
7PKGNAME= qt3-mysql-${QTVERSION} 7PKGNAME= qt3-mysql-${QTVERSION}
8PKGREVISION= 2 8PKGREVISION= 2
9COMMENT= QT mysql driver 9COMMENT= QT mysql driver
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include \ 11CONFIGURE_ARGS+= -I${QTDIR}/include \
12 -L${QTDIR}/lib \ 12 -L${QTDIR}/lib \
13 -I${BUILDLINK_PREFIX.mysql-client}/include/mysql \ 13 -I${BUILDLINK_PREFIX.mysql-client}/include/mysql \
14 -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql 14 -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql
15 15
16BUILD_QT3= yes 16BUILD_QT3= yes
17 17
18do-build: 18do-build:
19 (cd ${WRKSRC}/plugins/src/sqldrivers/mysql; \ 19 (cd ${WRKSRC}/plugins/src/sqldrivers/mysql; \
20 ${SETENV} ${MAKE_ENV} ${GMAKE}) 20 ${SETENV} ${MAKE_ENV} ${GMAKE})
21 21
22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
23INSTALLATION_DIRS= ${SQLDRVDIR} 23INSTALLATION_DIRS= ${SQLDRVDIR}
24 24
25do-install: 25do-install:
26 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \ 26 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
27 ${DESTDIR}${SQLDRVDIR} 27 ${DESTDIR}${SQLDRVDIR}
28 28
29.include "../../x11/qt3-libs/buildlink3.mk" 29.include "../../x11/qt3-libs/buildlink3.mk"
30.include "../../mk/mysql.buildlink3.mk" 30.include "../../mk/mysql.buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/x11/qt3-pgsql/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt3-pgsql/Attic/Makefile 2009/08/26 19:58:40 1.6
+++ pkgsrc/x11/qt3-pgsql/Attic/Makefile 2009/09/03 12:12:14 1.7
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.6 2009/08/26 19:58:40 sno Exp $ 1# $NetBSD: Makefile,v 1.7 2009/09/03 12:12:14 joerg Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt3-libs/Makefile.common" 5.include "../../x11/qt3-libs/Makefile.common"
6 6
7PKGNAME= qt3-psql-${QTVERSION} 7PKGNAME= qt3-psql-${QTVERSION}
8PKGREVISION= 4 8PKGREVISION= 4
9COMMENT= QT postgresql driver 9COMMENT= QT postgresql driver
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include \ 11CONFIGURE_ARGS+= -I${QTDIR}/include \
12 -I${PGSQL_PREFIX}/include/postgresql/server \ 12 -I${PGSQL_PREFIX}/include/postgresql/server \
13 -L${QTDIR}/lib 13 -L${QTDIR}/lib
14 14
15BUILD_QT3= yes 15BUILD_QT3= yes
16 16
17do-build: 17do-build:
18 (cd ${WRKSRC}/plugins/src/sqldrivers/psql; \ 18 (cd ${WRKSRC}/plugins/src/sqldrivers/psql; \
19 ${SETENV} ${MAKE_ENV} ${GMAKE}) 19 ${SETENV} ${MAKE_ENV} ${GMAKE})
20 20
21SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 21SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
22INSTALLATION_DIRS= ${SQLDRVDIR} 22INSTALLATION_DIRS= ${SQLDRVDIR}
23 23
24do-install: 24do-install:
25 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \ 25 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
26 ${DESTDIR}${SQLDRVDIR} 26 ${DESTDIR}${SQLDRVDIR}
27 27
28.include "../../x11/qt3-libs/buildlink3.mk" 28.include "../../x11/qt3-libs/buildlink3.mk"
29.include "../../mk/pgsql.buildlink3.mk" 29.include "../../mk/pgsql.buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mysql/Makefile 2009/08/26 19:58:40 1.4
+++ pkgsrc/x11/qt4-mysql/Makefile 2009/09/03 12:12:14 1.5
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.4 2009/08/26 19:58:40 sno Exp $ 1# $NetBSD: Makefile,v 1.5 2009/09/03 12:12:14 joerg Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-mysql-${QTVERSION} 7PKGNAME= qt4-mysql-${QTVERSION}
8PKGREVISION= 1 8PKGREVISION= 1
9COMMENT= QT mysql driver 9COMMENT= QT mysql driver
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include 11CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 12CONFIGURE_ARGS+= -L${QTDIR}/lib
13 13
14BUILD_QT4= yes 14BUILD_QT4= yes
15 15
16do-build: 16do-build:
17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE}
20 20
21SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 21SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
22INSTALLATION_DIRS= ${SQLDRVDIR} 22INSTALLATION_DIRS= ${SQLDRVDIR}
23 23
24do-install: 24do-install:
25 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \ 25 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
26 ${DESTDIR}${SQLDRVDIR} 26 ${DESTDIR}${SQLDRVDIR}
27 27
28.include "../../x11/qt4-libs/buildlink3.mk" 28.include "../../x11/qt4-libs/buildlink3.mk"
29.include "../../x11/qt4-tools/buildlink3.mk" 29.include "../../x11/qt4-tools/buildlink3.mk"
30.include "../../mk/mysql.buildlink3.mk" 30.include "../../mk/mysql.buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-pgsql/Makefile 2009/08/26 19:58:40 1.9
+++ pkgsrc/x11/qt4-pgsql/Makefile 2009/09/03 12:12:15 1.10
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.9 2009/08/26 19:58:40 sno Exp $ 1# $NetBSD: Makefile,v 1.10 2009/09/03 12:12:15 joerg Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-pgsql-${QTVERSION} 7PKGNAME= qt4-pgsql-${QTVERSION}
8PKGREVISION= 1 8PKGREVISION= 1
9COMMENT= QT postgresql driver 9COMMENT= QT postgresql driver
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include 11CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server 12CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server
13CONFIGURE_ARGS+= -L${QTDIR}/lib 13CONFIGURE_ARGS+= -L${QTDIR}/lib
14 14
15BUILD_QT4= yes 15BUILD_QT4= yes
16 16
17do-build: 17do-build:
18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
20 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE} 20 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE}
21 21
22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
23INSTALLATION_DIRS= ${SQLDRVDIR} 23INSTALLATION_DIRS= ${SQLDRVDIR}
24 24
25do-install: 25do-install:
26 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \ 26 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
27 ${DESTDIR}${SQLDRVDIR} 27 ${DESTDIR}${SQLDRVDIR}
28 28
29.include "../../x11/qt4-libs/buildlink3.mk" 29.include "../../x11/qt4-libs/buildlink3.mk"
30.include "../../x11/qt4-tools/buildlink3.mk" 30.include "../../x11/qt4-tools/buildlink3.mk"
31.include "../../mk/pgsql.buildlink3.mk" 31.include "../../mk/pgsql.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-sqlite3/Makefile 2009/08/26 19:58:40 1.4
+++ pkgsrc/x11/qt4-sqlite3/Makefile 2009/09/03 12:12:15 1.5
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.4 2009/08/26 19:58:40 sno Exp $ 1# $NetBSD: Makefile,v 1.5 2009/09/03 12:12:15 joerg Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-sqlite3-${QTVERSION} 7PKGNAME= qt4-sqlite3-${QTVERSION}
8PKGREVISION= 1 8PKGREVISION= 1
9COMMENT= QT sqlite3 driver 9COMMENT= QT sqlite3 driver
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include 11CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 12CONFIGURE_ARGS+= -L${QTDIR}/lib
13CONFIGURE_ARGS+= -system-sqlite 13CONFIGURE_ARGS+= -system-sqlite
14 14
15BUILD_QT4= yes 15BUILD_QT4= yes
16 16
17do-build: 17do-build:
18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
20 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} 20 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE}
21 21
22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
23INSTALLATION_DIRS= ${SQLDRVDIR} 23INSTALLATION_DIRS= ${SQLDRVDIR}
24 24
25do-install: 25do-install:
26 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \ 26 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \
27 ${DESTDIR}${SQLDRVDIR} 27 ${DESTDIR}${SQLDRVDIR}
28 28
29.include "../../x11/qt4-libs/buildlink3.mk" 29.include "../../x11/qt4-libs/buildlink3.mk"
30.include "../../x11/qt4-tools/buildlink3.mk" 30.include "../../x11/qt4-tools/buildlink3.mk"
31.include "../../databases/sqlite3/buildlink3.mk" 31.include "../../databases/sqlite3/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-tiff/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tiff/Makefile 2009/08/26 19:58:40 1.4
+++ pkgsrc/x11/qt4-tiff/Makefile 2009/09/03 12:12:15 1.5
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.4 2009/08/26 19:58:40 sno Exp $ 1# $NetBSD: Makefile,v 1.5 2009/09/03 12:12:15 joerg Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-tiff-${QTVERSION} 7PKGNAME= qt4-tiff-${QTVERSION}
8PKGREVISION= 1 8PKGREVISION= 1
9COMMENT= QT TIFF image format plugin 9COMMENT= QT TIFF image format plugin
10 10
11CONFIGURE_ARGS+= -I${QTDIR}/include 11CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 12CONFIGURE_ARGS+= -L${QTDIR}/lib
13 13
14BUILD_QT4= yes 14BUILD_QT4= yes
15 15
16do-build: 16do-build:
17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE}
20 20
21IMGFMTDIR= ${QTPREFIX}/plugins/imageformats 21IMGFMTDIR= ${QTPREFIX}/plugins/imageformats
22 22
23INSTALLATION_DIRS= ${IMGFMTDIR} 23INSTALLATION_DIRS= ${IMGFMTDIR}
24 24
25do-install: 25do-install:
26 ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqtiff.la \ 26 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqtiff.la \
27 ${DESTDIR}${IMGFMTDIR} 27 ${DESTDIR}${IMGFMTDIR}
28 28
29# up to 4.3.2 a builtin libtiff is used 29# up to 4.3.2 a builtin libtiff is used
30BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1 30BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1
31.include "../../x11/qt4-libs/buildlink3.mk" 31.include "../../x11/qt4-libs/buildlink3.mk"
32.include "../../x11/qt4-tools/buildlink3.mk" 32.include "../../x11/qt4-tools/buildlink3.mk"
33.include "../../graphics/tiff/buildlink3.mk" 33.include "../../graphics/tiff/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"