svn commit: r313652 - head/Mk/Uses
Baptiste Daroussin
bapt at FreeBSD.org
Fri Mar 8 15:04:20 UTC 2013
Author: bapt
Date: Fri Mar 8 15:04:18 2013
New Revision: 313652
URL: http://svnweb.freebsd.org/changeset/ports/313652
Log:
- Add a short usage description inside each Uses/*.mk
- Simplify logic for Uses/bison.mk and make error message more informative
- Add error handler for Uses/fuse.mk and Uses/pathfix.mk
Submitted by: ak@, az@
Modified:
head/Mk/Uses/bison.mk
head/Mk/Uses/fuse.mk
head/Mk/Uses/pathfix.mk
Modified: head/Mk/Uses/bison.mk
==============================================================================
--- head/Mk/Uses/bison.mk Fri Mar 8 14:46:22 2013 (r313651)
+++ head/Mk/Uses/bison.mk Fri Mar 8 15:04:18 2013 (r313652)
@@ -4,24 +4,29 @@
#
# MAINTAINER: portmgr at FreeBSD.org
#
+# Feature: bison
+# Usage: USES=bison or USES=bison:ARGS
+# Valid ARGS build (default, implicit), run, both
+#
+#
.if !defined(_INCLUDE_BISON_MK)
_INCLUDE_BISON_MK= yes
_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison
.if !defined(bison_ARGS)
-BUILD_DEPENDS+= ${_BISON_DEPENDS}
-.else
+bison_ARGS=build
+.endif
+
.if ${bison_ARGS} == "build"
-BUILD_DEPENDS+= ${_BUILD_DEPENDS}
+BUILD_DEPENDS+= ${_BISON_DEPENDS}
.elif ${bison_ARGS} == "run"
-RUN_DEPENDS+= ${_BUILD_DEPENDS}
+RUN_DEPENDS+= ${_BISON_DEPENDS}
.elif ${bison_ARGS} == "both"
BUILD_DEPENDS+= ${_BISON_DEPENDS}
-RUN_DEPENDS+= ${_BUILD_DEPENDS}
+RUN_DEPENDS+= ${_BISON_DEPENDS}
.else
-IGNORE= Bad usage of USES= bison
-.endif
+IGNORE= USES=bison - invalid args: [${bison_ARGS}] specifed
.endif
.endif
Modified: head/Mk/Uses/fuse.mk
==============================================================================
--- head/Mk/Uses/fuse.mk Fri Mar 8 14:46:22 2013 (r313651)
+++ head/Mk/Uses/fuse.mk Fri Mar 8 15:04:18 2013 (r313652)
@@ -4,9 +4,18 @@
#
# MAINTAINER: portmgr at FreeBSD.org
#
+# Feature: fuse
+# Usage: USES=fuse
+# Valid ARGS does not require args
+#
+#
.if !defined(_INCLUDE_FUSE_MK)
_INCLUDE_FUSE_MK= yes
+.if defined(fuse_ARGS)
+IGNORE= USES=fuse does not require args
+.endif
+
LIB_DEPENDS+= fuse:${PORTSDIR}/sysutils/fusefs-libs
.if !exists(/sbin/mount_fusefs)
RUN_DEPENDS+= mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
Modified: head/Mk/Uses/pathfix.mk
==============================================================================
--- head/Mk/Uses/pathfix.mk Fri Mar 8 14:46:22 2013 (r313651)
+++ head/Mk/Uses/pathfix.mk Fri Mar 8 15:04:18 2013 (r313652)
@@ -5,9 +5,18 @@
#
# MAINTAINER: portmgr at FreeBSD.org
#
+# Feature: pathfix
+# Usage: USES=pathfix
+# Valid ARGS does not require args
+#
+#
.if !defined(_INCLUDE_PATHFIX_MK)
_INCLUDE_PATHFIX_MK= yes
+.if defined(pathfix_ARGS)
+IGNORE= USES=pathfix does not require args
+.endif
+
PATHFIX_MAKEFILEIN?= Makefile.in
pre-patch: pathfix-pre-patch
More information about the svn-ports-all
mailing list