moved extra/* to main/

and fixed misc build issues

1 files changed, 0 insertions, 278 deletions

diff --git a/extra/squid/APKBUILD b/extra/squid/APKBUILD
deleted file mode 100644
index ac840cbbd5..0000000000
--- a/extra/squid/APKBUILD
+++ /dev/null
@@ -1,278 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
-pkgname=squid
-pkgver=2.7.6
-_ver=2.7.STABLE6
-pkgrel=5
-pkgdesc="A full-featured Web proxy cache server."
-url="http://www.squid-cache.org"
-install="squid.post-install"
-license="GPL-2"
-depends="$pkgname-errors-english logrotate"
-makedepends="openssl-dev perl-dev autoconf automake"
-subpackages="$pkgname-doc
-	$pkgname-errors-armenian:errors_armenian
-	$pkgname-errors-azerbaijani:errors_azerbaijani
-	$pkgname-errors-bulgarian:errors_bulgarian
-	$pkgname-errors-catalan:errors_catalan 
-	$pkgname-errors-czech:errors_czech
-	$pkgname-errors-danish:errors_danish
-	$pkgname-errors-dutch:errors_dutch
-	$pkgname-errors-english:errors_english
-	$pkgname-errors-estonian:errors_estonian
-	$pkgname-errors-finnish:errors_finnish
-	$pkgname-errors-french:errors_french
-	$pkgname-errors-german:errors_german
-	$pkgname-errors-greek:errors_greek
-	$pkgname-errors-hebrew:errors_hebrew
-	$pkgname-errors-hungarian:errors_hungarian
-	$pkgname-errors-italian:errors_italian
-	$pkgname-errors-japanese:errors_japanese
-	$pkgname-errors-korean:errors_korean
-	$pkgname-errors-lithuanian:errors_lithuanian
-	$pkgname-errors-polish:errors_polish
-	$pkgname-errors-portuguese:errors_portuguese
-	$pkgname-errors-romanian:errors_romanian
-	$pkgname-errors-russian-1251:errors_russian_1251
-	$pkgname-errors-russian-koi8-r:errors_russian_koi8_r
-	$pkgname-errors-serbian:errors_serbian
-	$pkgname-errors-simplify_chinese:errors_simplify_chinese
-	$pkgname-errors-slovak:errors_slovak
-	$pkgname-errors-spanish:errors_spanish
-	$pkgname-errors-swedish:errors_swedish
-	$pkgname-errors-traditional_chinese:errors_traditional_chinese
-	$pkgname-errors-turkish:errors_turkish
-	$pkgname-errors-ukrainian-1251:errors_ukrainian_1251
-	$pkgname-errors-ukrainian-koi8-u:errors_ukrainian_koi8_u
-	$pkgname-errors-ukrainian-utf8:errors_ukrainian_utf8"
-
-source="http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${_ver}.tar.bz2
-	squid.initd
-	squid.confd
-	squid.post-install
-	squid-2.7-gentoo.patch
-	$pkgname.logrotate
-	"
-
-build() {
-	cd "$srcdir/$pkgname-$_ver"
-
-	patch -p1 -i "$srcdir"/squid-2.7-gentoo.patch || return 1
-	touch NEWS AUTHORS
-	aclocal && autoconf && automake -a || return 1
-
-	./configure --prefix=/usr --datadir=/usr/share/squid \
-		--sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \
-		--localstatedir=/var --enable-auth="basic,digest,ntlm" \
-		--enable-removal-policies="lru,heap" \
-		--enable-digest-auth-helpers="password" \
-		--enable-storeio="aufs,ufs,diskd,coss,null" \
-		--enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM" \
-		--enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
-		--enable-delay-pools --enable-arp-acl --enable-ssl \
-		--enable-linux-netfilter --enable-ident-lookups \
-		--enable-useragent-log --enable-cache-digests --enable-referer-log \
-		--enable-async-io --enable-truncate --enable-arp-acl \
-		--enable-htcp --enable-carp --enable-poll --with-maxfd=4096 \
-		--enable-follow-x-forwarded-for
-
-	make || return 1
-	make DESTDIR="$pkgdir" install
-
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.logrotate \
-		"$pkgdir"/etc/logrotate.d/squid
-
-	mkdir -p "$pkgdir"/var/cache/squid "$pkgdir"/var/log/squid
-	chmod +x "$pkgdir"/usr/lib/squid/*
-}
-
-
-_mv_error() {
-	local d=usr/share/squid/errors
-	mkdir -p "$subpkgdir/$d"
-	mv "$pkgdir/$d/${1}" "$subpkgdir/$d/" || return 1
-	# last one removed the dir
-	rmdir "$pkgdir/$d" 2>/dev/null
-	return 0
-}
-
-errors_armenian() {
-	depends="$pkgname"
-	_mv_error Armenian
-}
-
-errors_azerbaijani() {
-	depends="$pkgname"
-	_mv_error Azerbaijani
-}
-
-errors_bulgarian() {
-	depends="$pkgname"
-	_mv_error Bulgarian
-}
-
-errors_catalan() {
-	depends="$pkgname"
-	_mv_error Catalan
-}
-
-errors_czech() {
-	depends="$pkgname"
-	_mv_error Czech
-}
-
-errors_danish() {
-	depends="$pkgname"
-	_mv_error Danish
-}
-
-errors_dutch() {
-	depends="$pkgname"
-	_mv_error Dutch
-}
-
-errors_english() {
-	depends="$pkgname"
-	_mv_error English
-}
-
-errors_estonian() {
-	depends="$pkgname"
-	_mv_error Estonian
-}
-
-errors_finnish() {
-	depends="$pkgname"
-	_mv_error Finnish
-}
-
-errors_french() {
-	depends="$pkgname"
-	_mv_error French
-}
-
-errors_german() {
-	depends="$pkgname"
-	_mv_error German
-}
-
-errors_greek() {
-	depends="$pkgname"
-	_mv_error Greek
-}
-
-errors_hebrew() {
-	depends="$pkgname"
-	_mv_error Hebrew
-}
-
-errors_hungarian() {
-	depends="$pkgname"
-	_mv_error Hungarian
-}
-
-errors_italian() {
-	depends="$pkgname"
-	_mv_error Italian
-}
-
-errors_japanese() {
-	depends="$pkgname"
-	_mv_error Japanese
-}
-
-errors_korean() {
-	depends="$pkgname"
-	_mv_error Korean
-}
-
-errors_lithuanian() {
-	depends="$pkgname"
-	_mv_error Lithuanian
-}
-
-errors_polish() {
-	depends="$pkgname"
-	_mv_error Polish
-}
-
-errors_portuguese() {
-	depends="$pkgname"
-	_mv_error Portuguese
-}
-
-errors_romanian() {
-	depends="$pkgname"
-	_mv_error Romanian
-}
-
-errors_russian_1251() {
-	depends="$pkgname"
-	_mv_error Russian-1251
-}
-
-errors_russian_koi8_r() {
-	depends="$pkgname"
-	_mv_error Russian-koi8-r
-}
-
-errors_serbian() {
-	depends="$pkgname"
-	_mv_error Serbian
-}
-
-errors_simplify_chinese() {
-	depends="$pkgname"
-	_mv_error Simplify_Chinese
-}
-
-errors_slovak() {
-	depends="$pkgname"
-	_mv_error Slovak
-}
-
-errors_spanish() {
-	depends="$pkgname"
-	_mv_error Spanish
-}
-
-errors_swedish() {
-	depends="$pkgname"
-	_mv_error Swedish
-}
-
-errors_traditional_chinese() {
-	depends="$pkgname"
-	_mv_error Traditional_Chinese
-}
-
-errors_turkish() {
-	depends="$pkgname"
-	_mv_error Turkish
-}
-
-errors_ukrainian_1251() {
-	depends="$pkgname"
-	_mv_error Ukrainian-1251
-}
-
-errors_ukrainian_koi8_u() {
-	depends="$pkgname"
-	_mv_error Ukrainian-koi8-u
-}
-
-errors_ukrainian_utf8() {
-	depends="$pkgname"
-	_mv_error Ukrainian-utf8
-}
-
-
-md5sums="6de3a6a7a56a7ecae092f2d31a04f039  squid-2.7.STABLE6.tar.bz2
-d31f293cf10a90bc3d60aa6428889db5  squid.initd
-44b052db7910f386ef88ddcf69c9ba4e  squid.confd
-9bf350646e321f7c38ffeb9af828ec98  squid.post-install
-1d33108353d788b238d9a8877bf2e401  squid-2.7-gentoo.patch
-58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"