diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index b025ee4f7f95..15ee9a0ea5a3 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,88 +1,95 @@ # New ports collection makefile for: gnutls # Date created: 13 Nov 2002 # Whom: Sergei Kolobov # # $FreeBSD$ # 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 LIB_DEPENDS= nettle:${PORTSDIR}/security/nettle \ gpg-error:${PORTSDIR}/security/libgpg-error \ p11-kit:${PORTSDIR}/security/p11-kit CONFLICTS= gnutls-devel-[0-9]* USE_BZIP2= yes USE_ICONV= yes USE_PKGCONFIG= build USE_GNOME= ltverhack gnomehack 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 +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 + +.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 USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif PORTDOCS= AUTHORS NEWS README THANKS PORTEXAMPLES= *.c post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} \ -e 's|[$$][(]LTLIBPTHREAD[)]||g' post-install: .if !defined (NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES:C,^,doc/examples/,} \ ${EXAMPLESDIR} .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif .include "Makefile.man" -.include +.include 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 @@ -1,63 +1,63 @@ @comment $FreeBSD$ bin/certtool bin/gnutls-cli bin/gnutls-cli-debug bin/gnutls-serv bin/p11tool bin/psktool bin/srptool info/gnutls-certificate-user-use-case.png info/gnutls-client-server-use-case.png info/gnutls-extensions_st.png info/gnutls-handshake-sequence.png info/gnutls-handshake-state.png info/gnutls-internals.png info/gnutls-layers.png info/gnutls-logo.png info/gnutls-mod_auth_st.png info/gnutls-objects.png info/gnutls-pgp.png info/gnutls-x509.png info/pkcs11-vision.png include/gnutls/abstract.h include/gnutls/compat.h include/gnutls/crypto.h include/gnutls/extra.h include/gnutls/gnutls.h include/gnutls/openpgp.h include/gnutls/openssl.h include/gnutls/pkcs11.h include/gnutls/pkcs12.h include/gnutls/x509.h %%CXX%%include/gnutls/gnutlsxx.h %%CXX%%lib/libgnutlsxx.so.27 %%CXX%%lib/libgnutlsxx.so %%CXX%%lib/libgnutlsxx.la %%CXX%%lib/libgnutlsxx.a 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 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 %%NLS%%share/locale/de/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/en@quot/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/fr/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/it/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/ms/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/nl/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/pl/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/sv/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/vi/LC_MESSAGES/libgnutls.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgnutls.mo @dirrm include/gnutls