summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland>2013-04-13 20:22:25 +0000
committerdholland <dholland>2013-04-13 20:22:25 +0000
commit0ee6f14976fedda3dafafd7a25b0bbf198f66f33 (patch)
treedcad2662b7810d133b4fe5d2838d69a6977beb90
parent0d22d0b9cb922856525cd25b430f2f7ed16ef770 (diff)
downloadpkgsrc-0ee6f14976fedda3dafafd7a25b0bbf198f66f33.tar.gz
Fix up depends as per PR 30937; in particular, drop glut as it's used
only by the examples and we don't build or install them. PKGREVISION -> 3.
-rw-r--r--graphics/gle/Makefile13
-rw-r--r--graphics/gle/distinfo3
-rw-r--r--graphics/gle/patches/patch-configure15
3 files changed, 27 insertions, 4 deletions
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 8f16fc7fba0..6760eac2eee 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2012/10/06 14:10:55 asau Exp $
+# $NetBSD: Makefile,v 1.29 2013/04/13 20:22:25 dholland Exp $
#
DISTNAME= gle-3.1.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gle/} \
http://www.linas.org/gle/pub/
@@ -17,6 +17,13 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LIBS+= -lXext
-.include "../../graphics/Mesa/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?= build
+
+# GLUT is used only by the examples, which aren't built or installed.
+#.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gle/distinfo b/graphics/gle/distinfo
index f9ae558a648..b31cc1d6d62 100644
--- a/graphics/gle/distinfo
+++ b/graphics/gle/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 08:45:06 agc Exp $
+$NetBSD: distinfo,v 1.9 2013/04/13 20:22:25 dholland Exp $
SHA1 (gle-3.1.0.tar.gz) = ed6d7332df85357430b249854d4f2753f1228074
RMD160 (gle-3.1.0.tar.gz) = 49f217cf79ccc3c7e2802ae4347c15498f43db59
@@ -6,3 +6,4 @@ Size (gle-3.1.0.tar.gz) = 806861 bytes
SHA1 (patch-aa) = 27606906d948c17fb1b40ebe23f8b5f08f3399b4
SHA1 (patch-ab) = 499d1aed0ec9e9fb40cbde712d1b019cdb7c0fb2
SHA1 (patch-ac) = 68e29a74fcb082938a0f26e02794574e2663d2b9
+SHA1 (patch-configure) = c1258c83d7a8196f703188400f0f2dc465f1016d
diff --git a/graphics/gle/patches/patch-configure b/graphics/gle/patches/patch-configure
new file mode 100644
index 00000000000..54454c338ee
--- /dev/null
+++ b/graphics/gle/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2013/04/13 20:22:26 dholland Exp $
+
+--- configure~ 2013-04-13 20:22:22.000000000 +0000
++++ configure
+@@ -9532,9 +9532,7 @@ echo "${ECHO_T}$ac_cv_lib_glut_glutSwapB
+ if test $ac_cv_lib_glut_glutSwapBuffers = yes; then
+ X_LIBS="-lglut $X_LIBS"
+ else
+- { { echo "$as_me:$LINENO: error: Cannot find required glut library" >&5
+-echo "$as_me: error: Cannot find required glut library" >&2;}
+- { (exit 1); exit 1; }; }
++ :
+ fi
+
+