pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11 Check before redefining the target for creating sy...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce9ac058b9ee
branches:  trunk
changeset: 511679:ce9ac058b9ee
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed Apr 19 12:27:02 2006 +0000

description:
Check before redefining the target for creating symlink.
(Noticed warning that it was redefined in x11-links.)

diffstat:

 x11/compositeproto/builtin.mk |  7 ++++++-
 x11/fixesproto/builtin.mk     |  7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r b811388a7496 -r ce9ac058b9ee x11/compositeproto/builtin.mk
--- a/x11/compositeproto/builtin.mk     Wed Apr 19 12:25:15 2006 +0000
+++ b/x11/compositeproto/builtin.mk     Wed Apr 19 12:27:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2006/04/18 17:17:50 reed Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/04/19 12:27:02 reed Exp $
 
 BUILTIN_PKG:=  compositeproto
 
@@ -55,6 +55,9 @@
 .endif
 MAKEVARS+=     USE_BUILTIN.compositeproto
 
+CHECK_BUILTIN.compositeproto?=         no
+.if !empty(CHECK_BUILTIN.compositeproto:M[nN][oO])
+
 # following so old pkg-config name compositeext.pc will be available
 BUILDLINK_TARGETS+=    compositeext-symlink-pc
 
@@ -65,3 +68,5 @@
        if ${TEST} -f $${src}; then \
                ${LN} -sf $${src} $${dst}; \
        fi
+
+.endif # CHECK_BUILTIN.compositeproto
diff -r b811388a7496 -r ce9ac058b9ee x11/fixesproto/builtin.mk
--- a/x11/fixesproto/builtin.mk Wed Apr 19 12:25:15 2006 +0000
+++ b/x11/fixesproto/builtin.mk Wed Apr 19 12:27:02 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/04/18 18:03:22 reed Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/04/19 12:27:02 reed Exp $
 
 BUILTIN_PKG:=  fixesproto
 
@@ -55,6 +55,9 @@
 .endif
 MAKEVARS+=     USE_BUILTIN.fixesproto
 
+CHECK_BUILTIN.fixesproto?=     no
+.if !empty(CHECK_BUILTIN.fixesproto:M[nN][oO])
+
 # following so old pkg-config name fixesext.pc will be available
 # this is temporary and can be removed once not used
 BUILDLINK_TARGETS+=    fixesext-symlink-pc
@@ -66,3 +69,5 @@
        if ${TEST} -f $${src}; then \
                ${LN} -sf $${src} $${dst}; \
        fi
+
+.endif # CHECK_BUILTIN.fixesproto



Home | Main Index | Thread Index | Old Index