diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-26 14:38:10 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-26 14:38:10 +0000 |
commit | cce19ee9323766bd938bcbcb09a9dc547f013b58 (patch) | |
tree | 107af02c7a07924059a631e0962e92fce6dc9f79 /x11-toolkits/libgail-gnome | |
parent | Install <libspi/stateset.h> include, because it's referenced from (diff) |
Use USE_LIBTOOL.
Notes
Notes:
svn path=/head/; revision=58177
Diffstat (limited to 'x11-toolkits/libgail-gnome')
-rw-r--r-- | x11-toolkits/libgail-gnome/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/libgail-gnome/files/patch-configure | 13 | ||||
-rw-r--r-- | x11-toolkits/libgail-gnome/files/patch-ltmain.sh | 45 |
3 files changed, 15 insertions, 47 deletions
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 31d2ee44f6f0..90562fb2d0e3 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -16,13 +16,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - spi.0:${PORTSDIR}/x11-toolkits/at-spi + spi.1:${PORTSDIR}/x11-toolkits/at-spi USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \ --datadir=${PREFIX}/share/gnome2 \ --with-html-dir=${PREFIX}/share/doc \ diff --git a/x11-toolkits/libgail-gnome/files/patch-configure b/x11-toolkits/libgail-gnome/files/patch-configure new file mode 100644 index 000000000000..f3dc189b78bb --- /dev/null +++ b/x11-toolkits/libgail-gnome/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/26 14:06:24 1.1 ++++ configure 2002/04/26 14:06:33 +@@ -6479,6 +6479,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/x11-toolkits/libgail-gnome/files/patch-ltmain.sh b/x11-toolkits/libgail-gnome/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/x11-toolkits/libgail-gnome/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" |