summaryrefslogtreecommitdiff
path: root/x11/gnomecore
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-04-29 17:06:10 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-04-29 17:06:10 +0000
commit84bd9bca23a681cd2d9de2f262382cdbb601f119 (patch)
tree134c50df3f317336b24e2b3b927c63e3f2350cc0 /x11/gnomecore
parentUpdate to 1.4.1.6. (diff)
Update to 1.4.0.8.
Diffstat (limited to 'x11/gnomecore')
-rw-r--r--x11/gnomecore/Makefile5
-rw-r--r--x11/gnomecore/distinfo2
-rw-r--r--x11/gnomecore/files/patch-configure17
-rw-r--r--x11/gnomecore/files/patch-ltmain.sh45
4 files changed, 17 insertions, 52 deletions
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 663df0e4ca2b..c086dc4a1593 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnomecore
-PORTVERSION= 1.4.0.7
-PORTREVISION= 1
+PORTVERSION= 1.4.0.8
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-core
@@ -24,7 +23,7 @@ USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMECTRL= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \
--with-gtkhtml=${X11BASE} \
--disable-gtk-doc
diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo
index af824bd017dd..6af146239c40 100644
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnome-core-1.4.0.7.tar.bz2) = 41084a0aa9ad2ce5a9be384c42061833
+MD5 (gnome/gnome-core-1.4.0.8.tar.bz2) = 2af1f21c3be07c7c475b8cc51e974156
diff --git a/x11/gnomecore/files/patch-configure b/x11/gnomecore/files/patch-configure
index 8ed5570fa4ce..fa664525b3ed 100644
--- a/x11/gnomecore/files/patch-configure
+++ b/x11/gnomecore/files/patch-configure
@@ -1,6 +1,17 @@
---- configure.orig Wed Apr 24 22:37:56 2002
-+++ configure Wed Apr 24 22:40:48 2002
-@@ -9299,7 +9299,7 @@
+
+$FreeBSD$
+
+--- configure.orig Mon Apr 29 13:36:00 2002
++++ configure Mon Apr 29 13:36:41 2002
+@@ -5723,6 +5723,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'
+@@ -9299,7 +9300,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
diff --git a/x11/gnomecore/files/patch-ltmain.sh b/x11/gnomecore/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11/gnomecore/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"