pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/libgnomeprint Fix cups handling in buildlink3.mk...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/322cf6fc5e84
branches:  trunk
changeset: 503874:322cf6fc5e84
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 01 18:16:50 2005 +0000

description:
Fix cups handling in buildlink3.mk file.
cups is not enabled by default, so no further changes.

Users who have added cups to the options for this package should
rebuild all dependencies.

diffstat:

 print/libgnomeprint/buildlink3.mk |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r b66cc8a75fc3 -r 322cf6fc5e84 print/libgnomeprint/buildlink3.mk
--- a/print/libgnomeprint/buildlink3.mk Thu Dec 01 18:14:40 2005 +0000
+++ b/print/libgnomeprint/buildlink3.mk Thu Dec 01 18:16:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:18:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/12/01 18:16:50 wiz Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBGNOMEPRINT_BUILDLINK3_MK:=  ${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -25,8 +25,16 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 
-.if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
-.  include "../../print/cups/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
+
+.if !empty(PKG_BUILD_OPTIONS.libgnomeprint:Mcups)
+.  include "../../print/libgnomecups/buildlink3.mk"
 .endif
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}



Home | Main Index | Thread Index | Old Index