From owner-FreeBSD-users-jp@jp.freebsd.org  Sun Nov 28 21:35:46 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id VAA68174;
	Sun, 28 Nov 1999 21:35:46 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from pis.toba-cmt.ac.jp (pis.toba-cmt.ac.jp [202.26.248.77])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id VAA68169;
	Sun, 28 Nov 1999 21:35:43 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
From: kiri@pis.toba-cmt.ac.jp
Received: from kiri.pis (localhost [127.0.0.1])
	by pis.toba-cmt.ac.jp (8.9.3/8.9.3) with ESMTP id VAA92086;
	Sun, 28 Nov 1999 21:34:36 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
Message-Id: <199911281234.VAA92086@pis.toba-cmt.ac.jp>
Date: Sun, 28 Nov 1999 21:34:35 +0900
To: FreeBSD-users-jp@jp.freebsd.org
Cc: ports-jp@jp.freebsd.org
In-Reply-To: In your message of "Sun, 28 Nov 1999 08:16:50 +0900"
	<14400.26210.645573.72159A@hirose.tohoku.iij.ad.jp>
References: <19991127163619A.ryuichi@falcon.cs.ritsumei.ac.jp>
	<14400.26210.645573.72159A@hirose.tohoku.iij.ad.jp>
User-Agent: Wanderlust/1.0.3 (Notorious) SEMI/1.13.3 (Komaiko) FLIM/1.12.5 (Hirahata) MULE XEmacs/21.1 (patch 8) (Bryce Canyon) (i386--freebsd)
MIME-Version: 1.0 (generated by SEMI 1.13.3 - "Komaiko")
Content-Type: multipart/mixed;
 boundary="Multipart_Sun_Nov_28_21:34:35_1999-1"
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: FreeBSD-users-jp 47779
Subject: [FreeBSD-users-jp 47779] Re: Xtt package by XF86 3.3.5
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: kiri@pis.toba-cmt.ac.jp

--Multipart_Sun_Nov_28_21:34:35_1999-1
Content-Type: text/plain; charset=ISO-2022-JP

$B6M;3$G$9!#(B

