From 21245ebc344e65cb2bf3dd0468e86c18c0b0c782 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 24 Jul 2009 17:25:17 +0000
Subject: various: misc build fixes

---
 main/conntrack-tools/APKBUILD |  2 +-
 main/iproute2/APKBUILD        |  2 +-
 main/perl/APKBUILD            | 20 +++++++++++++-------
 main/pkgconfig/APKBUILD       |  3 ++-
 4 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 50080c703..3bcc08303 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Connection tracking userspace tools"
 url="http://conntrack-tools.netfilter.org"
 license="GPL-2"
 subpackages="$pkgname-doc"
-depends="uclibc libnfnetlink libnetfilter_conntrack"
+depends=
 makedepends="pkgconfig libnfnetlink-dev libnetfilter_conntrack-dev bison flex"
 source="http://www.netfilter.org/projects/conntrack-tools/files/$pkgname-$pkgver.tar.bz2
 	conntrackd.initd
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 93f0adad2..821d304ef 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -22,7 +22,7 @@ build() {
 
 	./configure || return 1
 	make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib || return 1
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
 }
 md5sums="c1bc258a6c345905e79935ac7a3cc582  iproute2-2.6.29-1.tar.bz2
 da1571ff1c0241c5c7f333a48d908927  iproute2.post-install
diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD
index 656e09ca5..fec034e53 100644
--- a/main/perl/APKBUILD
+++ b/main/perl/APKBUILD
@@ -1,12 +1,12 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl
 pkgver=5.10.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url=http://www.perl.org
 license="Artistic GPL-2"
 source=http://www.perl.com/CPAN/src/perl-${pkgver}.tar.gz
-depends=uclibc
-
+depends=
 subpackages="$pkgname-dev $pkgname-doc miniperl"
 
 build() {
@@ -15,14 +15,19 @@ build() {
 		-Dcccdlflags='-fPIC' \
 		-Dcccdlflags='-fPIC' \
 		-Dccdlflags='-rdynamic' \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
+		-Dprefix=/usr \
+		-Dprivlib=/usr/share/perl5/core_perl \
+		-Darchlib=/usr/lib/perl5/core_perl \
+		-Dvendorprefix=/usr \
+		-Dvendorlib=/usr/share/perl5/vendor_perl \
+		-Dvendorarch=/usr/lib/perl5/vendor_perl \
+		-Dsiteprefix=/usr/local \
+		-Dsitelib=/usr/local/share/perl5/site_perl \
+		-Dsitearch=/usr/local/lib/perl5/site_perl \
 		-Dlocincpth=' ' \
 		-Doptimize="${CFLAGS}" \
 		-Duselargefiles \
 		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
 		-Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 \
 		-Dinstallman1dir=/usr/share/man/man1 \
@@ -34,6 +39,7 @@ build() {
 		-Ud_csh \
 		-Dusenm \
 		|| return 1
+#		-Dscriptdir=/usr/bin \
 
 	make
 	make install DESTDIR="$pkgdir"
diff --git a/main/pkgconfig/APKBUILD b/main/pkgconfig/APKBUILD
index 73a44f414..afdb27288 100644
--- a/main/pkgconfig/APKBUILD
+++ b/main/pkgconfig/APKBUILD
@@ -1,10 +1,11 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pkgconfig
 pkgver=0.23
 pkgrel=0
 pkgdesc="A system for managing library compile/link flags"
 url="http://pkgconfig.freedesktop.org/wiki/"
 license="GPL"
-depends="uclibc"
+depends=
 source="http://$pkgname.freedesktop.org/releases/pkg-config-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
-- 
cgit v1.2.3