diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-26 10:08:55 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-26 10:08:55 +0000 |
| commit | 726e99308f2c780a4c8a1b5972d81b308ab4b93f (patch) | |
| tree | 7d6a7e506b29d9103428daf41825c025120c66c8 /textproc | |
| parent | Use USE_LIBTOOL. (diff) | |
Use USE_LIBTOOL.
Notes
Notes:
svn path=/head/; revision=58161
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/libxslt/Makefile | 2 | ||||
| -rw-r--r-- | textproc/libxslt/files/patch-configure | 13 | ||||
| -rw-r--r-- | textproc/libxslt/files/patch-ltmain.sh | 45 |
3 files changed, 14 insertions, 46 deletions
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 00ba1621ec69..f5d263a3d9f1 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 USE_BZIP2= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" diff --git a/textproc/libxslt/files/patch-configure b/textproc/libxslt/files/patch-configure new file mode 100644 index 000000000000..7b6b036578e7 --- /dev/null +++ b/textproc/libxslt/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/26 09:54:14 1.1 ++++ configure 2002/04/26 09:54:23 +@@ -5341,6 +5341,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/textproc/libxslt/files/patch-ltmain.sh b/textproc/libxslt/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/textproc/libxslt/files/patch-ltmain.sh +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed Jan 23 11:38:40 2002 -+++ ltmain.sh Sun Feb 3 01:44:17 2002 -@@ -1037,8 +1037,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2412,6 +2420,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4179,10 +4190,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |