aboutsummaryrefslogtreecommitdiff
path: root/devel/gettext/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gettext/files')
-rw-r--r--devel/gettext/files/patch-ad19
-rw-r--r--devel/gettext/files/patch-gettext-runtime_intl_Makefile.in40
2 files changed, 7 insertions, 52 deletions
diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
index 4bd832b13da3..5e93184aa1aa 100644
--- a/devel/gettext/files/patch-ad
+++ b/devel/gettext/files/patch-ad
@@ -1,14 +1,9 @@
---- gettext-tools/misc/Makefile.in.orig Mon Mar 14 07:24:11 2005
-+++ gettext-tools/misc/Makefile.in Mon Mar 14 20:40:33 2005
-@@ -447,11 +447,9 @@
- list='$(lisp_LISP)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
+--- gettext-tools/misc/Makefile.in.orig 2010-05-09 11:58:59.000000000 -0700
++++ gettext-tools/misc/Makefile.in 2010-05-17 18:05:21.000000000 -0700
+@@ -1285,6 +1285,4 @@
+ $(am__strip_dir) \
- echo " $(lispLISP_INSTALL) '$$d$$p' '$(DESTDIR)$(lispdir)/$$f'"; \
- $(lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f"; \
+ $(lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f" || exit $$?; \
if test -f $${p}c; then \
- echo " $(lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \
-- $(lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c"; \
- else : ; fi; \
- done; \
- else : ; fi
+- echo " $(lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \
+ $(lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c" || exit $$?; \
diff --git a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
deleted file mode 100644
index 823552253a8b..000000000000
--- a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
---- gettext-runtime/intl/Makefile.in.orig 2007-11-04 21:21:12.000000000 +0000
-+++ gettext-runtime/intl/Makefile.in 2007-12-12 03:28:44.000000000 +0000
-@@ -79,3 +79,3 @@
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
---DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
-+-DLIBDIR=\"$(prefix)/libdata\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
- -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
-@@ -195,3 +195,3 @@
- $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-- $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \
-+ $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ \
- $(OBJECTS_RES_@WOE32@) \
-@@ -369,18 +369,2 @@
- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
-- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-- dest=$(DESTDIR)$(libdir)/charset.alias; \
-- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-- orig=$(DESTDIR)$(libdir)/charset.alias; \
-- 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; \
- $(mkdir_p) $(DESTDIR)$(localedir); \
-@@ -472,5 +456,5 @@
- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-- dest=$(DESTDIR)$(libdir)/charset.alias; \
-+ if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \
-+ temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \
-+ dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \
- sed -f ref-del.sed $$dest > $$temp; \