summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-05-30 08:54:28 +0000
committerrillig <rillig@pkgsrc.org>2007-05-30 08:54:28 +0000
commit7f125459d80717a6f65cde59fcdb87bf381dc2d8 (patch)
tree9cb9969faf287080cd815dc0b06866755f0b1994 /print
parent2b5e22ff4d29ce619700d81749ac6e868c997059 (diff)
downloadpkgsrc-7f125459d80717a6f65cde59fcdb87bf381dc2d8.tar.gz
Removed some code duplication from the buildlink3 files by using the new
pkg-build-options.mk procedure.
Diffstat (limited to 'print')
-rw-r--r--print/libgnomeprint/buildlink3.mk11
-rw-r--r--print/xfce4-print/buildlink3.mk11
2 files changed, 6 insertions, 16 deletions
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 6daba76a4f8..1400221b45b 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -26,13 +26,8 @@ BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
-.if !defined(PKG_BUILD_OPTIONS.libgnomeprint)
-PKG_BUILD_OPTIONS.libgnomeprint!= \
- cd ${BUILDLINK_PKGSRCDIR.libgnomeprint} && \
- ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+= PKG_BUILD_OPTIONS.libgnomeprint=${PKG_BUILD_OPTIONS.libgnomeprint:Q}
-.endif
-MAKEVARS+= PKG_BUILD_OPTIONS.libgnomeprint
+pkgbase := libgnomeprint
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.libgnomeprint:Mcups)
. include "../../print/libgnomecups/buildlink3.mk"
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 4b9b2cba481..1b21f8c8187 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:12 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/05/30 08:54:31 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -22,13 +22,8 @@ BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
.include "../../devel/xfce4-dev-tools/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
+pkgbase := xfce4-print
+.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.xfce4-print:Mcups)
. include "../../print/cups/buildlink3.mk"