pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/xfce4-print Convert to options framework.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c61dbc7662ee
branches: trunk
changeset: 503877:c61dbc7662ee
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Dec 01 18:21:52 2005 +0000
description:
Convert to options framework.
Add cups option handling to buildlink3.mk (USE_CUPS was not properly
supported there before).
diffstat:
print/xfce4-print/Makefile | 11 +++--------
print/xfce4-print/buildlink3.mk | 14 +++++++++++++-
print/xfce4-print/options.mk | 12 ++++++++++++
3 files changed, 28 insertions(+), 9 deletions(-)
diffs (67 lines):
diff -r 7d4617fbfcc5 -r c61dbc7662ee print/xfce4-print/Makefile
--- a/print/xfce4-print/Makefile Thu Dec 01 18:21:00 2005 +0000
+++ b/print/xfce4-print/Makefile Thu Dec 01 18:21:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:04 martti Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/01 18:21:52 wiz Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -9,13 +9,8 @@
CONFIGURE_ARGS+= --with-printcap=/etc/printcap
-.include "../../print/a2ps/buildlink3.mk"
+.include "options.mk"
-.if defined(USE_CUPS)
-.include "../../print/cups/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-cups
-.endif
-
+.include "../../print/a2ps/buildlink3.mk"
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 7d4617fbfcc5 -r c61dbc7662ee print/xfce4-print/buildlink3.mk
--- a/print/xfce4-print/buildlink3.mk Thu Dec 01 18:21:00 2005 +0000
+++ b/print/xfce4-print/buildlink3.mk Thu Dec 01 18:21:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/11/09 06:42:58 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/12/01 18:21:52 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -19,4 +19,16 @@
.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+.if !defined(PKG_BUILD_OPTIONS.xfce4-print)
+PKG_BUILD_OPTIONS.xfce4-print!= \
+ cd ${BUILDLINK_PKGSRCDIR.xfce4-print} && \
+ ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+= PKG_BUILD_OPTIONS.xfce4-print=${PKG_BUILD_OPTIONS.xfce4-print:Q}
+.endif
+MAKEVARS+= PKG_BUILD_OPTIONS.xfce4-print
+
+.if !empty(PKG_BUILD_OPTIONS.xfce4-print:Mcups)
+. include "../../print/cups/buildlink3.mk"
+.endif
+
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 7d4617fbfcc5 -r c61dbc7662ee print/xfce4-print/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/xfce4-print/options.mk Thu Dec 01 18:21:52 2005 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2005/12/01 18:21:52 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-print
+PKG_SUPPORTED_OPTIONS= cups
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/cups/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-cups
+.endif
Home |
Main Index |
Thread Index |
Old Index