Date: Sunday, January 29, 2023 @ 21:04:25
  Author: felixonmars
Revision: 1391140

upgpkg: n2n 3.1.1-2: attempt to properly enable optional features

Modified:
  n2n/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-29 20:55:50 UTC (rev 1391139)
+++ PKGBUILD    2023-01-29 21:04:25 UTC (rev 1391140)
@@ -2,14 +2,14 @@
 
 pkgname=n2n
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Peer-to-peer VPN software which makes it easy to create virtual 
networks bypassing intermediate firewalls"
 arch=('x86_64')
 url="https://github.com/ntop/n2n";
 license=('GPL')
-depends=('libcap' 'openssl')
+depends=('libcap' 'openssl' 'miniupnpc' 'zstd')
 optdepends=('libpcap: for n2n-decode')
-makedepends=('cmake' 'ninja' 'libpcap')
+makedepends=('libpcap')
 backup=('etc/n2n/edge.conf'
         'etc/n2n/supernode.conf')
 source=("https://github.com/ntop/n2n/archive/$pkgver/n2n-$pkgver.tar.gz";)
@@ -17,7 +17,7 @@
 
 prepare() {
   cd $pkgname-$pkgver
-  sed -i 's/RUNTIME DESTINATION sbin/RUNTIME DESTINATION bin/' CMakeLists.txt
+  sed -i 's|/sbin|/bin|' Makefile.in
   sed -i 's|/usr/sbin|/usr/bin|' packages/etc/systemd/system/*.service.in
 
   # We need a better way to make the conf file owned by the user created in 
sysusers.d...
@@ -26,14 +26,14 @@
 
 build() {
   cd $pkgname-$pkgver
-
-  cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr .
-  ninja
+  ./autogen.sh
+  ./configure --with-zstd --with-openssl --enable-miniupnp --enable-pcap 
--enable-cap --enable-pthread
+  make
 }
 
 package() {
   cd $pkgname-$pkgver
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" SBINDIR="$pkgdir"/usr/bin make install
 
   install -Dm600 packages/etc/n2n/edge.conf.sample "$pkgdir"/etc/n2n/edge.conf
   install -Dm600 packages/etc/n2n/supernode.conf.sample 
"$pkgdir"/etc/n2n/supernode.conf

Reply via email to