4 files changed, 32 insertions, 27 deletions

diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index 8d1b70378b59..6fd3aff2c995 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -7,23 +7,22 @@
 #
 
 PORTNAME=	gsk
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.5
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-.if !defined(WITHOUT_OPENSSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS=	--enable-ssl
-.endif
-
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
+.if !defined(WITHOUT_OPENSSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--enable-ssl
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/gsk/distinfo b/net/gsk/distinfo
index dbee9631b01b..e661ab523a74 100644
--- a/net/gsk/distinfo
+++ b/net/gsk/distinfo
@@ -1 +1 @@
-MD5 (gsk-0.3.1.tar.gz) = daaa2690bc1710f8fba861bce0913da4
+MD5 (gsk-0.3.5.tar.gz) = 44e85b725f5f36dde2ced3fb5f29c3d1
diff --git a/net/gsk/files/patch-configure b/net/gsk/files/patch-configure
new file mode 100644
index 000000000000..570bbbffee1e
--- /dev/null
+++ b/net/gsk/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Aug 18 08:49:24 2001
++++ configure	Wed Aug 28 00:49:28 2002
+@@ -5150,6 +5150,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/net/gsk/pkg-plist b/net/gsk/pkg-plist
index e76f5a825b03..f22d64fcf0e5 100644
--- a/net/gsk/pkg-plist
+++ b/net/gsk/pkg-plist
@@ -1,15 +1,9 @@
 bin/gsk-config
+bin/gsk-generate-marshals
 bin/gsk-make-iface-macros
 bin/gsk-make-memchunk
 bin/gsk-skeleton
 bin/gsk-skeleton-data-scan
-include/gsk/lisp/gsklispinput.h
-include/gsk/lisp/gsklispmarshals.h
-include/gsk/lisp/gsklispnamespace.h
-include/gsk/lisp/gsklispnamespaceglobal.h
-include/gsk/lisp/gsklispnode.h
-include/gsk/lisp/gsklispoutput.h
-include/gsk/lisp/gsklispparser.h
 include/gsk/gskactor.h
 include/gsk/gskactorbuffered.h
 include/gsk/gskactorcli.h
@@ -29,6 +23,7 @@ include/gsk/gskdaemonsettings.h
 include/gsk/gskdatagramsocket.h
 include/gsk/gskdebug.h
 include/gsk/gskdebugoptions.h
+include/gsk/gskgenericmarshal.h
 include/gsk/gskghelpers.h
 include/gsk/gskgtk.h
 include/gsk/gskinterface.h
@@ -61,6 +56,13 @@ include/gsk/gtk/gtktypebuiltins.h
 include/gsk/gtk/gtktypeutils.h
 include/gsk/gtk/makeenums.h
 include/gsk/gtkreflection.h
+include/gsk/lisp/gsklispinput.h
+include/gsk/lisp/gsklispmarshals.h
+include/gsk/lisp/gsklispnamespace.h
+include/gsk/lisp/gsklispnamespaceglobal.h
+include/gsk/lisp/gsklispnode.h
+include/gsk/lisp/gsklispoutput.h
+include/gsk/lisp/gsklispparser.h
 include/gsk/protocols/gskbase64.h
 include/gsk/protocols/gskdate.h
 include/gsk/protocols/gskdns.h
@@ -86,35 +88,29 @@ include/gsk/xml/gskxmlprocessor.h
 include/gsk/xml/gskxmlserialize.h
 include/gsk/xml/gskxmlservlet.h
 include/gsk/xml/gskxmltoken.h
-@dirrm include/gsk/gtk
-@dirrm include/gsk/lisp
-@dirrm include/gsk/protocols
-@dirrm include/gsk/xml
-@dirrm include/gsk
 lib/libgsk-lisp.a
-lib/libgsk-lisp.la
 lib/libgsk-lisp.so
 lib/libgsk-lisp.so.0
 lib/libgsk-minigtk.a
-lib/libgsk-minigtk.la
 lib/libgsk-minigtk.so
 lib/libgsk-minigtk.so.0
 lib/libgsk-protocol.a
-lib/libgsk-protocol.la
 lib/libgsk-protocol.so
 lib/libgsk-protocol.so.0
 lib/libgsk-server.a
-lib/libgsk-server.la
 lib/libgsk-server.so
 lib/libgsk-server.so.0
 lib/libgsk-xml.a
-lib/libgsk-xml.la
 lib/libgsk-xml.so
 lib/libgsk-xml.so.0
 lib/libgsk.a
-lib/libgsk.la
 lib/libgsk.so
 lib/libgsk.so.0
 share/aclocal/gsk.m4
 share/gsk-skeleton/gsk.skeleton-data
 @dirrm share/gsk-skeleton
+@dirrm include/gsk/xml
+@dirrm include/gsk/protocols
+@dirrm include/gsk/lisp
+@dirrm include/gsk/gtk
+@dirrm include/gsk