5 files changed, 127 insertions, 45 deletions

diff --git a/net/gsk/Makefile b/net/gsk/Makefile
index 72337c44687f..186535234d1b 100644
--- a/net/gsk/Makefile
+++ b/net/gsk/Makefile
@@ -6,39 +6,33 @@
 #
 
 PORTNAME=	gsk
-PORTVERSION=	1.0.57
-PORTREVISION=	1
+PORTVERSION=	1.0.63
 CATEGORIES=	net devel
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C library for writing servers
 
-USE_GNOME=	glib20 gnomehack gnometarget
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-CONFIGURE_ARGS+=	--disable-gtk-doc
-
-PORTDOCS=	*
-
-.if defined(WITHOUT_OPENSSL)
-CONFIGURE_ARGS+=	--disable-ssl
-PLIST_SUB+=	OPENSSL="@comment "
-.else
+USE_GNOME=	glib20 gnomehack
 USE_OPENSSL=	yes
-PLIST_SUB+=	OPENSSL=""
-.endif
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS=	--disable-gtk-doc
+USE_LDCONFIG=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^\(HTML_DIR\).*|\1 = ${PREFIX}/share/doc|' \
-		${WRKSRC}/doc/Makefile.in
-	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|programs tests||' \
-		${WRKSRC}/src/Makefile.in
-
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^\(SUBDIRS = \).*|\1 src|' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|programs tests||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|fread_unlocked|fread|' ${WRKSRC}/src/gsktable-flat.c
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.css ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.png ${DOCSDIR}/html
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/gsk/distinfo b/net/gsk/distinfo
index 9ce33d41b004..f1d82b91f333 100644
--- a/net/gsk/distinfo
+++ b/net/gsk/distinfo
@@ -1,3 +1,3 @@
-MD5 (gsk-1.0.57.tar.gz) = 584736d068b0408dbfea3d2819d1d364
-SHA256 (gsk-1.0.57.tar.gz) = fda4e608c08d87b76f44864b060b1da5720c0c40209c52e7957f3e4898ce76d1
-SIZE (gsk-1.0.57.tar.gz) = 1510147
+MD5 (gsk-1.0.63.tar.gz) = 994e06d9a863baffb8957b9c3c1edaea
+SHA256 (gsk-1.0.63.tar.gz) = 433b4f884b912a35e16b73b4e781be01dbe927e4e77aaa0eae43a244a344a6b4
+SIZE (gsk-1.0.63.tar.gz) = 1591137
diff --git a/net/gsk/files/patch-src_gskdaemonize.c b/net/gsk/files/patch-src_gskdaemonize.c
deleted file mode 100644
index 113b06b39ebe..000000000000
--- a/net/gsk/files/patch-src_gskdaemonize.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gskdaemonize.c.orig	Sat Mar  5 02:29:09 2005
-+++ src/gskdaemonize.c	Sun May 15 01:59:28 2005
-@@ -2,6 +2,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <sys/wait.h>
-+#include <signal.h>
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/net/gsk/files/patch-src_gskipv4.c b/net/gsk/files/patch-src_gskipv4.c
index 3c2fd39f96ef..c11f209b7a27 100644
--- a/net/gsk/files/patch-src_gskipv4.c
+++ b/net/gsk/files/patch-src_gskipv4.c
@@ -1,10 +1,12 @@
---- src/gskipv4.c.orig	Tue Dec  7 06:53:22 2004
-+++ src/gskipv4.c	Sun Jan 30 23:55:09 2005
-@@ -1,5 +1,7 @@
+--- src/gskipv4.c.orig	2006-05-18 03:39:35.000000000 +0900
++++ src/gskipv4.c	2009-04-08 00:18:45.000000000 +0900
+@@ -1,7 +1,9 @@
  #include <string.h>
  #include <stdlib.h>
-+#include <sys/types.h>
+ #include <sys/types.h>
 +#include <sys/socket.h>
  #include <netinet/in.h>
++#include <arpa/inet.h>
  #include "gskipv4.h"
  
