testing/openvcp: new aport - ref. feature #484

testing/openvcp/APKBUILD

@@ -19,19 +19,6 @@ source="http://files.openvcp.org/$_pkgname-$_pkgver.tar.gz
 
 _builddir="$srcdir"/$_pkgname-$_pkgver
 
-prepare() {
-        local i
-	cd "$_builddir"
-	for i in $source; do
-	case $i in
-	*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-	esac
-	done
-}
-<<<<<<< HEAD
-
-=======
->>>>>>> 32c855584083dff4152ac2314ef0838b7019f2e6
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
@@ -39,10 +26,6 @@ build() {
 		--with-gnutls
 	make || return 1
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> 32c855584083dff4152ac2314ef0838b7019f2e6
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
@@ -50,8 +33,4 @@ package() {
 }
 
 md5sums="9c65d706133ea48553c90236997f1b8b  openvcpd-0.5rc3.tar.gz
-<<<<<<< HEAD
-db8efb9c086673fd2e3e2532294c7a2f  openvcp.initd"
-=======
 08cef22e3abc5824133733e17aa4e607  openvcp.initd"
->>>>>>> 32c855584083dff4152ac2314ef0838b7019f2e6