[pkgsrc/trunk]: pkgsrc/x11 Restore changes in revision 1.34 of qt3-libs/Makef...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91942479cfb7
branches:  trunk
changeset: 496095:91942479cfb7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 22 21:14:45 2005 +0000

description:
Restore changes in revision 1.34 of qt3-libs/Makefile.common after
the change in revision 1.6 of mk/buildink3/libtool-fix-la, and create
the qmake.conf files at post-configure time.  This causes the libtool
wrapper to be used to create the libtool archives, instead of just
using ${LOCALBASE}/bin/libtool.  Bump the PKGREVISIONs for the packages
that include qt3-libs/Makefile.common as their *.la files are now
different.

diffstat:

 x11/qt3-libs/Makefile        |   4 ++--
 x11/qt3-libs/Makefile.common |  12 ++----------
 x11/qt3-mysql/Makefile       |   3 ++-
 x11/qt3-psql/Makefile        |   3 ++-
 x11/qt3-tools/Makefile       |   3 ++-
 5 files changed, 10 insertions(+), 15 deletions(-)

diffs (85 lines):

diff -r 303754c698c7 -r 91942479cfb7 x11/qt3-libs/Makefile
--- a/x11/qt3-libs/Makefile     Wed Jun 22 21:14:42 2005 +0000
+++ b/x11/qt3-libs/Makefile     Wed Jun 22 21:14:45 2005 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2005/06/21 23:06:07 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/22 21:14:45 jlam Exp $
 
 LIBQT=                 ${WRKSRC}/lib/libqt-mt.la
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=               qt3-libs-${QTVERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 MAINTAINER=            adam%NetBSD.org@localhost
 COMMENT=               C++ X GUI toolkit
 
diff -r 303754c698c7 -r 91942479cfb7 x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common      Wed Jun 22 21:14:42 2005 +0000
+++ b/x11/qt3-libs/Makefile.common      Wed Jun 22 21:14:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.52 2005/06/21 23:06:07 jlam Exp $
+# $NetBSD: Makefile.common,v 1.53 2005/06/22 21:14:45 jlam Exp $
 #
 DISTNAME=              qt-x11-free-${QTVERSION}
 CATEGORIES=            x11
@@ -92,15 +92,7 @@
 
 .include "../../mk/x11.buildlink3.mk"
 
-# XXX This is actually wrong.  It should be done at pre-configure time
-# XXX or else the value of LIBTOOL embedded into the qmake.conf file
-# XXX is wrong.  However, that will cause other qt3-* packages to
-# XXX break since pkgsrc/mk/buildlink3/libtool-fix-la embeds the wrong
-# XXX buildlibdir in some cases.  This will be changed back to
-# XXX "pre-configure" and libtool-fix-la will be fixed after
-# XXX pkgsrc-2005Q2 has been branched.
-# XXX 
-post-patch:
+pre-configure:
        ${SED} \
                -e 's:@LOCALBASE@:${LOCALBASE}:g' \
                -e 's:@X11BASE@:${X11BASE}:g' \
diff -r 303754c698c7 -r 91942479cfb7 x11/qt3-mysql/Makefile
--- a/x11/qt3-mysql/Makefile    Wed Jun 22 21:14:42 2005 +0000
+++ b/x11/qt3-mysql/Makefile    Wed Jun 22 21:14:45 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/02/10 13:23:51 adam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/22 21:14:45 jlam Exp $
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=               qt3-mysql-${QTVERSION}
+PKGREVISION=           1
 COMMENT=               QT mysql driver
 
 CONFIGURE_ARGS+=       -I${QTDIR}/include \
diff -r 303754c698c7 -r 91942479cfb7 x11/qt3-psql/Makefile
--- a/x11/qt3-psql/Makefile     Wed Jun 22 21:14:42 2005 +0000
+++ b/x11/qt3-psql/Makefile     Wed Jun 22 21:14:45 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2005/02/10 13:22:46 adam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/22 21:14:45 jlam Exp $
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=               qt3-psql-${QTVERSION}
+PKGREVISION=           1
 COMMENT=               QT postgresql driver
 
 CONFIGURE_ARGS+=       -I${QTDIR}/include \
diff -r 303754c698c7 -r 91942479cfb7 x11/qt3-tools/Makefile
--- a/x11/qt3-tools/Makefile    Wed Jun 22 21:14:42 2005 +0000
+++ b/x11/qt3-tools/Makefile    Wed Jun 22 21:14:45 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2005/06/17 03:50:44 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/06/22 21:14:45 jlam Exp $
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=               qt3-tools-${QTVERSION}
+PKGREVISION=           1
 COMMENT=               QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=       -I${QTDIR}/include \