Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Sep 2004 11:40:23 +0800 (CST)
From:      Yen-Ming Lee <leeym@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jharris@widomaker.com
Subject:   ports/71579: [PATCH] sysutils/coreutils: add WITHOUT_NLS for USE_GETTEXT
Message-ID:  <20040911034023.8FD423E9C5F@utopia.leeym.com>
Resent-Message-ID: <200409110350.i8B3oLxP072721@freefall.freebsd.org>

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

>Number:         71579
>Category:       ports
>Synopsis:       [PATCH] sysutils/coreutils: add WITHOUT_NLS for USE_GETTEXT
>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:   Sat Sep 11 03:50:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-BETA3 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA3 FreeBSD 5.3-BETA3 #4: Fri Sep 10 05:12:41 CST 2004
>Description:

- fix CONFLICTS
- add WITHOUT_NLS for USE_GETTEXT
- don't make install in WRKSRC/lib, which will install useless charset.alias

Port maintainer (jharris@widomaker.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:

http://pointyhat.freebsd.org/errorlogs/i386-5-full-logs/extras.html

>Fix:

--- coreutils-5.2.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	21 Mar 2004 16:29:46 -0000	1.5
+++ Makefile	11 Sep 2004 03:22:35 -0000
@@ -16,12 +16,11 @@
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	The Free Software Foundation's core utilities
 
-CONFLICTS=	sh-utils-* fileutils-* textutils-* id-utils-*
+CONFLICTS=	sh-utils-[0-9]* fileutils-[0-9]* textutils-[0-9]* id-utils-[0-9]*
 
 USE_GPG?=	yes
 SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
@@ -29,6 +28,14 @@
 
 USE_GMAKE=	yes
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 INFO=		coreutils
 
 MAN1=	gbasename.1 gcat.1 gchgrp.1 gchmod.1 gchown.1 gchroot.1 gcksum.1 \
@@ -51,6 +58,9 @@
 .if !defined(WITH_SUID)
 	@${REINPLACE_CMD} -e "s/u\+s/u\+w/g" ${WRKSRC}/src/Makefile.in
 .endif
+
+post-build:
+	@${REINPLACE_CMD} -Ee "s/^(SUBDIRS =) lib (.*)/\1 \2/" ${WRKSRC}/Makefile
 
 post-install: install-info
 
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/coreutils/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	21 Mar 2004 16:29:46 -0000	1.3
+++ pkg-plist	11 Sep 2004 03:22:35 -0000
@@ -88,67 +88,107 @@
 bin/gwho
 bin/gwhoami
 bin/gyes
-share/locale/af/LC_MESSAGES/coreutils.mo
-share/locale/af/LC_TIME/coreutils.mo
-share/locale/be/LC_MESSAGES/coreutils.mo
-share/locale/be/LC_TIME/coreutils.mo
-share/locale/ca/LC_MESSAGES/coreutils.mo
-share/locale/ca/LC_TIME/coreutils.mo
-share/locale/cs/LC_MESSAGES/coreutils.mo
-share/locale/cs/LC_TIME/coreutils.mo
-share/locale/da/LC_MESSAGES/coreutils.mo
-share/locale/da/LC_TIME/coreutils.mo
-share/locale/de/LC_MESSAGES/coreutils.mo
-share/locale/de/LC_TIME/coreutils.mo
-share/locale/el/LC_MESSAGES/coreutils.mo
-share/locale/el/LC_TIME/coreutils.mo
-share/locale/es/LC_MESSAGES/coreutils.mo
-share/locale/es/LC_TIME/coreutils.mo
-share/locale/et/LC_MESSAGES/coreutils.mo
-share/locale/et/LC_TIME/coreutils.mo
-share/locale/fi/LC_MESSAGES/coreutils.mo
-share/locale/fi/LC_TIME/coreutils.mo
-share/locale/fr/LC_MESSAGES/coreutils.mo
-share/locale/fr/LC_TIME/coreutils.mo
-share/locale/ga/LC_MESSAGES/coreutils.mo
-share/locale/ga/LC_TIME/coreutils.mo
-share/locale/gl/LC_MESSAGES/coreutils.mo
-share/locale/gl/LC_TIME/coreutils.mo
-share/locale/hu/LC_MESSAGES/coreutils.mo
-share/locale/hu/LC_TIME/coreutils.mo
-share/locale/it/LC_MESSAGES/coreutils.mo
-share/locale/it/LC_TIME/coreutils.mo
-share/locale/ja/LC_MESSAGES/coreutils.mo
-share/locale/ja/LC_TIME/coreutils.mo
-share/locale/ko/LC_MESSAGES/coreutils.mo
-share/locale/ko/LC_TIME/coreutils.mo
-share/locale/lg/LC_MESSAGES/coreutils.mo
-share/locale/lg/LC_TIME/coreutils.mo
-share/locale/ms/LC_MESSAGES/coreutils.mo
-share/locale/ms/LC_TIME/coreutils.mo
-share/locale/nb/LC_MESSAGES/coreutils.mo
-share/locale/nb/LC_TIME/coreutils.mo
-share/locale/nl/LC_MESSAGES/coreutils.mo
-share/locale/nl/LC_TIME/coreutils.mo
-share/locale/no/LC_MESSAGES/coreutils.mo
-share/locale/no/LC_TIME/coreutils.mo
-share/locale/pl/LC_MESSAGES/coreutils.mo
-share/locale/pl/LC_TIME/coreutils.mo
-share/locale/pt/LC_MESSAGES/coreutils.mo
-share/locale/pt/LC_TIME/coreutils.mo
-share/locale/pt_BR/LC_MESSAGES/coreutils.mo
-share/locale/pt_BR/LC_TIME/coreutils.mo
-share/locale/ru/LC_MESSAGES/coreutils.mo
-share/locale/ru/LC_TIME/coreutils.mo
-share/locale/sk/LC_MESSAGES/coreutils.mo
-share/locale/sk/LC_TIME/coreutils.mo
-share/locale/sl/LC_MESSAGES/coreutils.mo
-share/locale/sl/LC_TIME/coreutils.mo
-share/locale/sv/LC_MESSAGES/coreutils.mo
-share/locale/sv/LC_TIME/coreutils.mo
-share/locale/tr/LC_MESSAGES/coreutils.mo
-share/locale/tr/LC_TIME/coreutils.mo
-share/locale/zh_CN/LC_MESSAGES/coreutils.mo
-share/locale/zh_CN/LC_TIME/coreutils.mo
-share/locale/zh_TW/LC_MESSAGES/coreutils.mo
-share/locale/zh_TW/LC_TIME/coreutils.mo
+%%NLS%%share/locale/af/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/af/LC_TIME/coreutils.mo
+%%NLS%%share/locale/be/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/be/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ca/LC_TIME/coreutils.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/cs/LC_TIME/coreutils.mo
+%%NLS%%share/locale/da/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/da/LC_TIME/coreutils.mo
+%%NLS%%share/locale/de/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/de/LC_TIME/coreutils.mo
+%%NLS%%share/locale/el/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/el/LC_TIME/coreutils.mo
+%%NLS%%share/locale/es/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/es/LC_TIME/coreutils.mo
+%%NLS%%share/locale/et/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/et/LC_TIME/coreutils.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/fi/LC_TIME/coreutils.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/fr/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ga/LC_TIME/coreutils.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/gl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/hu/LC_TIME/coreutils.mo
+%%NLS%%share/locale/it/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/it/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ja/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ko/LC_TIME/coreutils.mo
+%%NLS%%share/locale/lg/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/lg/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ms/LC_TIME/coreutils.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/nb/LC_TIME/coreutils.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/nl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/no/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/no/LC_TIME/coreutils.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/pl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/pt/LC_TIME/coreutils.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/pt_BR/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ru/LC_TIME/coreutils.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/sk/LC_TIME/coreutils.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/sl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/sv/LC_TIME/coreutils.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/tr/LC_TIME/coreutils.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/zh_CN/LC_TIME/coreutils.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/zh_TW/LC_TIME/coreutils.mo
+%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/tr/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sk/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pt_BR/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pt/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/no/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nb/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nb/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ms/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ms/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/lg/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/lg/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/lg 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ko/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ja/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/it/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/hu/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/gl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fr/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fi/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/et/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/es/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/el/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/da/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/cs/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ca/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/be/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/af/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/af/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/af 2>/dev/null || true
--- coreutils-5.2.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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