From owner-freebsd-ports Fri Oct 9 07:30:11 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id HAA09675 for freebsd-ports-outgoing; Fri, 9 Oct 1998 07:30:11 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA09610 for ; Fri, 9 Oct 1998 07:30:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id HAA15224; Fri, 9 Oct 1998 07:30:01 -0700 (PDT) Received: from nakaji.dpri.kyoto-u.ac.jp (p21-dn05neyagawa.osaka.ocn.ne.jp [210.154.209.54]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA08961 for ; Fri, 9 Oct 1998 07:24:00 -0700 (PDT) (envelope-from nakaji@nakaji.dpri.kyoto-u.ac.jp) Received: (from nakaji@localhost) by nakaji.dpri.kyoto-u.ac.jp (8.9.1/8.9.1) id XAA00440; Fri, 9 Oct 1998 23:24:05 +0900 (JST) (envelope-from nakaji) Message-Id: <199810091424.XAA00440@nakaji.dpri.kyoto-u.ac.jp> Date: Fri, 9 Oct 1998 23:24:05 +0900 (JST) From: nakaji@zeisei3.dpri.kyoto-u.ac.jp Reply-To: nakaji@zeisei3.dpri.kyoto-u.ac.jp To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/8230: patch for XFree86 port to make X98 servers Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 8230 >Category: ports >Synopsis: patch for XFree86 port to make X98 servers >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 9 07:30:01 PDT 1998 >Last-Modified: >Originator: NAKAJI Hiroyuki >Organization: DPRI, Kyoto Univ. >Release: FreeBSD 3.0-BETA i386 >Environment: FreeBSD nakaji.dpri.kyoto-u.ac.jp 3.0-BETA FreeBSD 3.0-BETA #3: Sun Sep 27 19:58:46 JST 1998 root@nakaji.dpri.kyoto-u.ac.jp:/export/src/sys/compile/NAKAJI2 i386 >Description: scripts/configure is modified to make X98 servers in the case of MACHINE=pc98. And pkg/PLIST and Makefile are also modified. >How-To-Repeat: >Fix: Here is a patch. --->8------>8------>8------>8------>8------>8------>8------>8--- diff -ru XFree86/Makefile XFree86-pc98/Makefile --- XFree86/Makefile Wed Sep 23 09:04:10 1998 +++ XFree86-pc98/Makefile Sun Oct 4 15:35:04 1998 @@ -34,6 +34,9 @@ # can't use USE_X_PREFIX here -- it will cause a circular dependency PREFIX= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11.dist +.if (${MACHINE} == "pc98") +SCRIPTS_ENV+= MACHINE=pc98 +.endif .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO) pre-fetch: diff -ru XFree86/pkg/PLIST XFree86-pc98/pkg/PLIST --- XFree86/pkg/PLIST Wed Sep 23 09:04:11 1998 +++ XFree86-pc98/pkg/PLIST Sun Oct 4 14:30:46 1998 @@ -1,6 +1,7 @@ bin/SuperProbe bin/X bin/XF86Setup +bin/XF98Setup bin/XF86_8514 bin/XF86_AGX bin/XF86_I128 @@ -14,6 +15,20 @@ bin/XF86_SVGA bin/XF86_VGA16 bin/XF86_W32 +bin/XF98_EGC +bin/XF98_GA968 +bin/XF98_GANBWAP +bin/XF98_MGA +bin/XF98_NEC480 +bin/XF98_NECS3 +bin/XF98_NKVNEC +bin/XF98_PWLB +bin/XF98_PWSKB +bin/XF98_SVGA +bin/XF98_TGUI +bin/XF98_WABEP +bin/XF98_WABS +bin/XF98_WSNA bin/Xmark bin/Xnest bin/Xprt @@ -66,6 +81,7 @@ bin/xdm bin/xdpyinfo bin/xf86config +bin/xf98config bin/xfd bin/xfindproxy bin/xfs @@ -404,8 +420,10 @@ include/X11/keysym.h include/X11/keysymdef.h lib/X11/Cards +lib/X11/Cards98 lib/X11/XErrorDB lib/X11/XF86Config.eg +lib/X11/XF86Config.98 lib/X11/XF86Setup/LICENSE lib/X11/XF86Setup/card.tcl lib/X11/XF86Setup/carddata.tcl diff -ru XFree86/scripts/configure XFree86-pc98/scripts/configure --- XFree86/scripts/configure Wed Sep 23 14:50:41 1998 +++ XFree86-pc98/scripts/configure Sun Oct 4 14:30:02 1998 @@ -65,17 +65,39 @@ echo "*** If you want to use XF86Setup to set the INITIAL configuration," echo "*** then you must build the VGA server" fi +# force the compilation of the EGC server for pc98. +if [ X"${MACHINE}" = X"pc98" ]; then + echo "#define BuildPC98Servers YES" >>$F + echo "#undef XF98EGCServer" >>$F + echo "#define XF98EGCServer YES" >>$F + servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA" + selected=EGC + for i in $servers; do + yesno "Do you want to build the $i server? [YES] " + if [ $answ = YES ]; then selected="$selected $i"; fi + echo "#undef XF98${i}Server" >>$F + echo "#define XF98${i}Server $answ" >>$F + done + echo "#undef XF86SVGAServer" >>$F + echo "#define XF86SVGAServer NO" >>$F + servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128" + for i in $servers; do + echo "#undef XF86${i}Server" >>$F + echo "#define XF86${i}Server NO" >>$F + done +else # force the compilation of the SVGA server. -echo "#undef XF86SVGAServer" >>$F -echo "#define XF86SVGAServer YES" >>$F -servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128" -selected=SVGA -for i in $servers; do - yesno "Do you want to build the $i server? [YES] " - if [ $answ = YES ]; then selected="$selected $i"; fi - echo "#undef XF86${i}Server" >>$F - echo "#define XF86${i}Server $answ" >>$F -done + echo "#undef XF86SVGAServer" >>$F + echo "#define XF86SVGAServer YES" >>$F + servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128" + selected=SVGA + for i in $servers; do + yesno "Do you want to build the $i server? [YES] " + if [ $answ = YES ]; then selected="$selected $i"; fi + echo "#undef XF86${i}Server" >>$F + echo "#define XF86${i}Server $answ" >>$F + done +fi echo ok=0 @@ -86,7 +108,11 @@ if [ $answ != none ]; then for i in $selected; do if [ $i = $answ ]; then ok=1 + if [ X"${MACHINE}" = X"pc98" ]; then + echo "#define ServerToInstall XF98_$answ" >>$F + else echo "#define ServerToInstall XF86_$answ" >>$F + fi fi done fi @@ -96,6 +122,7 @@ yesno "Do you want to build Xvfb? [YES] " echo "#define XVirtualFramebufferServer $answ" >>$F +if [ X"${MACHINE}" != X"pc98" ]; then cat >> $F <8------>8------>8------>8------>8------>8------>8------>8--- >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message