Skip site navigation (1)Skip section navigation (2)
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:   ports/91756: [PATCH] www/cadaver: Support NLS, Correct path in EXTRACT_AFTER_ARGS
Message-ID:  <20060114.005444.92496607.rushani@FreeBSD.org>
Resent-Message-ID: <200601131600.k0DG0L5t093082@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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 <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060114.005444.92496607.rushani>