6 files changed, 44 insertions, 12 deletions

diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index b1e6a1a78d66..c961bbbd21f7 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	0.5.11
+PORTVERSION=	0.6.0
 CATEGORIES=	security net
-MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
+MASTER_SITES=	http://gd.tuwien.ac.at/privacy/gnupg/alpha/gnutls/ \
+	ftp://ftp.gnutls.org/pub/gnutls/ \
 	ftp://ftp.gnupg.org/pub/gcrypt/alpha/gnutls/ \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
 	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/ \
@@ -20,13 +21,15 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 
 DOCS=		AUTHORS NEWS README THANKS
 
 post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.c ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
diff --git a/security/gnutls-devel/distinfo b/security/gnutls-devel/distinfo
index 35b3aaddb42c..67fd258ce290 100644
--- a/security/gnutls-devel/distinfo
+++ b/security/gnutls-devel/distinfo
@@ -1 +1 @@
-MD5 (gnutls-0.5.11.tar.gz) = 9e86b8fb85be918a17c6734391de103f
+MD5 (gnutls-0.6.0.tar.gz) = 98309d2e229abe5ef092a9f05fa5b437
diff --git a/security/gnutls-devel/pkg-plist b/security/gnutls-devel/pkg-plist
index 8e7a4c6ab718..c3259e0b9d55 100644
--- a/security/gnutls-devel/pkg-plist
+++ b/security/gnutls-devel/pkg-plist
@@ -5,14 +5,15 @@ bin/gnutls-cli
 bin/gnutls-srpcrypt
 bin/gnutls-cli-debug
 include/gnutls/extra.h
+include/gnutls/compat4.h
 include/gnutls/openssl.h
 include/gnutls/gnutls.h
 @dirrm include/gnutls
-lib/libgnutls.so.6
+lib/libgnutls.so.7
 lib/libgnutls.so
 lib/libgnutls.la
 lib/libgnutls.a
-lib/libgnutls-extra.so.6
+lib/libgnutls-extra.so.7
 lib/libgnutls-extra.so
 lib/libgnutls-extra.la
 lib/libgnutls-extra.a
@@ -25,3 +26,15 @@ share/aclocal/libgnutls-extra.m4
 %%PORTDOCS%%share/doc/gnutls/gnutls-logo.ps
 %%PORTDOCS%%share/doc/gnutls/gnutls.ps
 %%PORTDOCS%%@dirrm share/doc/gnutls
+share/examples/gnutls/ex-alert.c
+share/examples/gnutls/ex-client-resume.c
+share/examples/gnutls/ex-client-srp.c
+share/examples/gnutls/ex-client1.c
+share/examples/gnutls/ex-client2.c
+share/examples/gnutls/ex-info.c
+share/examples/gnutls/ex-pgp-keyserver.c
+share/examples/gnutls/ex-rfc2818.c
+share/examples/gnutls/ex-serv-export.c
+share/examples/gnutls/ex-serv-pgp.c
+share/examples/gnutls/ex-serv-srp.c
+share/examples/gnutls/ex-serv1.c
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index b1e6a1a78d66..c961bbbd21f7 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	0.5.11
+PORTVERSION=	0.6.0
 CATEGORIES=	security net
-MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
+MASTER_SITES=	http://gd.tuwien.ac.at/privacy/gnupg/alpha/gnutls/ \
+	ftp://ftp.gnutls.org/pub/gnutls/ \
 	ftp://ftp.gnupg.org/pub/gcrypt/alpha/gnutls/ \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
 	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/ \
@@ -20,13 +21,15 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 
 DOCS=		AUTHORS NEWS README THANKS
 
 post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.c ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 35b3aaddb42c..67fd258ce290 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1 +1 @@
-MD5 (gnutls-0.5.11.tar.gz) = 9e86b8fb85be918a17c6734391de103f
+MD5 (gnutls-0.6.0.tar.gz) = 98309d2e229abe5ef092a9f05fa5b437
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index 8e7a4c6ab718..c3259e0b9d55 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -5,14 +5,15 @@ bin/gnutls-cli
 bin/gnutls-srpcrypt
 bin/gnutls-cli-debug
 include/gnutls/extra.h
+include/gnutls/compat4.h
 include/gnutls/openssl.h
 include/gnutls/gnutls.h
 @dirrm include/gnutls
-lib/libgnutls.so.6
+lib/libgnutls.so.7
 lib/libgnutls.so
 lib/libgnutls.la
 lib/libgnutls.a
-lib/libgnutls-extra.so.6
+lib/libgnutls-extra.so.7
 lib/libgnutls-extra.so
 lib/libgnutls-extra.la
 lib/libgnutls-extra.a
@@ -25,3 +26,15 @@ share/aclocal/libgnutls-extra.m4
 %%PORTDOCS%%share/doc/gnutls/gnutls-logo.ps
 %%PORTDOCS%%share/doc/gnutls/gnutls.ps
 %%PORTDOCS%%@dirrm share/doc/gnutls
+share/examples/gnutls/ex-alert.c
+share/examples/gnutls/ex-client-resume.c
+share/examples/gnutls/ex-client-srp.c
+share/examples/gnutls/ex-client1.c
+share/examples/gnutls/ex-client2.c
+share/examples/gnutls/ex-info.c
+share/examples/gnutls/ex-pgp-keyserver.c
+share/examples/gnutls/ex-rfc2818.c
+share/examples/gnutls/ex-serv-export.c
+share/examples/gnutls/ex-serv-pgp.c
+share/examples/gnutls/ex-serv-srp.c
+share/examples/gnutls/ex-serv1.c