3 files changed, 53 insertions, 46 deletions

diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index 5abe9780e1e5..20d7e2efe36a 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.11 1998/12/12 21:03:36 jseger Exp $
+# $Id: Makefile,v 1.12 1999/01/02 19:11:10 sada Exp $
 #
 
 DISTNAME=	xc
@@ -19,30 +19,32 @@ DISTFILES=	X333src-1.tgz xtt-1.1.tar.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
+		xtt11pl01-to-pl02.diff.gz xtt11pl02-to-pl03.diff.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 LIB_DEPENDS=	ttf.3:${PORTSDIR}/print/freetype
-RUN_DEPENDS+=	mkttfdir:${PORTSDIR}/print/perlftlib
+#RUN_DEPENDS+=	mkttfdir:${PORTSDIR}/print/perlftlib
 
-.if !defined(XDM_DES) && defined(USA_RESIDENT)
-.if ${USA_RESIDENT} == NO
+.if !defined(USE_SHARED_WRKSRC) && defined(COMPILE_ALL_SERVERS_AT_ONCE)
+USE_SHARED_WRKSRC= YES
+.endif
+.if !defined(XDM_DES) && defined(USA_RESIDENT) && ${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
 IGNOREFILES=	Wraphelp.c
 .endif
-.endif
 USE_X_PREFIX=	YES
 EXTRACT_ONLY=	X333src-1.tgz xtt-1.1.tar.gz
 BINOWN=		root
 BINGRP=		wheel
-FILESDIR=	${.CURDIR}/../XttXF86srv-common/files
-PATCHDIR=	${.CURDIR}/../XttXF86srv-common/patches
-.if defined(SHARED_WRKSRC) && ${SHARED_WRKSRC} == YES
-WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/../XttXF86srv-common/work
+MASTERDIR?=	${.CURDIR}/../XttXF86srv-common
+FILESDIR=	${MASTERDIR}/files
+PATCHDIR=	${MASTERDIR}/patches
+.if defined(USE_SHARED_WRKSRC)
+WRKDIR=		${MASTERDIR}/work
 .endif
 WRKSRC=		${WRKDIR}/xc
 DIST_SUBDIR=	xc
@@ -52,10 +54,24 @@ SERVER?=	common
 PATCH_DIST_ARGS= -d ${WRKDIR} --forward --quiet -E ${PATCH_STRIP}
 #PATCH_DIST_STRIP=	-p1
 
-.if (defined(SHARED_WRKSRC) && ${SHARED_WRKSRC} == YES)
-.if ${SERVER} != xfs
-ALL_TARGET=	World
-.if defined(COMPILE_ALL_SERVERS_AT_ONCE) && ${COMPILE_ALL_SERVERS_AT_ONCE} == YES
+# ******************
+# USE_SHARED_WRKSRC:
+#  All Xtt ports require many disk space. Imagen, X source code will extract
+#  under server and common ports dir. This variable save your disk space.
+#  if this variable is defined, X source will only extract under common
+#  ports. server ports will use this common's WRKSRC.
+# COMPILE_ALL_SERVERS_AT_ONCE:
+#  If this variable is defined, All server ports will build at once.
+#  This variable will save your time, if you want to make all xtt packages.
+# ******************
+.if defined(USE_SHARED_WRKSRC)
+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
+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 \
 	XF86_SVGA XF86_VGA16 XF86_W32 \
@@ -65,21 +81,16 @@ ALL_SERVER=	XF86_3DLabs XF86_8514 XF86_AGX XF86_I128 XF86_Mach32 \
 	common
 HOSTDEFSRV=	${FILESDIR}/host.def.ALL
 .else
+ALL_SERVER=	${SERVER} common
 HOSTDEFSRV=	${FILESDIR}/host.def.${SERVER}
 .endif
-HOSTDEFDST=	${WRKSRC}/config/cf/host.def
-.else
-ALL_TARGET=	xfs
-ALL_SERVER=	xfs common
-HOSTDEFSRV=
+.if ${SERVER} == xfs
 HOSTDEFDST=	${WRKSRC}/config/cf/host.def.xfs
+.else
+HOSTDEFDST=	${WRKSRC}/config/cf/host.def
 .endif
-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
+ALL_SERVER=	${SERVER}
 .if (${SERVER} == xfs)
 ALL_TARGET=	xfs
 HOSTDEFSRV=
@@ -98,6 +109,15 @@ HOSTDEFLOCAL=	${WRKDIR}/host.def.local
 
 .include <bsd.port.pre.mk>
 
+.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." ; \
+	 false )
+.endif
+
 pre-patch:
 	@( cd ${WRKSRC}; ${PATCH} -p1 -t -s < ${XTTDIR}/xtt-1.1.diff ; \
 	   cd ${XTTDIR}; \
@@ -109,7 +129,7 @@ pre-configure:
 	${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \
 	(cd ${WRKDIR} ; ${XMKMF} ; \
           ${SETENV} ${MAKE_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
-                    FILESDIR=${FILESDIR} ${MAKE}) ; \
+		FILESDIR=${FILESDIR} ${MAKE}) ; \
 	${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} )
 
 .if ${SERVER} == common
@@ -137,42 +157,26 @@ do-install:
 	${LN} -fs ${PREFIX}/bin/${SERVER}.xtt ${PREFIX}/bin/X )
 .endif
 
-.if defined(SHARED_WRKSRC) && ${SHARED_WRKSRC} == YES
-.if defined(COMPILE_ALL_SERVERS_AT_ONCE) && ${COMPILE_ALL_SERVERS_AT_ONCE} == YES
+.if defined(USE_SHARED_WRKSRC)
 post-configure:
 	@( \
-	cd ${WRKDIR} ; \
-	for i in ${ALL_SERVER} ; do \
+	cd ${WRKDIR} ; for i in ${ALL_SERVER} ; do \
 		${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${CONFIGURE_COOKIE} .${SERVER}`.$${i} ; \
 	done )
 
 post-build:
 	@( \
-	cd ${WRKDIR} ; \
-	for i in ${ALL_SERVER} ; do \
+	cd ${WRKDIR} ; for i in ${ALL_SERVER} ; do \
 		${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${BUILD_COOKIE} .${SERVER}`.$${i} ; \
 	done )
-.else
-post-configure:
-	@( cd ${WRKDIR} ; \
-	   ${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE} ; \
-	   ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${CONFIGURE_COOKIE} .${SERVER}`.common )
-
-post-build:
-	@( cd ${WRKDIR} ; \
-	   ${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE} ; \
-	   ${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${BUILD_COOKIE} .${SERVER}`.common )
-.endif
 
 post-install:
 	@( \
-	cd ${WRKDIR} ; \
-	${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} )
+	cd ${WRKDIR} ; 	${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} )
 
 post-package:
 	@( \
-	cd ${WRKDIR} ; \
-	${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE} )
+	cd ${WRKDIR} ; 	${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE} )
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-servers/XttXF86srv-common/distinfo b/x11-servers/XttXF86srv-common/distinfo
index e56c712c8923..cbd0057e8689 100644
--- a/x11-servers/XttXF86srv-common/distinfo
+++ b/x11-servers/XttXF86srv-common/distinfo
@@ -4,4 +4,5 @@ MD5 (xc/xttdoc11-to-pl01.diff.gz) = 09911c05ba01a57b4518e2b1f94ef177
 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/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XttXF86srv-common/files/host.def.common b/x11-servers/XttXF86srv-common/files/host.def.common
index 4dc84865a397..8d641080b3ab 100644
--- a/x11-servers/XttXF86srv-common/files/host.def.common
+++ b/x11-servers/XttXF86srv-common/files/host.def.common
@@ -1,3 +1,4 @@
+
 #define BuildServersOnly	YES
 #define BuildFontServer		NO
 
@@ -16,6 +17,7 @@
 #define XF86AGXServer		NO
 #define XF86W32Server		NO
 #define XF86I128Server		NO
+#define XF86GLINTServer		NO
 
 #undef BuildPC98Servers
 #define BuildPC98Servers	NO