Menu
▾
▴
CVS: sidai/package ChangeLog,1.20,1.21 amanda.xml,1.9,1.10 apache.xml,1.25,1.26 chkrootkit.xml,1.9,1.10 cyrus-imapd.xml,1.20,1.21 cyrus-sasl.xml,1.18,1.19 flexlm.xml,1.15,1.16 fvwm2.xml,1.4,1.5 gnupg.xml,1.11,1.12 icarus-verilog.xml,1.18,1.19 john-the-ripper.xml,1.10,1.11 python.xml,1.25,1.26 rsync.xml,1.9,1.10
|
From: Will P. <pa...@us...> - 2005-11-16 14:20:39
|
Update of /cvsroot/ark/sidai/package In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16649/package Modified Files: ChangeLog amanda.xml apache.xml chkrootkit.xml cyrus-imapd.xml cyrus-sasl.xml flexlm.xml fvwm2.xml gnupg.xml icarus-verilog.xml john-the-ripper.xml python.xml rsync.xml Log Message: updates Index: ChangeLog =================================================================== RCS file: /cvsroot/ark/sidai/package/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** ChangeLog 12 Jun 2002 11:28:05 -0000 1.20 --- ChangeLog 16 Nov 2005 14:20:17 -0000 1.21 *************** *** 1,2 **** --- 1,8 ---- + 2005-11-16 Will Partain <wil...@ve...> + + * python.xml (configure): Don't set CONFIG_SHELL for the configure + step; Jim Rowan has shown that it breaks things, at least on some + Solarisen. + 2002-06-07 Will Partain <wil...@ve...> Index: amanda.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/amanda.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** amanda.xml 26 May 2004 18:40:27 -0000 1.9 --- amanda.xml 16 Nov 2005 14:20:17 -0000 1.10 *************** *** 101,109 **** <!-- ..................................................... --> <configure> ! <comment>if you want a gnuplot dependency (for amplot), do that at the site level</comment> - <constraint><dependency type="normal" name="readline" on-method="deploy" /></constraint> - <!-- readline for amrecover: not essential --> </configure> --- 101,107 ---- <!-- ..................................................... --> <configure> ! <comment>if you want a gnuplot dependency (for amplot), or readline, do that at the site level</comment> </configure> Index: apache.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/apache.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** apache.xml 25 Apr 2005 12:03:02 -0000 1.25 --- apache.xml 16 Nov 2005 14:20:17 -0000 1.26 *************** *** 104,108 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "2.0.54" -o "$PKG_VERSION" = "2.0.53" -o "$PKG_VERSION" = "2.0.52" -o "$PKG_VERSION" = "2.0.51" -o "$PKG_VERSION" = "2.0.50" -o "$PKG_VERSION" = "2.0.49" -o "$PKG_VERSION" = "2.0.48" -o "$PKG_VERSION" = "2.0.47" -o "$PKG_VERSION" = "2.0.46" -o "$PKG_VERSION" = "2.0.45" -o "$PKG_VERSION" = "2.0.40" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 ../apache-2.0.49/Makefile.in ./Makefile.in --- 104,117 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! case "$PKG_VERSION" in ! 2.0.5?) # drop through to the patch ! ;; ! 2.0.4?) # ditto ! ;; ! *) echo "do not how how to patch version $PKG_VERSION" ! exit 1 ! ;; ! esac ! $PATCH -p0 <<\EOPATCH diff -ru1 ../apache-2.0.49/Makefile.in ./Makefile.in *************** *** 135,181 **** @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true EOPATCH - - elif [ "$PKG_VERSION" = "2.0.39" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' ../apache-2.0.39/Makefile.in ./Makefile.in - --- ../apache-2.0.39/Makefile.in Sat Jun 15 10:41:03 2002 - +++ ./Makefile.in Tue Jun 25 16:11:34 2002 - @@ -106,7 +106,7 @@ - @echo Installing HTML documents - @test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) - - @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) - + @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp --dereference * $(DESTDIR)$(htdocsdir)) - @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) - - @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - + @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp --dereference * $(DESTDIR)$(manualdir)) - -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf - - @@ -114,5 +114,5 @@ - @echo Installing error documents - @test -d $(DESTDIR)$(errordir) || $(MKINSTALLDIRS) $(DESTDIR)$(errordir) - - @cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) - + @cd $(top_srcdir)/docs/error && cp -rp --dereference * $(DESTDIR)$(errordir) - -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf - - @@ -120,5 +120,5 @@ - @echo Installing icons - @test -d $(DESTDIR)$(iconsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) - - @cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) - + @cd $(top_srcdir)/docs/icons && cp -rp --dereference * $(DESTDIR)$(iconsdir) - -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf - - @@ -126,5 +126,5 @@ - @echo Installing CGIs - @test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) - - @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) - + @cd $(top_srcdir)/docs/cgi-examples && cp -rp --dereference * $(DESTDIR)$(cgidir) - -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf - - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 - fi ]]></code></patch> </package> --- 144,147 ---- Index: chkrootkit.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/chkrootkit.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** chkrootkit.xml 26 May 2004 18:40:27 -0000 1.9 --- chkrootkit.xml 16 Nov 2005 14:20:17 -0000 1.10 *************** *** 107,111 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "0.42b" ] ; then $PATCH -p0 <<\EOPATCH --- 107,121 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! case "$PKG_VERSION" in ! 0.42b) do_patch='42b' ! ;; ! 0.41) do_patch='41' ! ;; ! *) # nothing to do ! exit 0 ! ;; ! esac ! ! if [ "$do_patch" = "42b" ] ; then $PATCH -p0 <<\EOPATCH *************** *** 151,155 **** EOPATCH ! elif [ "$PKG_VERSION" = "0.41" ] ; then $PATCH -p0 <<\EOPATCH --- 161,165 ---- EOPATCH ! elif [ "$do_patch" = "41" ] ; then $PATCH -p0 <<\EOPATCH *************** *** 195,200 **** EOPATCH - else - : we will assume it is OK fi ]]></code></patch> --- 205,208 ---- Index: cyrus-imapd.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/cyrus-imapd.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** cyrus-imapd.xml 23 Dec 2004 15:44:25 -0000 1.20 --- cyrus-imapd.xml 16 Nov 2005 14:20:17 -0000 1.21 *************** *** 153,157 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "2.1.17" -o "$PKG_VERSION" = "2.1.16" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.16/configure ./configure --- 153,170 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! case "$PKG_VERSION" in ! 2.1.1[76]) ! use_patch=2116 ! ;; ! 2.1.1[543210]|2.1.[987]) ! use_patch=217 ! ;; ! *) ! echo "do not how how to patch version $PKG_VERSION" ! exit 1 ! ;; ! esac ! ! if [ "$use_patch" = "2116" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.16/configure ./configure *************** *** 209,213 **** # ....................................................................... ! elif [ "$PKG_VERSION" = "2.1.15" -o "$PKG_VERSION" = "2.1.14" -o "$PKG_VERSION" = "2.1.13" -o "$PKG_VERSION" = "2.1.12" -o "$PKG_VERSION" = "2.1.11" -o "$PKG_VERSION" = "2.1.9" -o "$PKG_VERSION" = "2.1.8" -o "$PKG_VERSION" = "2.1.7" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.7/configure ./configure --- 222,226 ---- # ....................................................................... ! elif [ "$use_patch" = "217" ]; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.7/configure ./configure *************** *** 238,311 **** EOPATCH - - # ....................................................................... - - elif [ "$PKG_VERSION" = "2.1.5" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-imapd-2.1.5/configure ./configure - --- ../cyrus-imapd-2.1.5/configure Tue Apr 30 19:39:22 2002 - +++ ./configure Tue Jun 4 15:29:48 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - - - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +#CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - +# - +# # this is CMU ADD LIBPATH - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - @@ -5224,5 +5224,5 @@ - cmu_saved_LDFLAGS=$LDFLAGS - - - LDFLAGS=$LIB_SASL - + LDFLAGS="$LIB_SASL $LDFLAGS" - - echo $ac_n "checking for sasl_checkapop in -lsasl2""... $ac_c" 1>&6 - EOPATCH - - # ....................................................................... - elif [ "$PKG_VERSION" = "2.1.4" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-imapd-2.1.4/configure ./configure - --- ../cyrus-imapd-2.1.4/configure Tue Apr 30 19:39:22 2002 - +++ ./configure Tue Jun 4 15:29:48 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - - - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +#CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - +# - +# # this is CMU ADD LIBPATH - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 fi ]]></code></patch> --- 251,254 ---- Index: cyrus-sasl.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/cyrus-sasl.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** cyrus-sasl.xml 23 Dec 2004 15:44:25 -0000 1.18 --- cyrus-sasl.xml 16 Nov 2005 14:20:17 -0000 1.19 *************** *** 109,114 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` # ....................................................................... ! if [ "$PKG_VERSION" = "2.1.20" -o "$PKG_VERSION" = "2.1.19" ] ; then # this patch makes us try *much* harder to get clean-linking $PATCH -p0 <<\EOPATCH --- 109,126 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` + case "$PKG_VERSION" in + 2.1.20|2.1.19) + use_patch=2119 + ;; + *) + echo "do not how how to patch version $PKG_VERSION" + echo "(no patches provided for versions before 2.1.19)" + exit 1 + ;; + esac + + # ....................................................................... ! if [ "$use_patch" = "2119" ] ; then # this patch makes us try *much* harder to get clean-linking $PATCH -p0 <<\EOPATCH *************** *** 590,1223 **** EOPATCH - elif [ "$PKG_VERSION" = "2.1.17" ] ; then - # as for 2.1.19 but with some actual bug fixes, too - $PATCH -p0 <<\EOPATCH - diff -ru1 ../cyrus-sasl-2.1.17/config/ltconfig ./config/ltconfig - --- ../cyrus-sasl-2.1.17/config/ltconfig 2003-06-12 01:32:43.000000000 +0100 - +++ ./config/ltconfig 2004-01-07 17:18:20.000000000 +0000 - @@ -1155,3 +1155,3 @@ - # support --undefined. This deserves some investigation. FIXME - - archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_cmds='$CC -nostart $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - else - @@ -1190,7 +1190,7 @@ - test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ - - $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' - + $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts' - - @@ -1201,6 +1201,6 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - + archive_cmds='$LD -Bshareable $libobjs $deplibs $LDFLAGS $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - @@ -1223,4 +1223,4 @@ - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1231,3 +1231,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - wlarc= - @@ -1239,4 +1239,4 @@ - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1272,3 +1272,3 @@ - always_export_symbols=yes - - archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - + archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - @@ -1309,4 +1309,4 @@ - allow_undefined_flag=' ${wl}-berok' - - archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - - archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - + archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - + archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - case "$host_os" in aix4.[01]|aix4.[01].*) - @@ -1335,3 +1335,3 @@ - # FIXME: Setting linknames here is a bad hack. - - archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - + archive_cmds='$CC -o $lib $libobjs $linkopts $LDFLAGS `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - @@ -1352,3 +1352,3 @@ - freebsd2.2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1360,3 +1360,3 @@ - freebsd2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1368,3 +1368,3 @@ - freebsd*) - - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1376,3 +1376,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1387,3 +1387,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1397,4 +1397,4 @@ - case "$host_os" in - - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;; - + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - + *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $LDFLAGS $linkopts' ;; - esac - @@ -1410,5 +1410,5 @@ - if test "$with_gcc" = yes; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - - archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1420,5 +1420,5 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # a.out - else - - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF - + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # ELF - fi - @@ -1430,3 +1430,3 @@ - openbsd*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1440,3 +1440,3 @@ - allow_undefined_flag=unsupported - - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def' - + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $LDFLAGS $linkopts $objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' - @@ -1447,6 +1447,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1459,6 +1459,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1469,3 +1469,3 @@ - sco3.2v5*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1479,5 +1479,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1492,3 +1492,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1503,5 +1503,5 @@ - # files that make .init and .fini sections work. - - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - else - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - fi - @@ -1513,3 +1513,3 @@ - sysv4.3*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1522,5 +1522,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec= - @@ -1531,3 +1531,3 @@ - uts4*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1537,3 +1537,3 @@ - dgux*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1544,3 +1544,3 @@ - if test -d /usr/nec; then - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1553,3 +1553,3 @@ - sysv4.2uw2*) - - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1562,3 +1562,3 @@ - unixware7*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - runpath_var='LD_RUN_PATH' - diff -ru1 ../cyrus-sasl-2.1.17/config/ltmain.sh ./config/ltmain.sh - --- ../cyrus-sasl-2.1.17/config/ltmain.sh 2003-07-02 14:29:00.000000000 +0100 - +++ ./config/ltmain.sh 2004-01-07 17:19:58.000000000 +0000 - @@ -1156,2 +1156,19 @@ - - + -Wl,-R*) - + dir=`$echo "X$arg" | $Xsed -e 's/^-Wl,-R//'` - + # We need an absolute path. - + case "$dir" in - + [\\/]* | [A-Za-z]:[\\/]*) ;; - + *) - + $echo "$modename: only absolute run-paths are allowed" 1>&2 - + exit 1 - + ;; - + esac - + case "$xrpath " in - + *" $dir "*) ;; - + *) xrpath="$xrpath $dir" ;; - + esac - + continue - + ;; - + - -static) - @@ -1274,2 +1291,7 @@ - esac;; - + -Wl,-R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-Wl,-R//'` - + case " $rpath $xrpath " in - + *" $temp_xrpath "*) ;; - + *) xrpath="$xrpath $temp_xrpath";; - + esac;; - -L*) case "$compile_command $temp_deplibs " in - Only in ./config: ltmain.sh.~1~ - diff -ru1 ../cyrus-sasl-2.1.17/configure ./configure - --- ../cyrus-sasl-2.1.17/configure 2003-12-01 16:35:06.000000000 +0000 - +++ ./configure 2004-01-07 16:48:07.000000000 +0000 - @@ -5134,3 +5134,3 @@ - - - for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - + for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - @@ -5143,3 +5143,3 @@ - ac_check_lib_save_LIBS=$LIBS - -LIBS="-l$dbname $LIBS" - +LIBS="-l$dbname -lpthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - @@ -5192,3 +5192,3 @@ - if test `eval echo '${'$as_ac_Lib'}'` = yes; then - - BDB_LIBADD="$BDB_LIBADD -l$dbname"; - + BDB_LIBADD="$BDB_LIBADD -l$dbname -lpthread"; - dblib="berkeley"; break - @@ -5255,3 +5255,3 @@ - if test $ac_cv_lib_db_db_open = yes; then - - BDB_LIBADD="$BDB_LIBADD -ldb"; - + BDB_LIBADD="$BDB_LIBADD -ldb -lpthread"; - dblib="berkeley"; dbname=db - @@ -5937,3 +5937,3 @@ - - - for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - + for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - @@ -5946,3 +5946,3 @@ - ac_check_lib_save_LIBS=$LIBS - -LIBS="-l$dbname $LIBS" - +LIBS="-l$dbname -lpthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - @@ -5995,3 +5995,3 @@ - if test `eval echo '${'$as_ac_Lib'}'` = yes; then - - BDB_LIBADD="$BDB_LIBADD -l$dbname"; - + BDB_LIBADD="$BDB_LIBADD -l$dbname -lpthread"; - dblib="berkeley"; break - @@ -6058,3 +6058,3 @@ - if test $ac_cv_lib_db_db_open = yes; then - - BDB_LIBADD="$BDB_LIBADD -ldb"; - + BDB_LIBADD="$BDB_LIBADD -ldb -lpthread"; - dblib="berkeley"; dbname=db - diff -ru1 ../cyrus-sasl-2.1.17/saslauthd/config/ltconfig ./saslauthd/config/ltconfig - --- ../cyrus-sasl-2.1.17/saslauthd/config/ltconfig 2003-10-08 21:24:14.000000000 +0100 - +++ ./saslauthd/config/ltconfig 2004-01-07 17:22:49.000000000 +0000 - @@ -1155,3 +1155,3 @@ - # support --undefined. This deserves some investigation. FIXME - - archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_cmds='$CC -nostart $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - else - @@ -1190,7 +1190,7 @@ - test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ - - $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' - + $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts' - - @@ -1201,6 +1201,6 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - + archive_cmds='$LD -Bshareable $libobjs $deplibs $LDFLAGS $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - @@ -1223,4 +1223,4 @@ - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1231,3 +1231,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - wlarc= - @@ -1239,4 +1239,4 @@ - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1272,3 +1272,3 @@ - always_export_symbols=yes - - archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - + archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - @@ -1309,4 +1309,4 @@ - allow_undefined_flag=' ${wl}-berok' - - archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - - archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - + archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - + archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - case "$host_os" in aix4.[01]|aix4.[01].*) - @@ -1335,3 +1335,3 @@ - # FIXME: Setting linknames here is a bad hack. - - archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - + archive_cmds='$CC -o $lib $libobjs $linkopts $LDFLAGS `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - @@ -1352,3 +1352,3 @@ - freebsd2.2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1360,3 +1360,3 @@ - freebsd2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1368,3 +1368,3 @@ - freebsd*) - - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1376,3 +1376,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1387,3 +1387,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1397,4 +1397,4 @@ - case "$host_os" in - - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;; - + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - + *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $LDFLAGS $linkopts' ;; - esac - @@ -1410,5 +1410,5 @@ - if test "$with_gcc" = yes; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - - archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1420,5 +1420,5 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # a.out - else - - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF - + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # ELF - fi - @@ -1430,3 +1430,3 @@ - openbsd*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1440,3 +1440,3 @@ - allow_undefined_flag=unsupported - - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def' - + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $LDFLAGS $linkopts $objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' - @@ -1447,6 +1447,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1459,6 +1459,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1469,3 +1469,3 @@ - sco3.2v5*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1479,5 +1479,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1492,3 +1492,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1503,5 +1503,5 @@ - # files that make .init and .fini sections work. - - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - else - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - fi - @@ -1513,3 +1513,3 @@ - sysv4.3*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1522,5 +1522,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec= - @@ -1531,3 +1531,3 @@ - uts4*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1537,3 +1537,3 @@ - dgux*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1544,3 +1544,3 @@ - if test -d /usr/nec; then - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1553,3 +1553,3 @@ - sysv4.2uw2*) - - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1562,3 +1562,3 @@ - unixware7*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - runpath_var='LD_RUN_PATH' - diff -ru1 ../cyrus-sasl-2.1.17/saslauthd/config/ltmain.sh ./saslauthd/config/ltmain.sh - --- ../cyrus-sasl-2.1.17/saslauthd/config/ltmain.sh 2003-07-02 14:29:02.000000000 +0100 - +++ ./saslauthd/config/ltmain.sh 2004-01-07 17:24:33.000000000 +0000 - @@ -1156,2 +1156,19 @@ - - + -Wl,-R*) - + dir=`$echo "X$arg" | $Xsed -e 's/^-Wl,-R//'` - + # We need an absolute path. - + case "$dir" in - + [\\/]* | [A-Za-z]:[\\/]*) ;; - + *) - + $echo "$modename: only absolute run-paths are allowed" 1>&2 - + exit 1 - + ;; - + esac - + case "$xrpath " in - + *" $dir "*) ;; - + *) xrpath="$xrpath $dir" ;; - + esac - + continue - + ;; - + - -static) - @@ -1274,2 +1291,7 @@ - esac;; - + -Wl,-R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-Wl,-R//'` - + case " $rpath $xrpath " in - + *" $temp_xrpath "*) ;; - + *) xrpath="$xrpath $temp_xrpath";; - + esac;; - -L*) case "$compile_command $temp_deplibs " in - EOPATCH - - # ....................................................................... - elif [ "$PKG_VERSION" = "2.1.15" -o "$PKG_VERSION" = "2.1.13" -o "$PKG_VERSION" = "2.1.12" -o "$PKG_VERSION" = "2.1.10" -o "$PKG_VERSION" = "2.1.9" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../cyrus-sasl-2.1.9/configure ./configure - --- ../cyrus-sasl-2.1.9/configure 2002-10-11 21:57:58.000000000 +0100 - +++ ./configure 2002-12-05 13:57:18.000000000 +0000 - @@ -1524,8 +1524,8 @@ - - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# # this is CMU ADD LIBPATH - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - EOPATCH - - # ....................................................................... - - elif [ "$PKG_VERSION" = "2.1.7" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-sasl-2.1.7/configure ./configure - --- ../cyrus-sasl-2.1.7/configure Tue Mar 26 18:30:27 2002 - +++ ./configure Tue Jun 4 14:34:12 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - +#CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - # ....................................................................... - - elif [ "$PKG_VERSION" = "2.1.6" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-sasl-2.1.6/configure ./configure - --- ../cyrus-sasl-2.1.6/configure Tue Mar 26 18:30:27 2002 - +++ ./configure Tue Jun 4 14:34:12 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - +#CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - # ....................................................................... - elif [ "$PKG_VERSION" = "2.1.2" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-sasl-2.1.2/configure ./configure - --- ../cyrus-sasl-2.1.2/configure Tue Mar 26 18:30:27 2002 - +++ ./configure Tue Jun 4 14:34:12 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - +#CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 fi ]]></code></patch> --- 602,605 ---- Index: flexlm.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/flexlm.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** flexlm.xml 26 May 2004 18:40:27 -0000 1.15 --- flexlm.xml 16 Nov 2005 14:20:17 -0000 1.16 *************** *** 90,96 **** # uncompress binaries /bin/rm -f sbin/lmgrd ! $GZIP -dc $PKG_TGZ_DIR/lmgrd.Z > sbin/lmgrd /bin/rm -f lmutil/lmutil ! $GZIP -dc $PKG_TGZ_DIR/lmutil.Z > lmutil/lmutil $CHMOD 775 sbin/lmgrd lmutil/lmutil --- 90,116 ---- # uncompress binaries /bin/rm -f sbin/lmgrd ! if [ -f $PKG_TGZ_DIR/lmgrd.Z ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmgrd.Z > sbin/lmgrd ! elif [ -f $PKG_TGZ_DIR/lmgrd.gz ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmgrd.gz > sbin/lmgrd ! elif [ -f $PKG_TGZ_DIR/lmgrd ] ; then ! /bin/cp -p $PKG_TGZ_DIR/lmgrd sbin/lmgrd ! else ! echo no idea what to do on the lmgrd binary ! exit 1 ! fi ! /bin/rm -f lmutil/lmutil ! if [ -f $PKG_TGZ_DIR/lmutil.Z ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmutil.Z > lmutil/lmutil ! elif [ -f $PKG_TGZ_DIR/lmutil.gz ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmutil.gz > lmutil/lmutil ! elif [ -f $PKG_TGZ_DIR/lmutil ] ; then ! /bin/cp -p $PKG_TGZ_DIR/lmutil lmutil/lmutil ! else ! echo no idea what to do on the lmutil binary ! exit 1 ! fi ! $CHMOD 775 sbin/lmgrd lmutil/lmutil Index: fvwm2.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/fvwm2.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** fvwm2.xml 10 Mar 2003 12:38:46 -0000 1.4 --- fvwm2.xml 16 Nov 2005 14:20:18 -0000 1.5 *************** *** 22,25 **** --- 22,34 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` + do_patch='no' + case "x$PKG_VERSION" in + x21.4.*) do_patch='yes' ;; + *) ;; + esac + + if [ $do_patch = 'no' ] ; then exit 0 ; fi + + $PATCH -p0 <<\EOPATCH diff -rc1 ../fvwm-2.4.0/utils/Makefile.am ./utils/Makefile.am Index: gnupg.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/gnupg.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** gnupg.xml 9 May 2005 09:46:09 -0000 1.11 --- gnupg.xml 16 Nov 2005 14:20:18 -0000 1.12 *************** *** 79,116 **** </install-bits> - <!-- ..................................................... --> - <patch> - <constraint><dependency type="essential" name="." on-method="src-linkfarm" /></constraint> - <param name="PATCH">@proxy-host:PATCH@</param> - <param name="PATCH_BOOT">@proxy-host:PATCH-BOOT@</param> - <param name="PKG_VERSION">!pkg_version</param> - - <code once-per="site" redoable="no"><![CDATA[ - cd $PKG_BUILD_DIR/src - - PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` - - if [ "$PKG_VERSION" = "1.4.1" -o "$PKG_VERSION" = "1.2.7" -o "$PKG_VERSION" = "1.2.6" -o "$PKG_VERSION" = "1.2.5" -o "$PKG_VERSION" = "1.2.4" -o "$PKG_VERSION" = "1.2.3" ] ; then - : ok - - elif [ "$PKG_VERSION" = "1.2.2" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../gnupg-1.2.2/checks/defs.inc ./checks/defs.inc - --- ../gnupg-1.2.2/checks/defs.inc 2003-05-01 14:17:46.000000000 +0100 - +++ ./checks/defs.inc 2003-06-02 14:58:29.000000000 +0100 - @@ -101,5 +101,5 @@ - # Make sure we have a valid option files even with VPATH builds. - -if [ -f ./options]; then - +if [ -f ./options ]; then - : - -elif [ -f ./gpg.conf]; then - +elif [ -f ./gpg.conf ]; then - : - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 - fi - ]]></code></patch> </package> --- 79,81 ---- Index: icarus-verilog.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/icarus-verilog.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** icarus-verilog.xml 20 Jun 2005 13:55:59 -0000 1.18 --- icarus-verilog.xml 16 Nov 2005 14:20:18 -0000 1.19 *************** *** 70,141 **** </install-bits> - <!-- ..................................................... --> - <patch> - <constraint><dependency type="essential" name="." on-method="src-linkfarm" /></constraint> - <param name="PATCH">@proxy-host:PATCH@</param> - <param name="PATCH_BOOT">@proxy-host:PATCH-BOOT@</param> - <param name="PKG_VERSION">!pkg_version</param> - - <code once-per="site" redoable="no"><![CDATA[ - cd $PKG_BUILD_DIR/src - - PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` - - if [ "$PKG_VERSION" = "0.8" ] ; then - : think it is OK - - elif [ "$PKG_VERSION" -ge "20031202" ] ; then - : think it is OK - - elif [ "$PKG_VERSION" = "20030904" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../icarus-verilog-20030904/cadpli/configure.in ./cadpli/configure.in - --- ../icarus-verilog-20030904/cadpli/configure.in 2003-04-23 06:27:44.000000000 +0100 - +++ ./cadpli/configure.in 2003-09-05 17:07:28.000000000 +0100 - @@ -80,2 +80,4 @@ - *-*-solaris*) - + whole_archive="" - + no_whole_archive="" - rdynamic="" - diff -ru1 ../icarus-verilog-20030904/cadpli/configure ./cadpli/configure - --- ../icarus-verilog-20030904/cadpli/configure 2003-09-04 21:47:52.000000000 +0100 - +++ ./cadpli/configure 2003-09-05 17:08:00.000000000 +0100 - @@ -4426,2 +4426,4 @@ - rdynamic="" - + whole_archive="" - + no_whole_archive="" - ;; - EOPATCH - - elif [ "$PKG_VERSION" = "20030518" ] ; then - : think it is OK - elif [ "$PKG_VERSION" = "20030216" ] ; then - : think it is OK - elif [ "$PKG_VERSION" = "20021207" ] ; then - : think it is OK - elif [ "$PKG_VERSION" = "20020907" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../icarus-verilog-20020907/lexor.lex ./lexor.lex - --- ../icarus-verilog-20020907/lexor.lex 2002-06-06 19:57:18.000000000 +0100 - +++ ./lexor.lex 2002-09-13 11:50:30.000000000 +0100 - @@ -48,3 +48,3 @@ - */ - -extern YYLTYPE yylloc; - +YYLTYPE yylloc; - - diff -ru1 ../icarus-verilog-20020907/parse.y ./parse.y - --- ../icarus-verilog-20020907/parse.y 2002-09-01 04:01:48.000000000 +0100 - +++ ./parse.y 2002-09-13 11:48:10.000000000 +0100 - @@ -891,3 +891,3 @@ - $$ = tmp; - - delete $1 - + delete $1; - } - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 - fi - ]]... [truncated message content] |