allow build under Darwin

14 files changed, 24 insertions, 13 deletions

diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 0f4a1f934..35e10ec85 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index d1b317d6b..6f0da9876 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index 95d37624e..fc0b6c227 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index d27714abe..645aac5b4 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index dbb773be1..8df46f86f 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index 8e1fa78e4..271fe18ad 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 5e9e8c336..e36e8710e 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index d789bb866..3cba71409 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index 104feb0eb..a65b12d9d 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index da8af246b..40f4cec26 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index e2bd31778..97e8ada96 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index a45a2ab82..4e1015900 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/font-util/patches/patch-fontutil_pc_in b/package/font-util/patches/patch-fontutil_pc_in
new file mode 100644
index 000000000..4662db361
--- /dev/null
+++ b/package/font-util/patches/patch-fontutil_pc_in
@@ -0,0 +1,11 @@
+--- font-util-1.1.1.orig/fontutil.pc.in	2009-10-11 06:32:56.000000000 +0200
++++ font-util-1.1.1/fontutil.pc.in	2010-12-02 22:28:16.000000000 +0100
+@@ -4,7 +4,7 @@ libdir=@libdir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ fontrootdir=@fontrootdir@
+-mapdir=@MAPDIR@
++mapdir=${prefix}/../@MAPDIR@
+  
+ Name: FontUtil
+ Description: Font utilities dirs
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index 9ab43c284..2a08c9b10 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		x11/fonts
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd !darwin
+PKG_HOST_DEPENDS:=      !netbsd !openbsd !cygwin !freebsd !mirbsd
 
 include $(TOPDIR)/mk/package.mk