$NetBSD: patch-ah,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $

--- config/cf/OpenBSD.cf.in.orig	2004-07-22 00:18:37.000000000 +0200
+++ config/cf/OpenBSD.cf.in	2004-07-22 00:19:48.000000000 +0200
@@ -162,7 +162,7 @@
 #define MkdirHierCmd		mkdir -p
 
 #ifndef CppCmd
-#define CppCmd          	/usr/libexec/cpp
+#define CppCmd          	@@PKGSRC_CPP@@
 #endif
 #define StandardCppOptions	-traditional
 #define StandardCppDefines	/**/
@@ -170,10 +170,10 @@
 #define PreIncDir		DefaultGccIncludeDir
 
 #ifndef CcCmd
-#define CcCmd 			cc
+#define CcCmd 			@@PKGSRC_CC@@
 #endif
 #ifndef AsCmd
-#define AsCmd			cc -c -x assembler
+#define AsCmd			@@PKGSRC_CC@@ -c -x assembler
 #endif
 #ifndef DefaultCCOptions
 #if defined(UseInstalled)
@@ -226,7 +226,6 @@
 
 #define HasBsdMake		YES
 
-#define BuildCyrillicFonts	YES
 #define GzipFontCompression	YES
 #define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
 #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
@@ -481,13 +480,7 @@
 # endif 
  
 
-# ifndef DefaultGcc2i386Opt
-#   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
-      /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
-#     define DefaultGcc2i386Opt	-O2 GccAliasingArgs
-#   endif
-# endif
-# define OptimizedCDebugFlags	DefaultGcc2i386Opt
+# define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraSysLibs	-li386
 # define LdPostLib		/**/