summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/SDL_gfx/Makefile29
-rw-r--r--package/SDL_ttf/Makefile27
-rw-r--r--package/alsa-utils/patches/alsa-utils-exp10-workaround.patch33
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/src/init3
-rw-r--r--package/cups/Makefile8
-rw-r--r--package/dillo/Makefile8
-rw-r--r--package/dillo/patches/patch-Makefile_in6
-rw-r--r--package/dillo/patches/patch-configure26
-rw-r--r--package/dillo/patches/patch-src_IO_Makefile_in12
-rw-r--r--package/e2fsprogs/Makefile54
-rw-r--r--package/fltk/Makefile13
-rw-r--r--package/fltk/patches/patch-Makefile12
-rw-r--r--package/fltk/patches/patch-OpenGL_Makefile11
-rw-r--r--package/fltk/patches/patch-configure20
-rw-r--r--package/fltk/patches/patch-fltk2-config_in27
-rw-r--r--package/fltk/patches/patch-images_Makefile11
-rw-r--r--package/fltk/patches/patch-makeinclude_in20
-rw-r--r--package/gdk-pixbuf/Makefile8
-rw-r--r--package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in10
-rw-r--r--package/gdk-pixbuf/patches/patch-ltmain_sh11
-rw-r--r--package/giflib/Makefile8
-rw-r--r--package/gtk+/Makefile10
-rw-r--r--package/jack/Makefile2
-rw-r--r--package/kbd/Makefile27
-rw-r--r--package/kbd/files/kbd.init26
-rw-r--r--package/kbd/files/kbd.postinst4
-rw-r--r--package/kbd/files/zaurus.map228
-rw-r--r--package/kexec-tools/Makefile28
-rw-r--r--package/kexec-tools/patches/patch-kexec_kexec_c24
-rw-r--r--package/kexecinit/Makefile26
-rwxr-xr-xpackage/kexecinit/src/kexecinit65
-rw-r--r--package/libXpm/Makefile1
-rw-r--r--package/libfm/Makefile8
-rw-r--r--package/libfm/patches/patch-Makefile_in11
-rw-r--r--package/libfm/patches/patch-config_log1143
-rw-r--r--package/libfm/patches/patch-config_log.orig1143
-rw-r--r--package/libfm/patches/patch-configure21
-rw-r--r--package/libfm/patches/patch-ltmain_sh81
-rw-r--r--package/libfm/patches/patch-src_Makefile_in40
-rw-r--r--package/libfm/patches/patch-src_Makefile_in.orig31
-rw-r--r--package/lm_sensors/Makefile64
-rw-r--r--package/log4cxx/Makefile37
-rw-r--r--package/log4cxx/patches/patch-src_Makefile_am8
-rw-r--r--package/log4cxx/patches/patch-src_Makefile_in11
-rw-r--r--package/log4cxx/patches/patch-src_examples_cpp_console_cpp11
-rw-r--r--package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp10
-rw-r--r--package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp10
-rw-r--r--package/lsscsi/Makefile26
-rw-r--r--package/mplayer/Makefile8
-rw-r--r--package/mplayer/patches/patch-libao2_ao_alsa_c14
-rw-r--r--package/pcmanfm/Makefile6
-rw-r--r--package/pcmanfm/patches/patch-ltmain_sh80
-rw-r--r--package/pcmanfm/patches/patch-ltmain_sh.orig34
-rw-r--r--package/python/Makefile12
-rw-r--r--package/python/patches/patch-Makefile_pre_in53
-rw-r--r--package/python/patches/patch-configure343
-rw-r--r--package/python/patches/patch-setup_py41
-rw-r--r--package/usbutils/Makefile4
-rw-r--r--package/vlc/Makefile46
-rw-r--r--package/vlc/patches/patch-modules_misc_Makefile_in155
-rw-r--r--package/vlc/patches/patch-src_misc_linux_specific_c19
-rw-r--r--package/xcb-util/Makefile23
-rw-r--r--package/xf86-input-evdev/Makefile25
-rw-r--r--package/xf86-input-evdev/patches/patch-ltmain_sh11
-rw-r--r--package/xinput/Makefile24
-rw-r--r--package/xinput_calibrator/Makefile24
-rw-r--r--package/xorg-server/Makefile4
68 files changed, 1243 insertions, 3138 deletions
diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile
new file mode 100644
index 000000000..4dea6018d
--- /dev/null
+++ b/package/SDL_gfx/Makefile
@@ -0,0 +1,29 @@
+# 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:= SDL_gfx
+PKG_VERSION:= 2.0.22
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 330f291f1f09a1bdf397c9b40d92ca41
+PKG_DESCR:= SDL GFX library
+PKG_SECTION:= libs
+PKG_DEPENDS:= libsdl
+PKG_BUILDDEP:= sdl
+PKG_URL:= http://www.ferzkopp.net/joomla/content/view/19/14/
+PKG_SITES:= http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+
+PKG_SUBPKGS:= LIBSDL_GFX
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+= --disable-mmx
+
+libsdl-gfx-install:
+ $(INSTALL_DIR) $(IDIR_LIBSDL_GFX)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libSDL_gfx.so* $(IDIR_LIBSDL_GFX)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
new file mode 100644
index 000000000..a76e49897
--- /dev/null
+++ b/package/SDL_ttf/Makefile
@@ -0,0 +1,27 @@
+# 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:= SDL_ttf
+PKG_VERSION:= 2.0.10
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 814e6e17e8879254208d23b3b7e0354b
+PKG_DESCR:= TrueType fonts in your SDL applications
+PKG_SECTION:= libs
+PKG_DEPENDS:= libsdl libfreetype
+PKG_BUILDDEP:= sdl freetype
+PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/
+PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/
+
+PKG_SUBPKGS:= LIBSDL_TTF
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libsdl-ttf-install:
+ $(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch
new file mode 100644
index 000000000..f4a520a5c
--- /dev/null
+++ b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch
@@ -0,0 +1,33 @@
+From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 14 Mar 2011 09:19:18 +0100
+Subject: [PATCH] alsamixer: fix build on uClibc
+
+exp10 is a glibc extension, which isn't supported on uClibc. Luckily,
+exp10() is trivial to compute based on exp(), so add a wrapper for
+the uClibc case.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ alsamixer/volume_mapping.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c
+index 9cacad8..1c0d7c4 100644
+--- a/alsamixer/volume_mapping.c
++++ b/alsamixer/volume_mapping.c
+@@ -37,6 +37,11 @@
+ #include <stdbool.h>
+ #include "volume_mapping.h"
+
++#ifdef __UCLIBC__
++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
++#define exp10(x) (exp((x) * log(10)))
++#endif /* __UCLIBC__ */
++
+ #define MAX_LINEAR_DB_SCALE 24
+
+ static inline bool use_linear_dB_scale(long dBmin, long dBmax)
+--
+1.7.2.3
+
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 4cc7e970a..27ecdaa7c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 46
+PKG_RELEASE:= 47
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
diff --git a/package/base-files/src/init b/package/base-files/src/init
index a3232cb9c..a9564011d 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -1,7 +1,7 @@
#!/bin/sh
echo "System initialization ..."
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-mount -t devtmpfs devtmpfs /dev > /dev/null 2>&1
+mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
mount -nt proc proc /proc
mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
[ ! -f /etc/notmpfs ] && {
@@ -18,6 +18,7 @@ echo >/dev/mdev.seq
echo "/sbin/mdev" >/proc/sys/kernel/hotplug
mdev -s
cat /etc/.rnd >/dev/urandom 2>&1
+[ -x /kexecinit ] && { /kexecinit; }
[ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a;}
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 762f1832a..6a36d424a 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -17,9 +17,13 @@ PKG_NEED_CXX:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
+PKG_SUBPKGS:= CUPS CUPS_DEV
+PKGSC_CUPS_DEV:= devel
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV}))
CONFIGURE_ENV+= ac_cv_func_sigset=no \
OPTIM='-fPIC'
@@ -80,4 +84,8 @@ post-install:
${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
+cups-dev-install:
+ ${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include
+
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 81d8751c5..de7c1ba29 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= dillo
-PKG_VERSION:= 2.2
-PKG_RELEASE:= 2
-PKG_MD5SUM:= f8bcd62093f178bed81e46cc54e73f42
+PKG_VERSION:= 3.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 448f44a923222270cb0c84e55adc1be1
PKG_DESCR:= small graphical web browser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libfltk libxi libiconv libpng zlib libjpeg
@@ -17,7 +17,7 @@ PKG_SITES:= http://www.dillo.org/download/
PKG_NEED_CXX:= 1
PKG_HOST_DEPENDS:= !cygwin
-PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:= x86 x86_64 mips arm
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in
index 6b18010d3..ff0c0c32f 100644
--- a/package/dillo/patches/patch-Makefile_in
+++ b/package/dillo/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- dillo-2.2.orig/Makefile.in 2010-02-11 11:20:01.000000000 +0100
-+++ dillo-2.2/Makefile.in 2011-01-07 21:37:49.000000000 +0100
+--- dillo-3.0.orig/Makefile.in 2011-09-06 22:55:42.000000000 +0200
++++ dillo-3.0/Makefile.in 2011-09-12 20:25:51.000482366 +0200
@@ -242,7 +242,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = lout dw dlib dpip src doc dpid dpi test
+SUBDIRS = lout dw dlib dpip src doc dpid dpi
- EXTRA_DIST = Doxyfile dillorc install-dpi-local
+ EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h
sysconf_DATA = dillorc
all: config.h
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure
deleted file mode 100644
index 222be7882..000000000
--- a/package/dillo/patches/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- dillo-2.2.orig/configure 2010-02-11 11:19:59.000000000 +0100
-+++ dillo-2.2/configure 2011-03-28 02:30:04.373370428 +0200
-@@ -5830,11 +5830,6 @@ typedef unsigned char bool_t;
- _______EOF
-
-
--if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
-- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-- LDFLAGS="$LDFLAGS -L/usr/local/lib"
--fi
--
- for ac_func in gethostbyname
- do :
- ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-@@ -6215,9 +6210,9 @@ if test "x$enable_png" = "xyes"; then
- $as_echo_n "checking for libpng-config... " >&6; }
-
- if test -z "$PNG_CONFIG"; then
-- PNG_CONFIG=`which libpng12-config`
-+ PNG_CONFIG=`which libpng-config`
- if test -z "$PNG_CONFIG"; then
-- PNG_CONFIG=`which libpng-config`
-+ PNG_CONFIG=`which libpng15-config`
- fi
- if test -z "$PNG_CONFIG"; then
- PNG_CONFIG=`which libpng10-config`
diff --git a/package/dillo/patches/patch-src_IO_Makefile_in b/package/dillo/patches/patch-src_IO_Makefile_in
index 242d86f5a..7c59b6168 100644
--- a/package/dillo/patches/patch-src_IO_Makefile_in
+++ b/package/dillo/patches/patch-src_IO_Makefile_in
@@ -1,9 +1,9 @@
---- dillo-2.2.orig/src/IO/Makefile.in 2010-02-11 11:20:01.000000000 +0100
-+++ dillo-2.2/src/IO/Makefile.in 2011-01-07 21:38:15.000000000 +0100
-@@ -188,7 +188,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -DDILLO_BINDIR='"$(bindir)/"'
+--- dillo-3.0.orig/src/IO/Makefile.in 2011-09-06 22:55:42.000000000 +0200
++++ dillo-3.0/src/IO/Makefile.in 2011-09-12 20:24:41.527983361 +0200
+@@ -191,7 +191,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -DDILLO_BINDIR='"$(bindir)/"'
+
-AM_CFLAGS = @LIBFLTK_CFLAGS@
+AM_CFLAGS =
AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index cd2c3caeb..7b76c5629 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -15,8 +15,11 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF
-PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC
+PKG_SUBPKGS:= LIBE2FS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC
PKG_SUBPKGS+= LIBCOM_ERR_DEV LIBSS_DEV LIBUUID_DEV LIBBLKID_DEV
+PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS
+PKGSD_LIBE2FS:= e2fsprogs library
+PKGSC_LIBE2FS:= libs
PKGSD_LIBUUID:= UUID library
PKGSC_LIBUUID:= libs
PKGSD_LIBUUID_DEV:= UUID headers
@@ -35,10 +38,22 @@ PKGSD_LIBBLKID_DEV:= blkid headers
PKGSC_LIBBLKID_DEV:= devel
PKGSD_E2FSCK_STATIC:= Static build of e2fsck
PKGSC_E2FSCK_STATIC:= fs
+PKGSD_RESIZE2FS:= Resize FS utility
+PKGSC_RESIZE2FS:= fs
+PKGSS_RESIZE2FS:= libe2fs
+PKGSD_TUNE2FS:= Tune2FS utility
+PKGSC_TUNE2FS:= fs
+PKGSS_TUNE2FS:= libe2fs
+PKGSD_E2FSCK:= E2fsck utility
+PKGSC_E2FSCK:= fs
+PKGSS_E2FSCK:= libe2fs
+PKGSD_MKE2FS:= Mke2fs utility
+PKGSC_MKE2FS:= fs
+PKGSS_MKE2FS:= libe2fs
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
$(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV}))
$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
@@ -48,6 +63,10 @@ $(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${
$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
$(eval $(call PKG_template,LIBBLKID_DEV,libblkid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID_DEV},${PKGSC_LIBBLKID_DEV}))
$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
+$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
+$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
+$(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_MKE2FS),${PKGSD_MKE2FS},${PKGSC_MKE2FS}))
+$(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath
INSTALL_TARGET+= install-libs
@@ -67,16 +86,29 @@ ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin
endif
-e2fsprogs-install:
- ${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc
- ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc
- ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin
- cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin
+libe2fs-install:
+ ${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
+ ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_LIBE2FS}/etc
+ ${INSTALL_DIR} ${IDIR_LIBE2FS}/usr/lib
${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
- ${IDIR_E2FSPROGS}/usr/lib
+ ${IDIR_LIBE2FS}/usr/lib
+
+e2fsck-install:
+ ${INSTALL_DIR} ${IDIR_E2FSCK}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSCK}/usr/sbin
+ cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext2
+
+mke2fs-install:
+ ${INSTALL_DIR} ${IDIR_MKE2FS}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_MKE2FS}/usr/sbin
+
+tune2fs-install:
+ ${INSTALL_DIR} ${IDIR_TUNE2FS}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_TUNE2FS}/usr/sbin
+
+resize2fs-install:
+ ${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin
libblkid-install:
${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 59c6cdcff..d727bb7f6 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -4,22 +4,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= fltk
-PKG_VERSION:= 2.0
-PKG_RELEASE:= 3
-PKG_MD5SUM:= 557544badbacca4ee1ebb2448f6e1f8a
+PKG_VERSION:= 1.3.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 92f6e29921227eec3426a07425c71232
PKG_DESCR:= fast light toolkit
PKG_SECTION:= libs
PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype
PKG_URL:= http://www.fltk.org/
-PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
+PKG_SITES:= http://openadk.org/distfiles/
PKG_NEED_CXX:= 1
PKG_CXX:= LIBFLTK
PKG_SUBPKGS:= LIBFLTK
-PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:= x86 x86_64 mips arm
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
-WRKDIST= ${WRKDIR}/${PKG_NAME}-2.0.x-r7513
+DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz
include $(TOPDIR)/mk/package.mk
diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile
index 466aef887..568110189 100644
--- a/package/fltk/patches/patch-Makefile
+++ b/package/fltk/patches/patch-Makefile
@@ -1,11 +1,11 @@
---- fltk-2.0.x-r7513.orig/Makefile 2010-04-15 18:29:49.000000000 +0200
-+++ fltk-2.0.x-r7513/Makefile 2011-01-14 22:01:49.000000000 +0100
-@@ -25,7 +25,7 @@
+--- fltk-1.3.0.orig/Makefile 2011-02-15 16:29:03.000000000 +0100
++++ fltk-1.3.0/Makefile 2011-09-12 20:20:27.137980830 +0200
+@@ -27,7 +27,7 @@
include makeinclude
--DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test
-+DIRS = src $(LOCALIMAGES) images OpenGL fluid
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
- all: makeinclude
+ all: makeinclude fltk-config
for dir in $(DIRS); do\
diff --git a/package/fltk/patches/patch-OpenGL_Makefile b/package/fltk/patches/patch-OpenGL_Makefile
deleted file mode 100644
index 71ac77285..000000000
--- a/package/fltk/patches/patch-OpenGL_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk-2.0.x-r7513.orig/OpenGL/Makefile 2008-08-05 01:03:58.000000000 +0200