diff --git a/core/patch/APKBUILD b/core/patch/APKBUILD deleted file mode 100644 index 2006c9fb9d7..00000000000 --- a/core/patch/APKBUILD +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=patch -pkgver=2.5.9 -pkgrel=0 -pkgdesc="Utility to apply diffs to files" -url="http://www.gnu.org/software/patch/patch.html" -license='GPL' -depends='uclibc' -source=http://alpha.gnu.org/gnu/diffutils/$pkgname-$pkgver.tar.gz - -subpackages="$pkgname-doc" - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man install -} - -md5sums='dacfb618082f8d3a2194601193cf8716 patch-2.5.9.tar.gz' diff --git a/core/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch b/main/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch similarity index 100% rename from core/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch rename to main/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch diff --git a/core/abuild/APKBUILD b/main/abuild/APKBUILD similarity index 100% rename from core/abuild/APKBUILD rename to main/abuild/APKBUILD diff --git a/core/alpine-base/APKBUILD b/main/alpine-base/APKBUILD similarity index 100% rename from core/alpine-base/APKBUILD rename to main/alpine-base/APKBUILD diff --git a/core/alpine-baselayout/0001-profile-change-default-path.patch b/main/alpine-baselayout/0001-profile-change-default-path.patch similarity index 100% rename from core/alpine-baselayout/0001-profile-change-default-path.patch rename to main/alpine-baselayout/0001-profile-change-default-path.patch diff --git a/core/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD similarity index 100% rename from core/alpine-baselayout/APKBUILD rename to main/alpine-baselayout/APKBUILD diff --git a/core/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD similarity index 100% rename from core/alpine-conf/APKBUILD rename to main/alpine-conf/APKBUILD diff --git a/core/alpine-sdk/APKBUILD b/main/alpine-sdk/APKBUILD similarity index 100% rename from core/alpine-sdk/APKBUILD rename to main/alpine-sdk/APKBUILD diff --git a/core/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch b/main/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch similarity index 100% rename from core/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch rename to main/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch diff --git a/core/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch b/main/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch similarity index 100% rename from core/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch rename to main/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch diff --git a/core/apk-tools/APKBUILD b/main/apk-tools/APKBUILD similarity index 100% rename from core/apk-tools/APKBUILD rename to main/apk-tools/APKBUILD diff --git a/core/autoconf/APKBUILD b/main/autoconf/APKBUILD similarity index 100% rename from core/autoconf/APKBUILD rename to main/autoconf/APKBUILD diff --git a/core/automake/APKBUILD b/main/automake/APKBUILD similarity index 100% rename from core/automake/APKBUILD rename to main/automake/APKBUILD diff --git a/core/bash/APKBUILD b/main/bash/APKBUILD similarity index 100% rename from core/bash/APKBUILD rename to main/bash/APKBUILD diff --git a/core/bash/bash-noinfo.patch b/main/bash/bash-noinfo.patch similarity index 100% rename from core/bash/bash-noinfo.patch rename to main/bash/bash-noinfo.patch diff --git a/core/bbsuid/APKBUILD b/main/bbsuid/APKBUILD similarity index 100% rename from core/bbsuid/APKBUILD rename to main/bbsuid/APKBUILD diff --git a/core/beecrypt/APKBUILD b/main/beecrypt/APKBUILD similarity index 100% rename from core/beecrypt/APKBUILD rename to main/beecrypt/APKBUILD diff --git a/core/beecrypt/beecrypt-4.1.2-base64.patch b/main/beecrypt/beecrypt-4.1.2-base64.patch similarity index 100% rename from core/beecrypt/beecrypt-4.1.2-base64.patch rename to main/beecrypt/beecrypt-4.1.2-base64.patch diff --git a/core/binutils/APKBUILD b/main/binutils/APKBUILD similarity index 100% rename from core/binutils/APKBUILD rename to main/binutils/APKBUILD diff --git a/core/bison/APKBUILD b/main/bison/APKBUILD similarity index 100% rename from core/bison/APKBUILD rename to main/bison/APKBUILD diff --git a/core/bkeymaps/APKBUILD b/main/bkeymaps/APKBUILD similarity index 100% rename from core/bkeymaps/APKBUILD rename to main/bkeymaps/APKBUILD diff --git a/core/build-base/APKBUILD b/main/build-base/APKBUILD similarity index 100% rename from core/build-base/APKBUILD rename to main/build-base/APKBUILD diff --git a/core/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD similarity index 100% rename from core/busybox-initscripts/APKBUILD rename to main/busybox-initscripts/APKBUILD diff --git a/core/busybox-initscripts/busybox-initscripts.post-install b/main/busybox-initscripts/busybox-initscripts.post-install similarity index 100% rename from core/busybox-initscripts/busybox-initscripts.post-install rename to main/busybox-initscripts/busybox-initscripts.post-install diff --git a/core/busybox-initscripts/cron.confd b/main/busybox-initscripts/cron.confd similarity index 100% rename from core/busybox-initscripts/cron.confd rename to main/busybox-initscripts/cron.confd diff --git a/core/busybox-initscripts/cron.initd b/main/busybox-initscripts/cron.initd similarity index 100% rename from core/busybox-initscripts/cron.initd rename to main/busybox-initscripts/cron.initd diff --git a/core/busybox-initscripts/dnsd.initd b/main/busybox-initscripts/dnsd.initd similarity index 100% rename from core/busybox-initscripts/dnsd.initd rename to main/busybox-initscripts/dnsd.initd diff --git a/core/busybox-initscripts/dvbdev b/main/busybox-initscripts/dvbdev similarity index 100% rename from core/busybox-initscripts/dvbdev rename to main/busybox-initscripts/dvbdev diff --git a/core/busybox-initscripts/httpd.initd b/main/busybox-initscripts/httpd.initd similarity index 100% rename from core/busybox-initscripts/httpd.initd rename to main/busybox-initscripts/httpd.initd diff --git a/core/busybox-initscripts/ide_links b/main/busybox-initscripts/ide_links similarity index 100% rename from core/busybox-initscripts/ide_links rename to main/busybox-initscripts/ide_links diff --git a/core/busybox-initscripts/inetd.initd b/main/busybox-initscripts/inetd.initd similarity index 100% rename from core/busybox-initscripts/inetd.initd rename to main/busybox-initscripts/inetd.initd diff --git a/core/busybox-initscripts/klogd.confd b/main/busybox-initscripts/klogd.confd similarity index 100% rename from core/busybox-initscripts/klogd.confd rename to main/busybox-initscripts/klogd.confd diff --git a/core/busybox-initscripts/klogd.initd b/main/busybox-initscripts/klogd.initd similarity index 100% rename from core/busybox-initscripts/klogd.initd rename to main/busybox-initscripts/klogd.initd diff --git a/core/busybox-initscripts/mdev-mount.initd b/main/busybox-initscripts/mdev-mount.initd similarity index 100% rename from core/busybox-initscripts/mdev-mount.initd rename to main/busybox-initscripts/mdev-mount.initd diff --git a/core/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf similarity index 100% rename from core/busybox-initscripts/mdev.conf rename to main/busybox-initscripts/mdev.conf diff --git a/core/busybox-initscripts/mdev.initd b/main/busybox-initscripts/mdev.initd similarity index 100% rename from core/busybox-initscripts/mdev.initd rename to main/busybox-initscripts/mdev.initd diff --git a/core/busybox-initscripts/rdate.confd b/main/busybox-initscripts/rdate.confd similarity index 100% rename from core/busybox-initscripts/rdate.confd rename to main/busybox-initscripts/rdate.confd diff --git a/core/busybox-initscripts/rdate.initd b/main/busybox-initscripts/rdate.initd similarity index 100% rename from core/busybox-initscripts/rdate.initd rename to main/busybox-initscripts/rdate.initd diff --git a/core/busybox-initscripts/syslog.confd b/main/busybox-initscripts/syslog.confd similarity index 100% rename from core/busybox-initscripts/syslog.confd rename to main/busybox-initscripts/syslog.confd diff --git a/core/busybox-initscripts/syslog.initd b/main/busybox-initscripts/syslog.initd similarity index 100% rename from core/busybox-initscripts/syslog.initd rename to main/busybox-initscripts/syslog.initd diff --git a/core/busybox-initscripts/usbdev b/main/busybox-initscripts/usbdev similarity index 100% rename from core/busybox-initscripts/usbdev rename to main/busybox-initscripts/usbdev diff --git a/core/busybox-initscripts/usbdisk_link b/main/busybox-initscripts/usbdisk_link similarity index 100% rename from core/busybox-initscripts/usbdisk_link rename to main/busybox-initscripts/usbdisk_link diff --git a/core/busybox-initscripts/watchdog.confd b/main/busybox-initscripts/watchdog.confd similarity index 100% rename from core/busybox-initscripts/watchdog.confd rename to main/busybox-initscripts/watchdog.confd diff --git a/core/busybox-initscripts/watchdog.initd b/main/busybox-initscripts/watchdog.initd similarity index 100% rename from core/busybox-initscripts/watchdog.initd rename to main/busybox-initscripts/watchdog.initd diff --git a/core/busybox/APKBUILD b/main/busybox/APKBUILD similarity index 100% rename from core/busybox/APKBUILD rename to main/busybox/APKBUILD diff --git a/core/busybox/bb-tar-numeric-owner.patch b/main/busybox/bb-tar-numeric-owner.patch similarity index 100% rename from core/busybox/bb-tar-numeric-owner.patch rename to main/busybox/bb-tar-numeric-owner.patch diff --git a/core/busybox/busybox-1.11.1-bb.patch b/main/busybox/busybox-1.11.1-bb.patch similarity index 100% rename from core/busybox/busybox-1.11.1-bb.patch rename to main/busybox/busybox-1.11.1-bb.patch diff --git a/core/busybox/busybox-1.14.2-df.patch b/main/busybox/busybox-1.14.2-df.patch similarity index 100% rename from core/busybox/busybox-1.14.2-df.patch rename to main/busybox/busybox-1.14.2-df.patch diff --git a/core/busybox/busybox-1.14.2-ls.patch b/main/busybox/busybox-1.14.2-ls.patch similarity index 100% rename from core/busybox/busybox-1.14.2-ls.patch rename to main/busybox/busybox-1.14.2-ls.patch diff --git a/core/busybox/busybox-1.14.2-udhcpd.patch b/main/busybox/busybox-1.14.2-udhcpd.patch similarity index 100% rename from core/busybox/busybox-1.14.2-udhcpd.patch rename to main/busybox/busybox-1.14.2-udhcpd.patch diff --git a/core/busybox/busybox.post-install b/main/busybox/busybox.post-install similarity index 100% rename from core/busybox/busybox.post-install rename to main/busybox/busybox.post-install diff --git a/core/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade similarity index 100% rename from core/busybox/busybox.post-upgrade rename to main/busybox/busybox.post-upgrade diff --git a/core/busybox/busyboxconfig b/main/busybox/busyboxconfig similarity index 100% rename from core/busybox/busyboxconfig rename to main/busybox/busyboxconfig diff --git a/core/cramfs/APKBUILD b/main/cramfs/APKBUILD similarity index 100% rename from core/cramfs/APKBUILD rename to main/cramfs/APKBUILD diff --git a/core/curl/APKBUILD b/main/curl/APKBUILD similarity index 100% rename from core/curl/APKBUILD rename to main/curl/APKBUILD diff --git a/core/device-mapper/APKBUILD b/main/device-mapper/APKBUILD similarity index 100% rename from core/device-mapper/APKBUILD rename to main/device-mapper/APKBUILD diff --git a/core/distcc/APKBUILD b/main/distcc/APKBUILD similarity index 100% rename from core/distcc/APKBUILD rename to main/distcc/APKBUILD diff --git a/core/distcc/distcc-3.1-clone.patch b/main/distcc/distcc-3.1-clone.patch similarity index 100% rename from core/distcc/distcc-3.1-clone.patch rename to main/distcc/distcc-3.1-clone.patch diff --git a/core/distcc/distcc-hardened.patch b/main/distcc/distcc-hardened.patch similarity index 100% rename from core/distcc/distcc-hardened.patch rename to main/distcc/distcc-hardened.patch diff --git a/core/distcc/distccd.confd b/main/distcc/distccd.confd similarity index 100% rename from core/distcc/distccd.confd rename to main/distcc/distccd.confd diff --git a/core/distcc/distccd.initd b/main/distcc/distccd.initd similarity index 100% rename from core/distcc/distccd.initd rename to main/distcc/distccd.initd diff --git a/core/dosfstools/APKBUILD b/main/dosfstools/APKBUILD similarity index 100% rename from core/dosfstools/APKBUILD rename to main/dosfstools/APKBUILD diff --git a/core/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD similarity index 100% rename from core/e2fsprogs/APKBUILD rename to main/e2fsprogs/APKBUILD diff --git a/core/expat/APKBUILD b/main/expat/APKBUILD similarity index 100% rename from core/expat/APKBUILD rename to main/expat/APKBUILD diff --git a/core/fakeroot/APKBUILD b/main/fakeroot/APKBUILD similarity index 100% rename from core/fakeroot/APKBUILD rename to main/fakeroot/APKBUILD diff --git a/core/fakeroot/busybox-compat.patch b/main/fakeroot/busybox-compat.patch similarity index 100% rename from core/fakeroot/busybox-compat.patch rename to main/fakeroot/busybox-compat.patch diff --git a/core/file/APKBUILD b/main/file/APKBUILD similarity index 100% rename from core/file/APKBUILD rename to main/file/APKBUILD diff --git a/core/file/nocxx.patch b/main/file/nocxx.patch similarity index 100% rename from core/file/nocxx.patch rename to main/file/nocxx.patch diff --git a/core/flex/APKBUILD b/main/flex/APKBUILD similarity index 88% rename from core/flex/APKBUILD rename to main/flex/APKBUILD index 88f1f0b39b9..d44643d7765 100644 --- a/core/flex/APKBUILD +++ b/main/flex/APKBUILD @@ -1,10 +1,11 @@ +# Maintainer: Natanael Copa pkgname=flex pkgver=2.5.35 pkgrel=2 pkgdesc="A tool for generating text-scanning programs" url="http://flex.sourceforge.net" license=custom -depends='uclibc m4' +depends='m4' makedepends=m4 source="http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2" subpackages="$pkgname-doc" diff --git a/core/gcc/00_all_gcc-4.0-cvs-incompat.patch b/main/gcc/00_all_gcc-4.0-cvs-incompat.patch similarity index 100% rename from core/gcc/00_all_gcc-4.0-cvs-incompat.patch rename to main/gcc/00_all_gcc-4.0-cvs-incompat.patch diff --git a/core/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch b/main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch similarity index 100% rename from core/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch rename to main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch diff --git a/core/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch b/main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch similarity index 100% rename from core/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch rename to main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch diff --git a/core/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch b/main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch similarity index 100% rename from core/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch rename to main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch diff --git a/core/gcc/03_all_gcc-4.3.2-hardened-default.patch b/main/gcc/03_all_gcc-4.3.2-hardened-default.patch similarity index 100% rename from core/gcc/03_all_gcc-4.3.2-hardened-default.patch rename to main/gcc/03_all_gcc-4.3.2-hardened-default.patch diff --git a/core/gcc/APKBUILD b/main/gcc/APKBUILD similarity index 100% rename from core/gcc/APKBUILD rename to main/gcc/APKBUILD diff --git a/core/gcc/gcc-4.2.0-cc1-no-stack-protector.patch b/main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch similarity index 100% rename from core/gcc/gcc-4.2.0-cc1-no-stack-protector.patch rename to main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch diff --git a/core/gcc/gcc-spec-env.patch b/main/gcc/gcc-spec-env.patch similarity index 100% rename from core/gcc/gcc-spec-env.patch rename to main/gcc/gcc-spec-env.patch diff --git a/core/gcc/gcc4-stack-protector-uclibc-no_tls.patch b/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch similarity index 100% rename from core/gcc/gcc4-stack-protector-uclibc-no_tls.patch rename to main/gcc/gcc4-stack-protector-uclibc-no_tls.patch diff --git a/core/gcc/pt_gnu_eh_frame.patch b/main/gcc/pt_gnu_eh_frame.patch similarity index 100% rename from core/gcc/pt_gnu_eh_frame.patch rename to main/gcc/pt_gnu_eh_frame.patch diff --git a/core/git/APKBUILD b/main/git/APKBUILD similarity index 100% rename from core/git/APKBUILD rename to main/git/APKBUILD diff --git a/core/git/bb-tar.patch b/main/git/bb-tar.patch similarity index 100% rename from core/git/bb-tar.patch rename to main/git/bb-tar.patch diff --git a/core/gmp/APKBUILD b/main/gmp/APKBUILD similarity index 93% rename from core/gmp/APKBUILD rename to main/gmp/APKBUILD index 71a61e81914..82651e897d3 100644 --- a/core/gmp/APKBUILD +++ b/main/gmp/APKBUILD @@ -1,3 +1,4 @@ +# Maintainer: Natanael Copa pkgname=gmp pkgver=4.3.1 pkgrel=0 @@ -5,6 +6,7 @@ pkgdesc="A free library for arbitrary precision arithmetic" url="http://gmplib.org/" license="LGPL3" makedepends="m4 texinfo" +depends= subpackages="$pkgname-doc $pkgname-dev" source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2 gmp-4.1.4-noexecstack.patch diff --git a/core/gmp/gmp-4.1.4-noexecstack.patch b/main/gmp/gmp-4.1.4-noexecstack.patch similarity index 100% rename from core/gmp/gmp-4.1.4-noexecstack.patch rename to main/gmp/gmp-4.1.4-noexecstack.patch diff --git a/core/groff/APKBUILD b/main/groff/APKBUILD similarity index 100% rename from core/groff/APKBUILD rename to main/groff/APKBUILD diff --git a/core/installkernel/APKBUILD b/main/installkernel/APKBUILD similarity index 100% rename from core/installkernel/APKBUILD rename to main/installkernel/APKBUILD diff --git a/core/iproute2/APKBUILD b/main/iproute2/APKBUILD similarity index 100% rename from core/iproute2/APKBUILD rename to main/iproute2/APKBUILD diff --git a/core/iproute2/iproute2.post-deinstall b/main/iproute2/iproute2.post-deinstall similarity index 100% rename from core/iproute2/iproute2.post-deinstall rename to main/iproute2/iproute2.post-deinstall diff --git a/core/iproute2/iproute2.post-install b/main/iproute2/iproute2.post-install similarity index 100% rename from core/iproute2/iproute2.post-install rename to main/iproute2/iproute2.post-install diff --git a/core/iptables/APKBUILD b/main/iptables/APKBUILD similarity index 100% rename from core/iptables/APKBUILD rename to main/iptables/APKBUILD diff --git a/core/iptables/iptables-1.4.2-include-in.patch b/main/iptables/iptables-1.4.2-include-in.patch similarity index 100% rename from core/iptables/iptables-1.4.2-include-in.patch rename to main/iptables/iptables-1.4.2-include-in.patch diff --git a/core/iptables/iptables.confd b/main/iptables/iptables.confd similarity index 100% rename from core/iptables/iptables.confd rename to main/iptables/iptables.confd diff --git a/core/iptables/iptables.initd b/main/iptables/iptables.initd similarity index 100% rename from core/iptables/iptables.initd rename to main/iptables/iptables.initd diff --git a/core/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD similarity index 100% rename from core/iscsitarget-grsec/APKBUILD rename to main/iscsitarget-grsec/APKBUILD diff --git a/core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch similarity index 100% rename from core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch rename to main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch diff --git a/core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch similarity index 100% rename from core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch rename to main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch diff --git a/core/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD similarity index 100% rename from core/iscsitarget/APKBUILD rename to main/iscsitarget/APKBUILD diff --git a/core/iscsitarget/ietd.confd b/main/iscsitarget/ietd.confd similarity index 100% rename from core/iscsitarget/ietd.confd rename to main/iscsitarget/ietd.confd diff --git a/core/iscsitarget/ietd.initd b/main/iscsitarget/ietd.initd similarity index 100% rename from core/iscsitarget/ietd.initd rename to main/iscsitarget/ietd.initd diff --git a/core/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch b/main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch similarity index 100% rename from core/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch rename to main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch diff --git a/core/iscsitarget/iscsitarget-0.4.17-build.patch b/main/iscsitarget/iscsitarget-0.4.17-build.patch similarity index 100% rename from core/iscsitarget/iscsitarget-0.4.17-build.patch rename to main/iscsitarget/iscsitarget-0.4.17-build.patch diff --git a/core/libpcap/APKBUILD b/main/libpcap/APKBUILD similarity index 100% rename from core/libpcap/APKBUILD rename to main/libpcap/APKBUILD diff --git a/core/libpcap/libpcap-1.0.0-LDFLAGS.patch b/main/libpcap/libpcap-1.0.0-LDFLAGS.patch similarity index 100% rename from core/libpcap/libpcap-1.0.0-LDFLAGS.patch rename to main/libpcap/libpcap-1.0.0-LDFLAGS.patch diff --git a/core/libpcap/libpcap-any.patch b/main/libpcap/libpcap-any.patch similarity index 100% rename from core/libpcap/libpcap-any.patch rename to main/libpcap/libpcap-any.patch diff --git a/core/libtool/APKBUILD b/main/libtool/APKBUILD similarity index 100% rename from core/libtool/APKBUILD rename to main/libtool/APKBUILD diff --git a/core/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch b/main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch similarity index 100% rename from core/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch rename to main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch diff --git a/core/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch b/main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch similarity index 100% rename from core/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch rename to main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch diff --git a/core/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD similarity index 100% rename from core/linux-grsec/APKBUILD rename to main/linux-grsec/APKBUILD diff --git a/core/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch similarity index 100% rename from core/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch rename to main/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch diff --git a/core/linux-grsec/kernelconfig b/main/linux-grsec/kernelconfig similarity index 100% rename from core/linux-grsec/kernelconfig rename to main/linux-grsec/kernelconfig diff --git a/core/linux-grsec/linux-grsec.post-install b/main/linux-grsec/linux-grsec.post-install similarity index 100% rename from core/linux-grsec/linux-grsec.post-install rename to main/linux-grsec/linux-grsec.post-install diff --git a/core/linux-grsec/linux-grsec.post-upgrade b/main/linux-grsec/linux-grsec.post-upgrade similarity index 100% rename from core/linux-grsec/linux-grsec.post-upgrade rename to main/linux-grsec/linux-grsec.post-upgrade diff --git a/core/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch b/main/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch similarity index 100% rename from core/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch rename to main/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch diff --git a/core/linux-headers/APKBUILD b/main/linux-headers/APKBUILD similarity index 100% rename from core/linux-headers/APKBUILD rename to main/linux-headers/APKBUILD diff --git a/core/linux-headers/linux-nbma-mroute-v4-2.6.29.diff b/main/linux-headers/linux-nbma-mroute-v4-2.6.29.diff similarity index 100% rename from core/linux-headers/linux-nbma-mroute-v4-2.6.29.diff rename to main/linux-headers/linux-nbma-mroute-v4-2.6.29.diff diff --git a/core/lvm2/APKBUILD b/main/lvm2/APKBUILD similarity index 100% rename from core/lvm2/APKBUILD rename to main/lvm2/APKBUILD diff --git a/core/lvm2/lvm.initd b/main/lvm2/lvm.initd similarity index 100% rename from core/lvm2/lvm.initd rename to main/lvm2/lvm.initd diff --git a/core/m4/APKBUILD b/main/m4/APKBUILD similarity index 100% rename from core/m4/APKBUILD rename to main/m4/APKBUILD diff --git a/core/make/APKBUILD b/main/make/APKBUILD similarity index 100% rename from core/make/APKBUILD rename to main/make/APKBUILD diff --git a/core/mdadm/APKBUILD b/main/mdadm/APKBUILD similarity index 100% rename from core/mdadm/APKBUILD rename to main/mdadm/APKBUILD diff --git a/core/mdadm/mdadm-raid.initd b/main/mdadm/mdadm-raid.initd similarity index 100% rename from core/mdadm/mdadm-raid.initd rename to main/mdadm/mdadm-raid.initd diff --git a/core/mdadm/mdadm.confd b/main/mdadm/mdadm.confd similarity index 100% rename from core/mdadm/mdadm.confd rename to main/mdadm/mdadm.confd diff --git a/core/mdadm/mdadm.initd b/main/mdadm/mdadm.initd similarity index 100% rename from core/mdadm/mdadm.initd rename to main/mdadm/mdadm.initd diff --git a/core/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD similarity index 100% rename from core/mkinitfs/APKBUILD rename to main/mkinitfs/APKBUILD diff --git a/core/module-init-tools/APKBUILD b/main/module-init-tools/APKBUILD similarity index 100% rename from core/module-init-tools/APKBUILD rename to main/module-init-tools/APKBUILD diff --git a/core/mpfr/APKBUILD b/main/mpfr/APKBUILD similarity index 100% rename from core/mpfr/APKBUILD rename to main/mpfr/APKBUILD diff --git a/core/mtools/APKBUILD b/main/mtools/APKBUILD similarity index 100% rename from core/mtools/APKBUILD rename to main/mtools/APKBUILD diff --git a/core/nasm/APKBUILD b/main/nasm/APKBUILD similarity index 100% rename from core/nasm/APKBUILD rename to main/nasm/APKBUILD diff --git a/core/ncurses/APKBUILD b/main/ncurses/APKBUILD similarity index 91% rename from core/ncurses/APKBUILD rename to main/ncurses/APKBUILD index 451c5026107..6bd01f640d5 100644 --- a/core/ncurses/APKBUILD +++ b/main/ncurses/APKBUILD @@ -1,10 +1,11 @@ +# Maintainer: Natanael Copa pkgname=ncurses pkgver=5.7 pkgrel=0 pkgdesc="Console display library" url="http://www.gnu.org/software/ncurses/" license=MIT -depends=uclibc +depends= source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz " diff --git a/core/openntpd/APKBUILD b/main/openntpd/APKBUILD similarity index 100% rename from core/openntpd/APKBUILD rename to main/openntpd/APKBUILD diff --git a/core/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff b/main/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff similarity index 100% rename from core/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff rename to main/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff diff --git a/core/openntpd/openntpd.conf.d b/main/openntpd/openntpd.conf.d similarity index 100% rename from core/openntpd/openntpd.conf.d rename to main/openntpd/openntpd.conf.d diff --git a/core/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install similarity index 100% rename from core/openntpd/openntpd.pre-install rename to main/openntpd/openntpd.pre-install diff --git a/core/openntpd/openntpd.rc b/main/openntpd/openntpd.rc similarity index 100% rename from core/openntpd/openntpd.rc rename to main/openntpd/openntpd.rc diff --git a/core/openrc/APKBUILD b/main/openrc/APKBUILD similarity index 100% rename from core/openrc/APKBUILD rename to main/openrc/APKBUILD diff --git a/core/openrc/hostname.initd b/main/openrc/hostname.initd similarity index 100% rename from core/openrc/hostname.initd rename to main/openrc/hostname.initd diff --git a/core/openrc/hwdrivers.initd b/main/openrc/hwdrivers.initd similarity index 100% rename from core/openrc/hwdrivers.initd rename to main/openrc/hwdrivers.initd diff --git a/core/openrc/keymaps.initd b/main/openrc/keymaps.initd similarity index 100% rename from core/openrc/keymaps.initd rename to main/openrc/keymaps.initd diff --git a/core/openrc/modloop.initd b/main/openrc/modloop.initd similarity index 100% rename from core/openrc/modloop.initd rename to main/openrc/modloop.initd diff --git a/core/openrc/modules.initd b/main/openrc/modules.initd similarity index 100% rename from core/openrc/modules.initd rename to main/openrc/modules.initd diff --git a/core/openrc/networking.initd b/main/openrc/networking.initd similarity index 100% rename from core/openrc/networking.initd rename to main/openrc/networking.initd diff --git a/core/openrc/openrc-0.4.3-mkmntdirs.patch b/main/openrc/openrc-0.4.3-mkmntdirs.patch similarity index 100% rename from core/openrc/openrc-0.4.3-mkmntdirs.patch rename to main/openrc/openrc-0.4.3-mkmntdirs.patch diff --git a/core/openrc/openrc-hwclock.patch b/main/openrc/openrc-hwclock.patch similarity index 100% rename from core/openrc/openrc-hwclock.patch rename to main/openrc/openrc-hwclock.patch diff --git a/core/openrc/openrc.post-install b/main/openrc/openrc.post-install similarity index 100% rename from core/openrc/openrc.post-install rename to main/openrc/openrc.post-install diff --git a/core/openrc/openrc.post-upgrade b/main/openrc/openrc.post-upgrade similarity index 100% rename from core/openrc/openrc.post-upgrade rename to main/openrc/openrc.post-upgrade diff --git a/core/openssh/APKBUILD b/main/openssh/APKBUILD similarity index 100% rename from core/openssh/APKBUILD rename to main/openssh/APKBUILD diff --git a/core/openssh/sshd.confd b/main/openssh/sshd.confd similarity index 100% rename from core/openssh/sshd.confd rename to main/openssh/sshd.confd diff --git a/core/openssh/sshd.initd b/main/openssh/sshd.initd similarity index 100% rename from core/openssh/sshd.initd rename to main/openssh/sshd.initd diff --git a/core/openssl/APKBUILD b/main/openssl/APKBUILD similarity index 100% rename from core/openssl/APKBUILD rename to main/openssl/APKBUILD diff --git a/core/openssl/openssl-0.9.8k-padlock-sha.patch b/main/openssl/openssl-0.9.8k-padlock-sha.patch similarity index 100% rename from core/openssl/openssl-0.9.8k-padlock-sha.patch rename to main/openssl/openssl-0.9.8k-padlock-sha.patch diff --git a/core/openssl/openssl-0.9.8k-quote-cc.patch b/main/openssl/openssl-0.9.8k-quote-cc.patch similarity index 100% rename from core/openssl/openssl-0.9.8k-quote-cc.patch rename to main/openssl/openssl-0.9.8k-quote-cc.patch diff --git a/core/openssl/openssl-bb-basename.patch b/main/openssl/openssl-bb-basename.patch similarity index 100% rename from core/openssl/openssl-bb-basename.patch rename to main/openssl/openssl-bb-basename.patch diff --git a/core/parted/APKBUILD b/main/parted/APKBUILD similarity index 100% rename from core/parted/APKBUILD rename to main/parted/APKBUILD diff --git a/core/parted/nocxx.patch b/main/parted/nocxx.patch similarity index 100% rename from core/parted/nocxx.patch rename to main/parted/nocxx.patch diff --git a/core/pax-utils/APKBUILD b/main/pax-utils/APKBUILD similarity index 100% rename from core/pax-utils/APKBUILD rename to main/pax-utils/APKBUILD diff --git a/core/paxctl/APKBUILD b/main/paxctl/APKBUILD similarity index 100% rename from core/paxctl/APKBUILD rename to main/paxctl/APKBUILD diff --git a/core/perl/APKBUILD b/main/perl/APKBUILD similarity index 100% rename from core/perl/APKBUILD rename to main/perl/APKBUILD diff --git a/core/pkgconfig/APKBUILD b/main/pkgconfig/APKBUILD similarity index 100% rename from core/pkgconfig/APKBUILD rename to main/pkgconfig/APKBUILD diff --git a/core/popt/APKBUILD b/main/popt/APKBUILD similarity index 84% rename from core/popt/APKBUILD rename to main/popt/APKBUILD index 6e95f26b50d..a46f218c2e9 100644 --- a/core/popt/APKBUILD +++ b/main/popt/APKBUILD @@ -1,15 +1,16 @@ +# Maintainer: Natanael Copa pkgname=popt pkgver=1.14 pkgrel=0 pkgdesc="A commandline option parser" url="http://rpm5.org" license="custom" -depends="uclibc" +depends= source="http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz" subpackages="$pkgname-doc $pkgname-dev" -build () -{ +build () +{ cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make || return 1 diff --git a/core/ppp/APKBUILD b/main/ppp/APKBUILD similarity index 100% rename from core/ppp/APKBUILD rename to main/ppp/APKBUILD diff --git a/core/ppp/ip-down b/main/ppp/ip-down similarity index 100% rename from core/ppp/ip-down rename to main/ppp/ip-down diff --git a/core/ppp/ip-up b/main/ppp/ip-up similarity index 100% rename from core/ppp/ip-up rename to main/ppp/ip-up diff --git a/core/ppp/options b/main/ppp/options similarity index 100% rename from core/ppp/options rename to main/ppp/options diff --git a/core/ppp/plog b/main/ppp/plog similarity index 100% rename from core/ppp/plog rename to main/ppp/plog diff --git a/core/ppp/poff b/main/ppp/poff similarity index 100% rename from core/ppp/poff rename to main/ppp/poff diff --git a/core/ppp/pon b/main/ppp/pon similarity index 100% rename from core/ppp/pon rename to main/ppp/pon diff --git a/core/ppp/pon.1 b/main/ppp/pon.1 similarity index 100% rename from core/ppp/pon.1 rename to main/ppp/pon.1 diff --git a/core/readline/APKBUILD b/main/readline/APKBUILD similarity index 100% rename from core/readline/APKBUILD rename to main/readline/APKBUILD diff --git a/core/sudo/APKBUILD b/main/sudo/APKBUILD similarity index 100% rename from core/sudo/APKBUILD rename to main/sudo/APKBUILD diff --git a/core/syslinux/APKBUILD b/main/syslinux/APKBUILD similarity index 100% rename from core/syslinux/APKBUILD rename to main/syslinux/APKBUILD diff --git a/core/syslinux/syslinux-3.72-nopie.patch b/main/syslinux/syslinux-3.72-nopie.patch similarity index 100% rename from core/syslinux/syslinux-3.72-nopie.patch rename to main/syslinux/syslinux-3.72-nopie.patch diff --git a/core/texinfo/APKBUILD b/main/texinfo/APKBUILD similarity index 87% rename from core/texinfo/APKBUILD rename to main/texinfo/APKBUILD index 27d408059a3..a8484bf43ba 100644 --- a/core/texinfo/APKBUILD +++ b/main/texinfo/APKBUILD @@ -1,10 +1,12 @@ +# Maintainer: Natanael Copa pkgname=texinfo pkgver=4.13a pkgrel=1 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" url="http://www.gnu.org/software/texinfo/" license='GPL3' -depends='uclibc ncurses' +depends= +makedepends="ncurses-dev" source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" subpackages="$pkgname-doc" diff --git a/core/uclibc++/APKBUILD b/main/uclibc++/APKBUILD similarity index 96% rename from core/uclibc++/APKBUILD rename to main/uclibc++/APKBUILD index 98f2d113880..e6545e482f3 100644 --- a/core/uclibc++/APKBUILD +++ b/main/uclibc++/APKBUILD @@ -5,8 +5,8 @@ pkgrel=3 pkgdesc="Embedded C++ library" url="http://cxx.uclibc.org/" license='GPL-2' -depends="uclibc" -makedepends="g++" +depends= +makedepends= subpackages="$pkgname-dev" source="http://cxx.uclibc.org/src/uClibc++-$pkgver.tar.bz2 associative_base.patch diff --git a/core/uclibc++/associative_base.patch b/main/uclibc++/associative_base.patch similarity index 100% rename from core/uclibc++/associative_base.patch rename to main/uclibc++/associative_base.patch diff --git a/core/uclibc++/uclibc++-gcc-4.3.patch b/main/uclibc++/uclibc++-gcc-4.3.patch similarity index 100% rename from core/uclibc++/uclibc++-gcc-4.3.patch rename to main/uclibc++/uclibc++-gcc-4.3.patch diff --git a/core/uclibc++/uclibc++config b/main/uclibc++/uclibc++config similarity index 100% rename from core/uclibc++/uclibc++config rename to main/uclibc++/uclibc++config diff --git a/core/uclibc/0001-ldd-segfault-fix.patch b/main/uclibc/0001-ldd-segfault-fix.patch similarity index 100% rename from core/uclibc/0001-ldd-segfault-fix.patch rename to main/uclibc/0001-ldd-segfault-fix.patch diff --git a/core/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch b/main/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch similarity index 100% rename from core/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch rename to main/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch diff --git a/core/uclibc/APKBUILD b/main/uclibc/APKBUILD similarity index 100% rename from core/uclibc/APKBUILD rename to main/uclibc/APKBUILD diff --git a/core/uclibc/ppoll.patch b/main/uclibc/ppoll.patch similarity index 100% rename from core/uclibc/ppoll.patch rename to main/uclibc/ppoll.patch diff --git a/core/uclibc/pthread-new-aliasing-fix.diff b/main/uclibc/pthread-new-aliasing-fix.diff similarity index 100% rename from core/uclibc/pthread-new-aliasing-fix.diff rename to main/uclibc/pthread-new-aliasing-fix.diff diff --git a/core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch b/main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch similarity index 100% rename from core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch rename to main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch diff --git a/core/uclibc/uclibc-0.9.30.1-resolv.patch b/main/uclibc/uclibc-0.9.30.1-resolv.patch similarity index 100% rename from core/uclibc/uclibc-0.9.30.1-resolv.patch rename to main/uclibc/uclibc-0.9.30.1-resolv.patch diff --git a/core/uclibc/uclibc-fork-hook.diff b/main/uclibc/uclibc-fork-hook.diff similarity index 100% rename from core/uclibc/uclibc-fork-hook.diff rename to main/uclibc/uclibc-fork-hook.diff diff --git a/core/uclibc/uclibc-i386-floating-stacks.diff b/main/uclibc/uclibc-i386-floating-stacks.diff similarity index 100% rename from core/uclibc/uclibc-i386-floating-stacks.diff rename to main/uclibc/uclibc-i386-floating-stacks.diff diff --git a/core/uclibc/uclibc-resolv-cname-fix.diff b/main/uclibc/uclibc-resolv-cname-fix.diff similarity index 100% rename from core/uclibc/uclibc-resolv-cname-fix.diff rename to main/uclibc/uclibc-resolv-cname-fix.diff diff --git a/core/uclibc/uclibcconfig b/main/uclibc/uclibcconfig similarity index 100% rename from core/uclibc/uclibcconfig rename to main/uclibc/uclibcconfig diff --git a/core/util-vserver/APKBUILD b/main/util-vserver/APKBUILD similarity index 100% rename from core/util-vserver/APKBUILD rename to main/util-vserver/APKBUILD diff --git a/core/util-vserver/util-vserver-0.30.215-touch-t.patch b/main/util-vserver/util-vserver-0.30.215-touch-t.patch similarity index 100% rename from core/util-vserver/util-vserver-0.30.215-touch-t.patch rename to main/util-vserver/util-vserver-0.30.215-touch-t.patch diff --git a/core/wireless_tools/APKBUILD b/main/wireless_tools/APKBUILD similarity index 100% rename from core/wireless_tools/APKBUILD rename to main/wireless_tools/APKBUILD diff --git a/core/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD similarity index 100% rename from core/xfsprogs/APKBUILD rename to main/xfsprogs/APKBUILD diff --git a/core/xfsprogs/xfsprogs-3.0.0-gzip.patch b/main/xfsprogs/xfsprogs-3.0.0-gzip.patch similarity index 100% rename from core/xfsprogs/xfsprogs-3.0.0-gzip.patch rename to main/xfsprogs/xfsprogs-3.0.0-gzip.patch diff --git a/core/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD similarity index 100% rename from core/xtables-addons-grsec/APKBUILD rename to main/xtables-addons-grsec/APKBUILD diff --git a/core/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD similarity index 100% rename from core/xtables-addons/APKBUILD rename to main/xtables-addons/APKBUILD diff --git a/core/zlib/APKBUILD b/main/zlib/APKBUILD similarity index 100% rename from core/zlib/APKBUILD rename to main/zlib/APKBUILD