Merge branch 'master' of git+ssh://openadk.org/git/openadk

4 files changed, 13 insertions, 39 deletions

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@