diff options
| author | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2020-06-02 00:33:36 +0800 |
|---|---|---|
| committer | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2020-06-02 00:33:36 +0800 |
| commit | 342c3674e5a1bd4ee88a5909a42723240b0cd7cb (patch) | |
| tree | d4ac960419ff832d54bb8d1b8a49c1cae8da5c95 /textproc | |
| parent | daf098bd658a93c77a69af2ada6c549986e4e67f (diff) | |
| download | freebsd-ports-gnome-342c3674e5a1bd4ee88a5909a42723240b0cd7cb.tar.gz freebsd-ports-gnome-342c3674e5a1bd4ee88a5909a42723240b0cd7cb.tar.zst freebsd-ports-gnome-342c3674e5a1bd4ee88a5909a42723240b0cd7cb.zip | |
- Update to 2.1.2
PR: 237540
Submitted by: mi
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/dwdiff/Makefile | 20 | ||||
| -rw-r--r-- | textproc/dwdiff/distinfo | 5 | ||||
| -rw-r--r-- | textproc/dwdiff/files/patch-src_option.c | 15 |
3 files changed, 28 insertions, 12 deletions
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile index 455f813004c9..42d850c6242a 100644 --- a/textproc/dwdiff/Makefile +++ b/textproc/dwdiff/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= dwdiff -PORTVERSION= 2.0.9 -PORTREVISION= 15 +PORTVERSION= 2.1.2 CATEGORIES= textproc -MASTER_SITES= http://os.ghalkes.nl/dist/ \ +MASTER_SITES= https://os.ghalkes.nl/dist/ \ http://fossies.org/unix/privat/ MAINTAINER= danilo@FreeBSD.org @@ -14,22 +13,23 @@ COMMENT= Delimited word diff program LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +USES= tar:bz2 + OPTIONS_DEFINE= UNICODE NLS DOCS OPTIONS_DEFAULT=UNICODE OPTIONS_SUB= yes NLS_CONFIGURE_WITH= gettext -NLS_USES= gettext +NLS_USES= gettext localbase:ldflags +NLS_CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -lintl" UNICODE_CONFIGURE_WITH= unicode UNICODE_LIB_DEPENDS= libicudata.so:devel/icu +UNICODE_USES= localbase:ldflags pkgconfig -USES= localbase:ldflags tar:tgz HAS_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man - -post-patch: - @${REINPLACE_CMD} -e 's|share/doc/${PORTNAME}-${PORTVERSION}|${DOCSDIR_REL}|' \ - ${WRKSRC}/Makefile.in +CFLAGS+= -D_WITH_GETLINE +CONFIGURE_ARGS+=--with-verbose-compile +MAKE_ARGS+= prefix=${PREFIX:Q} mandir="${MANPREFIX}/man" docdir=${DOCSDIR:Q} .include <bsd.port.mk> diff --git a/textproc/dwdiff/distinfo b/textproc/dwdiff/distinfo index f1e2db883209..b48f40356b71 100644 --- a/textproc/dwdiff/distinfo +++ b/textproc/dwdiff/distinfo @@ -1,2 +1,3 @@ -SHA256 (dwdiff-2.0.9.tgz) = c1c9217825ad3fac9936129cc26b73fa5479fb079e5c34522fc7066e74e31ef8 -SIZE (dwdiff-2.0.9.tgz) = 86521 +TIMESTAMP = 1556142738 +SHA256 (dwdiff-2.1.2.tar.bz2) = 3201fd459164ebbb538a0b21ce17d955f2fa3babe37367b2e92f7f912cfac692 +SIZE (dwdiff-2.1.2.tar.bz2) = 79282 diff --git a/textproc/dwdiff/files/patch-src_option.c b/textproc/dwdiff/files/patch-src_option.c new file mode 100644 index 000000000000..3cda7a933b2c --- /dev/null +++ b/textproc/dwdiff/files/patch-src_option.c @@ -0,0 +1,15 @@ +Fix the compilation for when Unicode (ICU) support is disabled. + + -mi + +--- src/option.c.orig 2018-12-10 18:25:15 UTC ++++ src/option.c +@@ -468,7 +468,7 @@ static void initializeOptions(void) { + option.output = stdout; + + initOptions(); +- UErrorCode error = U_ZERO_ERROR; ++ ONLY_UNICODE(UErrorCode error = U_ZERO_ERROR;) + ONLY_UNICODE(option.decomposition = unorm2_getNFDInstance(&error);) + + option.needStartStop = true; |