diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-02-12 08:31:19 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-02-12 08:31:19 +0000 |
| commit | 7e1cbe2a8b51859bf33f810487f01a8c634beed5 (patch) | |
| tree | e2991df20874150e7c2d51acaeb32de19eae25c2 /devel/glib20/files | |
| parent | 61609d5e1ec57f9021756c3bfb5a8fee930cfe89 (diff) | |
| download | FreeBSD-ports-7e1cbe2a8b51859bf33f810487f01a8c634beed5.zip FreeBSD-ports-7e1cbe2a8b51859bf33f810487f01a8c634beed5.tar.gz | |
- Update to 1.3.13 - the version shipped with the GNOME2 alpha 2;
- switch to .bz2 distfile;
- move distfile into gnome2 DIST_SUBDIR.
Diffstat (limited to 'devel/glib20/files')
| -rw-r--r-- | devel/glib20/files/patch-ae | 20 | ||||
| -rw-r--r-- | devel/glib20/files/patch-ltmain.sh | 25 |
2 files changed, 31 insertions, 14 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 30d08ae..8740411 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,10 +1,10 @@ $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" +--- configure.orig Tue Jan 29 18:34:49 2002 ++++ configure Tue Feb 12 10:13:56 2002 +@@ -16378,8 +16378,8 @@ + rm -f conftest.$ac_objext conftest.$ac_ext fi ;; - *-freebsd2.2*) @@ -14,7 +14,7 @@ $FreeBSD$ # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support # -mthreads flag. -@@ -16433,13 +16433,13 @@ +@@ -16457,13 +16457,13 @@ fi ;; *) @@ -31,13 +31,13 @@ $FreeBSD$ fi if test x"$have_threads" = xposix; then defattr=0 -@@ -17636,13 +17636,13 @@ +@@ -17660,13 +17660,13 @@ # # Check for libiconv # -- echo "$as_me:17639: checking for libiconv_open in -liconv" >&5 +- echo "$as_me:17663: 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 "$as_me:17663: 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 @@ -46,9 +46,9 @@ $FreeBSD$ -LIBS="-liconv $LIBS" +LIBS="-lgiconv $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line 17647 "configure" + #line 17671 "configure" #include "confdefs.h" -@@ -17704,7 +17704,7 @@ +@@ -17728,7 +17728,7 @@ fi if test "x$with_libiconv" = "xyes" ; then diff --git a/devel/glib20/files/patch-ltmain.sh b/devel/glib20/files/patch-ltmain.sh index 98cb05e..91713d2 100644 --- a/devel/glib20/files/patch-ltmain.sh +++ b/devel/glib20/files/patch-ltmain.sh @@ -1,9 +1,26 @@ $FreeBSD$ ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ +--- ltmain.sh.orig Wed Jan 23 11:38:40 2002 ++++ ltmain.sh Sun Feb 3 01:44:17 2002 +@@ -1037,8 +1037,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2412,6 +2420,9 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; @@ -13,7 +30,7 @@ $FreeBSD$ *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ +@@ -4179,10 +4190,12 @@ fi # Install the pseudo-library for information purposes. |
