[pkgsrc/trunk]: pkgsrc/fonts/t1lib Optionalize X11 support. Requested & test...

[uebayasi <uebayasi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed6279f7019d
branches:  trunk
changeset: 534836:ed6279f7019d
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Fri Nov 02 00:41:04 2007 +0000

description:
Optionalize X11 support.  Requested & tested by Fredrik Ljung.

Reviewed By:    abs

diffstat:

 fonts/t1lib/Makefile   |   8 ++------
 fonts/t1lib/options.mk |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 96d75a34f630 -r ed6279f7019d fonts/t1lib/Makefile
--- a/fonts/t1lib/Makefile      Thu Nov 01 23:48:50 2007 +0000
+++ b/fonts/t1lib/Makefile      Fri Nov 02 00:41:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/09/28 08:42:07 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2007/11/02 00:41:04 uebayasi Exp $
 
 DISTNAME=      t1lib-5.1.0
 PKGREVISION=   6
@@ -23,7 +23,7 @@
 CONF_FILES=    ${EGDIR}/t1lib.config.sample ${DATADIR}/t1lib.config
 CONF_FILES+=   ${EGDIR}/FontDataBase ${DATADIR}/FontDataBase
 
-.include "../../x11/libXpm/buildlink3.mk"
+.include "options.mk"
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     t1lib.config.sample
@@ -49,8 +49,4 @@
        cd ${WRKSRC}/examples;                                          \
        ${PAX} -rw FontDataBase t1example1.c t1lib.config ${DESTDIR}${EGDIR}
 
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 96d75a34f630 -r ed6279f7019d fonts/t1lib/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/t1lib/options.mk    Fri Nov 02 00:41:04 2007 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2007/11/02 00:41:04 uebayasi Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.t1lib
+PKG_SUPPORTED_OPTIONS+= x11
+PKG_SUGGESTED_OPTIONS+= x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.endif