mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00
Code Issues Releases Activity

- Update to 2.0.2 (version found in the GNOME2 beta4);

Browse Source 
- use USE_LIBTOOL.
This commit is contained in:
Maxim Sobolev 2002-04-26 09:26:06 +00:00
parent 29a7790b5b
commit 07b4525b54
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=58154
12 changed files with 60 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11-toolkits/gtk20/Makefile
View File

@ -6,9 +6,9 @@
#
PORTNAME= gtk
PORTVERSION= 2.0.1
PORTVERSION= 2.0.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta4,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@ -32,7 +32,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \

2
x11-toolkits/gtk20/distinfo
View File

@ -1 +1 @@
MD5 (gnome2/gtk+-2.0.1.tar.bz2) = 3e0c9e5c171912f5668f969b56fe0278
MD5 (gnome2/gtk+-2.0.2.tar.bz2) = b8df4c513323b9efc9a157703f25a07f

22
x11-toolkits/gtk20/files/patch-ae
View File

@ -1,14 +1,22 @@
$FreeBSD$
--- configure.orig Fri Mar 8 19:22:14 2002
+++ configure Mon Mar 11 12:03:39 2002
@@ -9788,7 +9788,7 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
CATOBJEXT=.mo
--- configure.orig Tue Apr 2 14:45:37 2002
+++ configure Fri Apr 26 11:36:40 2002
@@ -5671,6 +5671,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'
@@ -7864,7 +7865,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
rm -f conftest*
INSTOBJEXT=.mo

20
x11-toolkits/gtk20/files/patch-ag
View File

@ -1,14 +1,14 @@
$FreeBSD$
--- gtk/Makefile.in.orig Fri Jan 18 11:03:21 2002
+++ gtk/Makefile.in Fri Jan 18 11:18:26 2002
--- gtk/Makefile.in.orig Fri Apr 26 11:39:34 2002
+++ gtk/Makefile.in Fri Apr 26 11:40:56 2002
@@ -176,7 +176,7 @@
-DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
-DGTK_LOCALEDIR=\"$(gtklocaledir)\" \
-DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
SUBDIRS = stock-icons theme-bits
-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DGTK_HOST=\"@host@\" -DGTK_COMPILATION -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@
+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DGTK_HOST=\"@host@\" -DGTK_COMPILATION -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@
gtarget = @gdktarget@

45
x11-toolkits/gtk20/files/patch-ltmain.sh
View File

@ -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"

2
x11-toolkits/gtk20/pkg-plist
View File

@ -274,7 +274,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Emacs
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/themes/Default/gtk-2.0
@dirrm share/themes/Default
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%
@ -285,3 +284,4 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
@dirrm etc/gtk-2.0
@unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true

6
x11-toolkits/gtk30/Makefile
View File

@ -6,9 +6,9 @@
#
PORTNAME= gtk
PORTVERSION= 2.0.1
PORTVERSION= 2.0.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta4,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@ -32,7 +32,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_PERL5= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
-I${LOCALBASE}/include -I${X11BASE}/include" \

2
x11-toolkits/gtk30/distinfo
View File

@ -1 +1 @@
MD5 (gnome2/gtk+-2.0.1.tar.bz2) = 3e0c9e5c171912f5668f969b56fe0278
MD5 (gnome2/gtk+-2.0.2.tar.bz2) = b8df4c513323b9efc9a157703f25a07f

22
x11-toolkits/gtk30/files/patch-ae
View File

@ -1,14 +1,22 @@
$FreeBSD$
--- configure.orig Fri Mar 8 19:22:14 2002
+++ configure Mon Mar 11 12:03:39 2002
@@ -9788,7 +9788,7 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
CATOBJEXT=.mo
--- configure.orig Tue Apr 2 14:45:37 2002
+++ configure Fri Apr 26 11:36:40 2002
@@ -5671,6 +5671,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'
@@ -7864,7 +7865,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
rm -f conftest*
INSTOBJEXT=.mo

20
x11-toolkits/gtk30/files/patch-ag
View File

@ -1,14 +1,14 @@
$FreeBSD$
--- gtk/Makefile.in.orig Fri Jan 18 11:03:21 2002
+++ gtk/Makefile.in Fri Jan 18 11:18:26 2002
--- gtk/Makefile.in.orig Fri Apr 26 11:39:34 2002
+++ gtk/Makefile.in Fri Apr 26 11:40:56 2002
@@ -176,7 +176,7 @@
-DG_LOG_DOMAIN=\"Gtk\" \
-DGTK_LIBDIR=\"$(libdir)\" \
-DGTK_DATA_PREFIX=\"$(prefix)\" \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \
-DGTK_LOCALEDIR=\"$(gtklocaledir)\" \
-DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \
SUBDIRS = stock-icons theme-bits
-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DGTK_HOST=\"@host@\" -DGTK_COMPILATION -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@
+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" -DGTK_HOST=\"@host@\" -DGTK_COMPILATION -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_DEP_CFLAGS@ @STRIP_END@
gtarget = @gdktarget@

45
x11-toolkits/gtk30/files/patch-ltmain.sh
View File

@ -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"

2
x11-toolkits/gtk30/pkg-plist
View File

@ -274,7 +274,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm share/themes/Emacs
@dirrm share/themes/Default/gtk-2.0-key
@dirrm share/themes/Default/gtk-2.0
@dirrm share/themes/Default
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
@dirrm lib/gtk-2.0/%%GTK_VERSION%%
@ -285,3 +284,4 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
@dirrm include/gtk-2.0/gdk
@dirrm include/gtk-2.0
@dirrm etc/gtk-2.0
@unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true