summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-11-04 13:27:59 +0000
committertnn <tnn@pkgsrc.org>2015-11-04 13:27:59 +0000
commit47a1a3f820e7c0e87b523d4065f6c107d2a62ebc (patch)
tree9c32925abe19521a66c1315c45bcec6d64a012dc
parent653bea7eb336e3309a98743272d36d74eae35070 (diff)
downloadpkgsrc-47a1a3f820e7c0e87b523d4065f6c107d2a62ebc.tar.gz
Use cleaner mechanism for gdiff dependency. From anonymous.
-rw-r--r--devel/rcs/Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 4f243fc36e3..af77645d17e 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/11/01 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.42 2015/11/04 13:27:59 tnn Exp $
DISTNAME= rcs-5.9.4
CATEGORIES= devel scm
@@ -11,15 +11,17 @@ COMMENT= GNU Revision Control System - version control software
LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake gsoelim
+USE_TOOLS+= gmake gsoelim diff:run diff3:run
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "AIX" || ${OPSYS} == "Minix"
-DEPENDS+= diffutils>=2.7:../../devel/diffutils
-CONFIGURE_ARGS+= --with-diffutils
+
# the native diff/diff3 is not sufficient for rcs
-TOOLS_PLATFORM.diff= ${PREFIX}/bin/gdiff
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "AIX" || ${OPSYS} == "Minix"
+TOOLS_PLATFORM.diff=
+TOOLS_PLATFORM.diff3=
.endif
+# DIFF is already in CONFIGURE_ENV
+CONFIGURE_ENV+= DIFF3=${TOOLS_PATH.diff3}
REPLACE_SH= build-aux/extract-help