1*4a0a8088Struckmandiff -ur misc/libxslt-1.1.28/ltmain.sh misc/build/libxslt-1.1.28/ltmain.sh 2*4a0a8088Struckman--- misc/libxslt-1.1.28/ltmain.sh 2012-11-20 23:21:48.000000000 -0800 3*4a0a8088Struckman+++ misc/build/libxslt-1.1.28/ltmain.sh 2016-03-27 11:14:40.564087000 -0700 4*4a0a8088Struckman@@ -7331,13 +7331,13 @@ 5*4a0a8088Struckman # 6*4a0a8088Struckman case $version_type in 7*4a0a8088Struckman # correct linux to gnu/linux during the next big refactor 8*4a0a8088Struckman- darwin|linux|osf|windows|none) 9*4a0a8088Struckman+ darwin|freebsd-elf|linux|osf|windows|none) 10*4a0a8088Struckman func_arith $number_major + $number_minor 11*4a0a8088Struckman current=$func_arith_result 12*4a0a8088Struckman age="$number_minor" 13cdf0e10cSrcweir revision="$number_revision" 14cdf0e10cSrcweir ;; 15*4a0a8088Struckman- freebsd-aout|freebsd-elf|qnx|sunos) 16*4a0a8088Struckman+ freebsd-aout|qnx|sunos) 17*4a0a8088Struckman current="$number_major" 18*4a0a8088Struckman revision="$number_minor" 19*4a0a8088Struckman age="0" 20*4a0a8088Struckman@@ -7414,8 +7414,8 @@ 21cdf0e10cSrcweir ;; 22cdf0e10cSrcweir 23cdf0e10cSrcweir freebsd-elf) 24cdf0e10cSrcweir- major=".$current" 25cdf0e10cSrcweir- versuffix=".$current" 26*4a0a8088Struckman+ major=.$(($current - $age)) 27*4a0a8088Struckman+ versuffix="$major.$age.$revision" 28cdf0e10cSrcweir ;; 29cdf0e10cSrcweir 30cdf0e10cSrcweir irix | nonstopux) 31*4a0a8088Struckmandiff -ur misc/libxslt-1.1.28/xslt-config.in misc/build/libxslt-1.1.28/xslt-config.in 32*4a0a8088Struckman--- misc/libxslt-1.1.28/xslt-config.in 2012-09-04 07:26:23.000000000 -0700 33*4a0a8088Struckman+++ misc/build/libxslt-1.1.28/xslt-config.in 2016-03-26 10:54:11.377552000 -0700 34*4a0a8088Struckman@@ -1,10 +1,15 @@ 35cdf0e10cSrcweir #! /bin/sh 36cdf0e10cSrcweir 37cdf0e10cSrcweir-prefix=@prefix@ 38cdf0e10cSrcweir-exec_prefix=@exec_prefix@ 39cdf0e10cSrcweir+#prefix=@prefix@ 40cdf0e10cSrcweir+#exec_prefix=@exec_prefix@ 41cdf0e10cSrcweir+#exec_prefix_set=no 42cdf0e10cSrcweir+#includedir=@includedir@ 43cdf0e10cSrcweir+#libdir=@libdir@ 44cdf0e10cSrcweir+prefix=${SOLARVERSION}/${INPATH} 45cdf0e10cSrcweir+exec_prefix=${SOLARVERSION}/${INPATH} 46cdf0e10cSrcweir exec_prefix_set=no 47cdf0e10cSrcweir-includedir=@includedir@ 48cdf0e10cSrcweir-libdir=@libdir@ 49cdf0e10cSrcweir+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external 50cdf0e10cSrcweir+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} 51cdf0e10cSrcweir 52cdf0e10cSrcweir usage() 53cdf0e10cSrcweir { 54*4a0a8088Struckman@@ -89,7 +94,8 @@ 55cdf0e10cSrcweir shift 56cdf0e10cSrcweir done 57cdf0e10cSrcweir 58*4a0a8088Struckman-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" 59*4a0a8088Struckman+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" 60cdf0e10cSrcweir+the_libs="-L${libdir} ${XSLTLIB} -lm" 61cdf0e10cSrcweir if test "$includedir" != "/usr/include"; then 62cdf0e10cSrcweir the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" 63cdf0e10cSrcweir else 64*4a0a8088Struckmandiff -ur misc/libxslt-1.1.28/configure misc/build/libxslt-1.1.28/configure 65*4a0a8088Struckman--- misc/libxslt-1.1.28/configure 2012-11-20 23:11:21.000000000 -0800 66*4a0a8088Struckman+++ misc/build/libxslt-1.1.28/configure 2016-03-27 12:43:44.464670000 -0700 67*4a0a8088Struckman@@ -6462,7 +6462,7 @@ 68cdf0e10cSrcweir 69cdf0e10cSrcweir cygwin*) 70cdf0e10cSrcweir # func_win32_libid is a shell function defined in ltmain.sh 71cdf0e10cSrcweir- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 72cdf0e10cSrcweir+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' 73cdf0e10cSrcweir lt_cv_file_magic_cmd='func_win32_libid' 74cdf0e10cSrcweir ;; 75cdf0e10cSrcweir 76*4a0a8088Struckman@@ -6472,7 +6472,7 @@ 77cdf0e10cSrcweir # unless we find 'file', for example because we are cross-compiling. 78*4a0a8088Struckman # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. 79*4a0a8088Struckman if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then 80cdf0e10cSrcweir- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 81cdf0e10cSrcweir+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' 82cdf0e10cSrcweir lt_cv_file_magic_cmd='func_win32_libid' 83cdf0e10cSrcweir else 84*4a0a8088Struckman # Keep this pattern in sync with the one in func_win32_libid. 85*4a0a8088Struckman@@ -11635,7 +11635,7 @@ 86*4a0a8088Struckman version_type=freebsd-$objformat 87*4a0a8088Struckman case $version_type in 88*4a0a8088Struckman freebsd-elf*) 89*4a0a8088Struckman- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' 90*4a0a8088Struckman+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' 91*4a0a8088Struckman need_version=no 92*4a0a8088Struckman need_lib_prefix=no 93*4a0a8088Struckman ;; 94