From 50d947fe58a371911197767fc9ac455422609fa4 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Sat, 10 Oct 1998 04:22:12 +0000 Subject: Update maintainer's Email address and update to version 1.0pl00. PR: 8198 Submitted by: maintainer --- x11-servers/XttXF86srv-8514/Makefile | 6 +- x11-servers/XttXF86srv-AGX/Makefile | 6 +- x11-servers/XttXF86srv-I128/Makefile | 6 +- x11-servers/XttXF86srv-Mach32/Makefile | 6 +- x11-servers/XttXF86srv-Mach64/Makefile | 6 +- x11-servers/XttXF86srv-Mach8/Makefile | 6 +- x11-servers/XttXF86srv-Mono/Makefile | 6 +- x11-servers/XttXF86srv-P9000/Makefile | 6 +- x11-servers/XttXF86srv-S3/Makefile | 6 +- x11-servers/XttXF86srv-S3V/Makefile | 6 +- x11-servers/XttXF86srv-SVGA/Makefile | 4 +- x11-servers/XttXF86srv-VGA16/Makefile | 6 +- x11-servers/XttXF86srv-W32/Makefile | 6 +- x11-servers/XttXF86srv-common/Makefile | 30 ++++---- x11-servers/XttXF86srv-common/distinfo | 2 + x11-servers/XttXF86srv-common/files/Imakefile | 97 ++++++++++++++---------- x11-servers/XttXF86srv-common/files/mkfontdir.pl | 1 + x11-servers/XttXF86srv-common/pkg-descr | 3 - x11-servers/XttXF86srv-common/pkg-plist | 7 +- x11-servers/XttXF86srv-xfs/Makefile | 4 +- 20 files changed, 148 insertions(+), 72 deletions(-) (limited to 'x11-servers') diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile index c8891ec5b60b..b686438f0447 100644 --- a/x11-servers/XttXF86srv-8514/Makefile +++ b/x11-servers/XttXF86srv-8514/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:45:19 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:00 asami Exp $ # DISTNAME= xc PKGNAME= xtt-8514-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_8514 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile index 43d8f3b17ab6..459ae37aa3ed 100644 --- a/x11-servers/XttXF86srv-AGX/Makefile +++ b/x11-servers/XttXF86srv-AGX/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:43:35 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:03 asami Exp $ # DISTNAME= xc PKGNAME= xtt-AGX-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_AGX .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile index 6c7692a614cc..fc7e8f17a977 100644 --- a/x11-servers/XttXF86srv-I128/Makefile +++ b/x11-servers/XttXF86srv-I128/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:43:35 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:04 asami Exp $ # DISTNAME= xc PKGNAME= xtt-I128-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_I128 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile index 9a389fd5b6fa..35fbbca99a8f 100644 --- a/x11-servers/XttXF86srv-Mach32/Makefile +++ b/x11-servers/XttXF86srv-Mach32/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:48:02 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:04 asami Exp $ # DISTNAME= xc PKGNAME= xtt-Mach32-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_Mach32 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile index af7687418be0..dfca98c85b14 100644 --- a/x11-servers/XttXF86srv-Mach64/Makefile +++ b/x11-servers/XttXF86srv-Mach64/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:49:37 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:05 asami Exp $ # DISTNAME= xc PKGNAME= xtt-Mach64-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_Mach64 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile index bc1492ad3896..1e8295cd58c7 100644 --- a/x11-servers/XttXF86srv-Mach8/Makefile +++ b/x11-servers/XttXF86srv-Mach8/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:51:11 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:06 asami Exp $ # DISTNAME= xc PKGNAME= xtt-Mach8-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_Mach8 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile index c21da3e21723..cc88f8bf2a75 100644 --- a/x11-servers/XttXF86srv-Mono/Makefile +++ b/x11-servers/XttXF86srv-Mono/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:53:44 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:06 asami Exp $ # DISTNAME= xc PKGNAME= xtt-Mono-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_Mono .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile index 5cc7e2db4bff..59517d4c8dec 100644 --- a/x11-servers/XttXF86srv-P9000/Makefile +++ b/x11-servers/XttXF86srv-P9000/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:55:36 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:07 asami Exp $ # DISTNAME= xc PKGNAME= xtt-P9000-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_P9000 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile index c4a24b6a9e37..c18738e07c27 100644 --- a/x11-servers/XttXF86srv-S3/Makefile +++ b/x11-servers/XttXF86srv-S3/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:57:29 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:07 asami Exp $ # DISTNAME= xc PKGNAME= xtt-S3-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_S3 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile index 64f88ef98433..873078c90090 100644 --- a/x11-servers/XttXF86srv-S3V/Makefile +++ b/x11-servers/XttXF86srv-S3V/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 14:58:51 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:08 asami Exp $ # DISTNAME= xc PKGNAME= xtt-S3V-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_S3V .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile index 0050efd4e1c7..8e89d7a5554d 100644 --- a/x11-servers/XttXF86srv-SVGA/Makefile +++ b/x11-servers/XttXF86srv-SVGA/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 15:00:37 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:08 asami Exp $ # DISTNAME= xc @@ -12,6 +12,8 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_SVGA .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile index d4907979cd81..7d4baad1f91c 100644 --- a/x11-servers/XttXF86srv-VGA16/Makefile +++ b/x11-servers/XttXF86srv-VGA16/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 15:01:45 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:09 asami Exp $ # DISTNAME= xc PKGNAME= xtt-VGA16-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_VGA16 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile index 3577a87d68ab..f16b1f180373 100644 --- a/x11-servers/XttXF86srv-W32/Makefile +++ b/x11-servers/XttXF86srv-W32/Makefile @@ -3,13 +3,17 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 15:02:47 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:09 asami Exp $ # DISTNAME= xc PKGNAME= xtt-W32-1.0 CATEGORIES= x11 +MAINTAINER= taguchi@tohoku.iij.ad.jp + +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= XF86_W32 .include "${.CURDIR}/../XttXF86srv-common/Makefile" diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile index fb224b12defb..f331952b0b22 100644 --- a/x11-servers/XttXF86srv-common/Makefile +++ b/x11-servers/XttXF86srv-common/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.3 1998/09/21 08:41:46 asami Exp $ +# $Id: Makefile,v 1.4 1998/10/08 23:52:03 asami Exp $ # DISTNAME= xc @@ -11,19 +11,20 @@ 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://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 + http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/ \ + ftp://www.tohoku.iij.ad.jp/xtt/ +DISTFILES= X332src-1.tgz xtt-1.0.tar.gz xttdoc10-to-pl00.diff.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 + http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/ \ + ftp://www.tohoku.iij.ad.jp/xtt/ +PATCHFILES= 3.3.2-patch1 3.3.2-patch2 3.3.2-patch3 \ + xtt10-to-pl00.diff.gz 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 @@ -99,13 +100,14 @@ pre-fetch: .endif pre-patch: - @( cd ${WRKDIR}; \ - ${PATCH} ${PATCH_DIST_ARGS} < ${XTTDIR}/xtt-1.0.diff ) + @( ${PATCH} ${PATCH_DIST_ARGS} < ${XTTDIR}/xtt-1.0.diff; \ + ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/xttdoc10-to-pl00.diff.gz | \ + ${PATCH} -d ${XTTDIR} ) pre-configure: @( \ ${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \ - (cd ${WRKDIR} ; ${XMKMF} ; ${SETENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} FILESDIR=${FILESDIR} LOCALBASE=${LOCALBASE} ${MAKE}) ; \ + (cd ${WRKDIR} ; ${XMKMF} ; ${SETENV} ${MAKE_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} FILESDIR=${FILESDIR} ${MAKE}) ; \ ${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ) .if defined(SERVER) @@ -136,18 +138,18 @@ post-build: do-install: @( \ cd ${WRKSRC}/lib/font; \ - ${MAKE} install; \ - ${LDCONFIG} -m ${PREFIX}/lib; \ + ${SETENV} ${MAKE_ENV} ${MAKE} install; \ + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib; \ ${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \ ${MKDIR} ${DOCDIR}; \ ${INSTALL_DATA} ${XTTDIR}/xtt10-* ${DOCDIR}) .elif defined(SERVER) && ${SERVER} == xfs do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/programs/xfs/xfs ${PREFIX}/bin/xfs.xtt + @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${INSTALL_PROGRAM} ${WRKSRC}/programs/xfs/xfs ${PREFIX}/bin/xfs.xtt .else do-install: @( \ - ${INSTALL_PROGRAM} ${WRKSRC}/programs/Xserver/${SERVER} ${PREFIX}/bin/${SERVER}.xtt; \ + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${INSTALL_PROGRAM} ${WRKSRC}/programs/Xserver/${SERVER} ${PREFIX}/bin/${SERVER}.xtt; \ ${LN} -fs ${PREFIX}/bin/${SERVER}.xtt ${PREFIX}/bin/X ) .endif diff --git a/x11-servers/XttXF86srv-common/distinfo b/x11-servers/XttXF86srv-common/distinfo index 7649f8c84025..ce85121d365b 100644 --- a/x11-servers/XttXF86srv-common/distinfo +++ b/x11-servers/XttXF86srv-common/distinfo @@ -1,6 +1,8 @@ MD5 (xc/X332src-1.tgz) = 61c0340f91c883e214886fb81d1eefc3 MD5 (xc/xtt-1.0.tar.gz) = a3c917f79b35d102079efceeb9b9ab0c +MD5 (xc/xttdoc10-to-pl00.diff.gz) = b848273897162314cc37124e78088a50 MD5 (xc/3.3.2-patch1) = e5a66e732d62cf23007d6b939281028a MD5 (xc/3.3.2-patch2) = ba4752cdab2f73e34020285043d51e14 MD5 (xc/3.3.2-patch3) = 413331b5bce0490a335855a7d3f42995 +MD5 (xc/xtt10-to-pl00.diff.gz) = 6366d34ae4da163c68a6a3b1421edd98 MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile index 7e42fd9bf8fb..90fca3352950 100644 --- a/x11-servers/XttXF86srv-common/files/Imakefile +++ b/x11-servers/XttXF86srv-common/files/Imakefile @@ -2,6 +2,7 @@ CONFFILE= host.def.local CP= /bin/cp DO_NADA= /usr/bin/true ECHO_MSG= echo +ECHO= echo WRKDIR?= . DISTDIR?= /usr/ports/distfiles FILESDIR?= ../files @@ -28,69 +29,86 @@ HASXDMAUTH= YES HASKRB4= YES #endif -all:: SecureRPCCheck XdmAuthCheck Krb4Check InputExtCheck pexCheck xieCheck +all:: SecureRPCCheck XdmAuthCheck Krb4Check \ + InputExtCheck pexCheck xieCheck \ + ELFCheck initialize:: @( \ ${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}; \ + ${ECHO} "#define FreeTypeLibDir ${LOCALBASE}/lib" >> ${CONFFILE}; \ + ${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86SVGAServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86VGA16Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86VGA16DualServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86MonoServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86MonoDualServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86S3Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86S3VServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86I8514Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86Mach8Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86Mach32Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86Mach64Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86P9000Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86AGXServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86W32Server" >> ${CONFFILE}; \ + ${ECHO} "#undef XF86I128Server" >> ${CONFFILE}; \ + ${ECHO} "#undef BuildFontServer" >> ${CONFFILE}; \ + ${ECHO} "#undef BuildFonts" >> ${CONFFILE}; \ + ${ECHO} "#undef XnestServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XVirtualFramebufferServer" >> ${CONFFILE}; \ + ${ECHO} "#undef XprtServer" >> ${CONFFILE}; \ + ${ECHO} "#define BuildFonts NO" >> ${CONFFILE}; \ + ${ECHO} "#define XnestServer NO" >> ${CONFFILE}; \ + ${ECHO} "#define XVirtualFramebufferServer NO" >> ${CONFFILE}; \ + ${ECHO} "#define XprtServer NO" >> ${CONFFILE}; \ ) InputExtCheck:: initialize .if defined(BUILDXINPUTEXT) && ${BUILDXINPUTEXT} == YES @( \ - ${ECHO_MSG} "#define BuildXInputExt YES" >> ${CONFFILE}; \ + ${ECHO} "#define BuildXInputExt YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using BuildXInputExt." ) .else @( \ - ${ECHO_MSG} "#define JoystickSupport YES" >> ${CONFFILE}; \ + ${ECHO} "#define JoystickSupport YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using JoystickSupport." ) .endif pexCheck:: initialize .if defined(BUILDPEXEXT) && ${BUILDPEXEXT} == YES @( \ - ${ECHO_MSG} "#define BuildPexExt YES" >> ${CONFFILE}; \ + ${ECHO} "#define BuildPexExt YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using BuildPexExt." ) +.else + @${DO_NADA} .endif + xieCheck:: initialize .if defined(BUILDXIE) && ${BUILDXIE} == YES @( \ - ${ECHO_MSG} "#define BuildXIE YES" >> ${CONFFILE}; \ + ${ECHO} "#define BuildXIE YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using BuildXIE." ) +.else + @${DO_NADA} .endif - + +ELFCheck:: initialize +.if defined(PORTOBJFORMAT) && ${PORTOBJFORMAT} == elf + @( \ + ${ECHO} "#define UseElfFormat YES" >> ${CONFFILE}; \ + ${ECHO} "#define FreeTypeCConvModule NO" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using ELF format." ) +.else + @${DO_NADA} +.endif + SecureRPCCheck:: initialize .if defined(HASSECURERPC) && ${HASSECURERPC} == YES @( \ - ${ECHO_MSG} "#define HasSecureRPC ${HASSECURERPC}" >> ${CONFFILE}; \ + ${ECHO} "#define HasSecureRPC ${HASSECURERPC}" >> ${CONFFILE}; \ ${ECHO_MSG} " Using Secure RPC"; \ ) .else @@ -103,13 +121,13 @@ XdmAuthCheck:: initialize ${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." ; \ + ${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} ; \ + ${ECHO} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ elif [ -f ${FILESDIR}/Wraphelp.c ]; then \ - ${ECHO_MSG} "===> Whaphelp.c found in FILESDIR directory, copying it to source tree." ; \ + ${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} ; \ + ${ECHO} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ else \ ${ECHO_MSG} "Wraphelp.c not found. You can not use XDM-AUTHORIZATION-1!" ; \ false ; \ @@ -123,9 +141,10 @@ XdmAuthCheck:: initialize Krb4Check:: initialize .if defined(HASKRB4) && ${HASKRB4} == YES @( \ - ${ECHO_MSG} "#define HasKrb4 ${HASKRB4}" >> ${CONFFILE} ; \ + ${ECHO} "#define HasKrb4 ${HASKRB4}" >> ${CONFFILE} ; \ ${ECHO_MSG} " Using KerberosIV." ; \ - ${ECHO_MSG} "===> Applying KerberosIV patches" ; \ + ${ECHO_MSG} " Applying KerberosIV patches" ; \ + ${CP} ${FILESDIR}/krb4auth.c ${FILESDIR}/krb4auth.h ${WRKDIR}/xc/programs/xdm/; \ patch -s -d ${WRKDIR}/xc -E -p0 < ${FILESDIR}/kerberos4.diffs ; \ ) .else diff --git a/x11-servers/XttXF86srv-common/files/mkfontdir.pl b/x11-servers/XttXF86srv-common/files/mkfontdir.pl index e3fd1e88e494..cf2ba5b66057 100644 --- a/x11-servers/XttXF86srv-common/files/mkfontdir.pl +++ b/x11-servers/XttXF86srv-common/files/mkfontdir.pl @@ -512,6 +512,7 @@ while () { } } if ($count) { + $count = $#f + 1; print "$count\n"; print @f; }else{ diff --git a/x11-servers/XttXF86srv-common/pkg-descr b/x11-servers/XttXF86srv-common/pkg-descr index 92cf0f3417f3..bdaafa290768 100644 --- a/x11-servers/XttXF86srv-common/pkg-descr +++ b/x11-servers/XttXF86srv-common/pkg-descr @@ -9,7 +9,6 @@ II. CONFIGURATION 1. extract your True Type Font to FONTDIR. # mkdir /usr/X11R6/lib/X11/fonts/TrueType # cp *.ttf /usr/X11R6/lib/X11/fonts/TrueType/ - 2. create your font.dir file. mkfontdir.pl is a utility script. # cd /usr/X11R6/lib/X11/fonts/TrueType/ # mkfontdir.pl > font.dir @@ -17,10 +16,8 @@ II. CONFIGURATION 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. enjoy! diff --git a/x11-servers/XttXF86srv-common/pkg-plist b/x11-servers/XttXF86srv-common/pkg-plist index 3f630ca43dc3..7d27af2a3b38 100644 --- a/x11-servers/XttXF86srv-common/pkg-plist +++ b/x11-servers/XttXF86srv-common/pkg-plist @@ -9,6 +9,8 @@ share/doc/Xtt/xtt10-miscnote.eng share/doc/Xtt/xtt10-miscnote.jis share/doc/Xtt/xtt10-readme.eng share/doc/Xtt/xtt10-readme.jis +share/doc/Xtt/xtt10-changes.eng +share/doc/Xtt/xtt10-changes.jis include/X11/fonts/codeconv/ftcap.h include/X11/fonts/codeconv/ftcconv.h include/X11/fonts/codeconv/ftcconvC.h @@ -34,9 +36,10 @@ lib/modules/codeconv/KOI8.so lib/modules/codeconv/KSC5601.so lib/modules/codeconv/KSCJOHAB.so lib/libfont.a +lib/libfont.so lib/libfont.so.1.0 -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm share/doc/Xtt @dirrm include/X11/fonts/codeconv @dirrm lib/modules/codeconv diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile index 4a555481c2e3..3223f5c54e95 100644 --- a/x11-servers/XttXF86srv-xfs/Makefile +++ b/x11-servers/XttXF86srv-xfs/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.1.1.1 1998/08/11 15:06:07 kuriyama Exp $ +# $Id: Makefile,v 1.2 1998/09/01 13:41:11 asami Exp $ # DISTNAME= xc @@ -12,6 +12,8 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp +RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common + SERVER= xfs .include "${.CURDIR}/../XttXF86srv-common/Makefile" -- cgit v1.2.3