Date: Sat, 25 Aug 2012 08:33:56 +0000 (UTC) From: Roman Bogorodskiy <novel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r303123 - in head/security/libgcrypt: . files Message-ID: <201208250833.q7P8XuYO007814@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: novel Date: Sat Aug 25 08:33:55 2012 New Revision: 303123 URL: http://svn.freebsd.org/changeset/ports/303123 Log: - Properly define deprecated functions to remove warnings in other ports - Avoid installing multiple copies of the GPLv2 and LGPL21 licenses - Bump PORTREVISION PR: 170488 Submitted by: Jason E. Hale <bsdkaffee@gmail.com> Approved by: Hirohisa Yamaguchi (maintainer) Added: head/security/libgcrypt/files/patch-src__gcrypt.h.in (contents, props changed) Modified: head/security/libgcrypt/Makefile head/security/libgcrypt/pkg-plist Modified: head/security/libgcrypt/Makefile ============================================================================== --- head/security/libgcrypt/Makefile Sat Aug 25 08:28:10 2012 (r303122) +++ head/security/libgcrypt/Makefile Sat Aug 25 08:33:55 2012 (r303123) @@ -6,6 +6,7 @@ PORTNAME= libgcrypt PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +16,6 @@ COMMENT= General purpose crypto library LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error RUN_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" USE_LDCONFIG= yes -DOCS= AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README README.SVN \ +DOCS= AUTHORS ChangeLog INSTALL NEWS README README.SVN \ THANKS TODO doc/HACKING doc/README.apichanges INFO= gcrypt Added: head/security/libgcrypt/files/patch-src__gcrypt.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libgcrypt/files/patch-src__gcrypt.h.in Sat Aug 25 08:33:55 2012 (r303123) @@ -0,0 +1,19 @@ +--- ./src/gcrypt.h.in.orig 2012-08-08 07:35:27.000000000 -0400 ++++ ./src/gcrypt.h.in 2012-08-08 07:37:47.000000000 -0400 +@@ -1248,7 +1248,7 @@ + number. */ + gcry_error_t gcry_md_list (int *list, int *list_length); + +- ++#if !defined(GCRYPT_NO_DEPRECATED) || defined(_GCRYPT_IN_LIBGCRYPT) + /* Alternative interface for asymmetric cryptography. This interface + is deprecated. */ + +@@ -1401,6 +1401,7 @@ + gcry_md_algo_t md; + } gcry_ac_ssa_pkcs_v1_5_t _GCRY_ATTR_INTERNAL; + ++#endif + + #ifndef GCRYPT_NO_DEPRECATED + /* Returns a new, empty data set in DATA. */ Modified: head/security/libgcrypt/pkg-plist ============================================================================== --- head/security/libgcrypt/pkg-plist Sat Aug 25 08:28:10 2012 (r303122) +++ head/security/libgcrypt/pkg-plist Sat Aug 25 08:33:55 2012 (r303123) @@ -9,8 +9,6 @@ lib/libgcrypt.so lib/libgcrypt.so.18 share/aclocal/libgcrypt.m4 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/INSTALL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208250833.q7P8XuYO007814>