summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testing/ngrep/APKBUILD4
-rw-r--r--testing/openvcp/APKBUILD10
-rw-r--r--testing/qpage/APKBUILD6
3 files changed, 14 insertions, 6 deletions
diff --git a/testing/ngrep/APKBUILD b/testing/ngrep/APKBUILD
index cdc056ddb..cf7ec7f1a 100644
--- a/testing/ngrep/APKBUILD
+++ b/testing/ngrep/APKBUILD
@@ -8,8 +8,8 @@ url="http://ngrep.sourceforge.net/"
arch="all"
license="custom"
depends=
-depends_dev=
-makedepends="libpcap-dev"
+depends_dev="libpcap-dev"
+makedepends="$depends_dev"
install=""
subpackages=""
source="http://downloads.sourceforge.net/sourceforge/ngrep/$pkgname-$pkgver.tar.bz2"
diff --git a/testing/openvcp/APKBUILD b/testing/openvcp/APKBUILD
index bee3a90c3..1f3a6ab12 100644
--- a/testing/openvcp/APKBUILD
+++ b/testing/openvcp/APKBUILD
@@ -28,7 +28,10 @@ prepare() {
esac
done
}
+<<<<<<< HEAD
+=======
+>>>>>>> 32c855584083dff4152ac2314ef0838b7019f2e6
build() {
cd "$_builddir"
./configure --prefix=/usr \
@@ -36,7 +39,10 @@ build() {
--with-gnutls
make || return 1
}
+<<<<<<< HEAD
+=======
+>>>>>>> 32c855584083dff4152ac2314ef0838b7019f2e6
package() {
cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
@@ -44,4 +50,8 @@ package() {
}
md5sums="9c65d706133ea48553c90236997f1b8b openvcpd-0.5rc3.tar.gz
+<<<<<<< HEAD
db8efb9c086673fd2e3e2532294c7a2f openvcp.initd"
+=======
+08cef22e3abc5824133733e17aa4e607 openvcp.initd"
+>>>>>>> 32c855584083dff4152ac2314ef0838b7019f2e6
diff --git a/testing/qpage/APKBUILD b/testing/qpage/APKBUILD
index c93b542c2..f0ddff4a7 100644
--- a/testing/qpage/APKBUILD
+++ b/testing/qpage/APKBUILD
@@ -7,18 +7,16 @@ pkgdesc="Sends messages to an alphanumeric pager via TAP protocol."
url="http://www.qpage.org/"
arch="all"
license="Custom"
-depends=
+depends=""
depends_dev=
-makedepends=
+makedepends="$depends_dev"
install="$pkgname.pre-install $pkgname.post-install"
source="saveas-http://archive.debian.org/debian/pool/non-free/q/$pkgname/"$pkgname"_3.3final.orig.tar.gz/$pkgname-$pkgver.tar.gz
config.input
qpage.initd
qpage.patch
"
-
_builddir="$srcdir"/$pkgname-$pkgver
-
prepare() {
cd "$_builddir"
for i in $source; do