diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-07-01 06:33:57 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-07-01 06:33:57 +0800 |
commit | e4dad3b5f51a314a6e3ffed90dd67f155424389b (patch) | |
tree | 91e9fbf1a81368ffb14faa37adbbe5e041dd5b24 /x11-fm | |
parent | f3a2ae97350cb5d7dee461d6b7a7579f26025b4f (diff) | |
download | marcuscom-ports-e4dad3b5f51a314a6e3ffed90dd67f155424389b.tar marcuscom-ports-e4dad3b5f51a314a6e3ffed90dd67f155424389b.tar.gz marcuscom-ports-e4dad3b5f51a314a6e3ffed90dd67f155424389b.tar.bz2 marcuscom-ports-e4dad3b5f51a314a6e3ffed90dd67f155424389b.tar.lz marcuscom-ports-e4dad3b5f51a314a6e3ffed90dd67f155424389b.tar.xz marcuscom-ports-e4dad3b5f51a314a6e3ffed90dd67f155424389b.tar.zst marcuscom-ports-e4dad3b5f51a314a6e3ffed90dd67f155424389b.zip |
Re-fix the dreaded thread problem. Seems they changed libtool versions in
mid-stream.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@939 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm')
-rw-r--r-- | x11-fm/nautilus/Makefile | 1 | ||||
-rw-r--r-- | x11-fm/nautilus/files/patch-ltmain.sh | 21 | ||||
-rw-r--r-- | x11-fm/nautilus2/Makefile | 1 | ||||
-rw-r--r-- | x11-fm/nautilus2/files/patch-ltmain.sh | 21 |
4 files changed, 32 insertions, 12 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 0fbe82374..2640c0a2b 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -7,6 +7,7 @@ PORTNAME= nautilus2 PORTVERSION= 2.3.6 +PORTREVISION= 1 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3 diff --git a/x11-fm/nautilus/files/patch-ltmain.sh b/x11-fm/nautilus/files/patch-ltmain.sh index 89c6ef915..854b2a10a 100644 --- a/x11-fm/nautilus/files/patch-ltmain.sh +++ b/x11-fm/nautilus/files/patch-ltmain.sh @@ -1,6 +1,15 @@ ---- ltmain.sh.orig Tue Jun 10 18:31:49 2003 -+++ ltmain.sh Fri Jun 13 14:37:37 2003 -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Sat Feb 8 09:47:44 2003 ++++ ltmain.sh Mon Jun 30 18:31:09 2003 +@@ -1075,7 +1075,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1085,8 +1085,16 @@ continue ;; @@ -17,8 +26,8 @@ continue ;; -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) +@@ -2503,6 +2511,9 @@ + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) @@ -27,7 +36,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ +@@ -4330,10 +4341,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 0fbe82374..2640c0a2b 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -7,6 +7,7 @@ PORTNAME= nautilus2 PORTVERSION= 2.3.6 +PORTREVISION= 1 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3 diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh index 89c6ef915..854b2a10a 100644 --- a/x11-fm/nautilus2/files/patch-ltmain.sh +++ b/x11-fm/nautilus2/files/patch-ltmain.sh @@ -1,6 +1,15 @@ ---- ltmain.sh.orig Tue Jun 10 18:31:49 2003 -+++ ltmain.sh Fri Jun 13 14:37:37 2003 -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Sat Feb 8 09:47:44 2003 ++++ ltmain.sh Mon Jun 30 18:31:09 2003 +@@ -1075,7 +1075,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1085,8 +1085,16 @@ continue ;; @@ -17,8 +26,8 @@ continue ;; -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) +@@ -2503,6 +2511,9 @@ + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) @@ -27,7 +36,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ +@@ -4330,10 +4341,12 @@ fi # Install the pseudo-library for information purposes. |