From cb2fdec4f6ac66f9d03e7ea4ca7dba5f5d101ac6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 7 Jul 2004 22:05:09 +0000 Subject: [PATCH] Fix PREFIX setting to match other xlibs ports and unmark BROKEN on -current. Still requires libXThrStub on 4.x, which libX11 isn't providing (yet). PR: ports/67759 Submitted by: Jonathan Fosburgh --- x11/libGL/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/x11/libGL/Makefile b/x11/libGL/Makefile index 3d94cbb4f88a..b0fa28c7381e 100644 --- a/x11/libGL/Makefile +++ b/x11/libGL/Makefile @@ -18,18 +18,22 @@ COMMENT= OpenGL library that renders using GLX or DRI LIB_DEPENDS= Xxf86vm.1:${PORTSDIR}/x11/libXxf86 -BROKEN= Build fails - CONFLICTS= XFree86-libraries-* EXTRA_PATCHES= ${CF_PATCHES} +PREFIX?= ${X11BASE} XBUILD_DIRS= lib/GL GLHEADERS= gl.h glext.h glx.h glxext.h glxint.h glxmd.h glxproto.h \ glxtokens.h INSTALLS_SHLIB= yes USE_GNOME= pkgconfig +.include +.if ${OSVERSION} < 500043 +BROKEN= Requires libXThrStub, which should be part of libX11 +.endif + post-extract: (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DIST_SUBDIR}/X11R6.7.0-src3.tar.gz | \ @@ -42,4 +46,4 @@ post-install: .endfor .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include