From katsura@gaia.cc.osaka-kyoiku.ac.jp  Thu Feb 12 06:48:40 2004
Return-Path: <katsura@gaia.cc.osaka-kyoiku.ac.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id F201E16A4CE; Thu, 12 Feb 2004 06:48:39 -0800 (PST)
Received: from filter.osaka-kyoiku.ac.jp (filter.osaka-kyoiku.ac.jp [150.86.1.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 757BB43D1F; Thu, 12 Feb 2004 06:48:38 -0800 (PST)
	(envelope-from katsura@gaia.cc.osaka-kyoiku.ac.jp)
Received: from ikoma.cc.osaka-kyoiku.ac.jp (IDENT:root@localhost [127.0.0.1])
	by filter.osaka-kyoiku.ac.jp (8.11.6/8.11.6) with ESMTP id i1CEo0I29081;
	Thu, 12 Feb 2004 23:50:00 +0900
Received: from gaia.cc.osaka-kyoiku.ac.jp (gaia.cc.osaka-kyoiku.ac.jp [150.86.33.173])
	by ikoma.cc.osaka-kyoiku.ac.jp (8.9.3p2+20030922+3.2W/3.7W) with ESMTP id XAA28400;
	Thu, 12 Feb 2004 23:48:35 +0900 (JST)
Received: from gaia.cc.osaka-kyoiku.ac.jp (localhost [127.0.0.1])
	by gaia.cc.osaka-kyoiku.ac.jp (8.12.9p2/8.12.9) with ESMTP id i1CEmZNv072741;
	Thu, 12 Feb 2004 23:48:35 +0900 (JST)
	(envelope-from katsura@gaia.cc.osaka-kyoiku.ac.jp)
Received: (from katsura@localhost)
	by gaia.cc.osaka-kyoiku.ac.jp (8.12.9p2/8.12.9/Submit) id i1CEmZOn072740;
	Thu, 12 Feb 2004 23:48:35 +0900 (JST)
	(envelope-from katsura)
Message-Id: <200402121448.i1CEmZOn072740@gaia.cc.osaka-kyoiku.ac.jp>
Date: Thu, 12 Feb 2004 23:48:35 +0900 (JST)
From: Katsura Matsumoto <katsura@cc.osaka-kyoiku.ac.jp>
Reply-To: katsura@cc.osaka-kyoiku.ac.jp
To: FreeBSD-gnats-submit@freebsd.org
Cc: eik@freebsd.org
Subject: ports/mail/fetchmail: WITHOUT_NLS knob
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62732
>Category:       ports
>Synopsis:       ports/mail/fetchmail: WITHOUT_NLS knob
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eik
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 12 06:50:18 PST 2004
>Closed-Date:    Wed Apr 28 10:28:06 PDT 2004
>Last-Modified:  Wed Apr 28 10:28:06 PDT 2004
>Originator:     Katsura Matsumoto
>Release:        FreeBSD 4.9-RELEASE-p2 i386
>Organization:
Osaka Kyoiku Univ.
>Environment:
System: FreeBSD gaia.cc.osaka-kyoiku.ac.jp 4.9-RELEASE-p2
>Description:
I would like to add an WITHOUT_NLS knob in Makefile of ports/mail/fetchmail.
>How-To-Repeat:
>Fix:

--- fetchmail.orig/Makefile	Sun Feb  8 15:18:22 2004
+++ fetchmail/Makefile	Thu Feb 12 22:08:40 2004
@@ -26,7 +26,9 @@
 RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
 
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+.endif
 .if defined(WITH_X11)
 USE_PYTHON=	yes
 .endif
@@ -34,9 +36,9 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-POP2 --enable-SDPS \
-		--enable-nls --with-hesiod=no --enable-fallback=no
+		--with-hesiod=no --enable-fallback=no
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 MAKE_ENV+=	${CONFIGURE_ENV}
 MAN1=		fetchmail.1
@@ -50,6 +52,14 @@
 
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+=--enable-inet6
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=        --disable-nls
+PLIST_SUB=      NLS="@comment "
+.else
+CONFIGURE_ARGS+=        --enable-nls
+PLIST_SUB+=     NLS=""
 .endif
 
 .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
--- fetchmail.orig/pkg-plist	Sat Oct 25 13:00:14 2003
+++ fetchmail/pkg-plist	Thu Feb 12 22:08:40 2004
@@ -13,16 +13,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/fetchmail-FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/fetchmail-features.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-share/locale/ca/LC_MESSAGES/fetchmail.mo
-share/locale/cs/LC_MESSAGES/fetchmail.mo
-share/locale/da/LC_MESSAGES/fetchmail.mo
-share/locale/de/LC_MESSAGES/fetchmail.mo
-share/locale/el/LC_MESSAGES/fetchmail.mo
-share/locale/es/LC_MESSAGES/fetchmail.mo
-share/locale/fr/LC_MESSAGES/fetchmail.mo
-share/locale/gl/LC_MESSAGES/fetchmail.mo
-share/locale/ja/LC_MESSAGES/fetchmail.mo
-share/locale/pl/LC_MESSAGES/fetchmail.mo
-share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
-share/locale/sk/LC_MESSAGES/fetchmail.mo
-share/locale/tr/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/de/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/el/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/es/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->eik  
Responsible-Changed-By: krion 
Responsible-Changed-When: Thu Feb 12 07:16:26 PST 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62732 
State-Changed-From-To: open->closed 
State-Changed-By: eik 
State-Changed-When: Wed Apr 28 19:27:50 CEST 2004 
State-Changed-Why:  
Committed, thanks! 

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