Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 1 Jun 2020 16:33:36 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r537491 - in head/textproc/dwdiff: . files
Message-ID:  <202006011633.051GXaFb005511@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: danilo
Date: Mon Jun  1 16:33:36 2020
New Revision: 537491
URL: https://svnweb.freebsd.org/changeset/ports/537491

Log:
  - Update to 2.1.2
  
  PR:		237540
  Submitted by:	mi

Added:
  head/textproc/dwdiff/files/
  head/textproc/dwdiff/files/patch-src_option.c   (contents, props changed)
Modified:
  head/textproc/dwdiff/Makefile
  head/textproc/dwdiff/distinfo

Modified: head/textproc/dwdiff/Makefile
==============================================================================
--- head/textproc/dwdiff/Makefile	Mon Jun  1 15:46:43 2020	(r537490)
+++ head/textproc/dwdiff/Makefile	Mon Jun  1 16:33:36 2020	(r537491)
@@ -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>

Modified: head/textproc/dwdiff/distinfo
==============================================================================
--- head/textproc/dwdiff/distinfo	Mon Jun  1 15:46:43 2020	(r537490)
+++ head/textproc/dwdiff/distinfo	Mon Jun  1 16:33:36 2020	(r537491)
@@ -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

Added: head/textproc/dwdiff/files/patch-src_option.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/dwdiff/files/patch-src_option.c	Mon Jun  1 16:33:36 2020	(r537491)
@@ -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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006011633.051GXaFb005511>