Prefix all bits of this iconv() implementation with "g" to avoid conflict with

another iconv() in converters/iconv:

libiconv --> libgiconv
iconv.h --> giconv.h
iconv*.3 --> giconv*.3

Suggested by:	knu

5 files changed, 93 insertions, 4 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 08e4dd5b0ab0..c27d61e3eb44 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -15,6 +15,6 @@ MAINTAINER=	sobomax@FreeBSD.org
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
-MAN3=		iconv.3 iconv_open.3 iconv_close.3
+MAN3=		giconv.3 giconv_open.3 giconv_close.3
 
 .include <bsd.port.mk>
diff --git a/converters/libiconv/files/patch-aa b/converters/libiconv/files/patch-aa
new file mode 100644
index 000000000000..c40a5613240f
--- /dev/null
+++ b/converters/libiconv/files/patch-aa
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	Tue Jul 18 09:47:28 2000
++++ Makefile.in	Tue Jul 18 09:48:50 2000
+@@ -36,14 +36,14 @@
+ install-lib : all force
+ 	cd src; $(MAKE) -r install-lib libdir='$(libdir)' includedir='$(includedir)'
+ 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
+-	$(INSTALL_DATA) include/iconv.h $(includedir)/iconv.h
++	$(INSTALL_DATA) include/iconv.h $(includedir)/giconv.h
+ 
+ install : force
+ 	cd src; $(MAKE) -r install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ 	if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi
+ 	if [ ! -d $(exec_prefix) ] ; then mkdir $(exec_prefix) ; fi
+ 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
+-	$(INSTALL_DATA) include/iconv.h $(includedir)/iconv.h
++	$(INSTALL_DATA) include/iconv.h $(includedir)/giconv.h
+ 	cd man; $(MAKE) -r install prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)'
+ 
+ installdirs : force
+@@ -55,7 +55,7 @@
+ 
+ uninstall : force
+ 	cd src; $(MAKE) -r uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+-	$(RM) $(includedir)/iconv.h
++	$(RM) $(includedir)/giconv.h
+ 	cd man; $(MAKE) -r uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)'
+ 
+ check : force
diff --git a/converters/libiconv/files/patch-ab b/converters/libiconv/files/patch-ab
new file mode 100644
index 000000000000..721ef9cb4458
--- /dev/null
+++ b/converters/libiconv/files/patch-ab
@@ -0,0 +1,41 @@
+--- src/Makefile.in.orig	Tue Jul 18 09:37:10 2000
++++ src/Makefile.in	Tue Jul 18 09:46:08 2000
+@@ -49,10 +49,10 @@
+ 
+ PLUG_SOURCES =
+ 
+-all : libiconv.la @PLUGLIB@
++all : libgiconv.la @PLUGLIB@
+ 
+-libiconv.la : $(OBJECTS)
+-	$(LIBTOOL_LINK) $(CC) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS)
++libgiconv.la : $(OBJECTS)
++	$(LIBTOOL_LINK) $(CC) -o libgiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS)
+ 
+ libiconv_plug.so : libiconv_plug_@OS@.so
+ 	$(RM) libiconv_plug.so
+@@ -79,13 +79,13 @@
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ install-lib : all force
+ 	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
+-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
++	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(libdir)/libgiconv.la
+ 
+ install : all force
+ 	if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi
+ 	if [ ! -d $(exec_prefix) ] ; then mkdir $(exec_prefix) ; fi
+ 	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
+-	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
++	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(libdir)/libgiconv.la
+ 	if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(libdir)/@PLUGLIB@.new && mv $(libdir)/@PLUGLIB@.new $(libdir)/@PLUGLIB@ ; fi
+ 
+ installdirs : force
+@@ -94,7 +94,7 @@
+ 	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
+ 
+ uninstall : force
+-	$(LIBTOOL_UNINSTALL) $(RM) $(libdir)/libiconv.la
++	$(LIBTOOL_UNINSTALL) $(RM) $(libdir)/libgiconv.la
+ 	if test -n "@PLUGLIB@"; then $(RM) $(libdir)/@PLUGLIB@ ; fi
+ 
+ check : all
diff --git a/converters/libiconv/files/patch-ac b/converters/libiconv/files/patch-ac
new file mode 100644
index 000000000000..d05300b64ef0
--- /dev/null
+++ b/converters/libiconv/files/patch-ac
@@ -0,0 +1,20 @@
+--- man/Makefile.in.orig	Tue Jul 18 09:52:08 2000
++++ man/Makefile.in	Tue Jul 18 09:53:20 2000
+@@ -30,7 +30,7 @@
+ 	if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi
+ 	if [ ! -d $(mandir) ] ; then mkdir $(mandir) ; fi
+ 	if [ ! -d $(mandir)/man3 ] ; then mkdir $(mandir)/man3 ; fi
+-	cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(mandir)/man3/$$f ; done
++	cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(mandir)/man3/g$$f ; $(INSTALL_DATA) $$f $(mandir)/man3/g$$f ; done
+ 
+ installdirs : force
+ 	if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi
+@@ -38,7 +38,7 @@
+ 	if [ ! -d $(mandir)/man3 ] ; then mkdir $(mandir)/man3 ; fi
+ 
+ uninstall : force
+-	cd $(srcdir) && for f in *.3 ; do echo $(RM) $(mandir)/man3/$$f ; $(RM) $(mandir)/man3/$$f ; done
++	cd $(srcdir) && for f in *.3 ; do echo $(RM) $(mandir)/man3/g$$f ; $(RM) $(mandir)/man3/g$$f ; done
+ 
+ check :
+ 
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index a4c86c085a89..c32cd9c61f5f 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -1,3 +1,3 @@
-include/iconv.h
-lib/libiconv.so
-lib/libiconv.so.2
+include/giconv.h
+lib/libgiconv.so
+lib/libgiconv.so.2