From 267c972eab297e87ce7c16314746799098e8dac4 Mon Sep 17 00:00:00 2001
From: sobomax <sobomax@FreeBSD.org>
Date: Mon, 18 Mar 2002 11:26:13 +0000
Subject: Iconv cleanup, stage 2a: remove patches that only replacing <iconv.h>
 with <giconv.h> or -liconv with -lgiconv.

---
 x11-toolkits/gal/files/patch-aa                   | 45 -----------------------
 x11-toolkits/gal/files/patch-gal::util::e-iconv.h | 14 -------
 2 files changed, 59 deletions(-)
 delete mode 100644 x11-toolkits/gal/files/patch-aa
 delete mode 100644 x11-toolkits/gal/files/patch-gal::util::e-iconv.h

(limited to 'x11-toolkits/gal')

diff --git a/x11-toolkits/gal/files/patch-aa b/x11-toolkits/gal/files/patch-aa
deleted file mode 100644
index 6051ab181d24..000000000000
--- a/x11-toolkits/gal/files/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Sun Jan 13 17:23:41 2002
-+++ configure	Sun Jan 13 17:24:34 2002
-@@ -4890,9 +4890,9 @@
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
- CFLAGS="$CFLAGS $ICONV_CFLAGS"
--LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
--echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:4896: checking for iconv in -liconv" >&5
-+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
-+echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-+echo "configure:4896: checking for iconv in -lgiconv" >&5
- if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4900,7 +4900,7 @@
- #line 4901 "configure"
- #include "confdefs.h"
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- int main() {
- 
-@@ -4923,7 +4923,7 @@
- 
- echo "$ac_t""$ac_cv_libiconv" 1>&6
- if test $ac_cv_libiconv = yes; then
--	ICONV_LIBS="$ICONV_LIBS -liconv"
-+	ICONV_LIBS="$ICONV_LIBS -lgiconv"
- 	have_iconv=yes
- else
- 	CFLAGS="$save_CFLAGS"
-@@ -5049,7 +5049,7 @@
- #line 5050 "configure"
- #include "confdefs.h"
- 
--#include <iconv.h>
-+#include <giconv.h>
- #include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_GNU_GET_LIBC_VERSION
diff --git a/x11-toolkits/gal/files/patch-gal::util::e-iconv.h b/x11-toolkits/gal/files/patch-gal::util::e-iconv.h
deleted file mode 100644
index 47a19c3586c8..000000000000
--- a/x11-toolkits/gal/files/patch-gal::util::e-iconv.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gal/util/e-iconv.h	2001/11/07 14:06:41	1.1
-+++ gal/util/e-iconv.h	2001/11/07 14:06:52
-@@ -24,7 +24,7 @@
- #ifndef _E_ICONV_H_
- #define _E_ICONV_H_
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
- #ifdef __cplusplus
- extern "C" {
-- 
cgit