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.diff -r1.28 -r1.29 pkgsrc/graphics/gle/Makefile
(dholland)
@@ -1,22 +1,29 @@ | @@ -1,22 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.28 2012/10/06 14:10:55 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.29 2013/04/13 20:22:25 dholland Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= gle-3.1.0 | 4 | DISTNAME= gle-3.1.0 | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 3 | |
6 | CATEGORIES= graphics | 6 | CATEGORIES= graphics | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gle/} \ | 7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gle/} \ | |
8 | http://www.linas.org/gle/pub/ | 8 | http://www.linas.org/gle/pub/ | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.linas.org/gle/ | 11 | HOMEPAGE= http://www.linas.org/gle/ | |
12 | COMMENT= GL subroutines for drawing tubing and extrusions | 12 | COMMENT= GL subroutines for drawing tubing and extrusions | |
13 | 13 | |||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | 15 | |||
16 | GNU_CONFIGURE= YES | 16 | GNU_CONFIGURE= YES | |
17 | USE_LIBTOOL= YES | 17 | USE_LIBTOOL= YES | |
18 | LIBS+= -lXext | 18 | LIBS+= -lXext | |
19 | 19 | |||
20 | .include "../../graphics/Mesa/buildlink3.mk" | 20 | BUILDLINK_DEPMETHOD.libXt?= build | |
21 | ||||
22 | # GLUT is used only by the examples, which aren't built or installed. | |||
23 | #.include "../../graphics/glut/buildlink3.mk" | |||
24 | .include "../../graphics/glu/buildlink3.mk" | |||
25 | .include "../../graphics/MesaLib/buildlink3.mk" | |||
21 | .include "../../x11/libXi/buildlink3.mk" | 26 | .include "../../x11/libXi/buildlink3.mk" | |
27 | .include "../../x11/libXmu/buildlink3.mk" | |||
28 | .include "../../x11/libXt/buildlink3.mk" | |||
22 | .include "../../mk/bsd.pkg.mk" | 29 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,9 @@ | @@ -1,8 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2005/02/24 08:45:06 agc Exp $ | 1 | $NetBSD: distinfo,v 1.9 2013/04/13 20:22:25 dholland Exp $ | |
2 | 2 | |||
3 | SHA1 (gle-3.1.0.tar.gz) = ed6d7332df85357430b249854d4f2753f1228074 | 3 | SHA1 (gle-3.1.0.tar.gz) = ed6d7332df85357430b249854d4f2753f1228074 | |
4 | RMD160 (gle-3.1.0.tar.gz) = 49f217cf79ccc3c7e2802ae4347c15498f43db59 | 4 | RMD160 (gle-3.1.0.tar.gz) = 49f217cf79ccc3c7e2802ae4347c15498f43db59 | |
5 | Size (gle-3.1.0.tar.gz) = 806861 bytes | 5 | Size (gle-3.1.0.tar.gz) = 806861 bytes | |
6 | SHA1 (patch-aa) = 27606906d948c17fb1b40ebe23f8b5f08f3399b4 | 6 | SHA1 (patch-aa) = 27606906d948c17fb1b40ebe23f8b5f08f3399b4 | |
7 | SHA1 (patch-ab) = 499d1aed0ec9e9fb40cbde712d1b019cdb7c0fb2 | 7 | SHA1 (patch-ab) = 499d1aed0ec9e9fb40cbde712d1b019cdb7c0fb2 | |
8 | SHA1 (patch-ac) = 68e29a74fcb082938a0f26e02794574e2663d2b9 | 8 | SHA1 (patch-ac) = 68e29a74fcb082938a0f26e02794574e2663d2b9 | |
9 | SHA1 (patch-configure) = c1258c83d7a8196f703188400f0f2dc465f1016d |
$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