5 files changed, 22 insertions, 45 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index b025ee4f7f95..15ee9a0ea5a3 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	gnutls
-PORTVERSION=	2.12.18
-PORTREVISION=	1
+PORTVERSION=	2.12.23
 CATEGORIES=	security net
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	\
+	ftp://ftp.gnutls.org/gcrypt/gnutls/v${PORTVERSION:C/.[0-9]+$//}/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
@@ -30,33 +28,42 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
+LIBTOOLFILES=	configure lib/configure libextra/configure
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-fPIC
 CONFIGURE_ARGS+=	--disable-guile
 MANCOMPRESSED=	no
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	LIBTASN1 CXX LZO NLS
 
-.if defined(WITH_LIBTASN1)
+LIBTASN1_DESC=	Use system libtasn1 instead of local one
+CXX_DESC=	Install C++ library
+LZO_DESC=	LZO compression
+
+OPTIONS_DEFAULT=	LIBTASN1 CXX
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLIBTASN1}
 LIB_DEPENDS+=	tasn1:${PORTSDIR}/security/libtasn1
 .else
 CONFIGURE_ARGS+=	--with-included-libtasn1
 .endif
 
-.if defined(WITH_LZO)
+.if ${PORT_OPTIONS:MLZO}
 LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
 CONFIGURE_ARGS+=	--with-lzo
 .endif
 
-.if defined(WITHOUT_CXX)
+.if ${PORT_OPTIONS:MCXX}
 CONFIGURE_ARGS+=	--disable-cxx
 PLIST_SUB+=		CXX="@comment "
 .else
 PLIST_SUB+=		CXX=""
 .endif
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .else
@@ -85,4 +92,4 @@ post-install:
 .endif
 
 .include "Makefile.man"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index bdfb8c61ba19..90e6550adaed 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnutls-2.12.18.tar.bz2) = 780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a
-SIZE (gnutls-2.12.18.tar.bz2) = 7207965
+SHA256 (gnutls-2.12.23.tar.bz2) = dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2
+SIZE (gnutls-2.12.23.tar.bz2) = 7279415
diff --git a/security/gnutls/files/patch-lib-Makefile.in b/security/gnutls/files/patch-lib-Makefile.in
deleted file mode 100644
index 1faabe51deac..000000000000
--- a/security/gnutls/files/patch-lib-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Makefile.in.orig	2012-03-25 12:01:29.000000000 +0400
-+++ lib/Makefile.in	2012-03-25 12:02:56.000000000 +0400
-@@ -940,9 +940,9 @@
- LTLIBPTHREAD = @LTLIBPTHREAD@
- LTLIBTASN1 = @LTLIBTASN1@
- LTLIBZ = @LTLIBZ@
--LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_REVISION = @LT_REVISION@
-+LT_AGE = 21
-+LT_CURRENT = 47
-+LT_REVISION = 10
- LT_SSL_AGE = @LT_SSL_AGE@
- LT_SSL_CURRENT = @LT_SSL_CURRENT@
- LT_SSL_REVISION = @LT_SSL_REVISION@
diff --git a/security/gnutls/files/patch-libextra-Makefile.in b/security/gnutls/files/patch-libextra-Makefile.in
deleted file mode 100644
index 553a1dcee0c5..000000000000
--- a/security/gnutls/files/patch-libextra-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- libextra/Makefile.in.orig	2012-03-25 12:13:09.000000000 +0400
-+++ libextra/Makefile.in	2012-03-25 12:13:41.000000000 +0400
-@@ -409,9 +409,9 @@
- LTLIBNETTLE = @LTLIBNETTLE@
- LTLIBOBJS = @LTLIBOBJS@
- LTLIBTASN1 = @LTLIBTASN1@
--LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_REVISION = @LT_REVISION@
-+LT_AGE = 21
-+LT_CURRENT = 47
-+LT_REVISION = 10
- LT_SSL_AGE = @LT_SSL_AGE@
- LT_SSL_CURRENT = @LT_SSL_CURRENT@
- LT_SSL_REVISION = @LT_SSL_REVISION@
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index fec6d57b3753..645b7a888d67 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -37,7 +37,7 @@ include/gnutls/x509.h
 lib/libgnutls-extra.a
 lib/libgnutls-extra.la
 lib/libgnutls-extra.so
-lib/libgnutls-extra.so.47
+lib/libgnutls-extra.so.26
 lib/libgnutls-openssl.a
 lib/libgnutls-openssl.la
 lib/libgnutls-openssl.so
@@ -45,7 +45,7 @@ lib/libgnutls-openssl.so.27
 lib/libgnutls.a
 lib/libgnutls.la
 lib/libgnutls.so
-lib/libgnutls.so.47
+lib/libgnutls.so.26
 libdata/pkgconfig/gnutls-extra.pc
 libdata/pkgconfig/gnutls.pc
 %%NLS%%share/locale/cs/LC_MESSAGES/libgnutls.mo