- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

4 files changed, 15 insertions, 93 deletions

diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index a9278dd8d3bd..1352145f0c5d 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -6,35 +6,35 @@
 #
 
 PORTNAME=	xorg-fonts-type1
-PORTVERSION=	6.9.0
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Type1 fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	${FONTDIR}/Type1/UTBI____.afm:${PORTSDIR}/x11-fonts/font-adobe-utopia-type1 \
+		${FONTDIR}/Type1/l047013t.afm:${PORTSDIR}/x11-fonts/font-bh-type1 \
+		${FONTDIR}/Type1/c0419bt_.afm:${PORTSDIR}/x11-fonts/font-bitstream-type1 \
+		${FONTDIR}/Type1/cour.afm:${PORTSDIR}/x11-fonts/font-ibm-type1 \
+		${FONTDIR}/Type1/cursor.pfa:${PORTSDIR}/x11-fonts/font-xfree86-type1 \
+		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontScalable-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+do-install:	# empty
 
-XBUILD_DIRS=	fonts/encodings fonts/scaled/Type1
-XINSTALL_DIRS=	fonts/scaled/Type1
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-post-install:
-	@command fc-cache ${PREFIX}/lib/X11/fonts/Type1 || true
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-type1/distinfo b/x11-fonts/xorg-fonts-type1/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-type1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-type1/pkg-plist b/x11-fonts/xorg-fonts-type1/pkg-plist
deleted file mode 100644
index cc63120c0a1a..000000000000
--- a/x11-fonts/xorg-fonts-type1/pkg-plist
+++ /dev/null
@@ -1,65 +0,0 @@
-lib/X11/fonts/Type1/UTBI____.afm
-lib/X11/fonts/Type1/UTBI____.pfa
-lib/X11/fonts/Type1/UTB_____.afm
-lib/X11/fonts/Type1/UTB_____.pfa
-lib/X11/fonts/Type1/UTI_____.afm
-lib/X11/fonts/Type1/UTI_____.pfa
-lib/X11/fonts/Type1/UTRG____.afm
-lib/X11/fonts/Type1/UTRG____.pfa
-lib/X11/fonts/Type1/c0419bt_.afm
-lib/X11/fonts/Type1/c0419bt_.pfb
-lib/X11/fonts/Type1/c0582bt_.afm
-lib/X11/fonts/Type1/c0582bt_.pfb
-lib/X11/fonts/Type1/c0583bt_.afm
-lib/X11/fonts/Type1/c0583bt_.pfb
-lib/X11/fonts/Type1/c0611bt_.afm
-lib/X11/fonts/Type1/c0611bt_.pfb
-lib/X11/fonts/Type1/c0632bt_.afm
-lib/X11/fonts/Type1/c0632bt_.pfb
-lib/X11/fonts/Type1/c0633bt_.afm
-lib/X11/fonts/Type1/c0633bt_.pfb
-lib/X11/fonts/Type1/c0648bt_.afm
-lib/X11/fonts/Type1/c0648bt_.pfb
-lib/X11/fonts/Type1/c0649bt_.afm
-lib/X11/fonts/Type1/c0649bt_.pfb
-lib/X11/fonts/Type1/cour.afm
-lib/X11/fonts/Type1/cour.pfa
-lib/X11/fonts/Type1/courb.afm
-lib/X11/fonts/Type1/courb.pfa
-lib/X11/fonts/Type1/courbi.afm
-lib/X11/fonts/Type1/courbi.pfa
-lib/X11/fonts/Type1/couri.afm
-lib/X11/fonts/Type1/couri.pfa
-lib/X11/fonts/Type1/cursor.pfa
-lib/X11/fonts/Type1/encodings.dir
-lib/X11/fonts/Type1/fonts.dir
-lib/X11/fonts/Type1/fonts.scale
-lib/X11/fonts/Type1/l047013t.afm
-lib/X11/fonts/Type1/l047013t.pfa
-lib/X11/fonts/Type1/l047016t.afm
-lib/X11/fonts/Type1/l047016t.pfa
-lib/X11/fonts/Type1/l047033t.afm
-lib/X11/fonts/Type1/l047033t.pfa
-lib/X11/fonts/Type1/l047036t.afm
-lib/X11/fonts/Type1/l047036t.pfa
-lib/X11/fonts/Type1/l048013t.afm
-lib/X11/fonts/Type1/l048013t.pfa
-lib/X11/fonts/Type1/l048016t.afm
-lib/X11/fonts/Type1/l048016t.pfa
-lib/X11/fonts/Type1/l048033t.afm
-lib/X11/fonts/Type1/l048033t.pfa
-lib/X11/fonts/Type1/l048036t.afm
-lib/X11/fonts/Type1/l048036t.pfa
-lib/X11/fonts/Type1/l049013t.afm
-lib/X11/fonts/Type1/l049013t.pfa
-lib/X11/fonts/Type1/l049016t.afm
-lib/X11/fonts/Type1/l049016t.pfa
-lib/X11/fonts/Type1/l049033t.afm
-lib/X11/fonts/Type1/l049033t.pfa
-lib/X11/fonts/Type1/l049036t.afm
-lib/X11/fonts/Type1/l049036t.pfa
-@exec command fc-cache %D/lib/X11/fonts/Type1 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache %D/lib/X11/fonts/Type1 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/Type1/fonts.cache-1 -a ! -s %D/lib/X11/fonts/Type1/fonts.cache-1 ]; then rm %D/lib/X11/fonts/Type1/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/Type1
diff --git a/x11-fonts/xorg-fonts-type1/scripts/configure b/x11-fonts/xorg-fonts-type1/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-type1/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen