4 files changed, 25 insertions, 24 deletions

diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 34c92166c3be..180449a6bbf2 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -6,14 +6,10 @@
 #
 
 PORTNAME=	guile-gtk
-PORTVERSION=	0.31
-PORTREVISION=	2
+PORTVERSION=	0.41
 CATEGORIES=	x11-toolkits scheme
-#MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-#MASTER_SITE_SUBDIR=	${PORTNAME}
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	marcus
-DISTNAME=	${PORTNAME}-1.2-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Guile binding library for GTK+
@@ -22,13 +18,16 @@ LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12 gnometarget
+USE_GNOME=	gnometarget gdkpixbuf libglade
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-gtkgl=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+INFO=		guile-gtk
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|gtk-1\.2/||g'
diff --git a/x11-toolkits/guile-gtk/distinfo b/x11-toolkits/guile-gtk/distinfo
index 7a651ee0f5fc..de602f383850 100644
--- a/x11-toolkits/guile-gtk/distinfo
+++ b/x11-toolkits/guile-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (guile-gtk-1.2-0.31.tar.gz) = b16d97570e1f06cbfdd232173ce9e179
-SHA256 (guile-gtk-1.2-0.31.tar.gz) = 560ab6245dcbccbb5585e9c4ad3a85ef78607a747ed0adcd7a1e5d61736a2ab5
-SIZE (guile-gtk-1.2-0.31.tar.gz) = 375504
+MD5 (guile-gtk-0.41.tar.gz) = 4e3ddf52cec8d900dd2180d18a1a1dd8
+SHA256 (guile-gtk-0.41.tar.gz) = 1193faf62d176470d9eea846c590da019d2b980c8472960fdd8f2c55d502193d
+SIZE (guile-gtk-0.41.tar.gz) = 697414
diff --git a/x11-toolkits/guile-gtk/files/patch-configure b/x11-toolkits/guile-gtk/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/x11-toolkits/guile-gtk/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,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-toolkits/guile-gtk/pkg-plist b/x11-toolkits/guile-gtk/pkg-plist
index 97cdf2b0903e..b5322f1b07c8 100644
--- a/x11-toolkits/guile-gtk/pkg-plist
+++ b/x11-toolkits/guile-gtk/pkg-plist
@@ -1,15 +1,27 @@
 bin/build-guile-gtk
 bin/build-guile-gtk-1.2
 include/guile-gtk.h
+lib/libguilegdkpixbuf-1.2.a
+lib/libguilegdkpixbuf-1.2.la
+lib/libguilegdkpixbuf-1.2.so
+lib/libguilegdkpixbuf-1.2.so.0
+lib/libguileglade-1.2.a
+lib/libguileglade-1.2.la
+lib/libguileglade-1.2.so
+lib/libguileglade-1.2.so.0
 lib/libguilegtk-1.2.a
 lib/libguilegtk-1.2.la
 lib/libguilegtk-1.2.so
 lib/libguilegtk-1.2.so.0
-share/guile-gtk/gdk-1.2.defs
-share/guile-gtk/gtk-1.2.defs
+%%DATADIR%%/gdk-1.2.defs
+%%DATADIR%%/gdk-pixbuf.defs
+%%DATADIR%%/glade.defs
+%%DATADIR%%/gtk-1.2.defs
 share/guile/gtk-1.2/config.scm
 share/guile/gtk-1.2/dynlink.scm
+share/guile/gtk-1.2/gdk-pixbuf.scm
 share/guile/gtk-1.2/gdk.scm
+share/guile/gtk-1.2/glade
 share/guile/gtk-1.2/gtk.scm
 share/guile/gtk-1.2/repl.scm
 share/guile/gtk-1.2/threads.scm
@@ -19,7 +31,7 @@ share/guile/gtk/gdk.scm
 share/guile/gtk/gtk.scm
 share/guile/gtk/repl.scm
 share/guile/gtk/threads.scm
-@dirrm share/guile-gtk
+@dirrm %%DATADIR%%
 @dirrm share/guile/gtk-1.2
 @dirrm share/guile/gtk
 @dirrm share/guile