Attachment #203987 for bug #237540

View | Details | Raw Unified | Return to bug 237540
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	dwdiff
PORTVERSION=	2.1.2
PORTREVISION=	12
CATEGORIES=	textproc
MASTER_SITES=	https://os.ghalkes.nl/dist/ \
		http://fossies.org/unix/privat/

MAINTAINER=	danilo@FreeBSD.org

OPTIONS_SUB=	yes

NLS_CONFIGURE_WITH=	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=		tar:bz2
HAS_CONFIGURE=	yes
CFLAGS+=	-D_WITH_GETLINE
CONFIGURE_ARGS+=--with-verbose-compile
MAKE_ARGS+=	prefix=${PREFIX:Q} mandir="${MANPREFIX}/man" docdir=${DOCSDIR:Q}

post-patch:
	@${REINPLACE_CMD} -e 's|share/doc/${PORTNAME}-${PORTVERSION}|${DOCSDIR_REL}|' \
		${WRKSRC}/Makefile.in

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (dwdiff-2.0.9.tgz) = c1c9217825ad3fac9936129cc26b73fa5479fb079e5c34522fc7066e74e31ef8	1	TIMESTAMP = 1556142738
2	SIZE (dwdiff-2.0.9.tgz) = 86521	2	SHA256 (dwdiff-2.1.2.tar.bz2) = 3201fd459164ebbb538a0b21ce17d955f2fa3babe37367b2e92f7f912cfac692
		3	SIZE (dwdiff-2.1.2.tar.bz2) = 79282




Fix the compilation for when Unicode (ICU) support is disabled.

	-mi

--- src/option.c	2018-12-10 13:25:15.000000000 -0500
+++ src/option.c	2019-04-24 18:01:23.594665000 -0400
@@ -469,5 +469,5 @@
 
 	initOptions();
-  UErrorCode error = U_ZERO_ERROR;
+	ONLY_UNICODE(UErrorCode error = U_ZERO_ERROR;)
 	ONLY_UNICODE(option.decomposition = unorm2_getNFDInstance(&error);)
 

Return to bug 237540

Lines 2-11 Link Here

(-)Makefile (-10 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dwdiff	4	PORTNAME= dwdiff
5	PORTVERSION= 2.0.9	5	PORTVERSION= 2.1.2
6	PORTREVISION= 12
7	CATEGORIES= textproc	6	CATEGORIES= textproc
8	MASTER_SITES= http://os.ghalkes.nl/dist/ \	7	MASTER_SITES= https://os.ghalkes.nl/dist/ \
9	http://fossies.org/unix/privat/	8	http://fossies.org/unix/privat/
10		9
11	MAINTAINER= danilo@FreeBSD.org	10	MAINTAINER= danilo@FreeBSD.org
Lines 19-35 Link Here
19	OPTIONS_SUB= yes	18	OPTIONS_SUB= yes
20		19
21	NLS_CONFIGURE_WITH= gettext	20	NLS_CONFIGURE_WITH= gettext
22	NLS_USES= gettext	21	NLS_USES= gettext localbase:ldflags
		22	NLS_CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -lintl"
23		23
24	UNICODE_CONFIGURE_WITH= unicode	24	UNICODE_CONFIGURE_WITH= unicode
25	UNICODE_LIB_DEPENDS= libicudata.so:devel/icu	25	UNICODE_LIB_DEPENDS= libicudata.so:devel/icu
		26	UNICODE_USES= localbase:ldflags pkgconfig
26		27
27	USES= localbase:ldflags tar:tgz	28	USES= tar:bz2
28	HAS_CONFIGURE= yes	29	HAS_CONFIGURE= yes
29	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man	30	CFLAGS+= -D_WITH_GETLINE
		31	CONFIGURE_ARGS+=--with-verbose-compile
		32	MAKE_ARGS+= prefix=${PREFIX:Q} mandir="${MANPREFIX}/man" docdir=${DOCSDIR:Q}
30		33
31	post-patch:
32	@${REINPLACE_CMD} -e 's\|share/doc/${PORTNAME}-${PORTVERSION}\|${DOCSDIR_REL}\|' \
33	${WRKSRC}/Makefile.in
34
35	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-unicode (+13 lines)
	1	Fix the compilation for when Unicode (ICU) support is disabled.
	2
	3	-mi
	4
	5	--- src/option.c 2018-12-10 13:25:15.000000000 -0500
	6	+++ src/option.c 2019-04-24 18:01:23.594665000 -0400
	7	@@ -469,5 +469,5 @@
	8
	9	initOptions();
	10	- UErrorCode error = U_ZERO_ERROR;
	11	+ ONLY_UNICODE(UErrorCode error = U_ZERO_ERROR;)
	12	ONLY_UNICODE(option.decomposition = unorm2_getNFDInstance(&error);)
	13