merge of '25bb53fbf963dd3caa035a35812ce4e881aaf682'

     and '357d97e86b9fe8fce1d432f4c1abcd5d56b0107c'

17 files changed, 158 insertions, 2 deletions

diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
index f7fdfb5466..2e63347f18 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
@@ -6,8 +6,8 @@ MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 SECTION = "net"
 LICENSE = "MIT"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_6 \
-	   cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_6 \
+SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_10 \
+	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_10 \
 	   file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name
diff --git a/packages/perl/libarchive-tar-perl-native_1.30.bb b/packages/perl/libarchive-tar-perl-native_1.30.bb
new file mode 100644
index 0000000000..172e0d64a9
--- /dev/null
+++ b/packages/perl/libarchive-tar-perl-native_1.30.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require libarchive-tar-perl_${PV}.bb
diff --git a/packages/perl/libarchive-tar-perl_1.30.bb b/packages/perl/libarchive-tar-perl_1.30.bb
new file mode 100644
index 0000000000..258cf1cb67
--- /dev/null
+++ b/packages/perl/libarchive-tar-perl_1.30.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Archive::Tar - module for manipulations of tar archives"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+DEPENDS += "libio-zlib-perl-native"
+RDEPENDS += "libio-zlib-perl"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-1.30.tar.gz"
+
+S = "${WORKDIR}/Archive-Tar-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libcompress-zlib-perl-native_1.42.bb b/packages/perl/libcompress-zlib-perl-native_1.42.bb
new file mode 100644
index 0000000000..002404a4e7
--- /dev/null
+++ b/packages/perl/libcompress-zlib-perl-native_1.42.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require libcompress-zlib-perl_${PV}.bb
diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb
new file mode 100644
index 0000000000..1dce1bf325
--- /dev/null
+++ b/packages/perl/libcompress-zlib-perl_1.42.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Compress::Zlib - Interface to zlib compression library"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.tar.gz"
+
+S = "${WORKDIR}/Compress-Zlib-${PV}"
+
+inherit cpan
+
+# Stop from searching /include - should put this in cpan class?
+export CCFLAGS = "${CFLAGS}"
diff --git a/packages/perl/libextutils-cbuilder-perl-native_0.18.bb b/packages/perl/libextutils-cbuilder-perl-native_0.18.bb
new file mode 100644
index 0000000000..91d027f09c
--- /dev/null
+++ b/packages/perl/libextutils-cbuilder-perl-native_0.18.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require libextutils-cbuilder-perl_${PV}.bb
diff --git a/packages/perl/libextutils-cbuilder-perl_0.18.bb b/packages/perl/libextutils-cbuilder-perl_0.18.bb
new file mode 100644
index 0000000000..8bf18e9f88
--- /dev/null
+++ b/packages/perl/libextutils-cbuilder-perl_0.18.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "ExtUtils::CBuilder - Compile and link C code for Perl modules"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-0.18.tar.gz"
+
+S = "${WORKDIR}/ExtUtils-CBuilder-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libextutils-parsexs-perl-native_2.16.bb b/packages/perl/libextutils-parsexs-perl-native_2.16.bb
new file mode 100644
index 0000000000..9176c524f0
--- /dev/null
+++ b/packages/perl/libextutils-parsexs-perl-native_2.16.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require libextutils-parsexs-perl_${PV}.bb
diff --git a/packages/perl/libextutils-parsexs-perl_2.16.bb b/packages/perl/libextutils-parsexs-perl_2.16.bb
new file mode 100644
index 0000000000..313a743713
--- /dev/null
+++ b/packages/perl/libextutils-parsexs-perl_2.16.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "ExtUtils::ParseXS - converts Perl XS code into C code"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.16.tar.gz"
+
+S = "${WORKDIR}/ExtUtils-ParseXS-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libio-zlib-perl-native_1.04.bb b/packages/perl/libio-zlib-perl-native_1.04.bb
new file mode 100644
index 0000000000..721aee026e
--- /dev/null
+++ b/packages/perl/libio-zlib-perl-native_1.04.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require libio-zlib-perl_${PV}.bb
diff --git a/packages/perl/libio-zlib-perl_1.04.bb b/packages/perl/libio-zlib-perl_1.04.bb
new file mode 100644
index 0000000000..b25aeeee83
--- /dev/null
+++ b/packages/perl/libio-zlib-perl_1.04.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "IO::Zlib - IO:: style interface to Compress::Zlib"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+DEPENDS = "libcompress-zlib-perl-native"
+RDEPENDS += "libcompress-zlib-perl"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.04.tar.gz"
+
+S = "${WORKDIR}/IO-Zlib-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libmodule-build-perl-native_0.2805.bb b/packages/perl/libmodule-build-perl-native_0.2805.bb
new file mode 100644
index 0000000000..65db79b150
--- /dev/null
+++ b/packages/perl/libmodule-build-perl-native_0.2805.bb
@@ -0,0 +1,4 @@
+SECTION = "libs"
+require libmodule-build-perl_${PV}.bb
+inherit native
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
diff --git a/packages/perl/libmodule-build-perl_0.2805.bb b/packages/perl/libmodule-build-perl_0.2805.bb
new file mode 100644
index 0000000000..ef646a5c1c
--- /dev/null
+++ b/packages/perl/libmodule-build-perl_0.2805.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Module::Build - Build and install Perl modules"
+SECTION = "libs"
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz"
+LICENSE = "Artistic"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+DEPENDS = "libyaml-perl-native libversion-perl-native \
+           libextutils-cbuilder-perl-native \
+           libextutils-parsexs-perl-native \
+           libarchive-tar-perl-native"
+RDEPENDS = "libyaml-perl libversion-perl libextutils-cbuilder-perl \
+            libextutils-parsexs-perl libarchive-tar-perl"
+PR = "r2"
+
+S = "${WORKDIR}/Module-Build-${PV}"
+
+inherit cpan_build
diff --git a/packages/perl/libversion-perl-native_0.6701.bb b/packages/perl/libversion-perl-native_0.6701.bb
new file mode 100644
index 0000000000..f0dfd2a084
--- /dev/null
+++ b/packages/perl/libversion-perl-native_0.6701.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require libversion-perl_${PV}.bb
diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb
new file mode 100644
index 0000000000..19b0631a04
--- /dev/null
+++ b/packages/perl/libversion-perl_0.6701.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "version - Perl extension for Version Objects"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-0.6701.tar.gz"
+
+S = "${WORKDIR}/version-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libyaml-perl-native_0.62.bb b/packages/perl/libyaml-perl-native_0.62.bb
new file mode 100644
index 0000000000..365e6084a7
--- /dev/null
+++ b/packages/perl/libyaml-perl-native_0.62.bb
@@ -0,0 +1,7 @@
+SECTION = "libs"
+
+inherit native
+
+EXTRA_CPANFLAGS += " EXPATINCPATH='${STAGING_INCDIR}' EXPATLIBPATH='${STAGING_LIBDIR}'"
+
+require libyaml-perl_${PV}.bb
diff --git a/packages/perl/libyaml-perl_0.62.bb b/packages/perl/libyaml-perl_0.62.bb
new file mode 100644
index 0000000000..2874fa9266
--- /dev/null
+++ b/packages/perl/libyaml-perl_0.62.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "YAML - YAML Ain't Markup Language (tm)"
+SECTION = "libs"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "Artistic"
+DEPENDS = "libdigest-sha1-perl-native liberror-perl-native \
+           libipc-sharelite-perl-native"
+RDEPENDS = "libdigest-sha1-perl liberror-perl libipc-sharelite-perl"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.62.tar.gz"
+
+S = "${WORKDIR}/YAML-${PV}"
+
+inherit cpan