diff options
| author | decke <decke@FreeBSD.org> | 2012-02-21 19:59:33 +0800 |
|---|---|---|
| committer | decke <decke@FreeBSD.org> | 2012-02-21 19:59:33 +0800 |
| commit | 7715671b90a38e12d2a6508f9ec42ea25dee5aa6 (patch) | |
| tree | a39e2b09177626491ae6a3fadbfc827ab9973a43 | |
| parent | 55c177a9b333fd74e8e4579fd8ba90442f7acdaf (diff) | |
| download | freebsd-ports-gnome-7715671b90a38e12d2a6508f9ec42ea25dee5aa6.tar.gz freebsd-ports-gnome-7715671b90a38e12d2a6508f9ec42ea25dee5aa6.tar.zst freebsd-ports-gnome-7715671b90a38e12d2a6508f9ec42ea25dee5aa6.zip | |
- Add CONFLICTS_INSTALL for kBuild-devel
- Fix possible build breakage in tinderbox
- Bump PORTREVISION
Submitted by: gahr
| -rw-r--r-- | devel/kBuild/Makefile | 7 | ||||
| -rw-r--r-- | devel/kBuild/files/patch-Config.mk | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile index 88ac7778ee58..cee4621785f2 100644 --- a/devel/kBuild/Makefile +++ b/devel/kBuild/Makefile @@ -7,7 +7,7 @@ PORTNAME= kBuild DISTVERSION= ${KBUILD_VERSION}-p2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.netlabs.org/pub/kbuild/ DISTNAME= ${PORTNAME}-${DISTVERSION}-src @@ -15,9 +15,13 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= gahr@FreeBSD.org COMMENT= Makefile framework +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex + USE_AUTOTOOLS= automake autoconf USE_GMAKE= yes +CONFLICTS_INSTALL= kBuild-devel-[0-9]* + WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} KBUILD_VERSION= 0.1.5 @@ -36,6 +40,7 @@ PORTDOCS= QuickReference-kmk.html \ post-patch: ${REINPLACE_CMD} -e '11269d;11274d' ${WRKSRC}/src/sed/configure + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Config.kmk # Override autotools run-autotools: diff --git a/devel/kBuild/files/patch-Config.mk b/devel/kBuild/files/patch-Config.mk new file mode 100644 index 000000000000..140ca289171b --- /dev/null +++ b/devel/kBuild/files/patch-Config.mk @@ -0,0 +1,12 @@ +--- Config.kmk.orig 2011-08-05 14:26:26.000000000 +0200 ++++ Config.kmk 2011-08-05 14:27:04.000000000 +0200 +@@ -105,6 +105,9 @@ + if1of ($(KBUILD_TARGET), openbsd) + TOOL_FLEX_LEX = gflex + endif ++if1of ($(KBUILD_TARGET), freebsd) ++ TOOL_FLEX_LEX = %%LOCALBASE%%/bin/flex ++endif + + # + # The OS and Architecture indicators. |