[Midnightbsd-cvs] mports: mports/x11-servers: Remove xorg-fontserver.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Tue Nov 6 23:42:30 EST 2007 

Log Message:
-----------
Remove xorg-fontserver.  It's a xorg6ism.

Modified Files:
--------------
    mports/x11-servers:
        Makefile (r1.6 -> r1.7)

Removed Files:
-------------
    mports/x11-servers/xorg-fontserver:
        Makefile
        distinfo
        pkg-descr
        pkg-install
        pkg-plist
    mports/x11-servers/xorg-fontserver/files:
        patch-Imakefile
        patch-config.cpp
        xfs.sh
    mports/x11-servers/xorg-fontserver/scripts:
        configure

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-servers/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L x11-servers/Makefile -L x11-servers/Makefile -u -r1.6 -r1.7
--- x11-servers/Makefile
+++ x11-servers/Makefile
@@ -7,7 +7,6 @@
     SUBDIR += x2vnc
     SUBDIR += x2x
     SUBDIR += xorg-dmx
-    SUBDIR += xorg-fontserver
     SUBDIR += xorg-nestserver
     SUBDIR += xorg-printserver
     SUBDIR += xorg-server
--- x11-servers/xorg-fontserver/pkg-install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
-
-XINITCONFDIR=${PKG_PREFIX}/lib/X11/fs
-if [ ! -f ${XINITCONFDIR}/config ]; then
-	cp ${XINITCONFDIR}/config.default ${XINITCONFDIR}/config
-fi
--- x11-servers/xorg-fontserver/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This package contains the X.Org font server.
-
-WWW: http://www.x.org/
-
-- Eric Anholt
-anholt at FreeBSD.org
--- x11-servers/xorg-fontserver/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/xfs
-etc/rc.d/xfs.sh
- at 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
- at dirrmtry lib/X11/fs
--- x11-servers/xorg-fontserver/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for:    xorg-fontserver
-# Date created:		10 June 2004
-# Whom:			anholt at FreeBSD.org
-#
-# $MidnightBSD: mports/x11-servers/xorg-fontserver/Makefile,v 1.2 2006/09/25 16:34:16 archite Exp $
-# $FreeBSD: ports/x11-servers/xorg-fontserver/Makefile,v 1.11 2006/01/21 18:55:06 lesi Exp $
-#
-
-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
-
-MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	X font server from X.Org
-
-CONFLICTS=	XFree86-FontServer-*
-
-EXTRA_PATCHES=	${CF_PATCHES}
-
-USE_XLIB=	yes
-USE_RC_SUBR=	yes
-
-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
-
-.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>
--- x11-servers/xorg-fontserver/distinfo
+++ /dev/null
@@ -1,6 +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
-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
--- x11-servers/xorg-fontserver/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
--- x11-servers/xorg-fontserver/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)
- 
--- x11-servers/xorg-fontserver/files/xfs.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/x11-servers/xorg-fontserver/files/xfs.sh,v 1.3 2006/02/20 20:47:50 dougb Exp $
-#
-
-# PROVIDE: xfs
-# REQUIRE: cleartmp ldconfig
-# BEFORE:  LOGIN
-
-# The following variables are provided to control startup of X font server in
-# rc configuration file (eg /etc/rc.conf):
-# xfs_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable X font server
-# xfs_config (str):	Set to "%%PREFIX%%/lib/X11/fs/config" by default.
-#			Configuration file for X font server.
-#
-# Please see xfs(1), rc.conf(5) and rc(8) for further details.
-
-. %%RC_SUBR%%
-
-name="xfs"
-rcvar=`set_rcvar`
-
-# Set defaults
-[ -z "$xfs_enable" ] && xfs_enable="NO"
-[ -z "$xfs_config" ] && xfs_config="%%PREFIX%%/lib/X11/fs/config"
-
-load_rc_config $name
-
-command="%%PREFIX%%/bin/${name}"
-command_args="-config ${xfs_config} -daemon"
-required_files="$xfs_config"
-extra_commands="reload"
-
-run_rc_command "$1"
--- x11-servers/xorg-fontserver/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

More information about the Midnightbsd-cvs mailing list