pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/wxGTK Move inclusion of graphics/glu/buildlink3.mk...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba5d904766ed
branches:  trunk
changeset: 538282:ba5d904766ed
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Feb 04 17:46:13 2008 +0000

description:
Move inclusion of graphics/glu/buildlink3.mk from Makefile to
Makefile.common. This should hopefully fix x11/wxGTK-contrib from failing:
checking for -lGLU... no
checking for -lMesaGL... no
configure: error: OpenGL libraries not available

XXX: buildlink3.mk doesn't include glu, is that really OK?

diffstat:

 x11/wxGTK/Makefile        |  3 +--
 x11/wxGTK/Makefile.common |  3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r efcfa77ff194 -r ba5d904766ed x11/wxGTK/Makefile
--- a/x11/wxGTK/Makefile        Mon Feb 04 16:16:54 2008 +0000
+++ b/x11/wxGTK/Makefile        Mon Feb 04 17:46:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2007/01/16 23:27:48 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2008/02/04 17:46:13 tnn Exp $
 #
 
 .include "Makefile.common"
@@ -21,6 +21,5 @@
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
 
-.include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r efcfa77ff194 -r ba5d904766ed x11/wxGTK/Makefile.common
--- a/x11/wxGTK/Makefile.common Mon Feb 04 16:16:54 2008 +0000
+++ b/x11/wxGTK/Makefile.common Mon Feb 04 17:46:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2007/08/13 23:10:04 salo Exp $
+# $NetBSD: Makefile.common,v 1.16 2008/02/04 17:46:13 tnn Exp $
 #
 
 DISTNAME=              wxGTK-2.6.3
@@ -45,6 +45,7 @@
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"



Home | Main Index | Thread Index | Old Index