update and fix packages which got activated to autogenerated

package configuration menu.

4 files changed, 61 insertions, 42 deletions

diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 6fd545c95..0f9a9de1b 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -4,47 +4,27 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		weechat
-PKG_VERSION:=		0.1.8
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		73d6bc211ac32c597f0d278506480a20
+PKG_VERSION:=		0.3.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0c4f6e7196703c6eca12217f254612aa
 PKG_DESCR:=		Lightweight IRC client
-PKG_SECTION:=		net
+PKG_SECTION:=		chat
 PKG_DEPENDS:=		libncurses libiconv
 PKG_BUILDDEP+=		ncurses libiconv
-ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y)
-PKG_DEPENDS+=		gnutls
-PKG_BUILDDEP+=		gnutls
-endif
-
-ifeq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
-PKG_DEPENDS+=		liblua
-PKG_BUILDDEP+=		lua
-endif
-PKG_URL:=		http://weechat.flashtux.org/download/
-PKG_SITES:=		http://weechat.flashtux.org/download/
+PKG_URL:=		http://www.weechat.org/
+PKG_SITES:=		http://www.weechat.org/files/src/
 
 include ${TOPDIR}/mk/package.mk
 
-
 $(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y)
-ENABLE_TLS:=		--with-libgnutls-prefix=${STAGING_DIR}/usr
-else
-ENABLE_TLS:=		--disable-gnutls
-endif
-
-ifneq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
-DISABLE_LUA:=		--disable-lua
-endif
-
-CONFIGURE_ARGS+=	${ENABLE_TLS} \
-			--with-debug=0 \
+CONFIGURE_ARGS+=	--with-debug=0 \
 			--disable-perl \
 			--disable-python \
+			--disable-lua \
+			--disable-gnutls \
 			--disable-ruby \
-			--with-libiconv-prefix='${STAGING_DIR}/usr' \
-			${DISABLE_LUA}
+			--with-libiconv-prefix='${STAGING_DIR}/usr'
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
diff --git a/package/weechat/patches/patch-configure b/package/weechat/patches/patch-configure
new file mode 100644
index 000000000..efb7207e2
--- /dev/null
+++ b/package/weechat/patches/patch-configure
@@ -0,0 +1,40 @@
+--- weechat-0.3.2.orig/configure	2010-04-17 11:40:27.000000000 +0200
++++ weechat-0.3.2/configure	2010-07-09 17:34:32.236316102 +0200
+@@ -17146,36 +17146,8 @@ else
+ fi
+ 
+    fi
+-   if test "x$ac_found_iconv_lib" = "xyes" ; then
+-      ICONV_LFLAGS="-liconv"
+-      LIBS="$LIBS $ICONV_LFLAGS"
+-   fi
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv usability in programs" >&5
+-$as_echo_n "checking for iconv usability in programs... " >&6; }
+-   if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+ 
+-        #include <iconv.h>
+-        int main(int argc, char **argv) {
+-            iconv_t conv = iconv_open("ISO8859-1", "UTF-8");
+-            if (conv != (iconv_t) -1) {
+-                return 0;
+-            }
+-            return 1;
+-      }
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  iconv_found="yes"
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
++iconv_found="yes"
+ 
+   if test "x$iconv_found" = "xno" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/package/weechat/patches/patch-src_gui_curses_Makefile_in b/package/weechat/patches/patch-src_gui_curses_Makefile_in
deleted file mode 100644
index e73dd48b5..000000000
--- a/package/weechat/patches/patch-src_gui_curses_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- weechat-0.1.8.orig/src/gui/curses/Makefile.in	2006-03-18 08:46:20.000000000 +0000
-+++ weechat-0.1.8/src/gui/curses/Makefile.in	2007-02-15 21:56:21.000000000 +0000
-@@ -365,7 +365,7 @@ clean-binPROGRAMS:
- 	done
- weechat-curses$(EXEEXT): $(weechat_curses_OBJECTS) $(weechat_curses_DEPENDENCIES) 
- 	@rm -f weechat-curses$(EXEEXT)
--	$(LINK) $(weechat_curses_LDFLAGS) $(weechat_curses_OBJECTS) $(weechat_curses_LDADD) $(LIBS)
-+	$(LINK) $(weechat_curses_LDFLAGS) $(weechat_curses_OBJECTS) $(weechat_curses_LDADD) $(LIBICONV) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/package/weechat/patches/patch-src_plugins_Makefile_in b/package/weechat/patches/patch-src_plugins_Makefile_in
new file mode 100644
index 000000000..e03608f6f
--- /dev/null
+++ b/package/weechat/patches/patch-src_plugins_Makefile_in
@@ -0,0 +1,11 @@
+--- weechat-0.3.2.orig/src/plugins/Makefile.in	2010-04-17 11:40:31.000000000 +0200
++++ weechat-0.3.2/src/plugins/Makefile.in	2010-07-09 17:38:00.229617601 +0200
+@@ -751,8 +751,6 @@ uninstall-am:
+ # install plugin header
+ 
+ install-data-hook:
+-	$(INSTALL) -d $(includedir)/$(PACKAGE)
+-	$(INSTALL_DATA) weechat-plugin.h $(includedir)/$(PACKAGE)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.