commit 1a512ec048a5c607a01b9fd82561c1601ba87406
from: Christian Kellermann <ckeen@pestilenz.org>
via: Russ Cox <rsc@swtch.com>
date: Tue Dec 11 17:45:45 2012 UTC

fontsrv: fix build on OpenBSD 5.2

R=rsc
CC=plan9port.codebot
https://codereview.appspot.com/6850108

commit - 0b4fd921055175e9dda8c424f9252f4141507742
commit + 1a512ec048a5c607a01b9fd82561c1601ba87406
blob - 7215408544439f1711ce1a60c68f0f791dc7a7af
blob + 63effd2ad8ff19f0da3a918089edc8c4248e8c6f
--- CONTRIBUTORS
+++ CONTRIBUTORS
@@ -12,6 +12,7 @@ Anthony Sorace <a@9srv.net>
 Arvindh Rajesh Tamilmani <art@a-30.net>
 Benjamin Huntsman <BHuntsman@mail2.cu-portland.edu>
 Caio Oliveira <cmarcelo@gmail.com>
+Christian Kellermann <ckeen@pestilenz.org>
 Christopher Brannon <chris@the-brannons.com>
 David du Colombier <0intro@gmail.com>
 David Jeannot <djeannot24@gmail.com>
blob - 7625cc8078d562bd8f75763335543b6dcc48bc50
blob + 1ce9bd0c62e9874b00731a2a64d9594f9e732109
--- INSTALL
+++ INSTALL
@@ -45,6 +45,11 @@ rm -f config
 echo "* Compiler version:"
 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/	/'
 
+if [ `uname` = OpenBSD ]; then
+       echo "* Running on OpenBSD, adjusting linker flags"
+       echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config
+fi
+
 if [ `uname` = Linux ]; then
 	# On Linux, we use the kernel version to decide whether
 	# to use pthreads or not.  On 2.6 versions that aren't
blob - dde44c819e98fddfc8509fb12becf2d283fe9599
blob + 9c422261af513db67a1765bf5eeeebd448b6df6d
--- src/cmd/devdraw/mkwsysrules.sh
+++ src/cmd/devdraw/mkwsysrules.sh
@@ -45,6 +45,7 @@ fi
 	
 echo 'WSYSTYPE='$WSYSTYPE
 echo 'X11='$X11
+echo 'X11H='$X11H
 
 if [ $WSYSTYPE = x11 ]; then
 	echo 'CFLAGS=$CFLAGS '$X11H
blob - ca7a02618255911f7961853a39555730d102ed78
blob + 7b9a002fbc2e9e9fb7eef6492cff5318ee71f106
--- src/cmd/fontsrv/freetyperules.sh
+++ src/cmd/fontsrv/freetyperules.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
 
 if [ "x$1" = "xx11" ]; then
-	echo 'CFLAGS=$CFLAGS -I/usr/include/freetype2' 
+	if [ "x$2" = "x" ]; then
+		i=/usr/include
+	else
+		i=$2
+	fi
+	echo 'CFLAGS=$CFLAGS '$i'/freetype2' 
         echo 'LDFLAGS=$LDFLAGS -lfontconfig -lfreetype -lz'
 fi
 
blob - 9fbbd52063f4d9788c54014324e1fda6efe70cf9
blob + eed0355a7f7035bf37dd01dff91b2e70017ec7fb
--- src/cmd/fontsrv/mkfile
+++ src/cmd/fontsrv/mkfile
@@ -1,6 +1,6 @@
 <$PLAN9/src/mkhdr
 <|sh ../devdraw/mkwsysrules.sh
-<|sh freetyperules.sh $WSYSTYPE
+<|sh freetyperules.sh $WSYSTYPE $X11H
 
 TARG=fontsrv