diff options
| author | Francesco Colista <francesco.colista@gmail.com> | 2011-03-02 09:26:20 +0000 |
|---|---|---|
| committer | Francesco Colista <francesco.colista@gmail.com> | 2011-03-02 09:26:20 +0000 |
| commit | 4f3272dc611e81b5c37a9c34ab63b82d9c6a2317 (patch) | |
| tree | af239468db01648e0336249d73071a210560b11d /testing/openvcp | |
| parent | a3b37bc56a794d671a61ef4bfd177840d94ec2f8 (diff) | |
| parent | 32c855584083dff4152ac2314ef0838b7019f2e6 (diff) | |
| download | aports-4f3272dc611e81b5c37a9c34ab63b82d9c6a2317.tar.bz2 aports-4f3272dc611e81b5c37a9c34ab63b82d9c6a2317.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/fcolista/aports
Conflicts:
testing/expect/APKBUILD
testing/ngrep/APKBUILD
testing/openvcp/APKBUILD
testing/perl-php-serialization/APKBUILD
testing/perl-sys-mmap/APKBUILD
testing/qpage/APKBUILD
Diffstat (limited to 'testing/openvcp')
| -rw-r--r-- | testing/openvcp/APKBUILD | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/testing/openvcp/APKBUILD b/testing/openvcp/APKBUILD index bee3a90c3c..1f3a6ab125 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 |