From rushani@FreeBSD.org  Fri Jan 13 15:55:04 2006
Return-Path: <rushani@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5ABA716A41F
	for <FreeBSD-gnats-submit@FreeBSD.org>; 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 <FreeBSD-gnats-submit@FreeBSD.org>; 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 <rushani@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: josh@tcbug.org
Subject: [PATCH] www/cadaver: Support NLS, Correct path in
 EXTRACT_AFTER_ARGS

>Number:         91756
>Category:       ports
>Synopsis:       [PATCH] www/cadaver: Support NLS, Correct path in EXTRACT_AFTER_ARGS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vd
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 13 16:00:20 GMT 2006
>Closed-Date:    Tue Feb 07 17:16:16 GMT 2006
>Last-Modified:  Tue Feb 07 17:16:16 GMT 2006
>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 <bsd.port.mk>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Jan 13 16:04:14 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91756 
State-Changed-From-To: feedback->open 
State-Changed-By: edwin 
State-Changed-When: Fri Jan 20 02:29:25 UTC 2006 
State-Changed-Why:  
maitainer approver 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91756 

From: Josh Paetzel <josh@tcbug.org>
To: edwin@freebsd.org
Cc:  
Subject: Re: ports/91756: [PATCH] www/cadaver: Support NLS, Correct path in EXTRACT_AFTER_ARGS
Date: Thu, 19 Jan 2006 20:25:45 -0600

 On Friday 13 January 2006 10:04, Edwin Groothuis wrote:
 > Maintainer of www/cadaver,
 >
 > Please note that PR ports/91756 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the
 > patch and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/91756
 
 This is fine although I'd like to get www/cadaver working again before 
 any more patches are applied to the Makefile.  I sent an email to 
 your @freebsd.org address a few minutes ago.  Once the BROKEN is 
 removed and my one line patch committed this can go in without any 
 objections on my end.
  
 -- 
 Thanks,
 
 Josh Paetzel
 
Responsible-Changed-From-To: freebsd-ports-bugs->vd 
Responsible-Changed-By: vd 
Responsible-Changed-When: Tue Feb 7 15:20:25 UTC 2006 
Responsible-Changed-Why:  
I will take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91756 
State-Changed-From-To: open->closed 
State-Changed-By: vd 
State-Changed-When: Tue Feb 7 17:15:35 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=91756 
>Unformatted:
