- Update to the latest development version (1.1.6)

  after repocopy from security/gnutls

3 files changed, 38 insertions, 30 deletions

diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 072f729464c6..07b474860ce2 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -1,25 +1,32 @@
-# New ports collection makefile for:	gnutls
-# Date created:		13 Nov 2002
+# New ports collection makefile for:	gnutls-devel
+# Date created:		2003-07-17
 # Whom:			Sergei Kolobov <sergei@kolobov.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	0.8.10
-PORTREVISION=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
-	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
-	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/ \
-	ftp://ftp.gnutls.org/pub/gnutls/
-MASTER_SITE_SUBDIR=	alpha/gnutls
+	http://www.mirrors.wiretapped.net/security/network-security/gnutls/devel/ \
+	ftp://ftp.mirrors.wiretapped.net/security/network-security/gnutls/devel/ \
+	ftp://ftp.gnutls.org/pub/gnutls/devel/
+MASTER_SITE_SUBDIR=	alpha/gnutls/devel
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	sergei@FreeBSD.org
-COMMENT=	GNU Transport Layer Security library
+COMMENT=	GNU Transport Layer Security library (development version)
 
-LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt \
+		gpg-error.1:${PORTSDIR}/security/libgpg-error \
+		tasn1.2:${PORTSDIR}/security/libtasn1 \
+		opencdk.8:${PORTSDIR}/security/opencdk
 
+CONFLICTS=	gnutls-[0-9]*
+
+USE_ICONV=	yes
+USE_GETTEXT=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -28,18 +35,8 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-included-lzo
 
-.if defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.2)
-LIB_DEPENDS+=		tasn1.2:${PORTSDIR}/security/libtasn1
-.else
-CONFIGURE_ARGS+=	--with-included-libtasn1
-.endif
-
-.if defined(WITH_OPENCDK) || exists(${LOCALBASE}/lib/libopencdk.so.6)
-LIB_DEPENDS+=		opencdk.6:${PORTSDIR}/security/opencdk
-.else
-CONFIGURE_ARGS+=	--disable-openpgp-authentication
-.endif
-
+MAN1=		certtool.1 gnutls-cli.1 gnutls-cli-debug.1 \
+       		gnutls-serv.1 gnutls-srpcrypt.1
 DOCS=		AUTHORS NEWS README THANKS doc/tex/*.ps
 EXAMPLES=	doc/examples/*.c
 
diff --git a/security/gnutls-devel/distinfo b/security/gnutls-devel/distinfo
index 1176374b2b61..8f053d80f684 100644
--- a/security/gnutls-devel/distinfo
+++ b/security/gnutls-devel/distinfo
@@ -1 +1,2 @@
-MD5 (gnutls-0.8.10.tar.gz) = 11130b920b1395d03e559beebf6b3c2b
+MD5 (gnutls-1.1.6.tar.gz) = 29b45e3273be895d6efc2d29819dce2a
+SIZE (gnutls-1.1.6.tar.gz) = 1400963
diff --git a/security/gnutls-devel/pkg-plist b/security/gnutls-devel/pkg-plist
index da6dd05f151f..f748dbdfb9dc 100644
--- a/security/gnutls-devel/pkg-plist
+++ b/security/gnutls-devel/pkg-plist
@@ -1,25 +1,31 @@
 @comment $FreeBSD$
+bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
 bin/gnutls-srpcrypt
 bin/libgnutls-config
 bin/libgnutls-extra-config
-include/gnutls/compat4.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
+include/gnutls/openpgp.h
 include/gnutls/openssl.h
-@dirrm include/gnutls
+include/gnutls/pkcs12.h
+include/gnutls/x509.h
 lib/libgnutls-extra.a
 lib/libgnutls-extra.la
 lib/libgnutls-extra.so
-lib/libgnutls-extra.so.7
+lib/libgnutls-extra.so.12
+lib/libgnutls-openssl.a
+lib/libgnutls-openssl.la
+lib/libgnutls-openssl.so
+lib/libgnutls-openssl.so.12
 lib/libgnutls.a
 lib/libgnutls.la
 lib/libgnutls.so
-lib/libgnutls.so.7
-share/aclocal/libgnutls.m4
+lib/libgnutls.so.12
 share/aclocal/libgnutls-extra.m4
+share/aclocal/libgnutls.m4
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -28,15 +34,19 @@ share/aclocal/libgnutls-extra.m4
 %%PORTDOCS%%%%DOCSDIR%%/gnutls.ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/ex-alert.c
+%%EXAMPLESDIR%%/ex-cert-select.c
 %%EXAMPLESDIR%%/ex-client-resume.c
 %%EXAMPLESDIR%%/ex-client-srp.c
-%%EXAMPLESDIR%%/ex-client1.c
 %%EXAMPLESDIR%%/ex-client2.c
-%%EXAMPLESDIR%%/ex-info.c
+%%EXAMPLESDIR%%/ex-crq.c
 %%EXAMPLESDIR%%/ex-pgp-keyserver.c
+%%EXAMPLESDIR%%/ex-pkcs12.c
 %%EXAMPLESDIR%%/ex-rfc2818.c
 %%EXAMPLESDIR%%/ex-serv-export.c
 %%EXAMPLESDIR%%/ex-serv-pgp.c
 %%EXAMPLESDIR%%/ex-serv-srp.c
 %%EXAMPLESDIR%%/ex-serv1.c
+%%EXAMPLESDIR%%/ex-session-info.c
+%%EXAMPLESDIR%%/ex-x509-info.c
 @dirrm %%EXAMPLESDIR%%
+@dirrm include/gnutls