summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-29 17:44:52 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-29 17:44:52 +0200
commit2fd97804d7094633451c3fb0ac2ac41d88229c16 (patch)
tree48cbb96921c2d9a89ca4538d947b6519bc671bc4
parent3614f9bb5447b0f331ceaff2284ec9f7b529cb72 (diff)
update to latest upstream version
-rw-r--r--package/firefox/Makefile10
-rw-r--r--package/nano/Makefile7
2 files changed, 9 insertions, 8 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 73a2afb7b..a5acfd29a 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,18 +4,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= firefox
-PKG_VERSION:= 3.6.3
+PKG_VERSION:= 3.6.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 5e4541ab23084b7b14ba228291ce2688
+PKG_MD5SUM:= c9a071b31bb90d05edfb93117d0a7537
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11
-PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib gtk+ libnotify libidl
+PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify libidl
PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
PKG_DEPENDS+= libxdamage libxfixes
PKG_BUILDDEP+= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt
PKG_BUILDDEP+= nspr nss jpeg
PKG_URL:= http://www.mozilla.org/
-PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/source/
+PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --enable-application=browser \
post-install:
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
- $(CP) $(WRKINST)/usr/lib/firefox-3.6.3 \
+ $(CP) $(WRKINST)/usr/lib/firefox-${PKG_VERSION} \
$(IDIR_FIREFOX)/usr/lib/
$(CP) $(WRKINST)/usr/bin/firefox \
$(IDIR_FIREFOX)/usr/bin
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 088ad4ca5..2efed2730 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -4,15 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= nano
-PKG_VERSION:= 2.0.9
+PKG_VERSION:= 2.2.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2be94dc43fb60fff4626a2401a977220
+PKG_MD5SUM:= 6304308afb1f7ef4a5e93eb99206632a
PKG_DESCR:= An enhanced clone of the Pico text editor
PKG_SECTION:= admin
PKG_DEPENDS:= libncurses
PKG_BUILDDEP+= ncurses
PKG_URL:= http://www.nano-editor.org
-PKG_SITES:= http://www.nano-editor.org/dist/v2.0/
+PKG_SITES:= http://www.nano-editor.org/dist/v2.2/
PKG_FLAVOURS:= TINY
@@ -24,6 +24,7 @@ CONFIGURE_ENV+= ac_cv_header_regex_h=no
CONFIGURE_ARGS+= --enable-nanorc \
--disable-glibtest \
--disable-utf8 \
+ --disable-color \
--without-slang
ifeq (${ADK_PACKAGE_NANO_TINY},y)
CONFIGURE_ARGS+= --enable-tiny