summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-10-28 03:14:04 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-10-28 03:14:04 +0000
commita8c0e602950b3fd5dc5f009bad5e6aad2eacdd8d (patch)
treea3fa169579bcf22ba2b7140bcdee8acbae22933a /converters
parentAdd missing directory (diff)
Do not create a ${PREFIX}/doc directory. Also, consolidate two patches
that modify the same file into one. Submitted by: bento and kris
Notes
Notes: svn path=/head/; revision=69008
Diffstat (limited to 'converters')
-rw-r--r--converters/libiconv/Makefile2
-rw-r--r--converters/libiconv/files/patch-Makefile.in11
-rw-r--r--converters/libiconv/files/patch-aa15
-rw-r--r--converters/libiconv/files/patch-ac23
-rw-r--r--converters/libiconv/files/patch-lib_aliases.gperf34
5 files changed, 49 insertions, 36 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 0a4a971d28fa..bee50c4eaf42 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libiconv
PORTVERSION= 1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/converters/libiconv/files/patch-Makefile.in b/converters/libiconv/files/patch-Makefile.in
deleted file mode 100644
index 0bf0dae4b300..000000000000
--- a/converters/libiconv/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Sat Apr 6 21:20:47 2002
-+++ Makefile.in Sat Apr 6 21:18:03 2002
-@@ -27,7 +27,7 @@
- SHELL = /bin/sh
-
- all : force
-- builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
-+ builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib"
- cd lib && $(MAKE) all
- cd src && $(MAKE) all
- cd man && $(MAKE) all
diff --git a/converters/libiconv/files/patch-aa b/converters/libiconv/files/patch-aa
index c767d10cffb7..fd162499d97c 100644
--- a/converters/libiconv/files/patch-aa
+++ b/converters/libiconv/files/patch-aa
@@ -1,11 +1,14 @@
-
-$FreeBSD$
-
---- Makefile.in.orig Tue Feb 20 21:43:19 2001
-+++ Makefile.in Sun Mar 17 11:01:20 2002
-@@ -31,7 +31,7 @@
+--- Makefile.in.orig Tue Apr 30 10:23:47 2002
++++ Makefile.in Sun Oct 27 22:11:16 2002
+@@ -27,12 +27,12 @@
+ SHELL = /bin/sh
+
+ all : force
+- builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
++ builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib"
cd lib && $(MAKE) all
cd src && $(MAKE) all
+ cd po && $(MAKE) all
cd man && $(MAKE) all
- if test -d tests; then cd tests && $(MAKE) all; fi
+ #if test -d tests; then cd tests && $(MAKE) all; fi
diff --git a/converters/libiconv/files/patch-ac b/converters/libiconv/files/patch-ac
index 94e8629943cb..e5b6a109d0ff 100644
--- a/converters/libiconv/files/patch-ac
+++ b/converters/libiconv/files/patch-ac
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- man/Makefile.in.orig Mon May 21 15:30:41 2001
-+++ man/Makefile.in Mon Aug 27 12:28:49 2001
+--- man/Makefile.in.orig Mon May 21 08:34:42 2001
++++ man/Makefile.in Sun Oct 27 22:09:17 2002
@@ -10,7 +10,7 @@
local_prefix = /usr/local
exec_prefix = @exec_prefix@
@@ -12,3 +9,19 @@ $FreeBSD$
htmldir = $(docdir)
# Programs used by "make":
+@@ -35,7 +35,6 @@
+ cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done
+ if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
+ cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done
+- if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
+ if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
+ if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
+ cd $(srcdir) && for f in *.html ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; done
+@@ -45,7 +44,6 @@
+ if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
+ if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi
+ if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
+- if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
+ if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
+ if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
+
diff --git a/converters/libiconv/files/patch-lib_aliases.gperf b/converters/libiconv/files/patch-lib_aliases.gperf
index 25f88e67dcee..0322a2c605e6 100644
--- a/converters/libiconv/files/patch-lib_aliases.gperf
+++ b/converters/libiconv/files/patch-lib_aliases.gperf
@@ -1,6 +1,14 @@
---- lib/aliases.gperf.orig Mon Jun 25 21:39:41 2001
-+++ lib/aliases.gperf Sun May 19 21:08:32 2002
-@@ -42,6 +42,7 @@
+--- lib/aliases.gperf.orig Wed May 29 10:16:47 2002
++++ lib/liases.gperf Mon Oct 14 12:31:58 2002
+@@ -12,6 +12,7 @@
+ US, ei_ascii
+ CSASCII, ei_ascii
+ UTF-8, ei_utf8
++UTF8, ei_utf8
+ UCS-2, ei_ucs2
+ ISO-10646-UCS-2, ei_ucs2
+ CSUNICODE, ei_ucs2
+@@ -43,6 +44,7 @@
JAVA, ei_java
ISO-8859-1, ei_iso8859_1
ISO_8859-1, ei_iso8859_1
@@ -8,7 +16,7 @@
ISO_8859-1:1987, ei_iso8859_1
ISO-IR-100, ei_iso8859_1
CP819, ei_iso8859_1
-@@ -51,6 +52,7 @@
+@@ -52,6 +54,7 @@
CSISOLATIN1, ei_iso8859_1
ISO-8859-2, ei_iso8859_2
ISO_8859-2, ei_iso8859_2
@@ -16,7 +24,7 @@
ISO_8859-2:1987, ei_iso8859_2
ISO-IR-101, ei_iso8859_2
LATIN2, ei_iso8859_2
-@@ -58,6 +60,7 @@
+@@ -59,6 +62,7 @@
CSISOLATIN2, ei_iso8859_2
ISO-8859-3, ei_iso8859_3
ISO_8859-3, ei_iso8859_3
@@ -24,7 +32,7 @@
ISO_8859-3:1988, ei_iso8859_3
ISO-IR-109, ei_iso8859_3
LATIN3, ei_iso8859_3
-@@ -65,6 +68,7 @@
+@@ -66,6 +70,7 @@
CSISOLATIN3, ei_iso8859_3
ISO-8859-4, ei_iso8859_4
ISO_8859-4, ei_iso8859_4
@@ -32,7 +40,7 @@
ISO_8859-4:1988, ei_iso8859_4
ISO-IR-110, ei_iso8859_4
LATIN4, ei_iso8859_4
-@@ -72,12 +76,14 @@
+@@ -73,12 +78,14 @@
CSISOLATIN4, ei_iso8859_4
ISO-8859-5, ei_iso8859_5
ISO_8859-5, ei_iso8859_5
@@ -47,7 +55,7 @@
ISO_8859-6:1987, ei_iso8859_6
ISO-IR-127, ei_iso8859_6
ECMA-114, ei_iso8859_6
-@@ -86,6 +92,7 @@
+@@ -87,6 +94,7 @@
CSISOLATINARABIC, ei_iso8859_6
ISO-8859-7, ei_iso8859_7
ISO_8859-7, ei_iso8859_7
@@ -55,7 +63,7 @@
ISO_8859-7:1987, ei_iso8859_7
ISO-IR-126, ei_iso8859_7
ECMA-118, ei_iso8859_7
-@@ -95,12 +102,14 @@
+@@ -96,12 +104,14 @@
CSISOLATINGREEK, ei_iso8859_7
ISO-8859-8, ei_iso8859_8
ISO_8859-8, ei_iso8859_8
@@ -70,7 +78,7 @@
ISO_8859-9:1989, ei_iso8859_9
ISO-IR-148, ei_iso8859_9
LATIN5, ei_iso8859_9
-@@ -108,6 +117,7 @@
+@@ -109,6 +119,7 @@
CSISOLATIN5, ei_iso8859_9
ISO-8859-10, ei_iso8859_10
ISO_8859-10, ei_iso8859_10
@@ -78,7 +86,7 @@
ISO_8859-10:1992, ei_iso8859_10
ISO-IR-157, ei_iso8859_10
LATIN6, ei_iso8859_10
-@@ -115,11 +125,13 @@
+@@ -116,11 +127,13 @@
CSISOLATIN6, ei_iso8859_10
ISO-8859-13, ei_iso8859_13
ISO_8859-13, ei_iso8859_13
@@ -92,7 +100,7 @@
ISO_8859-14:1998, ei_iso8859_14
ISO-IR-199, ei_iso8859_14
LATIN8, ei_iso8859_14
-@@ -127,10 +139,12 @@
+@@ -128,10 +141,12 @@
ISO-CELTIC, ei_iso8859_14
ISO-8859-15, ei_iso8859_15
ISO_8859-15, ei_iso8859_15
@@ -105,7 +113,7 @@
ISO_8859-16:2000, ei_iso8859_16
ISO-IR-226, ei_iso8859_16
KOI8-R, ei_koi8_r
-@@ -251,12 +265,12 @@
+@@ -253,12 +268,12 @@
CHINESE, ei_gb2312
ISO-IR-165, ei_isoir165
CN-GB-ISOIR165, ei_isoir165