Add x11 as an option; fix building on Darwin/MacOSX

6 files changed, 40 insertions, 13 deletions

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 69c7ddeefb9..02cc9477c10 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2008/10/18 11:43:45 adam Exp $
+# $NetBSD: Makefile,v 1.53 2008/11/01 09:51:59 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 
 USE_LIBTOOL=		yes
-USE_LANGUAGES+=		c c++ fortran
+USE_LANGUAGES=		c c++ fortran
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt
 GNU_CONFIGURE=		yes
@@ -26,9 +26,7 @@ CONFIGURE_ARGS+=	--without-python
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 BROKEN_GETTEXT_DETECTION=	yes
 
-# checks for X11/Intrinsic.h
-BUILDLINK_DEPMETHOD.libXt?=	build
-.include "../../x11/libXt/buildlink3.mk"
+.include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -38,6 +36,4 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index a8927496938..f487d21ad6d 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2008/10/18 11:43:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/11/01 09:51:59 adam Exp $
 bin/fontforge
 bin/fontimage
 bin/fontlint
@@ -61,7 +61,7 @@ include/fontforge/unicoderange.h
 include/fontforge/ustring.h
 include/fontforge/utype.h
 lib/libfontforge.la
-lib/libgdraw.la
+${PLIST.x11}lib/libgdraw.la
 lib/libgioftp.la
 lib/libgunicode.la
 lib/libgutils.la
diff --git a/fonts/fontforge/PLIST.Darwin b/fonts/fontforge/PLIST.Darwin
new file mode 100644
index 00000000000..cb48e0e7714
--- /dev/null
+++ b/fonts/fontforge/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2008/11/01 09:51:59 adam Exp $
+share/locale/en/LC_MESSAGES/Mac-FontForge-MenuShortCuts.mo
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index a1ddc9c21cd..718285f2aab 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2008/10/18 11:43:45 adam Exp $
+$NetBSD: distinfo,v 1.44 2008/11/01 09:51:59 adam Exp $
 
 SHA1 (fontforge_full-20080927.tar.bz2) = bf80dd035d0ff26da1f5cc4aa55dcd9b6ff9e748
 RMD160 (fontforge_full-20080927.tar.bz2) = 8f8fb0026b967602184bfefd83d5234fc684f340
 Size (fontforge_full-20080927.tar.bz2) = 5072410 bytes
-SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
+SHA1 (patch-aa) = ca71036b37dc1abf9b6915a75c75a0f9b9f1bbd6
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
 SHA1 (patch-ae) = a5ccbd571154dc03fbb4e3dae31615e6d064832d
 SHA1 (patch-af) = b71942feaf59b69d02782679219dd694e1054b3d
diff --git a/fonts/fontforge/options.mk b/fonts/fontforge/options.mk
new file mode 100644
index 00000000000..6d13e57370a
--- /dev/null
+++ b/fonts/fontforge/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2008/11/01 09:51:59 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.fontforge
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	x11
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=	yes
+# checks for X11/Intrinsic.h
+BUILDLINK_DEPMETHOD.libXt+=	build
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif
diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa
index b7bcfcac78e..0d58e814be4 100644
--- a/fonts/fontforge/patches/patch-aa
+++ b/fonts/fontforge/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2007/11/17 21:20:49 adam Exp $
+$NetBSD: patch-aa,v 1.7 2008/11/01 09:51:59 adam Exp $
 
---- fontforge/Makefile.dynamic.in.orig	2007-10-28 05:06:05.000000000 +0100
+--- fontforge/Makefile.dynamic.in.orig	2008-09-15 00:27:24.000000000 +0200
 +++ fontforge/Makefile.dynamic.in
 @@ -15,7 +15,7 @@ CC = @CC@
  O = @O_EXTENSION@
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.6 2007/11/17 21:20:49 adam Exp $
  X_11LIB = @X_11LIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
+@@ -73,7 +73,7 @@ LIBLIBS = -rpath $(libdir) ../libgutils.
+     @LIBS@ $(STATIC_LIBS) -lm
+ DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
+ 
+-all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint
++all: @FINAL_TARGET@ sfddiff fontimage fontlint
+ 
+ fontforge: $(@exeOBJECTS@) $(fontforge_LIBOBJECTS) exelibstamp.pre libstamp.pre
+ 	sed -e '1,$$ s/REPLACE_ME_WITH_MAJOR_VERSION/$(FF_VERSION)/' -e '1,$$ s/REPLACE_ME_WITH_MINOR_VERSION/$(FF_REVISION)/' < exelibstamp.pre > exelibstamp.c