scripts/configure is modified to make X98 servers in the case of MACHINE=pc98. And pkg/PLIST and Makefile are also modified. Fix: Here is a patch. --->8------>8------>8------>8------>8------>8------>8------>8--- --->8------>8------>8------>8------>8------>8------>8------>8-----zdm5Ezq4EyY3dqVP7UuQRqhmydU3DxV7A3dskyBgaanH7jWU Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" 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 <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 compaq mga oak al2101 ali \ @@ -113,6 +140,7 @@ #define XF86W32Drivers et4000w32 END +fi cat <<END
Responsible Changed From-To: freebsd-ports->jmz jmz is XFree86 port maintainer
State Changed From-To: open->closed Patches applied (with minor modifications). Thanks.