diff options
Diffstat (limited to 'x11-servers/XttXF86srv-common')
19 files changed, 202 insertions, 223 deletions
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile index 39c6f22ff86b..43a5927a9c30 100644 --- a/x11-servers/XttXF86srv-common/Makefile +++ b/x11-servers/XttXF86srv-common/Makefile @@ -1,55 +1,58 @@ # New ports collection makefile for: Common Files for Xservers with Xtt -# Version required: 0.6 +# Version required: 1.0 # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1998/08/11 15:04:09 kuriyama Exp $ # DISTNAME= xc -PKGNAME?= xtt-xf86srv-common-0.6 +PKGNAME?= xtt-common-1.0 CATEGORIES= x11 MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.2/source/ \ ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/source/ \ - http://cclub.cc.tut.ac.jp/~go/unix/ -DISTFILES= X332src-1.tgz xtt06.tgz + http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/study/freebsd-at-random/x-tt/dists/ +DISTFILES= X332src-1.tgz xtt-1.0.tar.gz + +PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.2/fixes/ \ + ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/fixes/ \ +PATCHFILES= 3.3.2-patch1 3.3.2-patch2 3.3.2-patch3 + +MAINTAINER= taguchi@tohoku.iij.ad.jp + +LIB_DEPENDS= ttf\\.2\\.:${PORTSDIR}/print/freetype +.if defined(SERVER) +RUN_DEPENDS= mkfontdir.pl:${PORTSDIR}/x11/XttXF86srv-common +.endif + .if !defined(XDM_DES) && defined(USA_RESIDENT) .if ${USA_RESIDENT} == NO MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/ DISTFILES+= Wraphelp.c -EXTRACT_ONLY= X332src-1.tgz xtt06.tgz IGNOREFILES= Wraphelp.c .endif .endif - -MAINTAINER= taguchi@tohoku.iij.ad.jp - -LIB_DEPENDS= ttf\\.2\\.:${PORTSDIR}/print/freetype -.if defined(SERVER) -RUN_DEPENDS= ${PREFIX}/lib/libfont.so.1.0:${.CURDIR}/../XttXF86srv-common -.endif - -USE_X11= yes +EXTRACT_ONLY= X332src-1.tgz xtt-1.0.tar.gz +# can't use USE_X_PREFIX here +PREFIX= ${X11BASE} +MTREE_FILE= /etc/mtree/BSD.x11.dist WRKDIR= ${.CURDIR}/../XttXF86srv-common/work WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../XttXF86srv-common/patches FILESDIR= ${.CURDIR}/../XttXF86srv-common/files -DIST_SUBDIR= xc -.if defined(PATCH_DEBUG) -PATCH_XTT_ARGS= -d ${WRKDIR} -E ${PATCH_STRIP} -.else -PATCH_XTT_ARGS= -d ${WRKDIR} --forward --quiet -E ${PATCH_STRIP} -.endif +XTTDIR= ${WRKDIR}/xtt-1.0 +DOCDIR= ${PREFIX}/share/doc/Xtt +DIST_SUBDIR= xc +PATCH_DIST_STRIP= -p1 ALL_SERVER= XF86_8514 XF86_AGX XF86_I128 XF86_Mach32 XF86_Mach64 \ - XF86_Mach8 XF86_Mono XF86_P9000 XF86_S3 \ + XF86_Mach8 XF86_Mono XF86_P9000 XF86_S3 XF86_S3V \ XF86_SVGA XF86_VGA16 XF86_W32 -HOSTDEFSRC= ${FILESDIR}/host.def.template HOSTDEFLOCAL= ${WRKDIR}/host.def.local .if defined(SERVER) && (${SERVER} == xfs) ALL_TARGET= xfs -HOSTDEFSRV= ${FILESDIR}/host.def.xfs +HOSTDEFSRV= HOSTDEFDST= ${WRKSRC}/config/cf/host.def.xfs .else ALL_TARGET= World @@ -60,23 +63,18 @@ HOSTDEFSRV= ${FILESDIR}/host.def.ALL .endif HOSTDEFDST= ${WRKSRC}/config/cf/host.def .endif -DOCDIR= ${PREFIX}/lib/X11/doc/Xtt BINOWN= root BINGRP= wheel -XARGS?= /usr/bin/xargs -DIRNAME?= /usr/bin/dirname -TAIL?= /usr/bin/tail .if defined(SERVER) -CONFIGURECOOKIE= ${WRKDIR}/.configure_done -BUILDCOOKIE= ${WRKDIR}/.build_done -INSTALLCOOKIE= ${WRKDIR}/.install_done CONFIGURE_COOKIE= ${WRKDIR}/.configure_done.${SERVER} BUILD_COOKIE= ${WRKDIR}/.build_done.${SERVER} INSTALL_COOKIE= ${WRKDIR}/.install_done.${SERVER} PACKAGE_COOKIE= ${WRKDIR}/.package_done.${SERVER} +TMPPLIST= ${WRKDIR}/.PLIST.${SERVER}.mktmp .else PACKAGE_COOKIE= ${WRKDIR}/.package_done.common +TMPPLIST= ${WRKDIR}/.PLIST.common.mktmp .endif .if !defined(SERVER) && !exists(${WRKDIR}/.build_done) @@ -87,40 +85,28 @@ BROKEN= This port is dummy. .if ${SERVER} != xfs pre-fetch: @( \ - ${ECHO} "*******" ; \ - ${ECHO} "NOTICE:" ; \ - ${ECHO} "*******" ; \ - ${ECHO} " If you want to build/install this ${SERVER} server only," ; \ - ${ECHO} "you should execute:" ; \ - ${ECHO} " # make THIS_SERVER_ONLY=YES" ; \ - ${ECHO} "If the THIS_SERVER_ONLY flag not be set, this port will" ; \ - ${ECHO} "build ALL Xtt-X servers, and install only ${SERVER}." ; \ - ${ECHO} "This means you will need more disk space and CPU times." ; \ - ${ECHO} "" ; \ - ) + ${ECHO_MSG} "*******" ; \ + ${ECHO_MSG} "NOTICE:" ; \ + ${ECHO_MSG} "*******" ; \ + ${ECHO_MSG} " If you want to build/install this ${SERVER} server only," ; \ + ${ECHO_MSG} "you should execute:" ; \ + ${ECHO_MSG} " # make THIS_SERVER_ONLY=YES" ; \ + ${ECHO_MSG} "If the THIS_SERVER_ONLY flag not be set, this port will" ; \ + ${ECHO_MSG} "build ALL Xtt-X servers, and install only ${SERVER}." ; \ + ${ECHO_MSG} "This means you will need more disk space and CPU times." ; \ + ${ECHO_MSG} "" ) .endif .endif pre-patch: - @( \ - for i in ${WRKDIR}/xtt06/xtt06-serveronly.diff \ - ${WRKDIR}/xtt06/xtt06-fs.diff; do \ - ${PATCH} ${PATCH_XTT_ARGS} < $$i; \ - done ; \ - ${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \ - (cd ${WRKDIR} ; ${XMKMF} ; ${SETENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} FILESDIR=${FILESDIR} ${MAKE}) ; \ - ) + @( cd ${WRKDIR}; \ + ${PATCH} ${PATCH_DIST_ARGS} < ${XTTDIR}/xtt-1.0.diff ) pre-configure: @( \ - FREETYPELIBDIR=`${LDCONFIG} -r | ${GREP} -e "-lttf" | ${AWK} '{print $$3}' | ${TAIL} -1 | ${XARGS} ${DIRNAME}` ; \ - FREETYPEINCDIR=`${DIRNAME} $$FREETYPELIBDIR`/include ; \ - ${SED} "s+@FREETYPELIBDIR@+$$FREETYPELIBDIR+g" ${HOSTDEFSRC} | ${SED} "s+@FREETYPEINCDIR@+$$FREETYPEINCDIR+g" > ${HOSTDEFDST} ; \ - ${CAT} ${HOSTDEFSRV} >> ${HOSTDEFDST} ; \ - if [ -f ${HOSTDEFLOCAL} ]; then \ - ${CAT} ${HOSTDEFLOCAL} >> ${HOSTDEFDST} ; \ - fi; \ - ) + ${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \ + (cd ${WRKDIR} ; ${XMKMF} ; ${SETENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} FILESDIR=${FILESDIR} LOCALBASE=${LOCALBASE} ${MAKE}) ; \ + ${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ) .if defined(SERVER) .if (defined(THIS_SERVER_ONLY) && ${THIS_SERVER_ONLY} == YES) || ${SERVER} == xfs @@ -132,14 +118,16 @@ post-build: .else post-configure: @ ( \ + cd ${WRKDIR} ; \ for i in ${ALL_SERVER} ; do \ - ${TOUCH} ${TOUCH_FLAGS} ${CONFIGURECOOKIE}.$${i} ; \ + ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${CONFIGURE_COOKIE} .${SERVER}`.$${i} ; \ done ) post-build: @ ( \ + cd ${WRKDIR} ; \ for i in ${ALL_SERVER} ; do \ - ${TOUCH} ${TOUCH_FLAGS} ${BUILDCOOKIE}.$${i} ; \ + ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${BUILD_COOKIE} .${SERVER}`.$${i} ; \ done ) .endif .endif @@ -147,13 +135,12 @@ post-build: .if !defined(SERVER) do-install: @( \ - ${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \ - ${INSTALL_DATA} ${WRKSRC}/lib/font/libfont.so.* ${PREFIX}/lib; \ + cd ${WRKSRC}/lib/font; \ + ${MAKE} install; \ ${LDCONFIG} -m ${PREFIX}/lib; \ + ${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \ ${MKDIR} ${DOCDIR}; \ - ${INSTALL_DATA} ${WRKDIR}/xtt06/xtt06-readme.jis ${DOCDIR}; \ - ${INSTALL_DATA} ${WRKDIR}/xtt06/xtt06-example.jis ${DOCDIR} \ - ) + ${INSTALL_DATA} ${XTTDIR}/xtt10-* ${DOCDIR}) .elif defined(SERVER) && ${SERVER} == xfs do-install: @${INSTALL_PROGRAM} ${WRKSRC}/programs/xfs/xfs ${PREFIX}/bin/xfs.xtt @@ -161,8 +148,7 @@ do-install: do-install: @( \ ${INSTALL_PROGRAM} ${WRKSRC}/programs/Xserver/${SERVER} ${PREFIX}/bin/${SERVER}.xtt; \ - ${LN} -fs ${PREFIX}/bin/${SERVER}.xtt ${PREFIX}/bin/X \ - ) + ${LN} -fs ${PREFIX}/bin/${SERVER}.xtt ${PREFIX}/bin/X ) .endif post-install: diff --git a/x11-servers/XttXF86srv-common/distinfo b/x11-servers/XttXF86srv-common/distinfo index bc11124636ec..7649f8c84025 100644 --- a/x11-servers/XttXF86srv-common/distinfo +++ b/x11-servers/XttXF86srv-common/distinfo @@ -1,3 +1,6 @@ MD5 (xc/X332src-1.tgz) = 61c0340f91c883e214886fb81d1eefc3 -MD5 (xc/xtt06.tgz) = a4bdd4531fba0dfe7556311c5a178fb3 +MD5 (xc/xtt-1.0.tar.gz) = a3c917f79b35d102079efceeb9b9ab0c +MD5 (xc/3.3.2-patch1) = e5a66e732d62cf23007d6b939281028a +MD5 (xc/3.3.2-patch2) = ba4752cdab2f73e34020285043d51e14 +MD5 (xc/3.3.2-patch3) = 413331b5bce0490a335855a7d3f42995 MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile index 8cfac8b5295a..7e42fd9bf8fb 100644 --- a/x11-servers/XttXF86srv-common/files/Imakefile +++ b/x11-servers/XttXF86srv-common/files/Imakefile @@ -5,27 +5,94 @@ ECHO_MSG= echo WRKDIR?= . DISTDIR?= /usr/ports/distfiles FILESDIR?= ../files +LOCALBASE?= /usr/local -#ifdef HasSecureRPC -HASSECURERPC= HasSecureRPC +#if BuildXInputExt +BUILDXINPUTEXT= YES +#else +JOYSTICSUPPORT= YES #endif -#ifdef HasXdmAuth -HASXDMAUTH= HasXdmAuth +#if BuildPexExt +BUILDPEXEXT= YES #endif -# -#ifdef HasKrb4 -HASKRB4= HasKrb4 +#if BuildXIE +BUILDXIE= YES +#endif +#if HasSecureRPC +HASSECURERPC= YES +#endif +#if HasXdmAuth +HASXDMAUTH= YES +#endif +#if HasKrb4 +HASKRB4= YES #endif -all:: SecureRPCCheck XdmAuthCheck Krb4Check +all:: SecureRPCCheck XdmAuthCheck Krb4Check InputExtCheck pexCheck xieCheck initialize:: - @${ECHO_MSG} "Now checking your XFree86 environment." - @rm -f ${CONFFILE} + @( \ + ${ECHO_MSG} " Now checking your XFree86 environment."; \ + rm -f ${CONFFILE}; \ + ${ECHO_MSG} "#define FreeTypeLibDir ${LOCALBASE}/lib" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define FreeTypeIncDir ${LOCALBASE}/include" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86SVGAServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86VGA16Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86VGA16DualServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86MonoServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86MonoDualServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86S3Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86S3VServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86I8514Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86Mach8Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86Mach32Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86Mach64Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86P9000Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86AGXServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86W32Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86I128Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef BuildFontServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef BuildFonts" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XnestServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XVirtualFramebufferServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XprtServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define BuildFonts NO" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define XnestServer NO" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define XVirtualFramebufferServer NO" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define XprtServer NO" >> ${CONFFILE}; \ + ) +InputExtCheck:: initialize +.if defined(BUILDXINPUTEXT) && ${BUILDXINPUTEXT} == YES + @( \ + ${ECHO_MSG} "#define BuildXInputExt YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using BuildXInputExt." ) +.else + @( \ + ${ECHO_MSG} "#define JoystickSupport YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using JoystickSupport." ) +.endif + +pexCheck:: initialize +.if defined(BUILDPEXEXT) && ${BUILDPEXEXT} == YES + @( \ + ${ECHO_MSG} "#define BuildPexExt YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using BuildPexExt." ) +.endif + +xieCheck:: initialize +.if defined(BUILDXIE) && ${BUILDXIE} == YES + @( \ + ${ECHO_MSG} "#define BuildXIE YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using BuildXIE." ) +.endif + SecureRPCCheck:: initialize .if defined(HASSECURERPC) && ${HASSECURERPC} == YES - @echo "#define HasSecureRPC ${HASSECURERPC}" >> ${CONFFILE} + @( \ + ${ECHO_MSG} "#define HasSecureRPC ${HASSECURERPC}" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using Secure RPC"; \ + ) .else @${DO_NADA} .endif @@ -33,14 +100,16 @@ SecureRPCCheck:: initialize XdmAuthCheck:: initialize .if defined(HASXDMAUTH) && ${HASXDMAUTH} == YES @( \ - echo "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ + ${ECHO_MSG} " Using XdmAuth." ; \ if [ ! -f ${WRKDIR}/xc/lib/Xdmcp/Wraphelp.c ]; then \ if [ -f ${DISTDIR}/xc/Wraphelp.c ]; then \ ${ECHO_MSG} "===> Whaphelp.c found in DISTDIR directory, copying it to source tree." ; \ ${CP} ${DISTDIR}/xc/Wraphelp.c ${WRKDIR}/xc/lib/Xdmcp/ ; \ + ${ECHO_MSG} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ elif [ -f ${FILESDIR}/Wraphelp.c ]; then \ ${ECHO_MSG} "===> Whaphelp.c found in FILESDIR directory, copying it to source tree." ; \ ${CP} ${FILESDIR}/Wraphelp.c ${WRKDIR}/xc/lib/Xdmcp/ ; \ + ${ECHO_MSG} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ else \ ${ECHO_MSG} "Wraphelp.c not found. You can not use XDM-AUTHORIZATION-1!" ; \ false ; \ @@ -54,7 +123,8 @@ XdmAuthCheck:: initialize Krb4Check:: initialize .if defined(HASKRB4) && ${HASKRB4} == YES @( \ - echo "#define HasKrb4 ${HASKRB4}" >> ${CONFFILE} ; \ + ${ECHO_MSG} "#define HasKrb4 ${HASKRB4}" >> ${CONFFILE} ; \ + ${ECHO_MSG} " Using KerberosIV." ; \ ${ECHO_MSG} "===> Applying KerberosIV patches" ; \ patch -s -d ${WRKDIR}/xc -E -p0 < ${FILESDIR}/kerberos4.diffs ; \ ) diff --git a/x11-servers/XttXF86srv-common/files/host.def.ALL b/x11-servers/XttXF86srv-common/files/host.def.ALL index b28d94b88e82..42af9466c6b8 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.ALL +++ b/x11-servers/XttXF86srv-common/files/host.def.ALL @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer YES #define XF86VGA16Server YES @@ -16,12 +17,3 @@ #define XF86AGXServer YES #define XF86W32Server YES #define XF86I128Server YES - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 b/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 index 06e191f9486c..35fbc4e07861 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX b/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX index 6afafd0f9cec..b744eecb1c19 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,13 +17,3 @@ #define XF86AGXServer YES #define XF86W32Server NO #define XF86I128Server NO - - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 b/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 index a2fbaca54176..72e0e6c14479 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server YES - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 index 7404a71e59ba..cb7525929b94 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 index ace5a635800a..7b0476a361df 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,12 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 index d318261689a6..828f5a804132 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono index 7d7e79271e98..b4b3b9807188 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 b/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 index 257f9c7d35f2..e2d519690a16 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,11 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 index fad4eccdf0a9..839b673626f9 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,12 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V index d77e7604a472..8cc3ba6b2985 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA b/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA index ed1fe11e80e5..deab23467c07 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer YES #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 b/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 index 29965773ed3f..8bafbd9c15b4 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server YES @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 b/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 index cd13b3a1f703..6a4cf53661a4 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,11 +18,3 @@ #define XF86W32Server YES #define XF86I128Server NO -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/pkg-descr b/x11-servers/XttXF86srv-common/pkg-descr index 0634f00a23c7..92cf0f3417f3 100644 --- a/x11-servers/XttXF86srv-common/pkg-descr +++ b/x11-servers/XttXF86srv-common/pkg-descr @@ -1,33 +1,24 @@ Common files for X True Type Servers. I. INSTALL: - For compiling this ports, you will need about 112 - 140 -MBye free space on your HDD. - - XFree86 has many flags (such as "HasXdmAuth"), and they -are related to Xservers. For using them, this port read -your configuration files in your ${PREFIX}/lib/X11/config/ -except "host.def" file. File host.def will be generated -by this port temporally. So you must write your own -configuration flags to "xf86site.def" or "site.def". -${PORTSDIR}/x11/XFree86 use xf86site.def. I recommend to -use it. + For compiling this ports, you will need about 112 - 140 MByte on your HDD. II. CONFIGURATION - After installing this ports, following instructions are -required. + After installing this ports, following instructions are required. 1. extract your True Type Font to FONTDIR. # mkdir /usr/X11R6/lib/X11/fonts/TrueType # cp *.ttf /usr/X11R6/lib/X11/fonts/TrueType/ -2. make font.dir file. mkfontdir.pl is a utility script. +2. create your font.dir file. mkfontdir.pl is a utility script. # cd /usr/X11R6/lib/X11/fonts/TrueType/ # mkfontdir.pl > font.dir - -3. set FontPath in your XF86Config - add following line to your XF86Config - + Alternatively, Use mkttfdir.pl. It's cool. You can get it from + http://www.io.com/~kazushi/xtt/ + Also, you can edit your font.dir file manually. see documents for more + details. + +3. set FontPath in your XF86Config add following line to your XF86Config FontPath "/usr/X11R6/lib/X11/fonts/TrueType" 4. restart your X server. diff --git a/x11-servers/XttXF86srv-common/pkg-plist b/x11-servers/XttXF86srv-common/pkg-plist index 6fdfd5939829..3f630ca43dc3 100644 --- a/x11-servers/XttXF86srv-common/pkg-plist +++ b/x11-servers/XttXF86srv-common/pkg-plist @@ -1,6 +1,42 @@ bin/mkfontdir.pl +share/doc/Xtt/xtt10-announce.eng +share/doc/Xtt/xtt10-announce.jis +share/doc/Xtt/xtt10-example.eng +share/doc/Xtt/xtt10-example.jis +share/doc/Xtt/xtt10-install.eng +share/doc/Xtt/xtt10-install.jis +share/doc/Xtt/xtt10-miscnote.eng +share/doc/Xtt/xtt10-miscnote.jis +share/doc/Xtt/xtt10-readme.eng +share/doc/Xtt/xtt10-readme.jis +include/X11/fonts/codeconv/ftcap.h +include/X11/fonts/codeconv/ftcconv.h +include/X11/fonts/codeconv/ftcconvC.h +include/X11/fonts/codeconv/ftcconvP.h +include/X11/fonts/codeconv/ftmisc.h +lib/modules/codeconv/BIG5.so +lib/modules/codeconv/GB2312.so +lib/modules/codeconv/ISO8859_1.so +lib/modules/codeconv/ISO8859_10.so +lib/modules/codeconv/ISO8859_15.so +lib/modules/codeconv/ISO8859_2.so +lib/modules/codeconv/ISO8859_3.so +lib/modules/codeconv/ISO8859_4.so +lib/modules/codeconv/ISO8859_5.so +lib/modules/codeconv/ISO8859_6.so +lib/modules/codeconv/ISO8859_7.so +lib/modules/codeconv/ISO8859_8.so +lib/modules/codeconv/ISO8859_9.so +lib/modules/codeconv/JISX0201.so +lib/modules/codeconv/JISX0208.so +lib/modules/codeconv/JISX0212.so +lib/modules/codeconv/KOI8.so +lib/modules/codeconv/KSC5601.so +lib/modules/codeconv/KSCJOHAB.so +lib/libfont.a lib/libfont.so.1.0 @exec /sbin/ldconfig -m %D/lib -lib/X11/doc/Xtt/xtt06-readme.jis -lib/X11/doc/Xtt/xtt06-example.jis -@dirrm lib/X11/doc/Xtt +@unexec /sbin/ldconfig -R +@dirrm share/doc/Xtt +@dirrm include/X11/fonts/codeconv +@dirrm lib/modules/codeconv |