security/libgpg-error: update to 1.35

- Remove patch for the gpgrt-config issue fixed upstream
 - Reorder variables as per PH
This commit is contained in:
Roman Bogorodskiy 2019-01-31 02:32:56 +00:00
parent f62db6454a
commit be5bd93e3b
4 changed files with 10 additions and 33 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libgpg-error
PORTVERSION= 1.34
PORTVERSION= 1.35
CATEGORIES= security devel
MASTER_SITES= GNUPG
@ -16,23 +16,22 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
USES= gmake libtool tar:bzip2
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
CPP+= -P
CONFIGURE_ARGS= --enable-static=yes
INSTALL_TARGET= install-strip
DOCS= AUTHORS ChangeLog NEWS README
INFO= gpgrt
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
NLS_CONFIGURE_OFF= --disable-nls
NLS_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} --with-libintl-prefix=${LOCALBASE}
NLS_USES= gettext iconv
DOCS= AUTHORS ChangeLog NEWS README
INFO= gpgrt
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1547696932
SHA256 (libgpg-error-1.34.tar.bz2) = 0680799dee71b86b2f435efb825391eb040ce2704b057f6bd3dcc47fbc398c81
SIZE (libgpg-error-1.34.tar.bz2) = 919217
TIMESTAMP = 1548779586
SHA256 (libgpg-error-1.35.tar.bz2) = cbd5ee62a8a8c88d48c158fff4fc9ead4132aacd1b4a56eb791f9f997d07e067
SIZE (libgpg-error-1.35.tar.bz2) = 918408

View file

@ -1,22 +0,0 @@
--- src/gpgrt-config.orig 2018-11-15 16:10:09 UTC
+++ src/gpgrt-config
@@ -448,8 +448,8 @@ sysroot () {
_result="$_result${_result:+ }$_opt"
shift
_result="$_result $PKG_CONFIG_SYSROOT_DIR$1"
- elif expr "$1" : "^$_opt" >/dev/null; then
- _result="$_result${_result:+ }$_opt$PKG_CONFIG_SYSROOT_DIR$(expr "$1" : "^$_opt\(.*\)")"
+ elif expr "x$1" : "^x$_opt" >/dev/null; then
+ _result="$_result${_result:+ }$_opt$PKG_CONFIG_SYSROOT_DIR$(expr "x$1" : "^x$_opt\(.*\)")"
else
_result="$_result${_result:+ }$1"
fi
@@ -568,7 +568,7 @@ done
if [ -z "$module_list" ]; then
module_list=${myname%-config}
-elif expr match "$module_list" "=\|!=\|<\|>\|<=\|>=" >/dev/null; then
+elif expr "$module_list" : "=\|!=\|<\|>\|<=\|>=" >/dev/null; then
module_list="${myname%-config} $module_list"
fi

View file

@ -7,7 +7,7 @@ include/gpgrt.h
lib/libgpg-error.a
lib/libgpg-error.so
lib/libgpg-error.so.0
lib/libgpg-error.so.0.26.0
lib/libgpg-error.so.0.26.1
libdata/pkgconfig/gpg-error.pc
man/man1/gpgrt-config.1.gz
share/aclocal/gpg-error.m4