diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2001-04-18 21:37:32 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2001-04-18 21:37:32 +0000 |
commit | 01a9f79f0a3692d8148990805beabc8593d3596d (patch) | |
tree | 99d1ef5788fc9e55b6948a7d4951ac4a315f63bf /devel/glib20/files | |
parent | New index, rebuilt due to samba changes. (Gee, how many things (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_3_0'.release/4.3.0
Notes
Notes:
svn path=/head/; revision=41661
svn path=/tags/RELEASE_4_3_0/; revision=41662; tag=release/4.3.0
Diffstat (limited to 'devel/glib20/files')
-rw-r--r-- | devel/glib20/files/patch-ab | 21 | ||||
-rw-r--r-- | devel/glib20/files/patch-ae | 78 | ||||
-rw-r--r-- | devel/glib20/files/patch-ag | 29 | ||||
-rw-r--r-- | devel/glib20/files/patch-ah | 11 |
4 files changed, 0 insertions, 139 deletions
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab deleted file mode 100644 index 25bea128db73..000000000000 --- a/devel/glib20/files/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ ---- docs/Makefile.in.orig Mon Jul 17 10:35:35 2000 -+++ docs/Makefile.in Mon Jul 17 10:36:42 2000 -@@ -101,7 +101,7 @@ - STRIP_END = @STRIP_END@ - VERSION = @VERSION@ - --man_MANS = glib-config.1 -+man_MANS = glib-config-2.0.1 - - EXTRA_DIST = glib-config.1.in - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -129,6 +129,9 @@ - - glib-config.1: $(top_builddir)/config.status glib-config.1.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+glib-config-2.0.1: glib-config.1 -+ cp glib-config.1 glib-config-2.0.1 - - install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae deleted file mode 100644 index 3e306163ee3d..000000000000 --- a/devel/glib20/files/patch-ae +++ /dev/null @@ -1,78 +0,0 @@ ---- configure.orig Fri Nov 17 22:45:11 2000 -+++ configure Mon Nov 20 18:27:43 2000 -@@ -4230,6 +4230,12 @@ - linux*) - G_MODULE_LDFLAGS='-rdynamic' - ;; -+ freebsd*) -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test $objformat = "elf"; then -+ G_MODULE_LDFLAGS='-Wl,-E' -+ fi -+ ;; - esac - LIBS_orig="$LIBS" - LDFLAGS_orig="$LDFLAGS" -@@ -4523,7 +4529,7 @@ - G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" - fi - ;; -- *-freebsd2.2*) -+ *-freebsd*) - G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" - - # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support -@@ -4610,8 +4616,8 @@ - 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 -@@ -4912,7 +4918,7 @@ - sizeof (buffer)); - ; return 0; } - EOF --if { (eval echo configure:4916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then - rm -rf conftest* - ac_cv_func_nonposix_getpwuid_r=yes - else -@@ -5413,6 +5419,7 @@ - if eval "test \"`echo '$''{'ac_cv_func_iconv_open'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -+# LIBS="-liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 5418 "configure" - #include "confdefs.h" -@@ -5462,14 +5469,14 @@ - # - # Check for libiconv - # -- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 -+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 - echo "configure:5467: checking for libiconv_open in -liconv" >&5 - ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-lgiconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 5475 "configure" - #include "confdefs.h" -@@ -5509,7 +5516,7 @@ - fi - - if test "x$with_libiconv" = "xyes" ; then -- ICONV_LIBS="-liconv" -+ ICONV_LIBS="-lgiconv" - cat >> confdefs.h <<\EOF - #define USE_LIBICONV 1 - EOF diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag deleted file mode 100644 index b91c8e5ed4be..000000000000 --- a/devel/glib20/files/patch-ag +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in.orig Fri Nov 17 22:45:29 2000 -+++ Makefile.in Mon Nov 20 12:01:17 2000 -@@ -108,7 +108,7 @@ - - AUTOMAKE_OPTIONS = 1.4 - --SUBDIRS = . gobject gmodule gthread docs tests build -+SUBDIRS = . gobject gmodule gthread docs build - - bin_SCRIPTS = glib-config-2.0 - -@@ -134,7 +134,7 @@ - glibinclude_HEADERS = galloca.h garray.h gasyncqueue.h gbacktrace.h gcache.h gcompletion.h gconvert.h gdataset.h gdate.h gerror.h gfileutils.h ghash.h ghook.h giochannel.h glib.h glib-object.h glist.h gmacros.h gmain.h gmarkup.h gmem.h gmessages.h gnode.h gprimes.h gquark.h gqueue.h grand.h grel.h gscanner.h gshell.h gslist.h gspawn.h gstrfuncs.h gstring.h gthread.h gthreadpool.h gtimer.h gtree.h gtypes.h gunicode.h gutils.h gwin32.h - - --configexecincludedir = $(libdir)/glib-2.0/include -+configexecincludedir = $(glibincludedir) - - CONFIGURE_DEPENDENCIES = acglib.m4 - -@@ -594,7 +594,7 @@ - install-exec-local - install-exec: install-exec-recursive - --install-data-am: install-m4dataDATA install-pkgconfigDATA \ -+install-data-am: install-m4dataDATA \ - install-glibincludeHEADERS - install-data: install-data-recursive - 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 = |