diff options
| author | wiz <wiz@pkgsrc.org> | 2005-12-01 18:21:52 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-12-01 18:21:52 +0000 |
| commit | d97d5d3e778fdc13fc3433b52f453949d8c2c6f2 (patch) | |
| tree | f057368fd86c7a687a317480f62a23383740b96f | |
| parent | c5c9ee8071728be2e8f93d5fd8ffb07fae5f89e7 (diff) | |
| download | pkgsrc-d97d5d3e778fdc13fc3433b52f453949d8c2c6f2.tar.gz | |
Convert to options framework.
Add cups option handling to buildlink3.mk (USE_CUPS was not properly
supported there before).
| -rw-r--r-- | print/xfce4-print/Makefile | 11 | ||||
| -rw-r--r-- | print/xfce4-print/buildlink3.mk | 14 | ||||
| -rw-r--r-- | print/xfce4-print/options.mk | 12 |
3 files changed, 28 insertions, 9 deletions
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index 8b69e8957df..78e44397840 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -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 @@ COMMENT= Xfce print dialog CONFIGURE_ARGS+= --with-printcap=/etc/printcap -.include "../../print/a2ps/buildlink3.mk" - -.if defined(USE_CUPS) -.include "../../print/cups/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-cups -.endif +.include "options.mk" +.include "../../print/a2ps/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk index aac0874ee00..362b90f0bce 100644 --- a/print/xfce4-print/buildlink3.mk +++ b/print/xfce4-print/buildlink3.mk @@ -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 @@ BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print .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 --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk new file mode 100644 index 00000000000..ebb321a4d4c --- /dev/null +++ b/print/xfce4-print/options.mk @@ -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 |