At Sun, 28 Nov 1999 08:16:50 +0900,
taguchi@tohoku.iij.ad.jp wrote:
> 
> $B$9$G$K(B patch $B$O(B send-pr $B$7$F$"$j$^$9(B(ports/14862)$B!#(B
> $BK\2H$N(Bports$B$N%"!<%+%$%V$rC5$;$P!"(Bpatch$B$OF@$i$l$k$G$7$g$&!#(B

$B$h$&$d$/;W$$9x$r>e$2$F(B 3.3.5 $B$K>e$2!"(Bx-tt $B$b$3$l$K9g$o$;$k$Y$/",$N$r<h$C$F$-$F(B
$B$d$m$&$H$7$?$s$G$9$,!"(Bpatch $B$G7y$o$l$^$7$?!#(B

Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN x11-servers.ORIG/XttXF86srv-common/Makefile x11-servers/XttXF86srv-common/Makefile
|--- x11-servers.ORIG/XttXF86srv-common/Makefile	Tue Aug 31 11:58:51 1999
|+++ x11-servers/XttXF86srv-common/Makefile	Mon Nov  8 10:37:00 1999
--------------------------
Patching file x11-servers/XttXF86srv-common/Makefile using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 failed at 9.
Hunk #3 succeeded at 33.
Hunk #4 succeeded at 44.
Hunk #5 succeeded at 69.
Hunk #6 succeeded at 99.
Hunk #7 succeeded at 144.
Hunk #8 succeeded at 182.
1 out of 8 hunks failed--saving rejects to x11-servers/XttXF86srv-common/Makefile.rej

$B$s$G$H$j$"$($:<j$GEv$F$F"-$H$7$F(B

--Multipart_Sun_Nov_28_21:34:35_1999-1
Content-Type: text/plain; charset=ISO-2022-JP

--- Makefile.orig	Sun Nov 28 20:48:49 1999
+++ Makefile	Sun Nov 28 20:57:00 1999
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	Common Files for Xservers with Xtt
-# Version required:	1.2.1
+# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
@@ -9,23 +9,19 @@
 DISTNAME=	xc
 PKGNAME?=	xtt-common-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
-		http://X-TT.dsl.gr.jp/dists/1.x/1.2/
-DISTFILES=	X333src-1.tgz X333src-2.tgz \
-		xtt-1.2.tar.gz \
-		xtt-1.2-to-1.2.1.tar.gz
-
-PATCH_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/fixes/
-PATCHFILES=	3.3.3-3.3.3.1.diff.gz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
+		http://X-TT.dsl.gr.jp/dists/1.x/1.3/
+DISTFILES=	X335src-1.tgz xtt-1.3.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype
-RUN_DEPENDS=	mkttfdir:${PORTSDIR}/print/perlftlib
+RUN_DEPENDS+=	mkttfdir:${PORTSDIR}/print/perlftlib
 
-VERSION=	1.2
-PATCHLEVEL=	1
+VERSION=	1.3
+PATCHLEVEL=	0
+SERVER?=	common
 .if !defined(USE_SHARED_WRKSRC) && defined(COMPILE_ALL_SERVERS_AT_ONCE)
 USE_SHARED_WRKSRC= YES
 .endif
@@ -37,8 +33,7 @@
 IGNOREFILES=	Wraphelp.c
 .endif
 USE_X_PREFIX=	YES
-EXTRACT_ONLY=	X333src-1.tgz  X333src-2.tgz \
-		xtt-1.2.tar.gz xtt-1.2-to-1.2.1.tar.gz
+EXTRACT_ONLY=	X335src-1.tgz xtt-1.3.tgz
 BINOWN=		root
 BINGRP=		wheel
 MASTERDIR?=	${.CURDIR}/../XttXF86srv-common
@@ -49,20 +44,17 @@
 .endif
 WRKSRC=		${WRKDIR}/xc
 DIST_SUBDIR=	xc
-XTTDIR=		${WRKDIR}/xtt-1.2
-XTTPATCHDIR=	${WRKDIR}/xtt-1.2-to-1.2.1
+XTTDIR=		${WRKDIR}/xtt-1.3
 .if !defined(PATCH_DEBUG)
 XTTPATCHARGS=	-p1 -E -t -s -N
 .else
 XTTPATCHARGS=	-p1 -E
 .endif
-COREPATCHES=	shared-libfont-1.0.diff xfs-for-delayed-font-1.0.diff \
-		make-xfs-only-1.1.diff xtt-xf333-changes.diff
+COREPATCHES=	shared-libfont-1.2.diff xfs-for-delayed-font-1.0.diff \
+		make-xfs-only-1.3.diff xtt-xf335-changes.diff
 XTTTARBALL=	xtt-core.tar
-ADDPATCHES=	${XTTDIR}/contribute/xtt-xfsft-lib.patch \
-		${XTTPATCHDIR}/xtt-core.diff
+ADDPATCHES=	${XTTDIR}/contribute/xtt-xfsft-lib.patch
 DOCDIR=		${PREFIX}/share/doc/Xtt
-SERVER?=	common
 PATCH_DIST_ARGS= -d ${WRKDIR} --forward --quiet -E ${PATCH_STRIP}
 #PATCH_DIST_STRIP=	-p1
 
@@ -77,11 +69,18 @@
 #  This variable will save your time, if you want to make all xtt packages.
 # ******************
 .if defined(USE_SHARED_WRKSRC)
+SHARED_COOKIE=		${WRKDIR}/.compiled_by_other_server_ports
 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
+.if ${SERVER} == common && exists(${SHARED_COOKIE}) && !defined(COMPILE_ALL_SERVERS_AT_ONCE)
+EXTRACT_ONLY=
+.endif
+.if ${SERVER} == common && exists(${SHARED_COOKIE}) && !defined(COMPILE_ALL_SERVERS_AT_ONCE)
+NO_BUILD=	YES
+.endif
 .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 \
@@ -100,16 +99,16 @@
 HOSTDEFSRV=	${FILESDIR}/host.def.${SERVER}
 .endif
 
-HOSTDEFLOCAL=	${WRKDIR}/host.def.local
+LOCALFILE=	host.def.local
+HOSTDEFLOCAL=	${WRKDIR}/${LOCALFILE}
+HOSTDEFDST=	${WRKSRC}/config/cf/${LOCALFILE}
+HOSTDEFORG=	${WRKSRC}/config/cf/host.def
 .if ${SERVER} == xfs
 ALL_TARGET=	xfs
-HOSTDEFDST=	${WRKSRC}/config/cf/host.def.xfs
-.elif ${SERVER} == common
+.elif ${SERVER} == common && !defined(COMPILE_ALL_SERVERS_AT_ONCE)
 ALL_TARGET=	libfont
-HOSTDEFDST=	${WRKSRC}/config/cf/host.def
 .else
 ALL_TARGET=	World
-HOSTDEFDST=	${WRKSRC}/config/cf/host.def
 .endif
 
 .include <bsd.port.pre.mk>
@@ -145,17 +144,15 @@
 	   ${TAR} xf ${XTTDIR}/${XTTTARBALL} -C ${WRKSRC}/lib/font; \
 	   for i in ${ADDPATCHES} ; do \
 		${PATCH} ${XTTPATCHARGS} < $${i}; \
-	   done; \
-	   cd ${XTTDIR}/doc; \
-	   ${PATCH} ${XTTPATCHARGS} < ${XTTPATCHDIR}/xtt-doc.diff )
+	   done )
 
 pre-configure:
-	@( \
-	${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \
-	(cd ${WRKDIR} ; ${XMKMF} ; \
-	  ${SETENV} ${MAKE_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
+	@( ${CP} ${FILESDIR}/Imakefile ${WRKDIR} ; \
+	   (cd ${WRKDIR} ; ${XMKMF} ; \
+	    ${SETENV} ${SCRIPT_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		FILESDIR=${FILESDIR} ${MAKE}) ; \
-	${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} )
+	   ${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ; \
+	   ${ECHO} "#include <${LOCALFILE}>" >> ${HOSTDEFORG} )
 
 .if ${SERVER} == common
 do-install:
@@ -185,15 +182,22 @@
 .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 )
+.if ${SERVER} != common || (${SERVER} == common && defined(COMPILE_ALL_SERVERS_AT_ONCE))
+	@${TOUCH} ${TOUCH_FLAGS} ${SHARED_COOKIE}
+.endif
 
 post-build:
 	@( \
 	cd ${WRKDIR} ; for i in ${ALL_SERVER} ; do \
 		${TOUCH} ${TOUCH_FLAGS} `${BASENAME} ${BUILD_COOKIE} .${SERVER}`.$${i} ; \
 	done )
+.if ${SERVER} != common || (${SERVER} == common && defined(COMPILE_ALL_SERVERS_AT_ONCE))
+	@${TOUCH} ${TOUCH_FLAGS} ${SHARED_COOKIE}
+.endif
 
 post-install:
 	@( \

kiri# pwd
/usr/ports/x11-servers/XttXF86srv-xfs
kiri# make install 

$B$7$?$s$G$9$,!"(B

cc -o xfs -O2      -L/usr/X11R6/lib  difs/libdifs.a difs/libdifs.a os/libos.a     -lxpg4 -L/usr/X11R6/lib -L../../lib/font -lfont  -lm -lz -Wl,-rpath,/usr/X11R6/lib
difs/libdifs.a(initfonts.o): In function `InitFonts':
initfonts.o(.text+0xd5): undefined reference to `FontCacheChangeSettings'
*** Error code 1

Stop in /usr/ports/x11-servers/XttXF86srv-xfs/work/xc/programs/xfs.
*** Error code 1

$B$GMn$A$^$7$?!#40A4$J%m%0$O"-$KCV$-$^$7$?!#(B

ftp://fbsd.toba-cmt.ac.jp/incoming/XttXF86srv-xfs_install.log

$B2?$+%H%s%G%b%J%$4*0c$$$7$F$^$9$+!)(B

$B!t(B $B0J9_$O(B ports-jp $B$G$d$j$^$;$s$+!)(B
--Multipart_Sun_Nov_28_21:34:35_1999-1--
