- Update to 1.3.13 - the version shipped with the GNOME2 alpha 2;

- switch to .bz2 distfile;
- move distfile into gnome2 DIST_SUBDIR.

10 files changed, 86 insertions, 44 deletions

diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index 4739bb5ba774..8faeed832240 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	1.3.12
-PORTREVISION=	1
+PORTVERSION=	1.3.13
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -23,6 +24,7 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 NO_LATEST_LINK=	"Unstable, development version."
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo
index de9d453e25e1..4e34b9225cd1 100644
--- a/devel/glib13/distinfo
+++ b/devel/glib13/distinfo
@@ -1 +1 @@
-MD5 (glib-1.3.12.tar.gz) = ef5be630496f3b3078a042f265ef07d3
+MD5 (gnome2/glib-1.3.13.tar.bz2) = 6452c711661ec88b553040e87777ffeb
diff --git a/devel/glib13/files/patch-ae b/devel/glib13/files/patch-ae
index 30d08aef0edc..87404113cbaf 100644
--- a/devel/glib13/files/patch-ae
+++ b/devel/glib13/files/patch-ae
@@ -1,10 +1,10 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Dec 24 00:50:12 2001
-+++ configure	Fri Jan 18 09:40:30 2002
-@@ -16354,8 +16354,8 @@
-             	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
+--- configure.orig	Tue Jan 29 18:34:49 2002
++++ configure	Tue Feb 12 10:13:56 2002
+@@ -16378,8 +16378,8 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
  		fi
  		;;
 -	*-freebsd2.2*)
@@ -14,7 +14,7 @@ $FreeBSD$
  
  		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  		# -mthreads flag.
-@@ -16433,13 +16433,13 @@
+@@ -16457,13 +16457,13 @@
             	fi
  		;;
               *)
@@ -31,13 +31,13 @@ $FreeBSD$
  			fi
  			if test x"$have_threads" = xposix; then
  				defattr=0
-@@ -17636,13 +17636,13 @@
+@@ -17660,13 +17660,13 @@
     #
     # Check for libiconv
     #
--   echo "$as_me:17639: checking for libiconv_open in -liconv" >&5
+-   echo "$as_me:17663: checking for libiconv_open in -liconv" >&5
 -echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+   echo "$as_me:17639: checking for libiconv_open in -lgiconv" >&5
++   echo "$as_me:17663: checking for libiconv_open in -lgiconv" >&5
 +echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
  if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -46,9 +46,9 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 17647 "configure"
+ #line 17671 "configure"
  #include "confdefs.h"
-@@ -17704,7 +17704,7 @@
+@@ -17728,7 +17728,7 @@
  fi
  
  if test "x$with_libiconv" = "xyes" ; then
diff --git a/devel/glib13/files/patch-ltmain.sh b/devel/glib13/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/devel/glib13/files/patch-ltmain.sh
+++ b/devel/glib13/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- 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.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index e4d423b39f59..b581f40a3641 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -68,16 +68,16 @@ include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/libglib-1.3.a
 lib/libglib-1.3.so
-lib/libglib-1.3.so.12
+lib/libglib-1.3.so.13
 lib/libgmodule-1.3.a
 lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.12
+lib/libgmodule-1.3.so.13
 lib/libgobject-1.3.a
 lib/libgobject-1.3.so
-lib/libgobject-1.3.so.12
+lib/libgobject-1.3.so.13
 lib/libgthread-1.3.a
 lib/libgthread-1.3.so
-lib/libgthread-1.3.so.12
+lib/libgthread-1.3.so.13
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
@@ -97,6 +97,8 @@ share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo
+share/locale/pl/LC_MESSAGES/glib20.mo
+share/locale/pt/LC_MESSAGES/glib20.mo
 share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 4739bb5ba774..8faeed832240 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	1.3.12
-PORTREVISION=	1
+PORTVERSION=	1.3.13
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -23,6 +24,7 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 NO_LATEST_LINK=	"Unstable, development version."
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index de9d453e25e1..4e34b9225cd1 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.3.12.tar.gz) = ef5be630496f3b3078a042f265ef07d3
+MD5 (gnome2/glib-1.3.13.tar.bz2) = 6452c711661ec88b553040e87777ffeb
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 30d08aef0edc..87404113cbaf 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,10 +1,10 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Dec 24 00:50:12 2001
-+++ configure	Fri Jan 18 09:40:30 2002
-@@ -16354,8 +16354,8 @@
-             	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
+--- configure.orig	Tue Jan 29 18:34:49 2002
++++ configure	Tue Feb 12 10:13:56 2002
+@@ -16378,8 +16378,8 @@
+ rm -f conftest.$ac_objext conftest.$ac_ext
  		fi
  		;;
 -	*-freebsd2.2*)
@@ -14,7 +14,7 @@ $FreeBSD$
  
  		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  		# -mthreads flag.
-@@ -16433,13 +16433,13 @@
+@@ -16457,13 +16457,13 @@
             	fi
  		;;
               *)
@@ -31,13 +31,13 @@ $FreeBSD$
  			fi
  			if test x"$have_threads" = xposix; then
  				defattr=0
-@@ -17636,13 +17636,13 @@
+@@ -17660,13 +17660,13 @@
     #
     # Check for libiconv
     #
--   echo "$as_me:17639: checking for libiconv_open in -liconv" >&5
+-   echo "$as_me:17663: checking for libiconv_open in -liconv" >&5
 -echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+   echo "$as_me:17639: checking for libiconv_open in -lgiconv" >&5
++   echo "$as_me:17663: checking for libiconv_open in -lgiconv" >&5
 +echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
  if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -46,9 +46,9 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 17647 "configure"
+ #line 17671 "configure"
  #include "confdefs.h"
-@@ -17704,7 +17704,7 @@
+@@ -17728,7 +17728,7 @@
  fi
  
  if test "x$with_libiconv" = "xyes" ; then
diff --git a/devel/glib20/files/patch-ltmain.sh b/devel/glib20/files/patch-ltmain.sh
index 98cb05e4ddb3..91713d2306f8 100644
--- a/devel/glib20/files/patch-ltmain.sh
+++ b/devel/glib20/files/patch-ltmain.sh
@@ -1,9 +1,26 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
+--- 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.
  	    ;;
@@ -13,7 +30,7 @@ $FreeBSD$
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index e4d423b39f59..b581f40a3641 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -68,16 +68,16 @@ include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/libglib-1.3.a
 lib/libglib-1.3.so
-lib/libglib-1.3.so.12
+lib/libglib-1.3.so.13
 lib/libgmodule-1.3.a
 lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.12
+lib/libgmodule-1.3.so.13
 lib/libgobject-1.3.a
 lib/libgobject-1.3.so
-lib/libgobject-1.3.so.12
+lib/libgobject-1.3.so.13
 lib/libgthread-1.3.a
 lib/libgthread-1.3.so
-lib/libgthread-1.3.so.12
+lib/libgthread-1.3.so.13
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
@@ -97,6 +97,8 @@ share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo
+share/locale/pl/LC_MESSAGES/glib20.mo
+share/locale/pt/LC_MESSAGES/glib20.mo
 share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo