diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-05-11 14:42:42 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-05-11 14:42:42 +0800 |
| commit | bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41 (patch) | |
| tree | df7cf27c9f17b9bb2174ed93e6c9cf86be89872e /x11-fm | |
| parent | d71fdc780b323cd2045be8fe89729513f50d35fd (diff) | |
| download | marcuscom-ports-bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41.tar marcuscom-ports-bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41.tar.gz marcuscom-ports-bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41.tar.bz2 marcuscom-ports-bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41.tar.lz marcuscom-ports-bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41.tar.xz marcuscom-ports-bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41.tar.zst marcuscom-ports-bf753e7f0f2f5c6d4d2521cfa88a8ffb58d0dd41.zip | |
Add a patch to fix lock up problems on -CURRENT. Special thanks
goes to Glenn Johnson <gjohnson@srrc.ars.usda.gov> for tracking this
down.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@745 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 f2f206757..94e7e48db 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -7,6 +7,7 @@ PORTNAME= nautilus2 PORTVERSION= 2.3.1 +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 1c2fba5d5..8afc42e39 100644 --- a/x11-fm/nautilus/files/patch-ltmain.sh +++ b/x11-fm/nautilus/files/patch-ltmain.sh @@ -1,6 +1,15 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Fri Apr 25 15:18:44 2003 ++++ ltmain.sh Sun May 11 02:27:13 2003 +@@ -1061,7 +1061,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 + ;; +@@ -1071,8 +1071,16 @@ continue ;; @@ -17,8 +26,8 @@ continue ;; -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) +@@ -2471,6 +2479,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 @@ +@@ -4280,10 +4291,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index f2f206757..94e7e48db 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -7,6 +7,7 @@ PORTNAME= nautilus2 PORTVERSION= 2.3.1 +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 1c2fba5d5..8afc42e39 100644 --- a/x11-fm/nautilus2/files/patch-ltmain.sh +++ b/x11-fm/nautilus2/files/patch-ltmain.sh @@ -1,6 +1,15 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Fri Apr 25 15:18:44 2003 ++++ ltmain.sh Sun May 11 02:27:13 2003 +@@ -1061,7 +1061,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 + ;; +@@ -1071,8 +1071,16 @@ continue ;; @@ -17,8 +26,8 @@ continue ;; -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) +@@ -2471,6 +2479,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 @@ +@@ -4280,10 +4291,12 @@ fi # Install the pseudo-library for information purposes. |