Index: head/x11-servers/XFree86-4-FontServer/Makefile =================================================================== --- head/x11-servers/XFree86-4-FontServer/Makefile (revision 126749) +++ head/x11-servers/XFree86-4-FontServer/Makefile (revision 126750) @@ -1,38 +1,45 @@ # New ports collection makefile for: XFree86-FontServer # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # # $FreeBSD$ # PORTNAME= FontServer PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- DISTFILES= XFree86-4.4.0-src-1.tgz \ XFree86-4.4.0-src-2.tgz \ XFree86-4.4.0-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 font server CONFLICTS= xorg-fontserver-* MAN1= xfs.1 XBUILD_DIRS= programs/xfs XINCLUDE_DIRS= lib/xtrans programs/Xserver XINSTALL_MAN_DIRS= programs/xfs EXTRA_PATCHES+= ${FILESDIR}/patch-programs::xfs::Imakefile +USE_RC_SUBR= yes +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 @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include .if ${X_WINDOW_SYSTEM:L} != xfree86-4 IGNORE= is part of XFree86-4 .endif .include Property changes on: head/x11-servers/XFree86-4-FontServer/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.27 \ No newline at end of property +1.28 \ No newline at end of property Index: head/x11-servers/XFree86-4-FontServer/files/xfs.sh =================================================================== --- head/x11-servers/XFree86-4-FontServer/files/xfs.sh (nonexistent) +++ head/x11-servers/XFree86-4-FontServer/files/xfs.sh (revision 126750) @@ -0,0 +1,36 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: xfs +# REQUIRE: cleartmp +# BEFORE: LOGIN +# KEYWORD: FreeBSD + +# 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" Property changes on: head/x11-servers/XFree86-4-FontServer/files/xfs.sh ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/x11-servers/XFree86-4-FontServer/pkg-plist =================================================================== --- head/x11-servers/XFree86-4-FontServer/pkg-plist (revision 126749) +++ head/x11-servers/XFree86-4-FontServer/pkg-plist (revision 126750) @@ -1,3 +1,4 @@ @unexec if cmp -s %D/lib/X11/fs/config %D/lib/X11/fs/config.default; then rm -f %D/lib/X11/fs/config; fi bin/xfs +etc/rc.d/xfs.sh lib/X11/fs/config.default Property changes on: head/x11-servers/XFree86-4-FontServer/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/x11-servers/XFree86-4-FontServer/scripts/configure =================================================================== --- head/x11-servers/XFree86-4-FontServer/scripts/configure (revision 126749) +++ head/x11-servers/XFree86-4-FontServer/scripts/configure (revision 126750) @@ -1,66 +1,67 @@ #!/bin/sh # This script does the following: # (1) cp xf86site.def, installed by imake-4 port, # to ${WRKDIR}/xc/config/cf. # this provides settings for the ports system. # (2) Create a host.def for this specific port, using # host.def as a base. ORIGDEF=$PREFIX/lib/X11/config/xf86site.def DESTDEF=$WRKDIR/xc/config/cf/xf86site.def ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def LOCALDEF=$WRKDIR/.config HOSTDEF=$WRKDIR/xc/config/cf/host.def # Use original host.def as initial config file rm -f $LOCALDEF grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF echo "#define ProjectRoot $PREFIX" >> $LOCALDEF # This is also defined in xf86site.def, but doesn't get # picked up for some reason. echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF # disable some options for i in BuildFonts \ Build75DpiFonts \ Build100DpiFonts \ BuildSpeedoFonts \ BuildType1Fonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ BuildHtmlManPages \ XF86Server \ XnestServer \ XVirtualFramebufferServer \ XprtServer \ LibHeaders \ ForceNormalLib \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF done echo "#define BuildServer YES" >> $LOCALDEF echo "#define BuildFontServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF if [ X$InstallFSConfig = "X" ]; then InstallFSConfig=YES fi echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF +echo "#define BuildFontCacheLib YES" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF echo "#define FreeBSDCC ${CC}" >> $LOCALDEF echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF cp -f $ORIGDEF $DESTDEF # copy generated config to host.def cp -f $LOCALDEF $HOSTDEF exit 0 Property changes on: head/x11-servers/XFree86-4-FontServer/scripts/configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property