diff options
| author | jlam <jlam> | 2005-06-22 21:14:45 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-22 21:14:45 +0000 |
| commit | 7df3f28fb144af29bdf3728f991f204649b9141b (patch) | |
| tree | 0fb67270aa5be23814c154a076a03bc4ae66a9c0 /x11/qt3-libs | |
| parent | b3f18690c55999eda4be11985c299a83c8ac3253 (diff) | |
| download | pkgsrc-7df3f28fb144af29bdf3728f991f204649b9141b.tar.gz | |
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 (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 894fd1414d9..fd362ec55a9 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -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 COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 9a3cf067fb8..44a45c2abfc 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -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 @@ CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline .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' \ |