[Midnightbsd-cvs] mports [19097] trunk/Mk/extensions/xorg.mk: update xorg build

[laffer1 at midnightbsd.org]

Revision: 19097
          http://svnweb.midnightbsd.org/mports/?rev=19097
Author:   laffer1
Date:     2015-05-23 22:41:25 -0400 (Sat, 23 May 2015)
Log Message:
-----------
update xorg build

Modified Paths:
--------------
    trunk/Mk/extensions/xorg.mk

Modified: trunk/Mk/extensions/xorg.mk
===================================================================
--- trunk/Mk/extensions/xorg.mk	2015-05-24 02:38:53 UTC (rev 19096)
+++ trunk/Mk/extensions/xorg.mk	2015-05-24 02:41:25 UTC (rev 19097)
@@ -37,11 +37,13 @@
 
 .if defined(XORG_CAT)
 # Default variables, common to all new modular xorg ports.
-.if !defined(USE_TGZ) && !defined(USE_XZ)
+.if !defined(USES) || ! ${USES:Mtar*}
 USES+=		tar:bzip2
 .endif
 PREFIX?=       	${LOCALBASE}
 GNU_CONFIGURE= 	yes
+# for some reason this makes mkfontscale and others fail in the install target
+#INSTALL_TARGET=	install-strip
 DIST_SUBDIR=	xorg/${XORG_CAT}
 
 MASTER_SITES?=	${MASTER_SITE_XORG}
@@ -78,64 +80,20 @@
 . endif
 
 . if ${XORG_CAT} == "font"
-FONTDIR?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
-CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/lib/X11/fonts
-CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/lib/X11/fonts
-NEED_MKFONTFOO=	yes
-
-.  if ${PORTNAME:M*type1*}x != x
-INSTALLS_TTF?=	yes
-.  elif ${PORTNAME:M*ttf*}x != x
-INSTALLS_TTF?=	yes
-.  elif ${PORTNAME:M*encodings*}x != x
-# This is terrific, we want mkfontscale at build time, but don't use it like for the other ports.
-NEED_MKFONTFOO=	no
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-INSTALLS_TTF?=	no
-.  else
-INSTALLS_TTF?=	no
+FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
+CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
+CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/share/fonts
+.    if !defined(NOFONT)
+USES+=	fonts
+BUILD_DEPENDS+=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+				bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+PLIST_FILES+=	"@comment ${FONTSDIR}/fonts.dir" \
+				"@comment ${FONTSDIR}/fonts.scale"
+.    endif
 .  endif
 
-.  if ${PORTNAME:M*font-util*}x != x
-USES+=	pathfix
-NEED_MKFONTFOO=	no
-.  elif ${INSTALLS_TTF} == "yes"
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
-.  else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-.  endif
-
-.  if ${NEED_MKFONTFOO} == "yes"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-				${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-RUN_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-				${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-.  endif
-
-post-install:
-.  if ${INSTALLS_TTF} == "yes"
-.   for _fontdir in ${FONTDIR}
-	@${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-.   endfor
-.  endif
-.  for _fontdir in ${FONTDIR}
-.   if ${NEED_MKFONTFOO} == "yes"
-	@${ECHO_CMD} "@exec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec mkfontscale %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.scale -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.scale 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.scale; fi" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec mkfontdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec if [ -e %D/lib/X11/fonts/${_fontdir}/fonts.dir -a \"\`stat -f '%%z' %D/lib/X11/fonts/${_fontdir}/fonts.dir 2>/dev/null\`\" = '2' ]; then rm %D/lib/X11/fonts/${_fontdir}/fonts.dir; fi" >> ${TMPPLIST}
-.   endif
-	@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
-.  endfor
-. endif
-
 . if ${XORG_CAT} == "lib"
-USES+=		pathfix libtool:keepla
+USES+=		pathfix libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=--enable-malloc0returnsnull
 . endif
@@ -148,7 +106,8 @@
 DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
 WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
 USES+=	pathfix
-CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb
+CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
+					--with-fontrootdir=${LOCALBASE}/share/fonts
 
 LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
 USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
@@ -158,10 +117,6 @@
 
 .endif
 
-.if exists(${LOCALBASE}/bin/X)
-XSERVER_VER!=	${LOCALBASE}/bin/X -version 2>&1 | sed -n 's;^X\.Org X Server \([^ ]*\).*;\1;p'
-.endif
-
 .if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
 
 Xorg_Post_Include=		xorg.mk
@@ -359,15 +314,4 @@
 RUN_DEPENDS+=			${LIB_PC_DEPENDS}
 BUILD_DEPENDS+=			${LIB_PC_DEPENDS}
 
-.if !target(check-latest)
-check-latest:
-	@AVAIL_VER=`fetch -qo - http://xorg.freedesktop.org/releases/individual/${XORG_CAT}/ | sed -ne 's/.*${PORTNAME}-\(.*\).tar.bz2\".*/\1/p'` && \
-		${ECHO_CMD} "Available versions for ${PORTNAME} are: $${AVAIL_VER}." && \
-		for ver in $${AVAIL_VER}; do \
-			if [ `pkg_version -t $$ver ${PORTVERSION}` = ">" ]; then \
-				${ECHO_CMD} "${PORTNAME} $$ver is newer than current version."; \
-			fi; \
-		done
 .endif
-
-.endif