+ /* Standard ipv4 addresses in guint8[4] format. */
diff --git a/net/gsk/pkg-plist b/net/gsk/pkg-plist
index f0eef829549b..ef767dac3c77 100644
--- a/net/gsk/pkg-plist
+++ b/net/gsk/pkg-plist
@@ -62,6 +62,7 @@ include/gsk-1.0/gsk/gskstreamqueue.h
 include/gsk-1.0/gsk/gskstreamtransferrequest.h
 include/gsk-1.0/gsk/gskstreamwatchdog.h
 include/gsk-1.0/gsk/gskstringmatcher.h
+include/gsk-1.0/gsk/gsktable.h
 include/gsk-1.0/gsk/gskthreadpool.h
 include/gsk-1.0/gsk/gsktree.h
 include/gsk-1.0/gsk/gsktypes.h
@@ -78,9 +79,9 @@ include/gsk-1.0/gsk/mime/gskmimeencodings.h
 include/gsk-1.0/gsk/mime/gskmimemultipartdecoder.h
 include/gsk-1.0/gsk/mime/gskmimemultipartencoder.h
 include/gsk-1.0/gsk/mime/gskmimemultipartpiece.h
-%%OPENSSL%%include/gsk-1.0/gsk/ssl/gskopensslbiostream.h
-%%OPENSSL%%include/gsk-1.0/gsk/ssl/gskstreamlistenerssl.h
-%%OPENSSL%%include/gsk-1.0/gsk/ssl/gskstreamssl.h
+include/gsk-1.0/gsk/ssl/gskopensslbiostream.h
+include/gsk-1.0/gsk/ssl/gskstreamlistenerssl.h
+include/gsk-1.0/gsk/ssl/gskstreamssl.h
 include/gsk-1.0/gsk/store/gskasynccache.h
 include/gsk-1.0/gsk/store/gskfilestreammap.h
 include/gsk-1.0/gsk/store/gskgtypeloader.h
@@ -105,11 +106,106 @@ lib/libgsk-1.0.la
 lib/libgsk-1.0.so
 lib/libgsk-1.0.so.0
 libdata/pkgconfig/gsk-1.0.pc
+%%PORTDOCS%%%%DOCSDIR%%/html/GskHttpClient.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskHttpHeader.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskHttpRequest.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskHttpResponse.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskHttpServer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskIO.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskMainLoop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskMainLoopDevPoll.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskMainLoopKqueue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskMainLoopPoll.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskMainLoopPollBase.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskMainLoopSelect.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskPacketQueue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskPacketQueueFd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskSocketAddress.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskStream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskStreamFd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskStreamListener.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskStreamListenerSocket.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskUrl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskUrlTransfer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/GskUrlTransferHttp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch05.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch06.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch07.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch08.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch09.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch13.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch14.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch15.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ch16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-GskMimeMultipartDecoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-GskStreamExternal.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-GskStreamQueue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-GskXmlrpcStream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-GskZlibDeflator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-GskZlibInflator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskbase64.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskbuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskbufferstream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdebug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdns.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdnsclient.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdnslocalresolver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdnsresolver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdnsrrcache.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskdnsserver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskerrno.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskerror.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskfork.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskghelpers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskhash.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskhook.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskinit.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gsklistmacros.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gsklog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskmacros.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskmain.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskmemory.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskmempool.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskmimemultipartpiece.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gsknameresolver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gsknetworkinterface.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskpacket.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskqsortmacro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskrbtreemacros.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskstreamclient.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskstreamconnection.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskstreamssl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gsktree.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gsktypes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskutils.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskxmlrpc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gsk-gskzlib.html
+%%PORTDOCS%%%%DOCSDIR%%/html/home.png
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/left.png
+%%PORTDOCS%%%%DOCSDIR%%/html/right.png
+%%PORTDOCS%%%%DOCSDIR%%/html/style.css
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial-client.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial-debugging-hints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial-httpclient.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial-httpserver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial-server.html
+%%PORTDOCS%%%%DOCSDIR%%/html/up.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/gsk-1.0/gsk/zlib
 @dirrm include/gsk-1.0/gsk/xmlrpc
 @dirrm include/gsk-1.0/gsk/url
 @dirrm include/gsk-1.0/gsk/store
-%%OPENSSL%%@dirrm include/gsk-1.0/gsk/ssl
+@dirrm include/gsk-1.0/gsk/ssl
 @dirrm include/gsk-1.0/gsk/mime
 @dirrm include/gsk-1.0/gsk/http
 @dirrm include/gsk-1.0/gsk/hash