pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt3-libs Back out the previous change and add a co...
details: https://anonhg.NetBSD.org/pkgsrc/rev/06eb53aeb016
branches: trunk
changeset: 495807:06eb53aeb016
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Jun 21 23:06:07 2005 +0000
description:
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:
x11/qt3-libs/Makefile | 4 ++--
x11/qt3-libs/Makefile.common | 12 ++++++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diffs (43 lines):
diff -r abb3e295d0d8 -r 06eb53aeb016 x11/qt3-libs/Makefile
--- a/x11/qt3-libs/Makefile Tue Jun 21 21:02:16 2005 +0000
+++ b/x11/qt3-libs/Makefile Tue Jun 21 23:06:07 2005 +0000
@@ -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@localhost
COMMENT= C++ X GUI toolkit
diff -r abb3e295d0d8 -r 06eb53aeb016 x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common Tue Jun 21 21:02:16 2005 +0000
+++ b/x11/qt3-libs/Makefile.common Tue Jun 21 23:06:07 2005 +0000
@@ -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 @@
.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' \
Home |
Main Index |
Thread Index |
Old Index