From 791a7635ed96a32aa13240b1b515f03e049c1d6d Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 26 Apr 2002 13:22:42 +0000 Subject: - Update to 0.12.1 (version found in the GNOME2 beta4); - use USE_LIBTOOL. --- accessibility/at-spi/Makefile | 7 ++--- accessibility/at-spi/distinfo | 2 +- accessibility/at-spi/files/patch-Makefile.in | 14 +++++++++ accessibility/at-spi/files/patch-configure | 13 ++++++++ accessibility/at-spi/files/patch-ltmain.sh | 45 ---------------------------- accessibility/at-spi/pkg-plist | 7 ++--- x11-toolkits/at-spi/Makefile | 7 ++--- x11-toolkits/at-spi/distinfo | 2 +- x11-toolkits/at-spi/files/patch-Makefile.in | 14 +++++++++ x11-toolkits/at-spi/files/patch-configure | 13 ++++++++ x11-toolkits/at-spi/files/patch-ltmain.sh | 45 ---------------------------- x11-toolkits/at-spi/pkg-plist | 7 ++--- 12 files changed, 68 insertions(+), 108 deletions(-) create mode 100644 accessibility/at-spi/files/patch-Makefile.in create mode 100644 accessibility/at-spi/files/patch-configure delete mode 100644 accessibility/at-spi/files/patch-ltmain.sh create mode 100644 x11-toolkits/at-spi/files/patch-Makefile.in create mode 100644 x11-toolkits/at-spi/files/patch-configure delete mode 100644 x11-toolkits/at-spi/files/patch-ltmain.sh diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index c3120ba0e1ad..0cce56f229c1 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -6,8 +6,7 @@ # PORTNAME= at-spi -PORTVERSION= 0.10.0 -PORTREVISION= 1 +PORTVERSION= 0.12.1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3 @@ -15,14 +14,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gailutil.11:${PORTSDIR}/x11-toolkits/gail \ +LIB_DEPENDS= gailutil.13:${PORTSDIR}/x11-toolkits/gail \ bonobo-2.0:${PORTSDIR}/devel/libbonobo 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/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index 569448ce2621..c754cbdcda08 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1 +1 @@ -MD5 (gnome2/at-spi-0.10.0.tar.bz2) = 86ccccf8e0982e0b99e64f40914fb037 +MD5 (gnome2/at-spi-0.12.1.tar.bz2) = 8aa7aff16abb53181299c1e5938ac665 diff --git a/accessibility/at-spi/files/patch-Makefile.in b/accessibility/at-spi/files/patch-Makefile.in new file mode 100644 index 000000000000..5760d4d8e1ef --- /dev/null +++ b/accessibility/at-spi/files/patch-Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Makefile.in 2002/04/26 13:13:43 1.1 ++++ Makefile.in 2002/04/26 13:14:02 +@@ -129,7 +129,7 @@ + X_LIBS = @X_LIBS@ + cxxflags_set = @cxxflags_set@ + +-SUBDIRS = docs idl libspi registryd atk-bridge cspi util test ++SUBDIRS = docs idl libspi registryd atk-bridge cspi util + + pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc diff --git a/accessibility/at-spi/files/patch-configure b/accessibility/at-spi/files/patch-configure new file mode 100644 index 000000000000..5b9571dfd74e --- /dev/null +++ b/accessibility/at-spi/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/26 13:02:36 1.1 ++++ configure 2002/04/26 13:02:46 +@@ -6712,6 +6712,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/accessibility/at-spi/files/patch-ltmain.sh b/accessibility/at-spi/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/accessibility/at-spi/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" diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist index 1340e76375f8..67fc8c8ef82c 100644 --- a/accessibility/at-spi/pkg-plist +++ b/accessibility/at-spi/pkg-plist @@ -34,10 +34,10 @@ lib/libatk-bridge.so lib/libatk-bridge.so.0 lib/libcspi.a lib/libcspi.so -lib/libcspi.so.0 +lib/libcspi.so.1 lib/libspi.a lib/libspi.so -lib/libspi.so.0 +lib/libspi.so.1 lib/orbit-2.0/Accessibility_module.so libdata/bonobo/servers/Accessibility_Registry.server libdata/bonobo/servers/Accessibility_Util.server @@ -61,8 +61,7 @@ share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html share/doc/at-spi-cspi/book1.html -share/doc/at-spi-cspi/c5947.html -share/doc/at-spi-cspi/c5951.html +share/doc/at-spi-cspi/c6121.html share/doc/at-spi-cspi/index.sgml share/doc/at-spi-cspi/spi-accessible.html share/doc/at-spi-cspi/spi-application.html diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile index c3120ba0e1ad..0cce56f229c1 100644 --- a/x11-toolkits/at-spi/Makefile +++ b/x11-toolkits/at-spi/Makefile @@ -6,8 +6,7 @@ # PORTNAME= at-spi -PORTVERSION= 0.10.0 -PORTREVISION= 1 +PORTVERSION= 0.12.1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3 @@ -15,14 +14,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gailutil.11:${PORTSDIR}/x11-toolkits/gail \ +LIB_DEPENDS= gailutil.13:${PORTSDIR}/x11-toolkits/gail \ bonobo-2.0:${PORTSDIR}/devel/libbonobo 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/at-spi/distinfo b/x11-toolkits/at-spi/distinfo index 569448ce2621..c754cbdcda08 100644 --- a/x11-toolkits/at-spi/distinfo +++ b/x11-toolkits/at-spi/distinfo @@ -1 +1 @@ -MD5 (gnome2/at-spi-0.10.0.tar.bz2) = 86ccccf8e0982e0b99e64f40914fb037 +MD5 (gnome2/at-spi-0.12.1.tar.bz2) = 8aa7aff16abb53181299c1e5938ac665 diff --git a/x11-toolkits/at-spi/files/patch-Makefile.in b/x11-toolkits/at-spi/files/patch-Makefile.in new file mode 100644 index 000000000000..5760d4d8e1ef --- /dev/null +++ b/x11-toolkits/at-spi/files/patch-Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Makefile.in 2002/04/26 13:13:43 1.1 ++++ Makefile.in 2002/04/26 13:14:02 +@@ -129,7 +129,7 @@ + X_LIBS = @X_LIBS@ + cxxflags_set = @cxxflags_set@ + +-SUBDIRS = docs idl libspi registryd atk-bridge cspi util test ++SUBDIRS = docs idl libspi registryd atk-bridge cspi util + + pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc diff --git a/x11-toolkits/at-spi/files/patch-configure b/x11-toolkits/at-spi/files/patch-configure new file mode 100644 index 000000000000..5b9571dfd74e --- /dev/null +++ b/x11-toolkits/at-spi/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/04/26 13:02:36 1.1 ++++ configure 2002/04/26 13:02:46 +@@ -6712,6 +6712,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/at-spi/files/patch-ltmain.sh b/x11-toolkits/at-spi/files/patch-ltmain.sh deleted file mode 100644 index 91713d2306f8..000000000000 --- a/x11-toolkits/at-spi/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" diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist index 1340e76375f8..67fc8c8ef82c 100644 --- a/x11-toolkits/at-spi/pkg-plist +++ b/x11-toolkits/at-spi/pkg-plist @@ -34,10 +34,10 @@ lib/libatk-bridge.so lib/libatk-bridge.so.0 lib/libcspi.a lib/libcspi.so -lib/libcspi.so.0 +lib/libcspi.so.1 lib/libspi.a lib/libspi.so -lib/libspi.so.0 +lib/libspi.so.1 lib/orbit-2.0/Accessibility_module.so libdata/bonobo/servers/Accessibility_Registry.server libdata/bonobo/servers/Accessibility_Util.server @@ -61,8 +61,7 @@ share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html share/doc/at-spi-cspi/book1.html -share/doc/at-spi-cspi/c5947.html -share/doc/at-spi-cspi/c5951.html +share/doc/at-spi-cspi/c6121.html share/doc/at-spi-cspi/index.sgml share/doc/at-spi-cspi/spi-accessible.html share/doc/at-spi-cspi/spi-application.html -- cgit v1.2.3