Tue Jul 5 02:14:12 2011 UTC ()
Fix up xf86dga handling so it will hopefully work with -5 native X.


(dholland)
diff -r1.49 -r1.50 pkgsrc/graphics/libggi/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/graphics/libggi/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/libggi/Makefile 2010/01/30 15:22:13 1.49
+++ pkgsrc/graphics/libggi/Makefile 2011/07/05 02:14:12 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.49 2010/01/30 15:22:13 tnn Exp $ 1# $NetBSD: Makefile,v 1.50 2011/07/05 02:14:12 dholland Exp $
2# 2#
3 3
4DISTNAME= libggi-2.2.2.src 4DISTNAME= libggi-2.2.2.src
5PKGNAME= ${DISTNAME:S/.src//} 5PKGNAME= ${DISTNAME:S/.src//}
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \ 7MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/ \
8 ${MASTER_SITE_SOURCEFORGE:=ggi/} 8 ${MASTER_SITE_SOURCEFORGE:=ggi/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.ggi-project.org/ 12HOMEPAGE= http://www.ggi-project.org/
13COMMENT= General Graphics Interface library is a flexible drawing library 13COMMENT= General Graphics Interface library is a flexible drawing library
14 14
@@ -33,31 +33,30 @@ PLIST_VARS+= libvgl terminfo xf86dga @@ -33,31 +33,30 @@ PLIST_VARS+= libvgl terminfo xf86dga
33 33
34.if ${OPSYS} == "NetBSD" 34.if ${OPSYS} == "NetBSD"
35. if empty(OS_VERSION:M1.[56].*) 35. if empty(OS_VERSION:M1.[56].*)
36PLIST.terminfo= yes 36PLIST.terminfo= yes
37. endif 37. endif
38.else 38.else
39PLIST.terminfo= yes 39PLIST.terminfo= yes
40.endif 40.endif
41 41
42.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" 42.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
43PLIST.libvgl= yes 43PLIST.libvgl= yes
44.endif 44.endif
45 45
46.if ${X11_TYPE} == "modular" 46.if ${X11_TYPE} == "modular" || \
 47 exists(${X11BASE}/include/X11/extensions/xf86dga.h)
47.include "../../x11/libXxf86dga/buildlink3.mk" 48.include "../../x11/libXxf86dga/buildlink3.mk"
48.include "../../x11/libXxf86vm/buildlink3.mk" 49.include "../../x11/libXxf86vm/buildlink3.mk"
49PLIST_SUBST+= COND_XF86DGA="" 50.include "../../x11/xf86dgaproto/buildlink3.mk"
50PLIST.xf86dga= yes 
51.elif exists(${X11BASE}/include/X11/extensions/xf86dga.h) 
52PLIST.xf86dga= yes 51PLIST.xf86dga= yes
53.endif 52.endif
54 53
55BUILDLINK_DEPMETHOD.libXt?= build 54BUILDLINK_DEPMETHOD.libXt?= build
56 55
57.include "../../devel/ncurses/buildlink3.mk" 56.include "../../devel/ncurses/buildlink3.mk"
58.include "../../graphics/libgii/buildlink3.mk" 57.include "../../graphics/libgii/buildlink3.mk"
59.include "../../x11/libX11/buildlink3.mk" 58.include "../../x11/libX11/buildlink3.mk"
60.include "../../x11/libXext/buildlink3.mk" 59.include "../../x11/libXext/buildlink3.mk"
61.include "../../x11/libXt/buildlink3.mk" 60.include "../../x11/libXt/buildlink3.mk"
62.include "../../x11/xextproto/buildlink3.mk" 61.include "../../x11/xextproto/buildlink3.mk"
63.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"