10 files changed, 78 insertions, 10 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 3162b7a56cf9..0e6e07051e70 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -18,11 +18,11 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	pango.0:${PORTSDIR}/x11-toolkits/pango \
-		glib-1.3.5:${PORTSDIR}/devel/glib13
+		glib-1.3.6:${PORTSDIR}/devel/glib13
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 7e2871ee3cd0..ac0a735f2801 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1 +1 @@
-MD5 (atk-0.1.tar.gz) = 537033078f8f7a895aac838ae871d684
+MD5 (atk-0.2.tar.gz) = 1ab565a3651696ecf1bd88cabf2493af
diff --git a/accessibility/atk/files/patch-Makefile.in b/accessibility/atk/files/patch-Makefile.in
new file mode 100644
index 000000000000..be30e08fdddc
--- /dev/null
+++ b/accessibility/atk/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Wed Aug  1 20:32:06 2001
++++ Makefile.in	Wed Aug  1 20:33:45 2001
+@@ -96,7 +96,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-SUBDIRS = atk tests docs
++SUBDIRS = atk
+ 
+ EXTRA_DIST =  	atk-uninstalled.pc.in		atk.pc.in
+ 
diff --git a/accessibility/atk/files/patch-ltmain.sh b/accessibility/atk/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0c594216b0e1
--- /dev/null
+++ b/accessibility/atk/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/23 09:45:58	1.1
++++ ltmain.sh	2001/07/23 09:46:28
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if 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/atk/pkg-plist b/accessibility/atk/pkg-plist
index fe72b726982a..43073526a67a 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -11,13 +11,15 @@ include/atk-1.0/atk/atkregistry.h
 include/atk-1.0/atk/atkrelation.h
 include/atk-1.0/atk/atkrelationset.h
 include/atk-1.0/atk/atkselection.h
+include/atk-1.0/atk/atkstate.h
 include/atk-1.0/atk/atkstateset.h
+include/atk-1.0/atk/atkstreamablecontent.h
 include/atk-1.0/atk/atktable.h
 include/atk-1.0/atk/atktext.h
 include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk.so
-lib/libatk.so.0
+lib/libatk.so.2
 libdata/pkgconfig/atk.pc
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 3162b7a56cf9..0e6e07051e70 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -18,11 +18,11 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	pango.0:${PORTSDIR}/x11-toolkits/pango \
-		glib-1.3.5:${PORTSDIR}/devel/glib13
+		glib-1.3.6:${PORTSDIR}/devel/glib13
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index 7e2871ee3cd0..ac0a735f2801 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1 +1 @@
-MD5 (atk-0.1.tar.gz) = 537033078f8f7a895aac838ae871d684
+MD5 (atk-0.2.tar.gz) = 1ab565a3651696ecf1bd88cabf2493af
diff --git a/devel/atk/files/patch-Makefile.in b/devel/atk/files/patch-Makefile.in
new file mode 100644
index 000000000000..be30e08fdddc
--- /dev/null
+++ b/devel/atk/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Wed Aug  1 20:32:06 2001
++++ Makefile.in	Wed Aug  1 20:33:45 2001
+@@ -96,7 +96,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-SUBDIRS = atk tests docs
++SUBDIRS = atk
+ 
+ EXTRA_DIST =  	atk-uninstalled.pc.in		atk.pc.in
+ 
diff --git a/devel/atk/files/patch-ltmain.sh b/devel/atk/files/patch-ltmain.sh
new file mode 100644
index 000000000000..0c594216b0e1
--- /dev/null
+++ b/devel/atk/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/07/23 09:45:58	1.1
++++ ltmain.sh	2001/07/23 09:46:28
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if 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/devel/atk/pkg-plist b/devel/atk/pkg-plist
index fe72b726982a..43073526a67a 100644
--- a/devel/atk/pkg-plist
+++ b/devel/atk/pkg-plist
@@ -11,13 +11,15 @@ include/atk-1.0/atk/atkregistry.h
 include/atk-1.0/atk/atkrelation.h
 include/atk-1.0/atk/atkrelationset.h
 include/atk-1.0/atk/atkselection.h
+include/atk-1.0/atk/atkstate.h
 include/atk-1.0/atk/atkstateset.h
+include/atk-1.0/atk/atkstreamablecontent.h
 include/atk-1.0/atk/atktable.h
 include/atk-1.0/atk/atktext.h
 include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk.so
-lib/libatk.so.0
+lib/libatk.so.2
 libdata/pkgconfig/atk.pc
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0