From 4e49b3a97e745e4470ec8e80790de254a934cf95 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Wed, 20 Nov 2013 05:37:02 +0700
Subject: development/nant: Change to repackage binary package

The source package is not compatible with latest mono

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/nant/README                          |  2 ++
 development/nant/fixup-nant_pc.diff              |  9 ---------
 development/nant/fixup-x86_64-pkgconfig_dir.diff | 12 ------------
 development/nant/nant.SlackBuild                 | 19 ++++++++++---------
 development/nant/nant.info                       |  6 +++---
 5 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 development/nant/fixup-nant_pc.diff
 delete mode 100644 development/nant/fixup-x86_64-pkgconfig_dir.diff

(limited to 'development/nant')

diff --git a/development/nant/README b/development/nant/README
index 1a8913a600..37360ff32d 100644
--- a/development/nant/README
+++ b/development/nant/README
@@ -1,2 +1,4 @@
 NAnt is a free .NET build tool.  In theory, it is kind of like make, 
 but without make's wrinkles.  In practice, it's a lot like Ant. 
+
+This is a repackaging script, not building from source
\ No newline at end of file
diff --git a/development/nant/fixup-nant_pc.diff b/development/nant/fixup-nant_pc.diff
deleted file mode 100644
index 80003efe60..0000000000
--- a/development/nant/fixup-nant_pc.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur nant-0.90.orig//etc/nant.pc.in nant-0.90/etc/nant.pc.in
---- nant-0.90.orig//etc/nant.pc.in	2008-11-03 07:56:55.000000000 -0600
-+++ nant-0.90/etc/nant.pc.in	2010-07-07 03:23:29.811833713 -0500
-@@ -1,4 +1,4 @@
--prefix=${pcfiledir}/../..
-+prefix=/usr
- extensiondir=${prefix}/share/NAnt/bin/extensions
- libdir=${prefix}/share/NAnt/bin/lib
- 
diff --git a/development/nant/fixup-x86_64-pkgconfig_dir.diff b/development/nant/fixup-x86_64-pkgconfig_dir.diff
deleted file mode 100644
index d3fd8edc96..0000000000
--- a/development/nant/fixup-x86_64-pkgconfig_dir.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur nant-0.90.orig//NAnt.build nant-0.90//NAnt.build
---- nant-0.90.orig//NAnt.build	2010-05-08 16:12:26.000000000 -0500
-+++ nant-0.90//NAnt.build	2010-07-07 03:25:12.707823923 -0500
-@@ -868,7 +868,7 @@
-             <property name="install.destdir" value="${destdir}" />
-         </if>
-         <property name="install.bindir" value="${install.destdir + path::combine(install.prefix, 'bin')}" />
--        <property name="install.pkgconfigdir" value="${install.destdir + path::combine(install.prefix, 'lib/pkgconfig')}" />
-+        <property name="install.pkgconfigdir" value="${install.destdir + path::combine(install.prefix, 'lib64/pkgconfig')}" />
-         <property name="install.copylocation" value="${install.destdir + install.nant}" />
- 
-         <!-- perform (staged) install -->
diff --git a/development/nant/nant.SlackBuild b/development/nant/nant.SlackBuild
index ad82acdb6c..e222129f5a 100644
--- a/development/nant/nant.SlackBuild
+++ b/development/nant/nant.SlackBuild
@@ -5,7 +5,7 @@
 # Written by (Asaf) (asaf@lingnu.com)
 
 PRGNAM=nant
-VERSION=${VERSION:-0.90}
+VERSION=${VERSION:-0.92}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -28,7 +28,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-bin.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -37,17 +37,18 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix prefix declaration in pkgconfig file
-patch -p1 < $CWD/fixup-nant_pc.diff
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/usr/share/NAnt
 
-# Fix pkgconfig directory on x86_64
-[ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/fixup-x86_64-pkgconfig_dir.diff
-
-make
-make install DESTDIR=$PKG prefix=/usr
+cp -R * $PKG/usr/share/NAnt
+echo '/usr/bin/mono /usr/share/NAnt/bin/NAnt.exe "$@"' > $PKG/usr/bin/nant
+chmod +x $PKG/usr/bin/nant
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/share/NAnt/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/NAnt/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+mv $PKG/usr/share/NAnt/examples $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/nant/nant.info b/development/nant/nant.info
index fd46be9d54..48c2d9c427 100644
--- a/development/nant/nant.info
+++ b/development/nant/nant.info
@@ -1,8 +1,8 @@
 PRGNAM="nant"
-VERSION="0.90"
+VERSION="0.92"
 HOMEPAGE="http://nant.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/nant/nant-0.90-src.tar.gz"
-MD5SUM="1ba849249c6ff00062ac9ea90f729b20"
+DOWNLOAD="http://downloads.sourceforge.net/nant/nant-0.92-bin.tar.gz"
+MD5SUM="1bcac3e7fab283240b78d21efa07f036"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mono"
-- 
cgit v1.2.3