[pkgsrc/trunk]: pkgsrc/mk Follow Grant's advice: use _OPSYS_GPATCH_REQD to i...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6cd4bdb57c3
branches:  trunk
changeset: 475540:a6cd4bdb57c3
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Wed May 19 03:26:09 2004 +0000

description:
Follow Grant's advice:  use _OPSYS_GPATCH_REQD to influence _NEED_PATCH
and let tools.mk take care of the rest.

diffstat:

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

diffs (59 lines):

diff -r 58e2e8527bee -r a6cd4bdb57c3 devel/patch/Makefile
--- a/devel/patch/Makefile      Wed May 19 01:27:03 2004 +0000
+++ b/devel/patch/Makefile      Wed May 19 03:26:09 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/05/19 01:27:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2004/05/19 03:26:09 jschauma Exp $
 #
 
 DISTNAME=      patch-2.5.4
@@ -16,10 +16,6 @@
 
 .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 58e2e8527bee -r a6cd4bdb57c3 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed May 19 01:27:03 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed May 19 03:26:09 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1461 2004/05/19 01:27:03 jschauma Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1462 2004/05/19 03:26:09 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -380,10 +380,6 @@
 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
@@ -492,6 +488,9 @@
 TOUCH_FLAGS?=          -f
 
 # determine if we need a working patch(1).
+.if defined(_OPSYS_GPATCH_REQD) && !empty(_OPSYS_GPATCH_REQD:M[yY][eE][sS])
+_NEED_PATCH=           YES
+.else
 _NEED_PATCH!=          if [ -d ${PATCHDIR} ]; then \
                                if [ "`${ECHO} ${PATCHDIR}/patch-*`" != "${PATCHDIR}/patch-*" ]; then \
                                        ${ECHO} YES; \
@@ -501,6 +500,8 @@
                        else \
                                ${ECHO} NO; \
                        fi
+.endif
+
 .if defined(PATCHFILES)
 _NEED_PATCH=           YES
 .endif