- Welcome X.org 7.2 \o/.

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

9 files changed, 39 insertions, 97 deletions

diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 39dc521a8057..abd7e863acee 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -1,50 +1,30 @@
-# New ports collection makefile for:    xorg-fontserver
-# Date created:		10 June 2004
-# Whom:			anholt@FreeBSD.org
+# New ports collection makefile for:	xfs
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	xorg-fontserver
-PORTVERSION=	6.9.0
-PORTREVISION=	1
-CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src2.tar.gz
+PORTNAME=	xfs
+PORTVERSION=	1.0.4
+PORTREVISION=	3
+PORTEPOCH=	1
+CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X font server from X.Org
+COMMENT=	X.Org font server
 
-CONFLICTS=	XFree86-FontServer-*
-
-EXTRA_PATCHES=	${CF_PATCHES}
-
-USE_XLIB=	yes
-USE_RC_SUBR=	yes
+XORG_CAT=	app
+USE_XORG=	libfs xfont xtrans
+USE_RC_SUBR=	xfs
+ALL_TARGET=	all config
 
 MAN1=		xfs.1
 
-XBUILD_DIRS=	programs/xfs
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/xfs
-
-post-build:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-		${FILESDIR}/xfs.sh >${WRKDIR}/xfs.sh
-
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/xfs.sh ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKSRC}/programs/xfs/config \
-		${PREFIX}/lib/X11/fs/config.default
+	${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config.default
+	@if [ ! -f ${PREFIX}/lib/X11/fs/config ]; then \
+		${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config; \
+	fi
 
-.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>
+.include <bsd.port.mk>
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index 1785b7d2df7e..f5fc8d0b76d6 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,6 +1,3 @@
-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
-MD5 (xorg/X11R6.9.0-src2.tar.gz) = f49a0993d89038a46556720688450479
-SHA256 (xorg/X11R6.9.0-src2.tar.gz) = 848289b323d6193ac03ca001f41aa3cdf9cfd129cfbda1c5add209d5c18a8e4c
-SIZE (xorg/X11R6.9.0-src2.tar.gz) = 6056976
+MD5 (xorg/app/xfs-1.0.4.tar.bz2) = f43cb64d623b748208dfd9012d17b654
+SHA256 (xorg/app/xfs-1.0.4.tar.bz2) = 452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b
+SIZE (xorg/app/xfs-1.0.4.tar.bz2) = 149414
diff --git a/x11-fonts/xfs/files/patch-Imakefile b/x11-fonts/xfs/files/patch-Imakefile
deleted file mode 100644
index 64b65de2e69b..000000000000
--- a/x11-fonts/xfs/files/patch-Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- programs/xfs/Imakefile.orig	Tue Jan 18 22:28:55 2005
-+++ programs/xfs/Imakefile	Tue Jan 18 22:30:24 2005
-@@ -37,7 +37,11 @@
- FSLIBDIR = $(LIBDIR)/fs
- FSERRORS = $(LOGDIRECTORY)/xfs.log
- DEFAULTFONTPATH = DefaultFSFontPath
-+#if defined(BuildFontCacheLib) && BuildFontCacheLib
-+SITE_CONFIG = -DDEFAULTFONTPATH=$(DEFAULTFONTPATH) -DFSERRORS=$(FSERRORS) -DFONTCACHE
-+#else
- SITE_CONFIG = -DDEFAULTFONTPATH=$(DEFAULTFONTPATH) -DFSERRORS=$(FSERRORS)
-+#endif
- 
- $(OSLIB):	$(OSDIR)
- 
diff --git a/x11-fonts/xfs/files/patch-Makefile.in b/x11-fonts/xfs/files/patch-Makefile.in
new file mode 100644
index 000000000000..2fecfe5ad0ee
--- /dev/null
+++ b/x11-fonts/xfs/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Jul  8 12:35:19 2006
++++ Makefile.in	Sat Jul  8 12:35:21 2006
+@@ -289,7 +289,7 @@
+ FSERRORS = /var/log/xfs.log
+ FONTDIR = $(libdir)/X11/fonts
+ FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
+-config_DATA = config
++#config_DATA = config
+ EXTRA_DIST = xfs.def config.cpp $(appman_PRE)
+ CLEANFILES = config $(appman_DATA)
+ appmandir = $(APP_MAN_DIR)
diff --git a/x11-fonts/xfs/files/patch-config.cpp b/x11-fonts/xfs/files/patch-config.cpp
deleted file mode 100644
index d44e630c972f..000000000000
--- a/x11-fonts/xfs/files/patch-config.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- programs/xfs/config.cpp.orig	Tue Jan 18 22:31:25 2005
-+++ programs/xfs/config.cpp	Tue Jan 18 22:32:13 2005
-@@ -8,8 +8,10 @@
- XCOMM in decipoints
- default-point-size = 120
- default-resolutions = 75,75,100,100
-+#ifdef FONTCACHE
- 
- XCOMM font cache control, specified in KB
- cache-hi-mark = 2048
- cache-low-mark = 1433
- cache-balance = 70
-+#endif
diff --git a/x11-fonts/xfs/files/xfs.sh b/x11-fonts/xfs/files/xfs.in
index 5aa5f178ecff..cfb562fed5e3 100644
--- a/x11-fonts/xfs/files/xfs.sh
+++ b/x11-fonts/xfs/files/xfs.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/x11-fonts/xfs/files/Attic/xfs.sh,v 1.3 2006-02-20 20:47:50 dougb Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: xfs
@@ -28,8 +28,10 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 command="%%PREFIX%%/bin/${name}"
-command_args="-config ${xfs_config} -daemon"
+command_args="-config ${xfs_config} -daemon ${xfs_user:+-user ${xfs_user}}"
 required_files="$xfs_config"
 extra_commands="reload"
 
+unset xfs_user
+
 run_rc_command "$1"
diff --git a/x11-fonts/xfs/pkg-descr b/x11-fonts/xfs/pkg-descr
index 10961b30e99b..a3082dc9d0e9 100644
--- a/x11-fonts/xfs/pkg-descr
+++ b/x11-fonts/xfs/pkg-descr
@@ -1,6 +1,4 @@
 This package contains the X.Org font server.
 
-WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist
index 02128e26eb2a..02c0cee1f5f5 100644
--- a/x11-fonts/xfs/pkg-plist
+++ b/x11-fonts/xfs/pkg-plist
@@ -1,5 +1,5 @@
 bin/xfs
-etc/rc.d/xfs.sh
 @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi
 lib/X11/fs/config.default
+@exec if [ ! -f %D/lib/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
 @dirrmtry lib/X11/fs
diff --git a/x11-fonts/xfs/scripts/configure b/x11-fonts/xfs/scripts/configure
deleted file mode 100644
index 0ccd5cee2917..000000000000
--- a/x11-fonts/xfs/scripts/configure
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define XprtServer YES"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define InstallFSConfig NO"		>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen