diff options
| author | skrll <skrll@pkgsrc.org> | 2002-05-30 12:33:26 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2002-05-30 12:33:26 +0000 |
| commit | 203cb7c53fa094d8334a6b190b576a257fa5f0d5 (patch) | |
| tree | fc7c01935b6de57fa0876bdec07a4164cc0c9906 /x11/qt3-libs | |
| parent | c0436f544360df8bce468c357c16c5f54037e386 (diff) | |
| download | pkgsrc-203cb7c53fa094d8334a6b190b576a257fa5f0d5.tar.gz | |
Fix the detection of freetype 2 and opengl. Thanks to Chris Gilbert for
this.
While I'm here fix the qt3-libs dependency in qt3-tools and the fact that
the qt library was being built (needlessly) in qt3-tools.
Diffstat (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/Makefile | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 6 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-aa | 13 |
4 files changed, 20 insertions, 5 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 383eeb45179..7d3f1fdf911 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/05/29 19:09:55 skrll Exp $ +# $NetBSD: Makefile,v 1.6 2002/05/30 12:33:26 skrll Exp $ # .include "../qt3-libs/Makefile.common" @@ -42,6 +42,7 @@ do-install: .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/mng/buildlink.mk" .include "../../graphics/png/buildlink.mk" +.include "../../graphics/freetype2/buildlink.mk" .include "../../mk/pthread.buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 6a81a7120cc..534207eed7d 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.5 2002/05/29 19:09:55 skrll Exp $ +$NetBSD: distinfo,v 1.6 2002/05/30 12:33:26 skrll Exp $ SHA1 (qt-x11-free-3.0.4.tar.gz) = 1bed903c622009fbbcce8386bb1b48b4202f3dbb Size (qt-x11-free-3.0.4.tar.gz) = 15198015 bytes +SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180 SHA1 (patch-ac) = da32dd8596f36238fec30fb7b8a444d36e13ed92 SHA1 (patch-ad) = 197ba1f217635ad0b25d4709d0be9786ade079cc diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index af26c2512e0..0e0c274971d 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ # -# $Id: qmake.conf,v 1.2 2002/05/29 19:09:55 skrll Exp $ +# $Id: qmake.conf,v 1.3 2002/05/30 12:33:27 skrll Exp $ # # qmake configuration for netbsd-g++ # @@ -38,8 +38,8 @@ QMAKE_INCDIR_X11 = @BUILDLINK_X11_DIR@/include QMAKE_LIBDIR_X11 = @BUILDLINK_X11_DIR@/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib -QMAKE_INCDIR_OPENGL = @BUILDLINK_X11_DIR@/include -QMAKE_LIBDIR_OPENGL = @BUILDLINK_X11_DIR@/lib +QMAKE_INCDIR_OPENGL = @BUILDLINK_DIR@/include +QMAKE_LIBDIR_OPENGL = @BUILDLINK_DIR@/lib QMAKE_LINK = @LIBTOOL@ --mode=link @CXX@ QMAKE_LINK_SHLIB_CMD = \ diff --git a/x11/qt3-libs/patches/patch-aa b/x11/qt3-libs/patches/patch-aa new file mode 100644 index 00000000000..e52c4f01b2a --- /dev/null +++ b/x11/qt3-libs/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.4 2002/05/30 12:33:27 skrll Exp $ + +--- Makefile.orig Thu May 30 09:42:36 2002 ++++ Makefile +@@ -47,7 +47,7 @@ + cd tools && $(MAKE) uninstall + tools-install: sub-tools + cd tools && $(MAKE) install +-sub-tools: sub-plugins FORCE ++sub-tools: FORCE + cd tools && $(MAKE) + + #qmake |