diff options
| author | Tom Wambold | 2018-06-06 15:01:16 -0400 |
|---|---|---|
| committer | Tom Wambold | 2018-06-06 15:01:31 -0400 |
| commit | 2201afe68841f3f5b381f851bc6f8c03e3da0662 (patch) | |
| tree | 4a3f67919be54b9bf2007669c6f1241a03293bc2 | |
| parent | 13306a6b93fcb074c0eec0775ded3170b424451c (diff) | |
| download | aur-2201afe68841f3f5b381f851bc6f8c03e3da0662.tar.gz | |
Update to 1.2.2 release.
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 25 | ||||
| -rw-r--r-- | c++11.patch | 22 |
4 files changed, 21 insertions, 49 deletions
@@ -1,23 +1,23 @@ pkgbase = emane pkgdesc = Extendable Mobile Ad-hoc Network Emulator - pkgver = 0.9.2_r1 + pkgver = 1.2.2 pkgrel = 1 url = http://cs.itd.nrl.navy.mil/work/emane/index.php arch = i686 arch = x86_64 license = BSD - makedepends = python2 - makedepends = perl - depends = ace + makedepends = python + makedepends = protobuf depends = libxml2 depends = libpcap - optdepends = python2: Python bindings - optdepends = perl: Perl bindings + depends = pcre + depends = libutil-linux + depends = python-protobuf + depends = python-lxml + optdepends = python: Python bindings options = !libtool - source = http://downloads.pf.itd.nrl.navy.mil/emane/0.9.2-r1/emane-0.9.2-release-1.src.tar.gz - source = c++11.patch - md5sums = bac0267c492694bd545ef833d0d1f44d - md5sums = 668032102fee4b53315dc6bae4341bcc + source = https://github.com/adjacentlink/emane/archive/v1.2.2.tar.gz + md5sums = 771d48679336c1e8373527c934cbbf88 pkgname = emane diff --git a/.gitignore b/.gitignore index 464a3b732464..42c45577a211 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pkg/ /src/ -emane-*.tar.* +/emane-*.pkg.* +/v*.tar.gz @@ -1,34 +1,27 @@ # Maintainer: Tom Wambold <tom5760@gmail.com> pkgname=emane -pkgver=0.9.2_r1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Extendable Mobile Ad-hoc Network Emulator" arch=('i686' 'x86_64') url="http://cs.itd.nrl.navy.mil/work/emane/index.php" license=('BSD') options=(!libtool) -depends=(ace libxml2 libpcap) -optdepends=('python2: Python bindings' - 'perl: Perl bindings') -makedepends=(python2 perl) -source=('http://downloads.pf.itd.nrl.navy.mil/emane/0.9.2-r1/emane-0.9.2-release-1.src.tar.gz' - 'c++11.patch') -md5sums=('bac0267c492694bd545ef833d0d1f44d' - '668032102fee4b53315dc6bae4341bcc') +depends=(libxml2 libpcap pcre libutil-linux python-protobuf python-lxml) +optdepends=('python: Python bindings') +makedepends=(python protobuf) +source=("https://github.com/adjacentlink/emane/archive/v$pkgver.tar.gz") +md5sums=('771d48679336c1e8373527c934cbbf88') build() { - cd "$srcdir/emane-0.9.2-release-1/src" - bsdtar -xf emane-0.9.2.tar.gz - cd emane-0.9.2 - - patch -p1 < "$srcdir/c++11.patch" - + cd "$srcdir/emane-1.2.2" + ./autogen.sh ./configure --prefix=/usr make } package() { - cd "$srcdir/emane-0.9.2-release-1/src/emane-0.9.2" + cd "$srcdir/emane-1.2.2" make DESTDIR="$pkgdir/" install } diff --git a/c++11.patch b/c++11.patch deleted file mode 100644 index 4fa79e75c0db..000000000000 --- a/c++11.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur a/src/models/shim/commeffect/ethernetprotocolipv4rule.cc b/src/models/shim/commeffect/ethernetprotocolipv4rule.cc ---- a/src/models/shim/commeffect/ethernetprotocolipv4rule.cc 2014-03-24 10:30:59.000000000 -0400 -+++ b/src/models/shim/commeffect/ethernetprotocolipv4rule.cc 2015-06-25 13:33:21.037304851 -0400 -@@ -32,6 +32,7 @@ - * - */ - -+#include <functional> - #include "ethernetprotocolipv4rule.h" - #include "emane/net.h" - #include "emane/utils/netutils.h" -diff -Naur a/src/models/shim/commeffect/target.cc b/src/models/shim/commeffect/target.cc ---- a/src/models/shim/commeffect/target.cc 2014-03-24 10:30:59.000000000 -0400 -+++ b/src/models/shim/commeffect/target.cc 2015-06-25 13:34:47.692446865 -0400 -@@ -33,6 +33,7 @@ - - - -+#include <functional> - #include "target.h" - #include "emane/utils/netutils.h" - |