pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk We have a variable _OPSYS_GPATCH_REQD, but it doesn...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/58e2e8527bee
branches:  trunk
changeset: 475539:58e2e8527bee
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Wed May 19 01:27:03 2004 +0000

description:
We have a variable _OPSYS_GPATCH_REQD, but it doesn't do anything.
Change that:  if it's set to YES, require devel/patch.  If building
devel/patch, set _OPSYS_GPATCH_REQD to NO, as otherwise we have a
circular dependency.

diffstat:

 devel/patch/Makefile |  6 +++++-
 mk/bsd.pkg.mk        |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 5eba6734a2b0 -r 58e2e8527bee devel/patch/Makefile
--- a/devel/patch/Makefile      Tue May 18 19:07:57 2004 +0000
+++ b/devel/patch/Makefile      Wed May 19 01:27:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/05/18 11:58:05 recht Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/19 01:27:03 jschauma Exp $
 #
 
 DISTNAME=      patch-2.5.4
@@ -16,6 +16,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+# This is the package that provides gpatch!  So don't create a
+# circular dependency.
+_OPSYS_GPATCH_REQD=    NO
+
 .if defined(GNU_PROGRAM_PREFIX)
 CONFIGURE_ARGS+=       --program-prefix=${GNU_PROGRAM_PREFIX}
 .endif
diff -r 5eba6734a2b0 -r 58e2e8527bee mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue May 18 19:07:57 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed May 19 01:27:03 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1460 2004/05/17 04:44:44 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1461 2004/05/19 01:27:03 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -380,6 +380,10 @@
 CONFIGURE_ENV+=                install_sh=${INSTALL:Q}
 .endif
 
+.if defined(_OPSYS_GPATCH_REQD) && !empty(_OPSYS_GPATCH_REQD:M[yY][eE][sS])
+BUILD_DEPENDS+=                patch>=2.5.4:../../devel/patch
+.endif
+
 .if defined(_OPSYS_LIBTOOL_REQD)
 LIBTOOL_REQD=          ${_OPSYS_LIBTOOL_REQD}
 .else



Home | Main Index | Thread Index | Old Index