From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 13 16:00:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E67A516A41F for ; Fri, 13 Jan 2006 16:00:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B507D43D45 for ; Fri, 13 Jan 2006 16:00:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0DG0L4c093083 for ; Fri, 13 Jan 2006 16:00:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0DG0L5t093082; Fri, 13 Jan 2006 16:00:21 GMT (envelope-from gnats) Resent-Date: Fri, 13 Jan 2006 16:00:21 GMT Resent-Message-Id: <200601131600.k0DG0L5t093082@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, Hideyuki KURASHINA Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5ABA716A41F for ; Fri, 13 Jan 2006 15:55:04 +0000 (GMT) (envelope-from rushani@FreeBSD.org) Received: from wasley.bl.mmtr.or.jp (wasley.bl.mmtr.or.jp [210.228.173.142]) by mx1.FreeBSD.org (Postfix) with SMTP id E8C9043D49 for ; Fri, 13 Jan 2006 15:55:02 +0000 (GMT) (envelope-from rushani@FreeBSD.org) Received: (qmail 4653 invoked from network); 14 Jan 2006 00:54:59 +0900 Received: from unknown (HELO mpu.rushani.jp) (202.229.152.196) by wasley.bl.mmtr.or.jp with SMTP; 14 Jan 2006 00:54:59 +0900 Received: from localhost (localhost [IPv6:::1]) by mpu.rushani.jp (8.13.3/8.13.3) with ESMTP id k0DFspma084412; Sat, 14 Jan 2006 00:54:52 +0900 (JST) (envelope-from rushani@FreeBSD.org) Message-Id: <20060114.005444.92496607.rushani@FreeBSD.org> Date: Sat, 14 Jan 2006 00:54:44 +0900 (JST) From: Hideyuki KURASHINA To: FreeBSD-gnats-submit@FreeBSD.org Cc: josh@tcbug.org Subject: ports/91756: [PATCH] www/cadaver: Support NLS, Correct path in EXTRACT_AFTER_ARGS 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 Jan 2006 16:00:23 -0000 >Number: 91756 >Category: ports >Synopsis: [PATCH] www/cadaver: Support NLS, Correct path in EXTRACT_AFTER_ARGS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 13 16:00:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Hideyuki KURASHINA >Release: FreeBSD 5.4-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD ***.*******.jp 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #1: Thu Dec 1 00:38:07 JST 2005 hideyuki@***.*******.jp:/usr/obj/usr/src/sys/***_XCAST6 i386 >Description: 1. Support NLS. ``es'', ``it'' and ``en@quot'' versions of message catalogues are available. 2. Correct path in EXTRACT_AFTER_ARGS. >How-To-Repeat: 1. Per reading cadaver page at http://www.webdav.org/cadaver/, it supports i18n again (for the record, i18n support was disabled in cadaver 0.18.0, released on 23 September 2001) It seems that cadaver at least supports message catalogues, so I would like to propose installing those files. Sample sessions: % cadaver http://webdav.example.com/dav/ Authentication required for DAV on server `webdav.example.com': Username: Terminated by signal 2. Connection to `webdav.example.com' closed. % env LANG=es cadaver http://webdav.example.com/dav/ Autenticaci'on requerida para DAV en el servidor 'webdav.example.com': Nombre de usuario: Terminado por se~nal 2. Conexi'on con 'webdav.example.com' cerrada. % env LANG=it cadaver http://webdav.example.com/dav/ Autenticazione richiesta per DAV sul server "webdav.example.com": Nome utente: Terminato dal segnale 2. Connessione a "webdav.example.com" chiusa. 2. Bundled library path has changed since cadaver-0.22.3 as follows: Before: $topdir/expat, $topdir/libneon, ... After: $topdir/lib/expat, $topdir/lib/neon, ... From 0.22.3, it also bundles gettext library ($topdir/lib/intl), we can exclude related files, too. >Fix: Apply following patch, Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/cadaver/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- Makefile 5 Jan 2006 08:38:44 -0000 1.36 +++ Makefile 13 Jan 2006 15:15:55 -0000 @@ -7,6 +7,7 @@ PORTNAME= cadaver PORTVERSION= 0.22.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.webdav.org/cadaver/ \ http://www.tcbug.org/ @@ -34,8 +35,9 @@ # them to be sure, a stray .h is not included instead of what's # found under PREFIX (installed by the neon port): EXTRACT_AFTER_ARGS= | ${TAR} -xf - \ - --exclude '${PORTNAME}-${PORTVERSION}/expat/*.[ch]' \ - --exclude '${PORTNAME}-${PORTVERSION}/libneon/*.[ch]' + --exclude '${PORTNAME}-${PORTVERSION}/lib/expat/*.[ch]' \ + --exclude '${PORTNAME}-${PORTVERSION}/lib/intl/*.[ch]' \ + --exclude '${PORTNAME}-${PORTVERSION}/lib/neon/*.[ch]' CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib @@ -45,4 +47,19 @@ CONFIGURE_ARGS+= --with-ssl --with-force-ssl .endif +.if !defined(WITHOUT_NLS) +USE_ICONV= yes +USE_GETTEXT= yes +CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \ + --with-libintl-prefix=${LOCALBASE} +LINGUAS= es it en@quot +.for l in ${LINGUAS} +PLIST_FILES+= share/locale/${l}/LC_MESSAGES/cadaver.mo +.endfor +.else +CONFIGURE_ARGS+=--disable-nls \ + --without-libiconv-prefix \ + --without-libintl-prefix +.endif + .include >Release-Note: >Audit-Trail: >Unformatted: