summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Pierre Lejeune <superheron@gmail.com> 2014-01-19 22:29:08 +0100
committerAvatar Pierre Lejeune <superheron@gmail.com> 2014-01-21 20:50:36 +0100
commit09cc53f3915499193d07a5a32311688167908227 (patch)
tree27e47c217eb38a9e25eb7add8cfef9bcb225d9ee
parent731d5f4b9656aba948baa374bd2b5e5f26e75661 (diff)
downloadmono-09cc53f3915499193d07a5a32311688167908227.tar.gz
mono-09cc53f3915499193d07a5a32311688167908227.tar.xz
dev-util/nant: Bump to 0.93_pre20130613
-rw-r--r--packages/dev-util/nant/files/nant-0.93_pre20130613-fix-exherbo-dirs.patch (renamed from packages/dev-util/nant/files/nant-0.91-fix-exherbo-dirs.patch)6
-rw-r--r--packages/dev-util/nant/files/nant-0.93_pre20130613-parallel-build-fix.patch (renamed from packages/dev-util/nant/files/nant-0.91-parallel-build-fix.patch)0
-rw-r--r--packages/dev-util/nant/nant-0.93_pre20130613.exheres-0 (renamed from packages/dev-util/nant/nant-0.91-r1.exheres-0)24
3 files changed, 20 insertions, 10 deletions
diff --git a/packages/dev-util/nant/files/nant-0.91-fix-exherbo-dirs.patch b/packages/dev-util/nant/files/nant-0.93_pre20130613-fix-exherbo-dirs.patch
index 777b40f..dd15209 100644
--- a/packages/dev-util/nant/files/nant-0.91-fix-exherbo-dirs.patch
+++ b/packages/dev-util/nant/files/nant-0.93_pre20130613-fix-exherbo-dirs.patch
@@ -4,7 +4,7 @@ Reason: Respect Exherbo dirs (i.e. LIBDIR & DOCDIR)
--- a/Makefile 2011-10-04 06:19:34.000000000 +0200
+++ b/Makefile 2012-04-29 17:00:06.854327016 +0200
-@@ -66,7 +66,7 @@
+@@ -79,7 +79,7 @@
rm -fR build bootstrap
install: bootstrap
@@ -20,10 +20,10 @@ Reason: Respect Exherbo dirs (i.e. LIBDIR & DOCDIR)
<!-- global project settings -->
<property name="project.name" value="nant" />
+ <property name="project.revision" value="" unless="${property::exists('project.revision')}" />
- <property name="project.version" value="0.91" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="0.93" unless="${property::exists('project.version')}" />
<property name="project.release.type" value="release" unless="${property::exists('project.release.type')}" /> <!-- nightly | dev | alpha | beta# | rc# | release -->
-@@ -880,13 +881,17 @@
+@@ -828,13 +829,17 @@
<property name="install.destdir" value="${destdir}" />
</if>
diff --git a/packages/dev-util/nant/files/nant-0.91-parallel-build-fix.patch b/packages/dev-util/nant/files/nant-0.93_pre20130613-parallel-build-fix.patch
index 4947811..4947811 100644
--- a/packages/dev-util/nant/files/nant-0.91-parallel-build-fix.patch
+++ b/packages/dev-util/nant/files/nant-0.93_pre20130613-parallel-build-fix.patch
diff --git a/packages/dev-util/nant/nant-0.91-r1.exheres-0 b/packages/dev-util/nant/nant-0.93_pre20130613.exheres-0
index efc32b3..6fe9b5e 100644
--- a/packages/dev-util/nant/nant-0.91-r1.exheres-0
+++ b/packages/dev-util/nant/nant-0.93_pre20130613.exheres-0
@@ -1,7 +1,11 @@
# Copyright 2009 Saleem Abdulrasool <compnerd@compnerd.org>
# Distributed under the terms of the GNU General Public License v2
-require mono sourceforge [ pnv="${PNV}-src" suffix='tar.gz' ]
+[[ ${PV} == *_pre* ]] && REVISION="_pre${PV#*_pre}"
+[[ ${PR} == 'r0' ]] || REVISION="${REVISION}-${PR}"
+
+require mono sourceforge
+require github [ rev="3074f62bdce616058f19c1d6e27bf1bdb1953849" ]
SUMMARY=".NET build tool"
@@ -12,9 +16,9 @@ MYOPTIONS=""
DEPENDENCIES="
build:
- dev-util/pkg-config[>=0.20]
+ virtual/pkg-config[>=0.20]
build+run:
- dev-lang/mono[>=1.0]
+ dev-lang/mono[>=2.0]
dev-lang/mono-basic[>=1.0]
"
@@ -23,9 +27,15 @@ DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-parallel-build-fix.patch"
DEFAULT_SRC_COMPILE_PARAMS=( TARGET='mono-2.0' )
-REVISION="$([[ ${PR} == 'r0' ]] || echo "-${PR}")"
DEFAULT_SRC_INSTALL_PARAMS=( prefix='/usr' libdir="${LIBDIR}" revision="${REVISION}" )
+src_prepare() {
+ # Uses a fake smtp server bound to 0.0.0.0, unmodifiable
+ edo rm "${WORK}/tests/NAnt.Core/Tasks/MailTaskTest.cs"
+
+ default
+}
+
src_test() {
emake run-test
}
@@ -33,8 +43,8 @@ src_test() {
src_install() {
default
- sed -e "s,${IMAGE},/,g" \
- -e "2iexport MONO_SILENT_WARNING=1" \
- -i "${IMAGE}usr/bin/nant" || die "failed to fix paths in nant"
+ edo sed -e "s,${IMAGE},/,g" \
+ -e "2iexport MONO_SILENT_WARNING=1" \
+ -i "${IMAGE}usr/bin/${PN}"
}