1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Don't modify charset.alias file installed by libintl.

This commit is contained in:
Maxim Sobolev 2002-04-30 08:32:35 +00:00
parent 2e564be1e5
commit 33b28557ec
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=58357
4 changed files with 28 additions and 15 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= gettext
PORTVERSION= 0.11.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext

View File

@ -2,7 +2,7 @@
$FreeBSD$
--- intl/Makefile.in.orig Thu Jan 31 16:11:48 2002
+++ intl/Makefile.in Tue Apr 30 00:00:15 2002
+++ intl/Makefile.in Tue Apr 30 11:18:46 2002
@@ -52,7 +52,7 @@
YFLAGS = --name-prefix=__gettext
@ -21,7 +21,7 @@ $FreeBSD$
-version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-rpath $(libdir) \
-no-undefined
@@ -153,11 +153,11 @@
@@ -153,22 +153,6 @@
: ; \
fi
if test '@USE_INCLUDED_LIBINTL@' = yes; then \
@ -30,15 +30,21 @@ $FreeBSD$
- dest=$(DESTDIR)$(libdir)/charset.alias; \
- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
- orig=$(DESTDIR)$(libdir)/charset.alias; \
+ test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(prefix)/libdata; \
+ temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \
+ dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \
+ if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \
+ orig=$(DESTDIR)$(prefix)/libdata/charset.alias; \
sed -f ref-add.sed $$orig > $$temp; \
$(INSTALL_DATA) $$temp $$dest; \
rm -f $$temp; \
@@ -240,9 +240,9 @@
- sed -f ref-add.sed $$orig > $$temp; \
- $(INSTALL_DATA) $$temp $$dest; \
- rm -f $$temp; \
- else \
- if test @GLIBC21@ = no; then \
- orig=charset.alias; \
- sed -f ref-add.sed $$orig > $$temp; \
- $(INSTALL_DATA) $$temp $$dest; \
- rm -f $$temp; \
- fi; \
- fi; \
$(mkinstalldirs) $(DESTDIR)$(localedir); \
test -f $(DESTDIR)$(localedir)/locale.alias \
&& orig=$(DESTDIR)$(localedir)/locale.alias \
@@ -240,9 +224,9 @@
: ; \
fi
if test '@USE_INCLUDED_LIBINTL@' = yes; then \

View File

@ -2,7 +2,7 @@
$FreeBSD$
--- lib/Makefile.in.orig Tue Mar 12 21:04:16 2002
+++ lib/Makefile.in Tue Apr 30 00:01:20 2002
+++ lib/Makefile.in Tue Apr 30 11:06:26 2002
@@ -220,7 +220,7 @@
# Need @LTLIBICONV@ because linebreak.c uses iconv().
libgettextlib_la_LDFLAGS = \
@ -30,6 +30,15 @@ $FreeBSD$
SUFFIXES = .sed .sin
@@ -475,7 +475,7 @@
install-data-am: install-gettextsrcDATA
-install-exec-am: install-exec-local install-libLTLIBRARIES
+install-exec-am: install-libLTLIBRARIES
install-info: install-info-am
@@ -522,7 +522,7 @@
all-local: charset.alias ref-add.sed ref-del.sed

View File

@ -29,12 +29,10 @@ lib/libgettextsrc.so
lib/libintl.a
lib/libintl.so
lib/libintl.so.2
libdata/charset.alias
libdata/gettext/hostname
libdata/gettext/project-id
libdata/gettext/urlget
libdata/gettext/user-email
@comment libdata/charset.alias
share/aclocal/codeset.m4
share/aclocal/gettext.m4
share/aclocal/glibc21.m4