$OpenBSD: patch-source_Makefile,v 1.1 2013/01/12 16:21:43 stsp Exp $
--- source/Makefile.orig	Sun Sep 30 23:25:31 2012
+++ source/Makefile	Thu Dec 27 15:18:32 2012
@@ -533,7 +533,7 @@ ifndef BUILD_LUA
   endif
 endif
 ifndef BUILD_LUA
-  ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),)
+  ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || echo no),)
     ifneq ($(shell $(PKGCONFIG) lua --exists || echo no),)
       BUILD_LUA = yes
     else
@@ -544,7 +544,7 @@ ifndef BUILD_LUA
       endif
     endif
   else
-    LUA_PACKAGE = lua5.1
+    LUA_PACKAGE = lua${MODLUA_DEP_VERSION}
   endif
 endif
 ifndef BUILD_LUA
@@ -831,7 +831,7 @@ ifdef PROPORTIONAL_FONT
     INSTALL_FONTS += $(PROPORTIONAL_FONT)
   endif
 else
-  SYS_PROPORTIONAL_FONT = $(shell find /usr/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
+  SYS_PROPORTIONAL_FONT = ${X11BASE}/lib/X11/fonts/TTF/$(OUR_PROPORTIONAL_FONT)
   ifeq (,$(SYS_PROPORTIONAL_FONT))
     SYS_PROPORTIONAL_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_PROPORTIONAL_FONT)|head -n 1)
   endif
@@ -854,7 +854,7 @@ ifdef MONOSPACED_FONT
     INSTALL_FONTS += $(MONOSPACED_FONT)
   endif
 else
-  SYS_MONOSPACED_FONT = $(shell find /usr/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
+  SYS_MONOSPACED_FONT = ${X11BASE}/lib/X11/fonts/TTF/$(OUR_MONOSPACED_FONT)
   ifeq (,$(SYS_MONOSPACED_FONT))
     SYS_MONOSPACED_FONT = $(shell find /usr/local/share/fonts -iname $(OUR_MONOSPACED_FONT)|head -n 1)
   endif
@@ -1150,7 +1150,7 @@ endif
 # This information is included in crash reports, and is printed with
 # "crawl -version"
 compflag.h: $(OBJECTS:.o=.cc) util/gen-cflg.pl
-	$(QUIET_GEN)util/gen-cflg.pl compflag.h "$(ALL_CFLAGS)" "$(LDFLAGS)" "$(HOST)" "$(ARCH)"
+	$(QUIET_GEN)util/gen-cflg.pl compflag.h "$(CFLAGS)" "$(LDFLAGS)" "$(HOST)" "$(ARCH)"
 
 build.h: $(OBJECTS:.o=.cc) util/gen_ver.pl
 	$(QUIET_GEN)util/gen_ver.pl $@ $(MERGE_BASE)
