summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-12-16 10:34:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-12-16 10:34:55 +0000
commit92deadb10a3801cf8d01d4ace5065f1113f340a7 (patch)
tree603bd4aa9b34595da4bbfb9fd369c5c0618b7379
parentecbf14947c895c7ba40a99a3ac1c96acf60ec5cc (diff)
parent4e7c99b0941bbcdbc639e9001e71edcdd73cd60b (diff)
downloadaports-92deadb10a3801cf8d01d4ace5065f1113f340a7.tar.bz2
aports-92deadb10a3801cf8d01d4ace5065f1113f340a7.tar.xz
Merge remote branch 'larena/master'
-rw-r--r--testing/ucarp/APKBUILD20
-rw-r--r--testing/ucarp/nocxx.patch15
2 files changed, 10 insertions, 25 deletions
diff --git a/testing/ucarp/APKBUILD b/testing/ucarp/APKBUILD
index 4deee45da..e061ae0d6 100644
--- a/testing/ucarp/APKBUILD
+++ b/testing/ucarp/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor:
+# Contributor: Leonardo Arena <rnalrd@gmail.com>
# Maintainer:
pkgname=ucarp
-pkgver=1.5
+pkgver=1.5.1
pkgrel=0
pkgdesc="Share common IP and do fail over"
url="http://www.ucarp.org"
@@ -11,26 +11,26 @@ makedepends="libpcap-dev"
install=
subpackages=""
source="http://download.pureftpd.org/pub/ucarp/$pkgname-$pkgver.tar.gz
- nocxx.patch
ucarp.initd
ucarp.confd"
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch configure < ../nocxx.patch || return 1
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --infodir=/usr/share/info
+ --infodir=/usr/share/info
make || return 1
- make DESTDIR="$pkgdir" install
+}
- install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install || return 1
+ install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+ install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-md5sums="ba585233e73f0dbce80427d04f431048 ucarp-1.5.tar.gz
-28513788ba4d556ccd538867dc6205ab nocxx.patch
+md5sums="391caa69fc17ffbc8a3543d8692021c9 ucarp-1.5.1.tar.gz
e8f1e2fd144797524025343603dbe2b8 ucarp.initd
bf914f6ce4fe4fea33a45d4d5b2c1fff ucarp.confd"
diff --git a/testing/ucarp/nocxx.patch b/testing/ucarp/nocxx.patch
deleted file mode 100644
index beb1ab900..000000000
--- a/testing/ucarp/nocxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure 2004-12-07 21:34:23.205172545 +0000
-+++ b/configure 2004-12-07 21:37:17.726654782 +0000
-@@ -5148,10 +5148,8 @@
- :
- else
- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&5;}
-+ { echo "C++ sucks, ignoring ..." >&5; }; }
- fi
-
- ac_ext=cc