diff options
| author | jlam <jlam> | 2005-06-21 23:06:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-21 23:06:07 +0000 |
| commit | d5a80200d7c84ad27dab5eb16edafa237a22b21c (patch) | |
| tree | fc8326bb1154e7d9a953d4fb85298b0fde6307e0 /x11/qt3-libs | |
| parent | b3599ded384c60ec705554a3f5332494ed0aad2f (diff) | |
| download | pkgsrc-d5a80200d7c84ad27dab5eb16edafa237a22b21c.tar.gz | |
Back out the previous change and add a comment to qt3-libs/Makefile.common
noting why we did so, and that this will be fixed after pkgsrc-2005Q2
is branched. Bump the PKGREVISION.
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, 12 insertions, 4 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 868b1d2f145..894fd1414d9 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.34 2005/06/20 22:03:42 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/21 23:06:07 jlam Exp $ LIBQT= ${WRKSRC}/lib/libqt-mt.la .include "../qt3-libs/Makefile.common" PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= adam@NetBSD.org COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 13c30929fcf..9a3cf067fb8 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.51 2005/06/20 22:03:42 dmcmahill Exp $ +# $NetBSD: Makefile.common,v 1.52 2005/06/21 23:06:07 jlam Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -92,7 +92,15 @@ CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline .include "../../mk/x11.buildlink3.mk" -pre-configure: +# 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: ${SED} \ -e 's:@LOCALBASE@:${LOCALBASE}:g' \ -e 's:@X11BASE@:${X11BASE}:g' \ |