diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-29 17:05:43 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-29 17:05:43 +0000 |
commit | 3670e0fb0c2d8edf18f4b37745abb8aa3471d922 (patch) | |
tree | 4dc85955273fb28c9b30d772c84ceeabaf7789e1 /x11/gnome-libs | |
parent | Apply the latest patches. (diff) |
Update to 1.4.1.6.
Notes
Notes:
svn path=/head/; revision=58320
Diffstat (limited to 'x11/gnome-libs')
-rw-r--r-- | x11/gnome-libs/Makefile | 5 | ||||
-rw-r--r-- | x11/gnome-libs/distinfo | 2 | ||||
-rw-r--r-- | x11/gnome-libs/files/patch-aa | 22 | ||||
-rw-r--r-- | x11/gnome-libs/files/patch-libart_lgpl::configure | 13 | ||||
-rw-r--r-- | x11/gnome-libs/files/patch-ltmain.sh | 28 |
5 files changed, 32 insertions, 38 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 93a6f876cf0f..fb5f8c3f5c42 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.4.1.5 +PORTVERSION= 1.4.1.6 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs @@ -28,7 +28,8 @@ USE_GMAKE= yes USE_IMLIB= yes USE_ESOUND= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +LIBTOOLFILES= configure libart_lgpl/configure CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-test-gnome \ diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index f1658edba20c..548755c88156 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1 +1 @@ -MD5 (gnome/gnome-libs-1.4.1.5.tar.bz2) = a28b852859ca8ae5d9cba62898dfa935 +MD5 (gnome/gnome-libs-1.4.1.6.tar.bz2) = 6a629eb2b5cfebf26f3d5b59d51ee83b diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa index d8cf6b134f16..1af3d26ce2ef 100644 --- a/x11/gnome-libs/files/patch-aa +++ b/x11/gnome-libs/files/patch-aa @@ -1,9 +1,17 @@ $FreeBSD$ ---- configure.orig Mon Jan 14 11:58:21 2002 -+++ configure Mon Jan 14 12:00:15 2002 -@@ -8775,7 +8775,7 @@ +--- configure.orig Mon Apr 29 12:07:59 2002 ++++ configure Mon Apr 29 12:08:54 2002 +@@ -5339,6 +5339,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' +@@ -8775,7 +8776,7 @@ else save_LDFLAGS="$LDFLAGS" @@ -12,7 +20,7 @@ $FreeBSD$ if test "$cross_compiling" = yes; then ac_cv_gmodule=yes else -@@ -10394,7 +10394,7 @@ +@@ -10394,7 +10395,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" @@ -21,7 +29,7 @@ $FreeBSD$ cat > conftest.$ac_ext <<EOF #line 10400 "configure" #include "confdefs.h" -@@ -13483,13 +13483,13 @@ +@@ -13483,13 +13484,13 @@ SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' ART_LIBS="-lart_lgpl" @@ -37,7 +45,7 @@ $FreeBSD$ GNOME_IDLDIR='-I${datadir}/idl' -@@ -13887,6 +13887,7 @@ +@@ -13887,6 +13888,7 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@cflags_set@%$cflags_set%g @@ -45,7 +53,7 @@ $FreeBSD$ s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g -@@ -14356,10 +14357,6 @@ +@@ -14356,10 +14358,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/gnome-libs/files/patch-libart_lgpl::configure b/x11/gnome-libs/files/patch-libart_lgpl::configure new file mode 100644 index 000000000000..2ee4ceb2e6b1 --- /dev/null +++ b/x11/gnome-libs/files/patch-libart_lgpl::configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- libart_lgpl/configure 2002/04/29 09:45:17 1.1 ++++ libart_lgpl/configure 2002/04/29 09:45:37 +@@ -5090,6 +5090,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/gnome-libs/files/patch-ltmain.sh b/x11/gnome-libs/files/patch-ltmain.sh deleted file mode 100644 index 3084634cf3b8..000000000000 --- a/x11/gnome-libs/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Tue Jan 22 06:35:12 2002 -+++ ltmain.sh Fri Feb 8 01:27:17 2002 -@@ -1799,6 +1799,9 @@ - # rhapsody is a little odd... - deplibs="$deplibs -framework System" - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3360,10 +3366,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" |