package updates and compile fixes

- update ctorrent, cups, gnutls and freeradius-server
- compile kerberos (heimdal,krb5) with com_err library from
  e2fsprogs to allow both to be build without installing local
  copys of libcom_err
- cleanup lynx package add zlib dependency

2 files changed, 26 insertions, 38 deletions

diff --git a/package/lynx/Config.in b/package/lynx/Config.in
index 0b12bc0bb..0565c4150 100644
--- a/package/lynx/Config.in
+++ b/package/lynx/Config.in
@@ -4,6 +4,7 @@ config ADK_PACKAGE_LYNX
 	default n
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_CA_CERTS
 	help
 	  The standard text-based world wide web browser.
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 388109c89..12a04f7f1 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME=		lynx
 PKG_VERSION=		2.8.7dev.7
-PKG_RELEASE=		1
+PKG_RELEASE=		2
 PKG_MD5SUM=		83891107c873421e5ac917cc0ab53fe8
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		text
-PKG_DEPENDS:=		libncurses libopenssl
+PKG_DEPENDS:=		libncurses libopenssl zlib
 PKG_URL:=		http://lynx.isc.org
 PKG_SITES=		http://lynx.isc.org/current/ \
 			${MASTER_SITE_MIRBSD}
@@ -19,11 +19,14 @@ WRKDIST=		${WRKDIR}/lynx2-8-7
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LYNX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 TCPPFLAGS+=		-DLYNX_VERSION=\"${PKG_VERSION}-${PKG_RELEASE}\"
-# do not hardcode paths; do not scan for ports stuff
+TCPPFLAGS+=		-I${STAGING_DIR}/include/openssl
+TCPPFLAGS+=		-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
+TLDFLAGS+=		-lz
+
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_path_TELNET=telnet \
 			ac_cv_path_TN3270=tn3270 \
 			ac_cv_path_RLOGIN=rlogin \
@@ -38,27 +41,18 @@ CONFIGURE_ENV+=		ac_cv_path_TELNET=telnet \
 			ac_cv_path_UUDECODE=uudecode \
 			ac_cv_path_ZCAT=zcat \
 			ac_cv_path_ZIP=zip
-# from MirPorts Framework
-CONFIGURE_ARGS+=	--enable-vertrace \
-			--enable-warnings \
+
+CONFIGURE_ARGS+=	\
+			--disable-warnings \
 			--disable-nls \
-			--disable-full-paths \
-			--with-ssl=/usr \
 			--without-gnutls \
 			--without-socks \
 			--without-socks5 \
-			--with-screen=ncursesw \
-			--enable-widec \
 			--enable-addrlist-page \
 			--enable-charset-choice \
-			--enable-cjk \
-			--enable-japanese-utf8 \
 			--enable-color-style \
 			--disable-default-colors \
 			--disable-htmlized-cfg \
-			--enable-ipv6 \
-			--enable-kbd-layout \
-			--enable-locale-charset \
 			--enable-nested-tables \
 			--disable-scrollbar \
 			--enable-justify-elts \
@@ -66,37 +60,30 @@ CONFIGURE_ARGS+=	--enable-vertrace \
 			--enable-nsl-fork \
 			--enable-underlines \
 			--without-bzlib \
-			--with-zlib \
-			--without-x
-# local stuff
-CONFIGURE_ARGS+=	--with-ssl=${STAGING_DIR}/usr \
+			--without-x \
+			--with-zlib=${STAGING_DIR}/usr \
+			--with-ssl=${STAGING_DIR}/usr \
 			--disable-full-paths \
 			--with-cfg-file=/etc/lynx.cfg \
 			--with-lss-file=/etc/lynx.lss \
-			--disable-font-switch
-TCPPFLAGS+=		-I${STAGING_DIR}/include/openssl
-TCPPFLAGS+=		-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
-# needs libiconv
-CONFIGURE_ARGS+=	--disable-japanese-utf8
-# shrink size
-CONFIGURE_ARGS+=	--disable-vertrace \
+			--disable-font-switch \
+			--disable-japanese-utf8 \
+			--disable-vertrace \
 			--disable-trace \
 			--disable-cjk \
 			--disable-kbd-layout \
 			--disable-prettysrc \
 			--disable-finger \
-			--disable-dired
-ifeq (${ADK_UNICODE},)
-CONFIGURE_ARGS+=	--with-screen=ncurses \
+			--disable-dired \
+			--with-screen=ncurses \
 			--disable-widec \
 			--disable-locale-charset
-endif
-ifneq (${ADK_IPV6},y)
-CONFIGURE_ARGS+=	--disable-ipv6
-endif
-MAKE_FILE=		makefile
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+
+#			--prefix=${STAGING_DIR}/usr 
+
+MAKE_FILE:=		makefile
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LYNX}/etc ${IDIR_LYNX}/usr/bin