11 files changed, 5 insertions, 129 deletions
diff --git a/packages/fget/fget_1.2.9.bb b/packages/fget/fget_1.2.9.bb
deleted file mode 100644
index d8cea880f3..0000000000
--- a/packages/fget/fget_1.2.9.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "BSD"
-DESCRIPTION = "fget is a commandline tool for mirroring \
-remote files via FTP. It was designed as an analog to the \
-GNU wget utility. The fget package includes an FTP client \
-library, so that others can make use of FTP from within \
-their own C programs."
-SECTION = "libs"
-PRIORITY = "optional"
-
-SRC_URI = "ftp://ftp-dev.cites.uiuc.edu/pub/fget/fget-${PV}.tar.gz"
-
-inherit autotools 
-
-do_configure() {
-	oe_runconf
-}
-
-do_stage() {
-	oe_libinstall -a -C lib libfget ${STAGING_LIBDIR}
-	install -m 0755 lib/libfget.h ${STAGING_INCDIR}/
-}
-
diff --git a/packages/cvs/cvs_1.11.14.bb b/packages/fget/fget_1.3.3.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/cvs/cvs_1.11.14.bb
+++ b/packages/fget/fget_1.3.3.bb
diff --git a/packages/gsl/gsl_1.4.bb b/packages/gsl/gsl_1.4.bb
index 60619a9697..5e6ea090e4 100644
--- a/packages/gsl/gsl_1.4.bb
+++ b/packages/gsl/gsl_1.4.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.mirror.ac.uk/sites/sources.redhat.com/pub/gsl/gsl-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz"
 
 inherit autotools pkgconfig binconfig
 
diff --git a/packages/ntp/ntp-ssl_4.1.2.bb b/packages/ntp/ntp-ssl_4.1.2.bb
index adaa2283fd..eb314cdf40 100644
--- a/packages/ntp/ntp-ssl_4.1.2.bb
+++ b/packages/ntp/ntp-ssl_4.1.2.bb
@@ -1,30 +1,9 @@
-DESCRIPTION = "The Network Time Protocol (NTP) is used to \
-synchronize the time of a computer client or server to \
-another server or reference time source, such as a radio \
-or satellite receiver or modem."
-SECTION = "console/network"
-PRIORITY = "optional"
+include ntp_4.1.2.bb
 DEPENDS = "openssl"
-LICENSE = "NTP"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://readline.patch;patch=1 \
-	   file://ntpdate"
 S = "${WORKDIR}/ntp-${PV}"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-openssl-libdir=${STAGING_LIBDIR} \
 	        --with-openssl-incdir=${STAGING_INCDIR}/openssl"
-CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-
-PACKAGES = "ntpdate ntp"
-
-FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate"
 
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 755 ${WORKDIR}/ntpdate ${D}${sysconfdir}/init.d
-}
diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb
index 0328268026..47b30d8300 100644
--- a/packages/ntp/ntp_4.1.2.bb
+++ b/packages/ntp/ntp_4.1.2.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "ntp"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.1/ntp-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
@@ -18,7 +18,7 @@ inherit autotools
 EXTRA_OECONF = "--without-openssl"
 CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
 
-PACKAGES = "ntpdate ntp"
+PACKAGES =+ "ntpdate"
 
 FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate"
 
diff --git a/packages/resolvconf/resolvconf_1.22.bb b/packages/resolvconf/resolvconf_1.22.bb
deleted file mode 100644
index 5f340ff0cf..0000000000
--- a/packages/resolvconf/resolvconf_1.22.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \
-information about currently available nameservers. It sets \
-itself up as the intermediary between programs that supply \
-nameserver information and programs that need nameserver \
-information."
-SECTION = "console/network"
-LICENSE = "GPL"
-AUTHOR = "Thomas Hood"
-HOMEPAGE = "http://packages.debian.org/resolvconf"
-DEPENDS = "bash"
-RDEPENDS = "bash"
-PR = "r1"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
-
-do_compile () {
-	:
-}
-
-do_install () {
-	install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface
-	install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
-	cp -a etc/* ${D}${sysconfdir}/
-	install -m 0755 bin/resolvconf ${D}${base_sbindir}/
-	install -m 0644 README ${D}${docdir}/${P}/
-	install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
-}
diff --git a/packages/uae/files/m4.patch b/packages/resolvconf/resolvconf_1.28.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/uae/files/m4.patch
+++ b/packages/resolvconf/resolvconf_1.28.bb
diff --git a/packages/uae/uae_0.8.23-20040129.bb b/packages/uae/uae_0.8.23-20040129.bb
deleted file mode 100644
index c8e1d2fc47..0000000000
--- a/packages/uae/uae_0.8.23-20040129.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Amiga Emulator based on SDL"
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "libsdl-qpe"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://rcdrummond.net/uae/uae-${PV}/uae-${PV}.tar.bz2 \
-           file://configure.patch;patch=1 \
-           file://m4.patch;patch=1"
-
-inherit autotools 
-
-EXTRA_OECONF = "--with-hostcc=gcc --disable-ui --without-x \
-		--without-gtk --enable-jit --disable-natmem \
-		--with-zlib=${STAGING_LIBDIR}/.. \
-		--with-sdl-exec-prefix=${STAGING_BINDIR}/.. \
-		--with-sdl-prefix=${STAGING_LIBDIR}/.."
-
-CFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
-CXXFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
-PARALLEL_MAKE = ""
-
-do_configure_prepend () {
-	touch NEWS AUTHORS ChangeLog
-}
-
-do_install_append() {
-# Packages NEVER, ever, ever, ever touch home directories directly.
-# ever.
-# Either update a global config in /etc, install it into /etc/skel/ for
-# new users homedirs, rely on the user installing it to put it in place,
-# or dont install it at all.  --CL
-#	install -d ${D}/home/root
-#	install ${FILESDIR}/uaerc ${D}/home/root/.uaerc
-}
diff --git a/packages/zip/zip-native_2.3.bb b/packages/zip/zip-native_2.31.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/zip/zip-native_2.3.bb
+++ b/packages/zip/zip-native_2.31.bb
diff --git a/packages/zip/zip_2.3.bb b/packages/zip/zip_2.3.bb
deleted file mode 100644
index 934d585a94..0000000000
--- a/packages/zip/zip_2.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "console/utils"
-SRC_URI = "http://www.mirror.ac.uk/sites/ftp.info-zip.org/pub/infozip/src/zip23.tar.gz"
-PR = "r2"
-LICENSE = "Info-ZIP"
-EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
-		'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
-		'BINFLAGS=0755' 'INSTALL_D=install -d'"
-
-do_compile() {
-	oe_runmake -f unix/Makefile generic
-}
-
-do_install() {
-	oe_runmake -f unix/Makefile prefix=${D}${prefix} \
-		   BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
-		   install
-}
-
diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zip/zip_2.31.bb