Merge r857-r860 by bapt and zeising:

Sync with ports
Remove accidental stuff that crept in in r857.


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

4 files changed, 28 insertions, 17 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 8f7a3b9..b084360 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1,7 +1,7 @@
 #-*- tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: head/Mk/bsd.port.mk 316786 2013-04-29 08:57:12Z bapt $
+# $FreeBSD: head/Mk/bsd.port.mk 317115 2013-05-02 14:07:31Z bapt $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -1143,6 +1143,11 @@ INDEXDIR?=		${PORTSDIR}
 SRC_BASE?=		/usr/src
 USESDIR?=		${PORTSDIR}/Mk/Uses
 
+# make sure bmake treats -V as expected 
+.MAKE.EXPAND_VARIABLES= yes
+# tell bmake we use the old :L :U modifiers
+.MAKE.FreeBSD_UL= yes
+
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
 #
@@ -2803,18 +2808,12 @@ patch-sites: patch-sites-DEFAULT
 
 .if defined(IGNOREFILES)
 .if !defined(CKSUMFILES)
-CKSUMFILES!=	\
-	for file in ${ALLFILES}; do \
-		ignore=0; \
-		for tmp in ${IGNOREFILES}; do \
-			if [ "$$file" = "$$tmp" ]; then \
-				ignore=1; \
-			fi; \
-		done; \
-		if [ "$$ignore" = 0 ]; then \
-			${ECHO_CMD} "$$file"; \
-		fi; \
-	done
+.  for _f in ${ALLFILES}
+.    if ! ${IGNOREFILES:M${_f}}
+CKSUMFILES+=	${_f}
+.   endif
+.  endfor
+.  undef _f
 .endif
 .else
 CKSUMFILES=		${ALLFILES}
@@ -2962,6 +2961,11 @@ MANEXT=	.gz
 .endif
 
 .if (defined(MLINKS) || defined(_MLINKS_PREPEND)) && !defined(_MLINKS)
+
+.if defined(.PARSEDIR)
+_MLINKS=	 ${_MLINKS_PREPEND} \
+		 ${MANLANG:S,^,man/,:S,/"",,:@m@${MLINKS:@p@${MAN${p:E}PREFIX}/$m/man${p:E}/$p${MANEXT}@}@}
+.else
 __pmlinks!=	${ECHO_CMD} '${MLINKS:S/	/ /}' | ${AWK} \
  '{ if (NF % 2 != 0) { print "broken"; exit; } \
 	for (i=1; i<=NF; i++) { \
@@ -2988,6 +2992,7 @@ _MLINKS+=	${___pmlinks:S// /g}
 .endfor
 .endfor
 .endif
+.endif
 _COUNT=0
 .for ___tpmlinks in ${_MLINKS}
 .if ${_COUNT} == "1"
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 3a8bb43..6ccc937 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -15,6 +15,8 @@
 #
 # $FreeBSD$
 
+.MAKE.FreeBSD_UL=	yes
+
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index ad6a231..e1fce44 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -10,10 +10,12 @@ COMMENT=	OpenGL utility library
 USE_GL=		gl
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-do-install:
+INSTALL_WRKSRC=	${WRKSRC}/src/glu
+BUILD_WRKSRC=	${WRKSRC}/src/glu
+
+pre-install:
 	@${MKDIR} ${PREFIX}/include/GL/
 	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
-	cd ${WRKSRC}/src/glu; ${GMAKE} install
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index 16227c6..93d4fa5 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/x11/xorg-apps/Makefile 317162 2013-05-02 22:10:11Z bapt $
 
 PORTNAME=	xorg-apps
 PORTVERSION=	7.7
@@ -10,6 +10,8 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org apps meta-port
 
+.MAKE.FreeBSD_UL=	yes
+
 COMPONENTS=	appres bitmap xf86dga:dga iceauth luit \
 		x11-fonts/mkfontdir:mkfontdir \
 		x11-fonts/mkfontscale:mkfontscale sessreg \
@@ -38,7 +40,7 @@ ${comp:C/:.*//:C/.*\///:U}_DESC=	Install ${comp:C/:.*//:C/.*\///} application
 .include <bsd.port.options.mk>
 
 .for comp in ${COMPONENTS}
-. if !defined(${OPTIONS_UNSET:M${comp:C/:.*//:C/.*\///:U}})
+. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
 .  if ${comp:M*\:*}==""
 port=${comp}
 check=${comp:C/.*\///} # doesn't work