6 files changed, 45 insertions, 103 deletions
diff --git a/TODO b/TODO
index d4a643502..337b968e5 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
 global:
 - projects dir idea
+- lowercase package conversion
 
 toolchain stuff:
 - config.site/config.cache usage for speedup?
@@ -13,6 +14,7 @@ base system:
 
 new or update packages:
 - port weston / wayland
+- port lftp
 - add btrfs-utils
 - port uuterm
 - port opkg with gpg signing
diff --git a/package/jack/Makefile b/package/jack/Makefile
deleted file mode 100644
index d5df467d1..000000000
--- a/package/jack/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		jack
-PKG_VERSION:=		1.9.7
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		9759670feecbd43eeccf1c0f743ec199
-PKG_DESCR:=		audio connection kit
-PKG_SECTION:=		mm/audio
-PKG_DEPENDS:=		alsa-lib
-PKG_BUILDDEP:=		python2 alsa-lib
-PKG_URL:=		http://jackaudio.org
-PKG_SITES:=		http://www.grame.fr/~letz/
-
-PKG_ARCH_DEPENDS:=	x86
-PKG_HOST_DEPENDS:=	!darwin
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,JACK,jack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-configure:
-	$(WRKSRC)/waf configure --alsa  --prefix=$(WRKINST)/usr
-
-do-build:
-	cd $(WRKSRC) && $(WRKSRC)/waf build
-
-do-install:
-	cd $(WRKSRC) && $(WRKSRC)/waf install
-
-jack-install:
-	$(INSTALL_DIR) $(IDIR_JACK)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/jack* \
-		$(IDIR_JACK)/usr/bin
-	$(INSTALL_DIR) $(IDIR_JACK)/usr/lib
-	$(INSTALL_BIN) $(WRKINST)/usr/lib/lib* \
-		$(IDIR_JACK)/usr/lib
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jack2/Makefile b/package/jack2/Makefile
new file mode 100644
index 000000000..d5cab15c9
--- /dev/null
+++ b/package/jack2/Makefile
@@ -0,0 +1,42 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		jack2
+PKG_VERSION:=		1.9.10
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9ba759b640f9012d9a5e971a26675c6e
+PKG_DESCR:=		audio connection kit
+PKG_SECTION:=		mm/audio
+PKG_DEPENDS:=		alsa-lib libsndfile
+PKG_BUILDDEP:=		python2-host alsa-lib libsndfile
+PKG_URL:=		http://jackaudio.org
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JACK2,jack2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-configure:
+	cd $(WRKBUILD) && ./waf configure --alsa --prefix=/usr
+
+do-build:
+	cd $(WRKBUILD) && ./waf build
+
+do-install:
+	cd $(WRKBUILD) && ./waf install --destdir=$(WRKINST)
+
+jack2-install:
+	$(INSTALL_DIR) $(IDIR_JACK2)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/jack* \
+		$(IDIR_JACK2)/usr/bin
+	$(INSTALL_DIR) $(IDIR_JACK2)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjack{,server,net}.so* \
+		$(IDIR_JACK2)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libaio/Makefile b/package/libaio/Makefile
deleted file mode 100644
index ab697f715..000000000
--- a/package/libaio/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		libaio
-PKG_VERSION:=		0.3.109
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		435a5b16ca6198eaf01155263d855756
-PKG_DESCR:=		asynchronous I/O library
-PKG_SECTION:=		libs/misc
-PKG_URL:=		http://www.kernel.org
-PKG_SITES:=		http://openadk.org/distfiles/
-PKG_OPTS:=		dev
-
-PKG_ARCH_DEPENDS:=	x86 x86_64
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBAIO,libaio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-CONFIG_STYLE:=		manual
-XAKE_FLAGS+=         	prefix='${WRKINST}/usr'
-
-libaio-install:
-	$(INSTALL_DIR) $(IDIR_LIBAIO)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libaio*so* \
-		$(IDIR_LIBAIO)/usr/lib
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libaio/patches/patch-src_Makefile b/package/libaio/patches/patch-src_Makefile
deleted file mode 100644
index 8fb63f7b6..000000000
--- a/package/libaio/patches/patch-src_Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- libaio-0.3.109.orig/src/Makefile	2009-10-09 20:17:02.000000000 +0200
-+++ libaio-0.3.109/src/Makefile	2012-08-18 12:47:38.000000000 +0200
-@@ -3,7 +3,8 @@ includedir=$(prefix)/include
- libdir=$(prefix)/lib
- 
- ARCH := $(shell uname -m | sed -e s/i.86/i386/)
--CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
-+CFLAGS ?= -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
-+CFLAGS += -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
- SO_CFLAGS=-shared $(CFLAGS)
- L_CFLAGS=$(CFLAGS)
- LINK_FLAGS=
-@@ -51,9 +52,10 @@ $(libname): $(libaio_sobjs) libaio.map
- 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
- 
- install: $(all_targets)
--	install -D -m 644 libaio.h $(includedir)/libaio.h
--	install -D -m 644 libaio.a $(libdir)/libaio.a
--	install -D -m 755 $(libname) $(libdir)/$(libname)
-+	mkdir -p $(includedir) $(libdir)
-+	install -m 644 libaio.h $(includedir)/libaio.h
-+	install -m 644 libaio.a $(libdir)/libaio.a
-+	install -m 755 $(libname) $(libdir)/$(libname)
- 	ln -sf $(libname) $(libdir)/$(soname)
- 	ln -sf $(libname) $(libdir)/libaio.so
- 
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 3b9ac2416..f3da0b59c 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -14,6 +14,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=gkernel/}
 
 # argp.h required
 PKG_LIBC_DEPENDS:=	glibc
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(TOPDIR)/mk/package.mk