From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 13 07:50:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60EFA1065679 for ; Fri, 13 Jun 2008 07:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3496A8FC12 for ; Fri, 13 Jun 2008 07:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m5D7o2p6031757 for ; Fri, 13 Jun 2008 07:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5D7o2ZQ031756; Fri, 13 Jun 2008 07:50:02 GMT (envelope-from gnats) Resent-Date: Fri, 13 Jun 2008 07:50:02 GMT Resent-Message-Id: <200806130750.m5D7o2ZQ031756@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Kozlov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 705801065679 for ; Fri, 13 Jun 2008 07:40:29 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 55F9F8FC0A for ; Fri, 13 Jun 2008 07:40:29 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m5D7eTir021169 for ; Fri, 13 Jun 2008 07:40:29 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m5D7eTGt021168; Fri, 13 Jun 2008 07:40:29 GMT (envelope-from nobody) Message-Id: <200806130740.m5D7eTGt021168@www.freebsd.org> Date: Fri, 13 Jun 2008 07:40:29 GMT From: Alex Kozlov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/124543: [patch] www/lynx OPTIONify, use ncursesw X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2008 07:50:02 -0000 >Number: 124543 >Category: ports >Synopsis: [patch] www/lynx OPTIONify, use ncursesw >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jun 13 07:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Alex Kozlov >Release: FreeBSD 6.3 >Organization: private >Environment: >Description: - OPTIONify - use ncursesw if available (fix work in utf-8 locales) - use gzip_help >How-To-Repeat: >Fix: Patch attached with submission follows: Index: www/lynx/Makefile @@ -7,7 +7,7 @@ PORTNAME= lynx PORTVERSION= 2.8.6.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://lynx.isc.org/current/ \ @@ -23,9 +23,24 @@ USE_OPENSSL= yes WRKSRC= ${WRKDIR}/${PORTNAME}2-8-6 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \ +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--with-zlib --libdir="${L_LIB}" \ --enable-nsl-fork --enable-persistent-cookies \ - --with-ssl="${OPENSSLBASE}" + --enable-nested-tables --enable-gzip-help \ + --with-mime-libdir=${PREFIX}/etc + +OPTIONS= SSL "SSL support" on \ + DEFAULT_COLORS "Colors support" off \ + IPV6 "IPV6 support" off \ + NLS "Native language support" on + +.include + +.if ${OSVERSION} < 602107 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700033) +CONFIGURE_ARGS+= --with-screen=ncurses +.else +CONFIGURE_ARGS+= --with-screen=ncursesw +.endif .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls @@ -37,13 +52,17 @@ PLIST_SUB+= NLS='' .endif -.if defined(NO_INET6) || defined(WITHOUT_IPV6) -CONFIGURE_ARGS+=--disable-ipv6 -.else +.if defined(WITH_IPV6) && ! defined(NO_INET6) CONFIGURE_ARGS+=--enable-ipv6 +.else +CONFIGURE_ARGS+=--disable-ipv6 +.endif + +.if defined(WITH_SSL) +CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .endif -.if defined(ENABLE_DEFAULT_COLORS) +.if defined(WITH_DEFAULT_COLORS) || defined(ENABLE_DEFAULT_COLORS) CONFIGURE_ARGS+=--enable-default-colors .endif @@ -65,4 +84,4 @@ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP} ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg -.include +.include Index: www/lynx/pkg-plist @@ -17,16 +17,16 @@ @unexec rm -f %D/share/lynx_help/COPYING.asc %%DOCSDIR%%/PROBLEMS %%DOCSDIR%%/README -%%DOCSDIR%%/docs/CHANGES2.3 -%%DOCSDIR%%/docs/CHANGES2.4 -%%DOCSDIR%%/docs/CHANGES2.5 -%%DOCSDIR%%/docs/CHANGES2.6 -%%DOCSDIR%%/docs/CHANGES2.7 -%%DOCSDIR%%/docs/CHANGES2.8 -%%DOCSDIR%%/docs/CRAWL.announce -%%DOCSDIR%%/docs/FM.announce -%%DOCSDIR%%/docs/IBMPC-charsets.announce -%%DOCSDIR%%/docs/OS-390.announce +%%DOCSDIR%%/docs/CHANGES2.3.gz +%%DOCSDIR%%/docs/CHANGES2.4.gz +%%DOCSDIR%%/docs/CHANGES2.5.gz +%%DOCSDIR%%/docs/CHANGES2.6.gz +%%DOCSDIR%%/docs/CHANGES2.7.gz +%%DOCSDIR%%/docs/CHANGES2.8.gz +%%DOCSDIR%%/docs/CRAWL.announce.gz +%%DOCSDIR%%/docs/FM.announce.gz +%%DOCSDIR%%/docs/IBMPC-charsets.announce.gz +%%DOCSDIR%%/docs/OS-390.announce.gz %%DOCSDIR%%/docs/README.TRST %%DOCSDIR%%/docs/README.chartrans %%DOCSDIR%%/docs/README.defines @@ -35,13 +35,13 @@ %%DOCSDIR%%/docs/README.rootcerts %%DOCSDIR%%/docs/README.ssl %%DOCSDIR%%/docs/README.sslcerts -%%DOCSDIR%%/docs/SOCKETSHR.announce -%%DOCSDIR%%/docs/TCPWARE.announce -%%DOCSDIR%%/docs/VMSWAIS.announce +%%DOCSDIR%%/docs/SOCKETSHR.announce.gz +%%DOCSDIR%%/docs/TCPWARE.announce.gz +%%DOCSDIR%%/docs/VMSWAIS.announce.gz %%DOCSDIR%%/docs/djgpp.key %%DOCSDIR%%/docs/pdcurses.key %%DOCSDIR%%/docs/slang.key -%%DOCSDIR%%/docs/win-386.announce +%%DOCSDIR%%/docs/win-386.announce.gz %%DOCSDIR%%/samples/blue-background.lss %%DOCSDIR%%/samples/bright-blue.lss %%DOCSDIR%%/samples/cernrules.txt @@ -78,30 +78,30 @@ %%DOCSDIR%%/test/utf-8-demo.html share/lynx_help/COPYHEADER share/lynx_help/COPYING -share/lynx_help/Lynx_users_guide.html -share/lynx_help/about_lynx.html -share/lynx_help/keystrokes/alt_edit_help.html -share/lynx_help/keystrokes/bashlike_edit_help.html -share/lynx_help/keystrokes/bookmark_help.html -share/lynx_help/keystrokes/cookie_help.html -share/lynx_help/keystrokes/dired_help.html -share/lynx_help/keystrokes/edit_help.html -share/lynx_help/keystrokes/environments.html -share/lynx_help/keystrokes/follow_help.html -share/lynx_help/keystrokes/gopher_types_help.html -share/lynx_help/keystrokes/history_help.html -share/lynx_help/keystrokes/keystroke_help.html -share/lynx_help/keystrokes/movement_help.html -share/lynx_help/keystrokes/option_help.html -share/lynx_help/keystrokes/other_help.html -share/lynx_help/keystrokes/print_help.html -share/lynx_help/keystrokes/scrolling_help.html -share/lynx_help/keystrokes/test_display.html -share/lynx_help/keystrokes/visited_help.html -share/lynx_help/keystrokes/xterm_help.html -share/lynx_help/lynx-dev.html -share/lynx_help/lynx_help_main.html -share/lynx_help/lynx_url_support.html +share/lynx_help/Lynx_users_guide.html.gz +share/lynx_help/about_lynx.html.gz +share/lynx_help/keystrokes/alt_edit_help.html.gz +share/lynx_help/keystrokes/bashlike_edit_help.html.gz +share/lynx_help/keystrokes/bookmark_help.html.gz +share/lynx_help/keystrokes/cookie_help.html.gz +share/lynx_help/keystrokes/dired_help.html.gz +share/lynx_help/keystrokes/edit_help.html.gz +share/lynx_help/keystrokes/environments.html.gz +share/lynx_help/keystrokes/follow_help.html.gz +share/lynx_help/keystrokes/gopher_types_help.html.gz +share/lynx_help/keystrokes/history_help.html.gz +share/lynx_help/keystrokes/keystroke_help.html.gz +share/lynx_help/keystrokes/movement_help.html.gz +share/lynx_help/keystrokes/option_help.html.gz +share/lynx_help/keystrokes/other_help.html.gz +share/lynx_help/keystrokes/print_help.html.gz +share/lynx_help/keystrokes/scrolling_help.html.gz +share/lynx_help/keystrokes/test_display.html.gz +share/lynx_help/keystrokes/visited_help.html.gz +share/lynx_help/keystrokes/xterm_help.html.gz +share/lynx_help/lynx-dev.html.gz +share/lynx_help/lynx_help_main.html.gz +share/lynx_help/lynx_url_support.html.gz @dirrm %%DOCSDIR%%/docs @dirrm %%DOCSDIR%%/samples @dirrm %%DOCSDIR%%/test >Release-Note: >Audit-Trail: >Unformatted: