svn commit: r320199 - in head: . Mk
Bryan Drewery
bdrewery at FreeBSD.org
Fri Jun 7 13:25:24 UTC 2013
Author: bdrewery
Date: Fri Jun 7 13:25:22 2013
New Revision: 320199
URL: http://svnweb.freebsd.org/changeset/ports/320199
Log:
Add WRKSRC_SUBDIR to simplify overriding WRKSRC:
WRKSRC= ${WRKDIR}/${DISTNAME}/src
This becomes:
WRKSRC_SUBDIR= src
Reviewed by: bapt
With hat: portmgr
Modified:
head/CHANGES
head/Mk/bsd.port.mk
Modified: head/CHANGES
==============================================================================
--- head/CHANGES Fri Jun 7 13:21:00 2013 (r320198)
+++ head/CHANGES Fri Jun 7 13:25:22 2013 (r320199)
@@ -11,6 +11,18 @@ in the release notes and/or placed into
All ports committers are allowed to commit to this file.
20130606:
+AUTHOR: bdrewery at FreeBSD.org
+
+ * WRKSRC_SUBDIR has been added to simplify overriding WRKSRC
+ to use a subdirectory:
+
+ WRKSRC= ${WRKDIR}/${DISTNAME}/src
+
+ Becomes:
+
+ WRKSRC_SUBDIR= src
+
+20130606:
AUTHOR: bapt at FreeBSD.org
The OPTIONS macro is no longer recognized, please use the new options
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Fri Jun 7 13:21:00 2013 (r320198)
+++ head/Mk/bsd.port.mk Fri Jun 7 13:25:22 2013 (r320199)
@@ -568,6 +568,9 @@ FreeBSD_MAINTAINER= portmgr at FreeBSD.org
# unpacks to.
# Default: ${WRKDIR}/${DISTNAME} unless NO_WRKSUBDIR is set,
# in which case simply ${WRKDIR}
+# WRKSRC_SUBDIR - A subdirectory of ${WRKSRC} where the distribution actually
+# build in.
+# Default: not set
# NO_WRKSUBDIR - Assume port unpacks directly into ${WRKDIR}.
# PATCHDIR - A directory containing any additional patches you made
# to port this software to FreeBSD.
@@ -1543,6 +1546,9 @@ WRKSRC?= ${WRKDIR}
.else
WRKSRC?= ${WRKDIR}/${DISTNAME}
.endif
+.if defined(WRKSRC_SUBDIR)
+WRKSRC:= ${WRKSRC}/${WRKSRC_SUBDIR}
+.endif
PATCH_WRKSRC?= ${WRKSRC}
CONFIGURE_WRKSRC?= ${WRKSRC}
More information about the svn-ports-all
mailing list