- Update to 0.8.1

- Remove WITH_OPENCDK knob - require security/opencdk by default
- Use DOCSDIR and EXAMPLESDIR in pkg-plist

PR:		48706
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

8 files changed, 80 insertions, 82 deletions

diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 8c0bd33..938770c 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
@@ -19,11 +18,8 @@ MAINTAINER=	sergei@kolobov.com
 COMMENT=	GNU Transport Layer Security library
 
 LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		tasn1.0:${PORTSDIR}/security/libtasn1
-
-.if defined(WITH_OPENCDK)
-LIB_DEPENDS+=	opencdk.5:${PORTSDIR}/security/opencdk
-.endif
+		tasn1.1:${PORTSDIR}/security/libtasn1 \
+		opencdk.6:${PORTSDIR}/security/opencdk
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -34,18 +30,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=		AUTHORS NEWS README THANKS
 
-pre-configure:
-	@${ECHO_MSG} ""
-.if defined (WITH_OPENCDK)
-	@${ECHO_MSG} "Enabled OpenCDK support"
-.else
-	@${ECHO_MSG} "OpenCDK support is disabled by default"
-	@${ECHO_MSG} "Use WITH_OPENCDK=yes to enable"
-.endif
-	@${ECHO_MSG} ""
-
 post-install:
-	${RM} -f ${PREFIX}/lib/libgnutls.la ${PREFIX}/lib/libgnutls-extra.la
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.c ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
diff --git a/security/gnutls-devel/distinfo b/security/gnutls-devel/distinfo
index 67fd258..c910954 100644
--- a/security/gnutls-devel/distinfo
+++ b/security/gnutls-devel/distinfo
@@ -1 +1 @@
-MD5 (gnutls-0.6.0.tar.gz) = 98309d2e229abe5ef092a9f05fa5b437
+MD5 (gnutls-0.8.1.tar.gz) = 4a7d9e5f2683bb10f116f86c32c041c0
diff --git a/security/gnutls-devel/files/patch-configure b/security/gnutls-devel/files/patch-configure
new file mode 100644
index 0000000..1cbe489
--- /dev/null
+++ b/security/gnutls-devel/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Feb 27 21:25:22 2003
++++ configure	Thu Feb 27 21:25:36 2003
+@@ -12529,6 +12529,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/security/gnutls-devel/pkg-plist b/security/gnutls-devel/pkg-plist
index 94a1d58..0edcddb 100644
--- a/security/gnutls-devel/pkg-plist
+++ b/security/gnutls-devel/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/gnutls-serv
 bin/gnutls-cli
 bin/gnutls-srpcrypt
@@ -9,31 +10,31 @@ include/gnutls/compat4.h
 include/gnutls/openssl.h
 include/gnutls/gnutls.h
 @dirrm include/gnutls
-lib/libgnutls.so.7
+lib/libgnutls.so.8
 lib/libgnutls.so
 lib/libgnutls.a
-lib/libgnutls-extra.so.7
+lib/libgnutls-extra.so.8
 lib/libgnutls-extra.so
 lib/libgnutls-extra.a
 share/aclocal/libgnutls.m4
 share/aclocal/libgnutls-extra.m4
-%%PORTDOCS%%share/doc/gnutls/AUTHORS
-%%PORTDOCS%%share/doc/gnutls/NEWS
-%%PORTDOCS%%share/doc/gnutls/README
-%%PORTDOCS%%share/doc/gnutls/THANKS
-%%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
-@dirrm share/examples/gnutls
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/gnutls-logo.ps
+%%PORTDOCS%%%%DOCSDIR%%/gnutls.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/ex-alert.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-pgp-keyserver.c
+%%EXAMPLESDIR%%/ex-rfc2818.c
+%%EXAMPLESDIR%%/ex-serv-export.c
+%%EXAMPLESDIR%%/ex-serv-pgp.c
+%%EXAMPLESDIR%%/ex-serv-srp.c
+%%EXAMPLESDIR%%/ex-serv1.c
+@dirrm %%EXAMPLESDIR%%
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 8c0bd33..938770c 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
@@ -19,11 +18,8 @@ MAINTAINER=	sergei@kolobov.com
 COMMENT=	GNU Transport Layer Security library
 
 LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		tasn1.0:${PORTSDIR}/security/libtasn1
-
-.if defined(WITH_OPENCDK)
-LIB_DEPENDS+=	opencdk.5:${PORTSDIR}/security/opencdk
-.endif
+		tasn1.1:${PORTSDIR}/security/libtasn1 \
+		opencdk.6:${PORTSDIR}/security/opencdk
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
@@ -34,18 +30,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=		AUTHORS NEWS README THANKS
 
-pre-configure:
-	@${ECHO_MSG} ""
-.if defined (WITH_OPENCDK)
-	@${ECHO_MSG} "Enabled OpenCDK support"
-.else
-	@${ECHO_MSG} "OpenCDK support is disabled by default"
-	@${ECHO_MSG} "Use WITH_OPENCDK=yes to enable"
-.endif
-	@${ECHO_MSG} ""
-
 post-install:
-	${RM} -f ${PREFIX}/lib/libgnutls.la ${PREFIX}/lib/libgnutls-extra.la
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.c ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 67fd258..c910954 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1 +1 @@
-MD5 (gnutls-0.6.0.tar.gz) = 98309d2e229abe5ef092a9f05fa5b437
+MD5 (gnutls-0.8.1.tar.gz) = 4a7d9e5f2683bb10f116f86c32c041c0
diff --git a/security/gnutls/files/patch-configure b/security/gnutls/files/patch-configure
new file mode 100644
index 0000000..1cbe489
--- /dev/null
+++ b/security/gnutls/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Feb 27 21:25:22 2003
++++ configure	Thu Feb 27 21:25:36 2003
+@@ -12529,6 +12529,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/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index 94a1d58..0edcddb 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/gnutls-serv
 bin/gnutls-cli
 bin/gnutls-srpcrypt
@@ -9,31 +10,31 @@ include/gnutls/compat4.h
 include/gnutls/openssl.h
 include/gnutls/gnutls.h
 @dirrm include/gnutls
-lib/libgnutls.so.7
+lib/libgnutls.so.8
 lib/libgnutls.so
 lib/libgnutls.a
-lib/libgnutls-extra.so.7
+lib/libgnutls-extra.so.8
 lib/libgnutls-extra.so
 lib/libgnutls-extra.a
 share/aclocal/libgnutls.m4
 share/aclocal/libgnutls-extra.m4
-%%PORTDOCS%%share/doc/gnutls/AUTHORS
-%%PORTDOCS%%share/doc/gnutls/NEWS
-%%PORTDOCS%%share/doc/gnutls/README
-%%PORTDOCS%%share/doc/gnutls/THANKS
-%%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
-@dirrm share/examples/gnutls
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/gnutls-logo.ps
+%%PORTDOCS%%%%DOCSDIR%%/gnutls.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/ex-alert.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-pgp-keyserver.c
+%%EXAMPLESDIR%%/ex-rfc2818.c
+%%EXAMPLESDIR%%/ex-serv-export.c
+%%EXAMPLESDIR%%/ex-serv-pgp.c
+%%EXAMPLESDIR%%/ex-serv-srp.c
+%%EXAMPLESDIR%%/ex-serv1.c
+@dirrm %%EXAMPLESDIR%%