moved extra/* to main/

and fixed misc build issues

4 files changed, 0 insertions, 125 deletions

diff --git a/extra/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch b/extra/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
deleted file mode 100644
index 139ef99d7e..0000000000
--- a/extra/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Install with proper ownership.
-
-http://bugs.gentoo.org/24178
-
---- Makefile.in
-+++ Makefile.in
-@@ -14,10 +14,6 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
--# File ownership and group
--BINOWN = bin
--BINGRP = bin
--
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
-@@ -131,22 +127,17 @@
- 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
- 		$(INSTALL_ROOT)$(infodir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
--		$(INSTALL_ROOT)$(includedir)/gdbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
--		$(INSTALL_ROOT)$(man3dir)/gdbm.3
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
--		$(INSTALL_ROOT)$(infodir)/gdbm.info
-+	$(INSTALL_DATA) gdbm.h $(INSTALL_ROOT)$(includedir)/gdbm.h
-+	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(INSTALL_ROOT)$(man3dir)/gdbm.3
-+	$(INSTALL_DATA) $(srcdir)/gdbm.info $(INSTALL_ROOT)$(infodir)/gdbm.info
- 
- install-compat:
- 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
- 		$(INSTALL_ROOT)$(includedir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
- 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
--		$(INSTALL_ROOT)$(includedir)/dbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
--		$(INSTALL_ROOT)$(includedir)/ndbm.h
-+	$(INSTALL_DATA) $(srcdir)/dbm.h $(INSTALL_ROOT)$(includedir)/dbm.h
-+	$(INSTALL_DATA) $(srcdir)/ndbm.h $(INSTALL_ROOT)$(includedir)/ndbm.h
- 
- #libgdbm.a: $(OBJS) gdbm.h
- #	rm -f libgdbm.a
diff --git a/extra/gdbm/20-gdbm-1.8.3-compat-linking.patch b/extra/gdbm/20-gdbm-1.8.3-compat-linking.patch
deleted file mode 100644
index 1337d08f5b..0000000000
--- a/extra/gdbm/20-gdbm-1.8.3-compat-linking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Since libgdbm_compat uses libgdbm, make sure we link it in.
-
-http://bugs.gentoo.org/165263
-
---- Makefile.in
-+++ Makefile.in
-@@ -161,10 +161,10 @@
- 	$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
- 		-version-info $(SHLIB_VER) $(LOBJS)
- 
--libgdbm_compat.la: $(C_LOBJS) gdbm.h
-+libgdbm_compat.la: $(C_LOBJS) gdbm.h libgdbm.la
- 	rm -f libgdbm_compat.la
- 	$(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
--		-version-info $(SHLIB_VER) $(C_LOBJS)
-+		-version-info $(SHLIB_VER) $(C_LOBJS) libgdbm.la
- 
- gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
- 	rm -f gdbm.h
diff --git a/extra/gdbm/30-gdbm-1.8.3-build.patch b/extra/gdbm/30-gdbm-1.8.3-build.patch
deleted file mode 100644
index 084f5a1d24..0000000000
--- a/extra/gdbm/30-gdbm-1.8.3-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Respect system LDFLAGS when generating gdbm libs
-
-http://bugs.gentoo.org/209730
-
---- Makefile.in
-+++ Makefile.in
-@@ -146,12 +146,12 @@
- 
- libgdbm.la: $(LOBJS) gdbm.h
- 	rm -f libgdbm.la
--	$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm.la -rpath $(libdir) \
- 		-version-info $(SHLIB_VER) $(LOBJS)
- 
- libgdbm_compat.la: $(C_LOBJS) gdbm.h libgdbm.la
- 	rm -f libgdbm_compat.la
--	$(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm_compat.la -rpath $(libdir) \
- 		-version-info $(SHLIB_VER) $(C_LOBJS) libgdbm.la
- 
- gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
diff --git a/extra/gdbm/APKBUILD b/extra/gdbm/APKBUILD
deleted file mode 100644
index e20966b323..0000000000
--- a/extra/gdbm/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
-pkgname=gdbm
-pkgver=1.8.3
-pkgrel=0
-pkgdesc="GNU dbm is a set of database routines that use extensible hashing"
-url="http://www.gnu.org/software/gdbm/"
-license="GPL"
-depends="uclibc"
-makedepends=""
-install=
-subpackages="$pkgname-dev $pkgname-dev"
-source="ftp://ftp.nluug.nl/pub/gnu/gdbm/gdbm-1.8.3.tar.gz
-30-gdbm-1.8.3-build.patch
-20-gdbm-1.8.3-compat-linking.patch
-10-gdbm-1.8.3-fix-install-ownership.patch"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	
-	for i in ../*.patch; do
-		msg "Applying $i"
-		patch -p0 < $i || return 1
-	done
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/gdbm \
-		--disable-dependency-tracking \
-		--enable-fast-install
-	make || return 1
-	make INSTALL_ROOT="$pkgdir" install || return 1
-	make INSTALL_ROOT="$pkgdir" install-compat || return 1
-	mv "${pkgdir}"/usr/include/gdbm/gdbm.h "${pkgdir}"/usr/include/
-
-}
-
-md5sums="1d1b1d5c0245b1c00aff92da751e9aa1  gdbm-1.8.3.tar.gz
-5e76bc4f51640434e4279e940f6c73fb  30-gdbm-1.8.3-build.patch
-c8e2323a9e075d5c947cb7c7aeae5384  20-gdbm-1.8.3-compat-linking.patch
-4c7b88079898d7cb380e95c8ae99a9f9  10-gdbm-1.8.3-fix-install-ownership.patch"