diff options
Diffstat (limited to '')
33 files changed, 124 insertions, 90 deletions
diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile index 487c6d78fc90..4b15a33325c4 100644 --- a/x11-servers/XttXF86srv-3DLabs/Makefile +++ b/x11-servers/XttXF86srv-3DLabs/Makefile @@ -3,7 +3,7 @@ # Date created: 13 Dec 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1999/01/02 19:18:40 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_3DLabs diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile index 835c80c102ad..4cde49cc4c8a 100644 --- a/x11-servers/XttXF86srv-8514/Makefile +++ b/x11-servers/XttXF86srv-8514/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:39 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_8514 diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile index 85fcc9c4492c..f2eb05e28442 100644 --- a/x11-servers/XttXF86srv-AGX/Makefile +++ b/x11-servers/XttXF86srv-AGX/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:40 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_AGX diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile index 81ea2a67e2c1..b0e0cc455f4e 100644 --- a/x11-servers/XttXF86srv-I128/Makefile +++ b/x11-servers/XttXF86srv-I128/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:40 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_I128 diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile index bc26de9c0a2f..3d66ab581f7f 100644 --- a/x11-servers/XttXF86srv-Mach32/Makefile +++ b/x11-servers/XttXF86srv-Mach32/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:41 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mach32 diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile index 4166fbffe7be..47e1fcb7d6b9 100644 --- a/x11-servers/XttXF86srv-Mach64/Makefile +++ b/x11-servers/XttXF86srv-Mach64/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:41 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mach64 diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile index e593115b13ee..6765719cd469 100644 --- a/x11-servers/XttXF86srv-Mach8/Makefile +++ b/x11-servers/XttXF86srv-Mach8/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:42 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mach8 diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile index b0602008a418..0e7b624b068b 100644 --- a/x11-servers/XttXF86srv-Mono/Makefile +++ b/x11-servers/XttXF86srv-Mono/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:42 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mono diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile index 2fcaa10e178c..54dae60cfe73 100644 --- a/x11-servers/XttXF86srv-P9000/Makefile +++ b/x11-servers/XttXF86srv-P9000/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:43 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_P9000 diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile index 2107b1dc918f..e7d5c50756dd 100644 --- a/x11-servers/XttXF86srv-S3/Makefile +++ b/x11-servers/XttXF86srv-S3/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:43 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_S3 diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile index ffd9bfed0418..0d842612abb3 100644 --- a/x11-servers/XttXF86srv-S3V/Makefile +++ b/x11-servers/XttXF86srv-S3V/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:44 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_S3V diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile index d2fe691f7e6c..225843eef90b 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 <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.5 1998/12/05 06:16:22 kuriyama Exp $ +# $Id: Makefile,v 1.6 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_SVGA diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile index a95817e69b65..4cf1d713d451 100644 --- a/x11-servers/XttXF86srv-VGA16/Makefile +++ b/x11-servers/XttXF86srv-VGA16/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:45 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_VGA16 diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile index 272abc069eec..24840c6ad7ef 100644 --- a/x11-servers/XttXF86srv-W32/Makefile +++ b/x11-servers/XttXF86srv-W32/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:46 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF86_W32 diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile index 13e1e7bb1a6d..da535b7ee598 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 <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.13 1999/01/03 18:49:57 sada Exp $ +# $Id: Makefile,v 1.14 1999/01/04 20:42:33 sada Exp $ # DISTNAME= xc @@ -11,20 +11,21 @@ PKGNAME?= xtt-common-1.1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \ ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \ - http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/ \ - ftp://www.tohoku.iij.ad.jp/xtt/ -DISTFILES= X333src-1.tgz xtt-1.1.tar.gz \ - xttdoc11-to-pl01.diff.gz + http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/ +DISTFILES= X333src-1.tgz X333src-2.tgz \ + xtt-1.1.tar.gz xttdoc11-to-pl01.diff.gz -PATCH_SITES= http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/ \ - ftp://www.tohoku.iij.ad.jp/xtt/ -PATCHFILES= xtt11-to-pl00.diff.gz xtt11pl00-to-pl01.diff.gz \ - xtt11pl01-to-pl02.diff.gz xtt11pl02-to-pl03.diff.gz +PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/fixes/ \ + http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/ +PATCHFILES= 3.3.3-3.3.3.1.diff.gz \ + xtt11-to-pl00.diff.gz xtt11pl00-to-pl01.diff.gz \ + xtt11pl01-to-pl02.diff.gz xtt11pl02-to-pl03.diff.gz \ + xtt11pl03-to-pl04.diff.gz xtt11pl04-to-pl05.diff.gz MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype -RUN_DEPENDS+= mkttfdir:${PORTSDIR}/print/perlftlib +LIB_DEPENDS+= ttf.3:${PORTSDIR}/print/freetype +RUN_DEPENDS= mkttfdir:${PORTSDIR}/print/perlftlib .if !defined(USE_SHARED_WRKSRC) && defined(COMPILE_ALL_SERVERS_AT_ONCE) USE_SHARED_WRKSRC= YES @@ -37,7 +38,7 @@ DISTFILES+= Wraphelp.c IGNOREFILES= Wraphelp.c .endif USE_X_PREFIX= YES -EXTRACT_ONLY= X333src-1.tgz xtt-1.1.tar.gz +EXTRACT_ONLY= X333src-1.tgz X333src-2.tgz xtt-1.1.tar.gz BINOWN= root BINGRP= wheel MASTERDIR?= ${.CURDIR}/../XttXF86srv-common @@ -70,7 +71,6 @@ BUILD_COOKIE= ${WRKDIR}/.build_done.${SERVER} INSTALL_COOKIE= ${WRKDIR}/.install_done.${SERVER} PACKAGE_COOKIE= ${WRKDIR}/.package_done.${SERVER} TMPPLIST= ${WRKDIR}/.PLIST.${SERVER}.mktmp -ALL_TARGET= World .if defined(COMPILE_ALL_SERVERS_AT_ONCE) && ${SERVER} != xfs ALL_SERVER= XF86_3DLabs XF86_8514 XF86_AGX XF86_I128 XF86_Mach32 \ XF86_Mach64 XF86_Mach8 XF86_Mono XF86_P9000 XF86_S3 XF86_S3V \ @@ -84,37 +84,45 @@ HOSTDEFSRV= ${FILESDIR}/host.def.ALL ALL_SERVER= ${SERVER} common HOSTDEFSRV= ${FILESDIR}/host.def.${SERVER} .endif -.if ${SERVER} == xfs -HOSTDEFDST= ${WRKSRC}/config/cf/host.def.xfs -.else -HOSTDEFDST= ${WRKSRC}/config/cf/host.def -.endif .else ALL_SERVER= ${SERVER} -.if (${SERVER} == xfs) +HOSTDEFSRV= ${FILESDIR}/host.def.${SERVER} +.endif + +HOSTDEFLOCAL= ${WRKDIR}/host.def.local +.if ${SERVER} == xfs ALL_TARGET= xfs -HOSTDEFSRV= HOSTDEFDST= ${WRKSRC}/config/cf/host.def.xfs -.elif (${SERVER} == common) +.elif ${SERVER} == common ALL_TARGET= libfont -HOSTDEFSRV= ${FILESDIR}/host.def.${SERVER} HOSTDEFDST= ${WRKSRC}/config/cf/host.def .else ALL_TARGET= World -HOSTDEFSRV= ${FILESDIR}/host.def.${SERVER} HOSTDEFDST= ${WRKSRC}/config/cf/host.def .endif -.endif -HOSTDEFLOCAL= ${WRKDIR}/host.def.local .include <bsd.port.pre.mk> +pre-fetch: +.if defined(USE_SHARED_WRKSRC) + @( \ + ${ECHO} "************************************************************"; \ + ${ECHO} "* ALL PORTS COMMONLY USE x11/XttXF86srv-common/work ! *"; \ + ${ECHO} "************************************************************") +.if defined(COMPILE_ALL_SERVERS_AT_ONCE) + @( \ + ${ECHO} "************************************************************"; \ + ${ECHO} "* ALL PORTS (except xfs) BUILD AT ONCE ! *"; \ + ${ECHO} "************************************************************") +.endif +.endif + .if !defined(USE_SHARED_WRKSRC) && exists(${MASTERDIR}/work/.configure_done.${SERVER}) pre-extract: @( \ - echo "ERROR:" ; \ - echo "Xtt ${SERVER} ports have already extracted with" ; \ - echo "\"USE_SHARED_WRKSRC\" option." ; \ + ${ECHO} "ERROR:" ; \ + ${ECHO} "Xtt ${SERVER} ports have already extracted with" ; \ + ${ECHO} "\"USE_SHARED_WRKSRC\" option." ; \ false ) .endif @@ -172,7 +180,8 @@ post-build: post-install: @( \ - cd ${WRKDIR} ; ${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} ) + cd ${WRKDIR} ; ${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} ; \ + ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${INSTALL_COOKIE} .${SERVER}`.common ) post-package: @( \ diff --git a/x11-servers/XttXF86srv-common/distinfo b/x11-servers/XttXF86srv-common/distinfo index cbd0057e8689..a3b0946e941e 100644 --- a/x11-servers/XttXF86srv-common/distinfo +++ b/x11-servers/XttXF86srv-common/distinfo @@ -1,8 +1,12 @@ MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985 +MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039 MD5 (xc/xtt-1.1.tar.gz) = 9a6df3f641ffccde0d65271ff60fa813 MD5 (xc/xttdoc11-to-pl01.diff.gz) = 09911c05ba01a57b4518e2b1f94ef177 +MD5 (xc/3.3.3-3.3.3.1.diff.gz) = 35d41054e0bcb1a4cf29ab4364027d2b MD5 (xc/xtt11-to-pl00.diff.gz) = 4e78449a5448b761051be8ba8eaca0a7 MD5 (xc/xtt11pl00-to-pl01.diff.gz) = 13a411f6162b5a15418e8e8536c89a6d MD5 (xc/xtt11pl01-to-pl02.diff.gz) = 914aa5605b75eb4f22351e9eb4439daa MD5 (xc/xtt11pl02-to-pl03.diff.gz) = 88b7fa986d3eb30fcf44b7bb62cab68e +MD5 (xc/xtt11pl03-to-pl04.diff.gz) = 3f36befe256f442bee7bdfa074c10665 +MD5 (xc/xtt11pl04-to-pl05.diff.gz) = 28f1f8442728d4b4cb411c95b4bf8b94 MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile index 3558636b0aa8..fdd05e22a37a 100644 --- a/x11-servers/XttXF86srv-common/files/Imakefile +++ b/x11-servers/XttXF86srv-common/files/Imakefile @@ -80,10 +80,16 @@ initialize:: InputExtCheck:: initialize .if defined(BUILDXINPUTEXT) && ${BUILDXINPUTEXT} == YES @( \ + ${ECHO} "#ifdef BuildXInputExt" >> ${CONFFILE}; \ + ${ECHO} "#undef BuildXInputExt" >> ${CONFFILE}; \ + ${ECHO} "#endif" >> ${CONFFILE}; \ ${ECHO} "#define BuildXInputExt YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using BuildXInputExt." ) .else @( \ + ${ECHO} "#ifdef JoystickSupport" >> ${CONFFILE}; \ + ${ECHO} "#undef JoystickSupport" >> ${CONFFILE}; \ + ${ECHO} "#endif" >> ${CONFFILE}; \ ${ECHO} "#define JoystickSupport YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using JoystickSupport." ) .endif @@ -91,6 +97,9 @@ InputExtCheck:: initialize pexCheck:: initialize .if defined(BUILDPEXEXT) && ${BUILDPEXEXT} == YES @( \ + ${ECHO} "#ifdef BuildPexExt" >> ${CONFFILE}; \ + ${ECHO} "#undef BuildPexExt" >> ${CONFFILE}; \ + ${ECHO} "#endif" >> ${CONFFILE}; \ ${ECHO} "#define BuildPexExt YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using BuildPexExt." ) .else @@ -101,6 +110,9 @@ pexCheck:: initialize xieCheck:: initialize .if defined(BUILDXIE) && ${BUILDXIE} == YES @( \ + ${ECHO} "#ifdef BuildXIE" >> ${CONFFILE}; \ + ${ECHO} "#undef BuildXIE" >> ${CONFFILE}; \ + ${ECHO} "#endif" >> ${CONFFILE}; \ ${ECHO} "#define BuildXIE YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using BuildXIE." ) .else @@ -120,7 +132,10 @@ ELFCheck:: initialize SecureRPCCheck:: initialize .if defined(HASSECURERPC) && ${HASSECURERPC} == YES @( \ - ${ECHO} "#define HasSecureRPC ${HASSECURERPC}" >> ${CONFFILE}; \ + ${ECHO} "#ifdef HasSecureRPC" >> ${CONFFILE}; \ + ${ECHO} "#undefine HasSecureRPC" >> ${CONFFILE}; \ + ${ECHO} "#endif" >> ${CONFFILE}; \ + ${ECHO} "#define HasSecureRPC YES" >> ${CONFFILE}; \ ${ECHO_MSG} " Using Secure RPC"; \ ) .else @@ -135,10 +150,16 @@ XdmAuthCheck:: initialize 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} "#ifdef HasXdmAuth" >> ${CONFFILE} ; \ + ${ECHO} "#undef HasXdmAuth" >> ${CONFFILE} ; \ + ${ECHO} "#endif" >> ${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." ; \ ${CP} ${FILESDIR}/Wraphelp.c ${WRKDIR}/xc/lib/Xdmcp/ ; \ + ${ECHO} "#ifdef HasXdmAuth" >> ${CONFFILE} ; \ + ${ECHO} "#undef HasXdmAuth" >> ${CONFFILE} ; \ + ${ECHO} "#endif" >> ${CONFFILE}; \ ${ECHO} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ else \ ${ECHO_MSG} "Wraphelp.c not found. You can not use XDM-AUTHORIZATION-1!" ; \ diff --git a/x11-servers/XttXF86srv-common/files/mkfontdir.pl b/x11-servers/XttXF86srv-common/files/mkfontdir.pl index cf2ba5b66057..928cfbb735b1 100644 --- a/x11-servers/XttXF86srv-common/files/mkfontdir.pl +++ b/x11-servers/XttXF86srv-common/files/mkfontdir.pl @@ -31,8 +31,8 @@ "hgrhaesj.ttf -ricoh-hagoromo-e-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", "hgrhalsj.ttf -ricoh-hagoromo-l-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", "hgrhalsj.ttf -ricoh-hagoromo-l-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", -"hgrhamesj.ttf -ricoh-hagoromo-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", -"hgrhamesj.ttf -ricoh-hagoromo-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", +"hgrhamsj.ttf -ricoh-hagoromo-m-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", +"hgrhamsj.ttf -ricoh-hagoromo-m-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", "hgrgbpsj.ttf -ricoh-gothic-bpro-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", "hgrgbpsj.ttf -ricoh-gothic-bpro-r-normal--0-0-0-0-c-0-jisx0201.1983-0\n", "hgrhg3sj.ttc -ricoh-gothic-w3-r-normal--0-0-0-0-c-0-jisx0208.1983-0\n", diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile index b30d24f34457..eb76219d7d09 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 <taguchi@tohoku.iij.ad.jp> # -# $Id: Makefile,v 1.4 1998/12/01 03:06:47 asami Exp $ +# $Id: Makefile,v 1.5 1999/01/02 19:11:11 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= taguchi@tohoku.iij.ad.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= xfs diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile index c35ab180b27d..982da919cfa1 100644 --- a/x11-servers/XttXF98srv-EGC/Makefile +++ b/x11-servers/XttXF98srv-EGC/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_EGC diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile index 41e1900a91b6..d2b7fd88765f 100644 --- a/x11-servers/XttXF98srv-GA968/Makefile +++ b/x11-servers/XttXF98srv-GA968/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_GA968 diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile index 4295c8f9af69..7ef975fbd55c 100644 --- a/x11-servers/XttXF98srv-GANBWAP/Makefile +++ b/x11-servers/XttXF98srv-GANBWAP/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_GANBWAP diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile index 02a30a9801a6..75db4e1668bf 100644 --- a/x11-servers/XttXF98srv-MGA/Makefile +++ b/x11-servers/XttXF98srv-MGA/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_MGA diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile index 37bc9703a1a7..b7abf39b2a45 100644 --- a/x11-servers/XttXF98srv-NEC480/Makefile +++ b/x11-servers/XttXF98srv-NEC480/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_NEC480 diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile index ce4a0abbe943..16db02cda013 100644 --- a/x11-servers/XttXF98srv-NECS3/Makefile +++ b/x11-servers/XttXF98srv-NECS3/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_NECS3 diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile index e773f6b369a6..c4f9d13bc1ba 100644 --- a/x11-servers/XttXF98srv-NKVNEC/Makefile +++ b/x11-servers/XttXF98srv-NKVNEC/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_NKVNEC diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile index de2ad0a5bcee..3116b93d2863 100644 --- a/x11-servers/XttXF98srv-PWLB/Makefile +++ b/x11-servers/XttXF98srv-PWLB/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_PWLB diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile index 35c6572582fe..959a33fd2b40 100644 --- a/x11-servers/XttXF98srv-PWSKB/Makefile +++ b/x11-servers/XttXF98srv-PWSKB/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_PWSKB diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile index ec5cbd3d0ade..ec14bfb84e3b 100644 --- a/x11-servers/XttXF98srv-SVGA/Makefile +++ b/x11-servers/XttXF98srv-SVGA/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_SVGA diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile index ed019865a9c8..880098c2917f 100644 --- a/x11-servers/XttXF98srv-TGUI/Makefile +++ b/x11-servers/XttXF98srv-TGUI/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_TGUI diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile index 9207962472a6..4f23f3369cc1 100644 --- a/x11-servers/XttXF98srv-WABEP/Makefile +++ b/x11-servers/XttXF98srv-WABEP/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_WABEP diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile index 536ad1f59b5a..fea440a01e10 100644 --- a/x11-servers/XttXF98srv-WABS/Makefile +++ b/x11-servers/XttXF98srv-WABS/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:13 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_WABS diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile index 1e4c0f968573..2b8bf95c3fc3 100644 --- a/x11-servers/XttXF98srv-WSNA/Makefile +++ b/x11-servers/XttXF98srv-WSNA/Makefile @@ -3,7 +3,7 @@ # Date created: 25 October 1998 # Whom: NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp> # -# $Id: Makefile,v 1.1.1.1 1998/12/05 06:12:38 kuriyama Exp $ +# $Id: Makefile,v 1.2 1999/01/02 19:11:13 sada Exp $ # DISTNAME= xc @@ -12,7 +12,7 @@ CATEGORIES= x11 MAINTAINER= nakaji@zeisei.dpri.kyoto-u.ac.jp -RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common +LIB_DEPENDS= font.1:${.CURDIR}/../XttXF86srv-common SERVER= XF98_WSNA |