summaryrefslogtreecommitdiff
path: root/converters/libiconv/patches
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2005-07-28 15:15:17 +0000
committeradam <adam@pkgsrc.org>2005-07-28 15:15:17 +0000
commitc7919dce642aaf23bae6c51277a52dad249565ef (patch)
treeed3bdd10b0b1a5be3f97b84c9b6984067cfb94d3 /converters/libiconv/patches
parente0e32d70d32d7efd81ac2847194eed045672b7ac (diff)
downloadpkgsrc-c7919dce642aaf23bae6c51277a52dad249565ef.tar.gz
Changes 1.10:
* Added ISO-8859-11 converter. * Updated the ISO-8859-7 converter. * Added ATARIST converter, available through --enable-extra-encodings. * Added BIG5-2003 converter (experimental), available through --enable-extra-encodings. * Updated EUC-TW converter to include the Euro sign. * The preloadable library has been renamed from libiconv_plug.so to preloadable_libiconv.so. * Portability to mingw.
Diffstat (limited to 'converters/libiconv/patches')
-rw-r--r--converters/libiconv/patches/patch-aa6
-rw-r--r--converters/libiconv/patches/patch-ad10
2 files changed, 4 insertions, 12 deletions
diff --git a/converters/libiconv/patches/patch-aa b/converters/libiconv/patches/patch-aa
index 204b5a9069a..d80949d889a 100644
--- a/converters/libiconv/patches/patch-aa
+++ b/converters/libiconv/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.7 2004/11/23 12:38:00 adam Exp $
+$NetBSD: patch-aa,v 1.8 2005/07/28 15:15:18 adam Exp $
---- src/Makefile.in.orig 2004-11-23 13:27:22.000000000 +0000
+--- src/Makefile.in.orig 2005-07-28 16:45:25.000000000 +0000
+++ src/Makefile.in
@@ -92,7 +92,7 @@ install : all force
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
case "@host_os@" in \
- hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
+ hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
esac
diff --git a/converters/libiconv/patches/patch-ad b/converters/libiconv/patches/patch-ad
index e0abfb6d2db..8e33ab176ba 100644
--- a/converters/libiconv/patches/patch-ad
+++ b/converters/libiconv/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2004/11/23 12:38:00 adam Exp $
+$NetBSD: patch-ad,v 1.6 2005/07/28 15:15:18 adam Exp $
--- configure.orig 2003-07-02 10:34:07.000000000 +0000
+++ configure
@@ -11,11 +11,3 @@ $NetBSD: patch-ad,v 1.5 2004/11/23 12:38:00 adam Exp $
ac_ext=c
-@@ -13900,6 +13900,7 @@ else
- chmod u+w .
- $rm conftest* out/*
- rmdir out
-+ rm -f core core.* *.core
- cd ..
- rmdir conftest
- $rm conftest*