diff options
Diffstat (limited to 'x11-servers/XttXF86srv-common/files')
15 files changed, 97 insertions, 134 deletions
diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile index 8cfac8b5295a..7e42fd9bf8fb 100644 --- a/x11-servers/XttXF86srv-common/files/Imakefile +++ b/x11-servers/XttXF86srv-common/files/Imakefile @@ -5,27 +5,94 @@ ECHO_MSG= echo WRKDIR?= . DISTDIR?= /usr/ports/distfiles FILESDIR?= ../files +LOCALBASE?= /usr/local -#ifdef HasSecureRPC -HASSECURERPC= HasSecureRPC +#if BuildXInputExt +BUILDXINPUTEXT= YES +#else +JOYSTICSUPPORT= YES #endif -#ifdef HasXdmAuth -HASXDMAUTH= HasXdmAuth +#if BuildPexExt +BUILDPEXEXT= YES #endif -# -#ifdef HasKrb4 -HASKRB4= HasKrb4 +#if BuildXIE +BUILDXIE= YES +#endif +#if HasSecureRPC +HASSECURERPC= YES +#endif +#if HasXdmAuth +HASXDMAUTH= YES +#endif +#if HasKrb4 +HASKRB4= YES #endif -all:: SecureRPCCheck XdmAuthCheck Krb4Check +all:: SecureRPCCheck XdmAuthCheck Krb4Check InputExtCheck pexCheck xieCheck initialize:: - @${ECHO_MSG} "Now checking your XFree86 environment." - @rm -f ${CONFFILE} + @( \ + ${ECHO_MSG} " Now checking your XFree86 environment."; \ + rm -f ${CONFFILE}; \ + ${ECHO_MSG} "#define FreeTypeLibDir ${LOCALBASE}/lib" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define FreeTypeIncDir ${LOCALBASE}/include" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86SVGAServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86VGA16Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86VGA16DualServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86MonoServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86MonoDualServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86S3Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86S3VServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86I8514Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86Mach8Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86Mach32Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86Mach64Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86P9000Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86AGXServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86W32Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XF86I128Server" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef BuildFontServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef BuildFonts" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XnestServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XVirtualFramebufferServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#undef XprtServer" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define BuildFonts NO" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define XnestServer NO" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define XVirtualFramebufferServer NO" >> ${CONFFILE}; \ + ${ECHO_MSG} "#define XprtServer NO" >> ${CONFFILE}; \ + ) +InputExtCheck:: initialize +.if defined(BUILDXINPUTEXT) && ${BUILDXINPUTEXT} == YES + @( \ + ${ECHO_MSG} "#define BuildXInputExt YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using BuildXInputExt." ) +.else + @( \ + ${ECHO_MSG} "#define JoystickSupport YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using JoystickSupport." ) +.endif + +pexCheck:: initialize +.if defined(BUILDPEXEXT) && ${BUILDPEXEXT} == YES + @( \ + ${ECHO_MSG} "#define BuildPexExt YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using BuildPexExt." ) +.endif + +xieCheck:: initialize +.if defined(BUILDXIE) && ${BUILDXIE} == YES + @( \ + ${ECHO_MSG} "#define BuildXIE YES" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using BuildXIE." ) +.endif + SecureRPCCheck:: initialize .if defined(HASSECURERPC) && ${HASSECURERPC} == YES - @echo "#define HasSecureRPC ${HASSECURERPC}" >> ${CONFFILE} + @( \ + ${ECHO_MSG} "#define HasSecureRPC ${HASSECURERPC}" >> ${CONFFILE}; \ + ${ECHO_MSG} " Using Secure RPC"; \ + ) .else @${DO_NADA} .endif @@ -33,14 +100,16 @@ SecureRPCCheck:: initialize XdmAuthCheck:: initialize .if defined(HASXDMAUTH) && ${HASXDMAUTH} == YES @( \ - echo "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ + ${ECHO_MSG} " Using XdmAuth." ; \ if [ ! -f ${WRKDIR}/xc/lib/Xdmcp/Wraphelp.c ]; then \ 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_MSG} "#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_MSG} "#define HasXdmAuth ${HASXDMAUTH}" >> ${CONFFILE} ; \ else \ ${ECHO_MSG} "Wraphelp.c not found. You can not use XDM-AUTHORIZATION-1!" ; \ false ; \ @@ -54,7 +123,8 @@ XdmAuthCheck:: initialize Krb4Check:: initialize .if defined(HASKRB4) && ${HASKRB4} == YES @( \ - echo "#define HasKrb4 ${HASKRB4}" >> ${CONFFILE} ; \ + ${ECHO_MSG} "#define HasKrb4 ${HASKRB4}" >> ${CONFFILE} ; \ + ${ECHO_MSG} " Using KerberosIV." ; \ ${ECHO_MSG} "===> Applying KerberosIV patches" ; \ patch -s -d ${WRKDIR}/xc -E -p0 < ${FILESDIR}/kerberos4.diffs ; \ ) diff --git a/x11-servers/XttXF86srv-common/files/host.def.ALL b/x11-servers/XttXF86srv-common/files/host.def.ALL index b28d94b88e82..42af9466c6b8 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.ALL +++ b/x11-servers/XttXF86srv-common/files/host.def.ALL @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer YES #define XF86VGA16Server YES @@ -16,12 +17,3 @@ #define XF86AGXServer YES #define XF86W32Server YES #define XF86I128Server YES - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 b/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 index 06e191f9486c..35fbc4e07861 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_8514 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX b/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX index 6afafd0f9cec..b744eecb1c19 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_AGX @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,13 +17,3 @@ #define XF86AGXServer YES #define XF86W32Server NO #define XF86I128Server NO - - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 b/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 index a2fbaca54176..72e0e6c14479 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_I128 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server YES - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 index 7404a71e59ba..cb7525929b94 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach32 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 index ace5a635800a..7b0476a361df 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach64 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,12 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 index d318261689a6..828f5a804132 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mach8 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono index 7d7e79271e98..b4b3b9807188 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_Mono @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 b/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 index 257f9c7d35f2..e2d519690a16 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_P9000 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,11 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 index fad4eccdf0a9..839b673626f9 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,12 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V index d77e7604a472..8cc3ba6b2985 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_S3V @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA b/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA index ed1fe11e80e5..deab23467c07 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_SVGA @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer YES #define XF86VGA16Server NO @@ -16,11 +17,3 @@ #define XF86AGXServer NO #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 b/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 index 29965773ed3f..8bafbd9c15b4 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_VGA16 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server YES @@ -17,12 +18,3 @@ #define XF86W32Server NO #define XF86I128Server NO - -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - diff --git a/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 b/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 index cd13b3a1f703..6a4cf53661a4 100644 --- a/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 +++ b/x11-servers/XttXF86srv-common/files/host.def.XF86_W32 @@ -1,5 +1,6 @@ #define BuildServersOnly YES +#define BuildFontServer NO #define XF86SVGAServer NO #define XF86VGA16Server NO @@ -17,11 +18,3 @@ #define XF86W32Server YES #define XF86I128Server NO -#define BuildFontServer NO -#define BuildFonts NO -#define XnestServer NO -#define XVirtualFramebufferServer NO -#define XprtServer NO - -#define IncludeFlags - |