Resolving unstable/hping merge problem

6 files changed, 76 insertions, 46 deletions

diff --git a/main/libtheora/APKBUILD b/main/libtheora/APKBUILD
index e3b3999a3d..1f4f1117bc 100644
--- a/main/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
@@ -1,26 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtheora
-pkgver=1.0
-pkgrel=1
+pkgver=1.1.1
+pkgrel=0
 pkgdesc="An open video codec developed by the Xiph.org"
 url="http://www.xiph.org"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
-makedepends="libvorbis-dev libogg-dev"
-source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2"
+makedepends="libvorbis-dev libogg-dev autoconf automake libtool"
+source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2
+	libtheora-flags.patch"
 
 depends_dev="libogg-dev"
-build ()
-{
+build() {
 	cd "$srcdir"/libtheora-$pkgver
+	patch -p1 -i ../libtheora-flags.patch || return 1
+	aclocal -I m4 && autoconf && automake || return 1
+
 	./configure --prefix=/usr \
 		--enable-shared \
 		--disable-static || return 1
 
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/libtheora-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -m755 -d ""$pkgdir"/usr/share/licenses/$pkgname"
 	install -m644 LICENSE COPYING "$pkgdir"/usr/share/licenses/$pkgname/
 }
-md5sums="c963937053f45a7878954bed37ceb182  libtheora-1.0.tar.bz2"
+md5sums="292ab65cedd5021d6b7ddd117e07cd8e  libtheora-1.1.1.tar.bz2
+7cbab1ce1f52adb98e1c241515a27aca  libtheora-flags.patch"
diff --git a/main/libtheora/libtheora-flags.patch b/main/libtheora/libtheora-flags.patch
new file mode 100644
index 0000000000..a47cc57716
--- /dev/null
+++ b/main/libtheora/libtheora-flags.patch
@@ -0,0 +1,14 @@
+diff -ur libtheora-1.0beta2.orig/configure.ac libtheora-1.0beta2/configure.ac
+--- libtheora-1.0beta2.orig/configure.ac	2007-10-13 00:01:38.000000000 +0300
++++ libtheora-1.0beta2/configure.ac	2007-11-25 22:44:49.000000000 +0200
+@@ -102,8 +102,8 @@
+         case $host in 
+         *)
+                 DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+-                CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+-                PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
++                CFLAGS="-Wall -Wno-parentheses"
++                PROFILE="-Wall -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";;
+         esac
+ fi
+ CFLAGS="$CFLAGS $cflags_save"
diff --git a/testing/hping3/APKBUILD b/testing/hping3/APKBUILD
new file mode 100644
index 0000000000..f55e1168b9
--- /dev/null
+++ b/testing/hping3/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
+pkgname=hping3
+pkgver=20051105
+pkgrel=0
+pkgdesc="A ping-like TCP/IP packet assembler/analyzer"
+url="http://www.hping.org"
+license="GPL"
+depends=""
+makedepends="libpcap-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://www.hping.org/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	sed -i -e 's:net/bpf.h:pcap/bpf.h:' libpcap_stuff.c script.c || return 1
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--no-tcl
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	install -m755 -D hping3 "$pkgdir"/usr/sbin/hping3
+	ln -s hping3 "$pkgdir"/usr/sbin/hping
+	ln -s hping3 "$pkgdir"/usr/sbin/hping2
+	install -m644 -D docs/hping2.8 "$pkgdir"/usr/share/man/man8/hping2.8
+	install -m644 -D docs/hping3.8 "$pkgdir"/usr/share/man/man8/hping3.8
+}
+
+md5sums="ca4ea4e34bcc2162aedf25df8b2d1747  hping3-20051105.tar.gz"
diff --git a/unstable/ircii/APKBUILD b/testing/ircii/APKBUILD
index 7ab3af6200..221568ba40 100644
--- a/unstable/ircii/APKBUILD
+++ b/testing/ircii/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
 pkgdesc="Universal IRC for Unix systems"
 url="http://www.eterna.com.au/ircii/"
 license="GPL"
-depends="uclibc"
-makedepends=""
+depends=
+makedepends=
 install=
 subpackages="$pkgname-doc $pkgname-dev"
 source="ftp://ircii.warped.com/pub/ircII/ircii-20080314.tar.bz2"
@@ -20,8 +20,11 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
-	make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make -j1 DESTDIR="$pkgdir" install
 }
 
 md5sums="da7fcf2a442bd25f303778eb6466eb19  ircii-20080314.tar.bz2"
diff --git a/unstable/umix/APKBUILD b/testing/umix/APKBUILD
index 1ed166b05a..7eb262f7f1 100644
--- a/unstable/umix/APKBUILD
+++ b/testing/umix/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Program for adjusting soundcard volumes"
 url="http://umix.sf.net"
 license="GPL"
-depends="uclibc ncurses"
+depends=
 makedepends="ncurses-dev"
 install=
 subpackages="$pkgname-doc"
@@ -20,8 +20,11 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
-	make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 }
 
 md5sums="e38fc288273cc8b5b34f8769f06b32ee  umix-1.0.2.tar.gz"
diff --git a/unstable/hping/APKBUILD b/unstable/hping/APKBUILD
deleted file mode 100644
index b84d2fde3a..0000000000
--- a/unstable/hping/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=hping
-_altname=hping3
-pkgver=20051105
-pkgrel=0
-pkgdesc="A ping-like TCP/IP packet assembler/analyzer"
-url="http://www.hping.org"
-license="GPL"
-depends=""
-makedepends="libpcap-dev"
-install=
-subpackages="$pkgname-doc"
-source="http://www.hping.org/$_altname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$_altname-$pkgver
- 	sed -i -e 's:net/bpf.h:pcap/bpf.h:' libpcap_stuff.c
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--no-tcl
-	make || return 1
-	make strip || return 1
-	install -m755 -D "$srcdir"/"$_altname-$pkgver"/$_altname "$pkgdir"/usr/sbin/$pkgname
-	ln -s "$pkgdir"/usr/sbin/$pkgname "$pkgdir"/usr/sbin/hping3
-	ln -s "$pkgdir"/usr/sbin/$pkgname "$pkgdir"/usr/sbin/hping2
-	install -m644 -D "$srcdir"/"$_altname-$pkgver"/docs/hping2.8 "$pkgdir"/usr/share/man/man8/hping2.8
-	install -m644 -D "$srcdir"/"$_altname-$pkgver"/docs/hping3.8 "$pkgdir"/usr/share/man/man8/hping3.8
-
-}
-
-md5sums="ca4ea4e34bcc2162aedf25df8b2d1747  hping3-20051105.tar.gz"