svn commit: r348106 - in head/devel/kBuild: . files
Jung-uk Kim
jkim at FreeBSD.org
Thu Mar 13 17:36:31 UTC 2014
Author: jkim
Date: Thu Mar 13 17:36:30 2014
New Revision: 348106
URL: http://svnweb.freebsd.org/changeset/ports/348106
QAT: https://qat.redports.org/buildarchive/r348106/
Log:
- Prefer USES=gmake, add OPTIONS_DEFINE=DOCS, and support staging.
- Add an upstream patch to fix kmk_sed with GCC 4.7.
http://trac.netlabs.org/kbuild/ticket/112
http://trac.netlabs.org/kbuild/changeset/2727
Added:
head/devel/kBuild/files/patch-src__sed__lib__regex_internal.c (contents, props changed)
Modified:
head/devel/kBuild/Makefile
Modified: head/devel/kBuild/Makefile
==============================================================================
--- head/devel/kBuild/Makefile Thu Mar 13 17:28:09 2014 (r348105)
+++ head/devel/kBuild/Makefile Thu Mar 13 17:36:30 2014 (r348106)
@@ -3,7 +3,7 @@
PORTNAME= kBuild
DISTVERSION= ${KBUILD_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.netlabs.org/pub/kbuild/ \
http://tmp.chruetertee.ch/ \
@@ -16,7 +16,7 @@ COMMENT= Makefile framework
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
USE_AUTOTOOLS= automake autoconf
-USE_GMAKE= yes
+USES= gmake
CONFLICTS_INSTALL= kBuild-devel-[0-9]*
@@ -46,7 +46,10 @@ ENV=
.SHELL: path="/bin/sh" unsetenv=true
.endif
-NO_STAGE= yes
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.options.mk>
+
post-patch:
${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Config.kmk
@@ -66,14 +69,14 @@ do-build:
do-install:
.for bin in ${KBUILD_BINS}
- ${INSTALL_PROGRAM} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/bin/${bin} ${STAGEDIR}${PREFIX}/bin
.endfor
- ${MKDIR} ${DATADIR}
- (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${DATADIR})
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DATADIR}
+ (cd ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/kBuild && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/out/${KBUILD_TARGET}.${KBUILD_ARCH}/release/stage${PREFIX}/share/doc/${PORTNAME}-${KBUILD_VERSION}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
Added: head/devel/kBuild/files/patch-src__sed__lib__regex_internal.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/kBuild/files/patch-src__sed__lib__regex_internal.c Thu Mar 13 17:36:30 2014 (r348106)
@@ -0,0 +1,11 @@
+--- src/sed/lib/regex_internal.c.orig 2012-07-17 18:30:18.000000000 -0400
++++ src/sed/lib/regex_internal.c 2014-03-13 12:52:57.000000000 -0400
+@@ -781,7 +781,7 @@
+ }
+
+ static unsigned char
+-internal_function __attribute ((pure))
++internal_function
+ re_string_fetch_byte_case (re_string_t *pstr)
+ {
+ if (BE (!pstr->mbs_allocated, 1))
More information about the svn-ports-head
mailing list