aboutsummaryrefslogtreecommitdiff
path: root/devel/glib20/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/glib20/files')
-rw-r--r--devel/glib20/files/patch-ae59
-rw-r--r--devel/glib20/files/patch-ag23
-rw-r--r--devel/glib20/files/patch-ah11
-rw-r--r--devel/glib20/files/patch-glib::libcharset::Makefile.in25
-rw-r--r--devel/glib20/files/patch-gmodule::gmodule-dl.c23
-rw-r--r--devel/glib20/files/patch-ltmain.sh28
6 files changed, 0 insertions, 169 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
deleted file mode 100644
index 30d08aef0edc..000000000000
--- a/devel/glib20/files/patch-ae
+++ /dev/null
@@ -1,59 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig Mon Dec 24 00:50:12 2001
-+++ configure Fri Jan 18 09:40:30 2002
-@@ -16354,8 +16354,8 @@
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
- fi
- ;;
-- *-freebsd2.2*)
-- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
-+ *-freebsd*)
-+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
-
- # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
- # -mthreads flag.
-@@ -16433,13 +16433,13 @@
- fi
- ;;
- *)
-- for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
-+ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thread dce; do
- if test x"$thread_lib" = x; then
- add_thread_lib=""
- IN=""
- else
-- add_thread_lib="-l$thread_lib"
-- IN=" in -l$thread_lib"
-+ add_thread_lib="$thread_lib"
-+ IN=" in $thread_lib"
- fi
- if test x"$have_threads" = xposix; then
- defattr=0
-@@ -17636,13 +17636,13 @@
- #
- # Check for libiconv
- #
-- echo "$as_me:17639: checking for libiconv_open in -liconv" >&5
--echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+ echo "$as_me:17639: checking for libiconv_open in -lgiconv" >&5
-+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
- if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-liconv $LIBS"
-+LIBS="-lgiconv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 17647 "configure"
- #include "confdefs.h"
-@@ -17704,7 +17704,7 @@
- fi
-
- if test "x$with_libiconv" = "xyes" ; then
-- ICONV_LIBS="-liconv"
-+ ICONV_LIBS="-lgiconv"
- cat >>confdefs.h <<\_ACEOF
- #define USE_LIBICONV 1
- _ACEOF
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
deleted file mode 100644
index a73c1cf91a6b..000000000000
--- a/devel/glib20/files/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig Fri Jan 18 09:43:54 2002
-+++ Makefile.in Fri Jan 18 09:45:49 2002
-@@ -149,7 +149,7 @@
-
- AUTOMAKE_OPTIONS = 1.4
-
--SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
-+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
-
- bin_SCRIPTS = glib-gettextize
-
-@@ -191,7 +191,7 @@
- glib-zip
-
-
--configexecincludedir = $(libdir)/glib-2.0/include
-+configexecincludedir = $(glibincludedir)
-
- CONFIGURE_DEPENDENCIES = acglib.m4
-
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
deleted file mode 100644
index afb4544d268b..000000000000
--- a/devel/glib20/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/Makefile.in 2000/11/20 09:49:25 1.1
-+++ docs/reference/Makefile.in 2000/11/20 09:50:55
-@@ -106,7 +106,7 @@
- STRIP_END = @STRIP_END@
- VERSION = @VERSION@
-
--SUBDIRS = glib gobject
-+SUBDIRS = #glib gobject
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES =
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
deleted file mode 100644
index 441b9ddfea63..000000000000
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- glib/libcharset/Makefile.in 2002/01/18 08:04:15 1.1
-+++ glib/libcharset/Makefile.in 2002/01/18 08:13:49
-@@ -148,7 +148,7 @@
- ms_librarian = @ms_librarian@
-
- INCLUDES = \
-- -DLIBDIR=\"$(libdir)\"
-+ -DLIBDIR=\"$(prefix)/libdata\"
-
-
- noinst_LTLIBRARIES = libcharset.la
-@@ -172,8 +172,8 @@
- make-patch.sh
-
-
--charset_alias = $(DESTDIR)$(libdir)/charset.alias
--charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-+charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
-+charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
-
- SUFFIXES = .sed .sin
-
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
deleted file mode 100644
index eaa43a74e423..000000000000
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
-+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
-@@ -104,6 +104,7 @@
- static gpointer
- _g_module_self (void)
- {
-+#ifndef __FreeBSD__
- gpointer handle;
-
- /* to query symbols from the program itself, special link options
-@@ -115,6 +116,9 @@
- g_module_set_error (fetch_dlerror (TRUE));
-
- return handle;
-+#else
-+ return RTLD_DEFAULT;
-+#endif
- }
-
- static void
diff --git a/devel/glib20/files/patch-ltmain.sh b/devel/glib20/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/devel/glib20/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh 2001/08/27 09:51:26 1.1
-+++ ltmain.sh 2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"