Fix fetch, pet portlint a bit and clean up. Remove unused files/config file.

git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@251 058c260c-8361-11dd-a0ac-aa2bafec7d09

2 files changed, 6 insertions, 42 deletions

diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 6d0988f..1bceb96 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -2,15 +2,15 @@
 # Date created:         7 Nov 2003
 # Whom:                 anholt@FreeBSD.org
 #
-# $FreeBSD: ports/graphics/mesa-demos/Makefile,v 1.35 2011/03/02 23:59:52 linimon Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	mesa-demos
 PORTVERSION=	7.6.1
 CATEGORIES=	graphics
-MASTER_SITES=	CRITICAL/mesa3d:mesa,glut,demos
-DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX}:mesa \
-		MesaDemos-${PORTVERSION}${EXTRACT_SUFX}:demos
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/
+DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
+		MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
@@ -22,22 +22,18 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_GL=		glu glut
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-gallium --with-demos=demos,xdemos
 
 #ALL_TARGET=	yes
 
-#PATCHDIR=	${.CURDIR}/../../graphics/libGL/files
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS=	NVIDIA_GL	"Use NVIDIA's libraries"	off
 
-#EXTRA_PATCHES+=	${FILESDIR}/patch-progs-xdemos-glxpixmap.c \
-#		${FILESDIR}/patch-progs-xdemos-yuvrect_client.c
-
 .if defined(WITHOUT_XCB)
 CONFIGURE_ARGS+=	--disable-xcb
 .else
@@ -79,8 +75,6 @@ do-install:
 		done
 
 .include <bsd.port.pre.mk>
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 
 .if defined(WITH_NVIDIA_GL)
 CFLAGS+=	-DWITH_NVIDIA_GL=1
diff --git a/graphics/mesa-demos/files/config b/graphics/mesa-demos/files/config
deleted file mode 100644
index bbf7203..0000000
--- a/graphics/mesa-demos/files/config
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration for mesa-demos port for FreeBSD
-# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
-# $FreeBSD: ports/graphics/mesa-demos/files/config,v 1.4 2008/04/19 17:50:27 miwi Exp $
-#
-
-# Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
-# overriden in default include
-
-_CC := $(CC)
-_CXX := $(CXX)
-_CFLAGS := -fPIC -pedantic -I$(LOCALBASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \
-	-DPTHREADS $(PTHREAD_CFLAGS)
-_CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = FreeBSD
-
-# Now reset compiler and flags
-CC = $(_CC)
-CXX = $(_CXX)
-CFLAGS = $(_CFLAGS)
-CXXFLAGS = $(_CXXFLAGS)
-
-GLUT_CFLAGS = -fexceptions
-
-LIB_DIR = $(LOCALBASE)/lib
-
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm $(PTHREAD_LIBS)
-