aboutsummaryrefslogtreecommitdiff
path: root/www/screem-devel/files
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2000-03-21 23:34:08 +0000
committerWill Andrews <will@FreeBSD.org>2000-03-21 23:34:08 +0000
commit92342d3f07a37597c4cbaf5c0b973aa1ef28ec3e (patch)
treee59bb41e2736b33e7a6cc1fea29e0005797557ad /www/screem-devel/files
parent4005837bf8d6083a0d1327cb9f164897123e86ff (diff)
Update SCREEM to 0.2.1.
Status: 1) Remove pth-devel dependency. I discovered that -pthread works too. In the process of testing a previous update, I also discovered that if you have linuxthreads installed (as I did on my -current box), it will use -lpthread instead of -pthread. So I had to patch configure further to make sure that we don't get "lost dependencies" down the road. 2) Add USE_LIBTOOL. Remove *.la from pkg/PLIST. 3) Shuffle pkg/PLIST around to make it more ordered. 4) New (and faster) MASTER_SITE. 5) New patch to fix uploadWizard plugin Makefile.in so it doesn't hardcode the pthread library. This commit also affects PR 17471, in that it will probably help Mikhail remove pth-devel so he can build Mozilla again. :-) PR: 17477 Submitted by: myself
Notes
Notes: svn path=/head/; revision=26933
Diffstat (limited to 'www/screem-devel/files')
-rw-r--r--www/screem-devel/files/patch-ab74
1 files changed, 71 insertions, 3 deletions
diff --git a/www/screem-devel/files/patch-ab b/www/screem-devel/files/patch-ab
index ced38c2cfb75..dbaa9196f0dd 100644
--- a/www/screem-devel/files/patch-ab
+++ b/www/screem-devel/files/patch-ab
@@ -1,6 +1,74 @@
---- configure Thu Oct 28 15:09:16 1999
-+++ configure.new Sat Nov 13 15:01:06 1999
-@@ -5686,7 +5686,7 @@
+--- configure Mon Jan 3 09:33:01 2000
++++ configure.new Sat Mar 18 16:23:46 2000
+@@ -1922,8 +1922,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
+ # Reload cache, that may have been modified by ltconfig
+@@ -1937,7 +1937,7 @@
+
+
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2405,6 +2405,7 @@
+ fi
+
+
++if false; then
+ PTHREAD_LIB=""
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+ echo "configure:2411: checking for pthread_create in -lpthread" >&5
+@@ -2482,6 +2483,9 @@
+ PTHREAD_LIB="-lpthreads"
+ else
+ echo "$ac_t""no" 1>&6
++fi
++fi
++fi
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+ echo "configure:2487: checking for pthread_create in -lc_r" >&5
+ ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+@@ -2489,7 +2493,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lc_r $LIBS"
++LIBS="-pthread $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2495 "configure"
+ #include "confdefs.h"
+@@ -2517,7 +2521,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- PTHREAD_LIB="-lc_r"
++ PTHREAD_LIB="-pthread"
+ else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -2571,11 +2575,6 @@
+
+ fi
+
+-
+-fi
+-
+-
+-fi
+
+
+
+@@ -5882,7 +5881,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo