svn commit: r400022 - in head/misc/lifelines: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Oct 23 13:09:10 2015
New Revision: 400022
URL: https://svnweb.freebsd.org/changeset/ports/400022

Log:
  - Improve wide character (UTF-8) support, define LICENSE (MIT)
  - Convert to option helpers and thus cleanup Makefile; running `make
    package OPTIONS_UNSET=DOCS -DBATCH' will produce a docless package
    without any pre-staging-era hacks in the Makefile
  
  PR:		203098
  Submitted by:	dhw
  Approved by:	maintainer

Added:
  head/misc/lifelines/files/patch-src_stdlib_icvt.c   (contents, props changed)
Modified:
  head/misc/lifelines/Makefile

Modified: head/misc/lifelines/Makefile
==============================================================================
--- head/misc/lifelines/Makefile	Fri Oct 23 12:56:02 2015	(r400021)
+++ head/misc/lifelines/Makefile	Fri Oct 23 13:09:10 2015	(r400022)
@@ -3,34 +3,26 @@
 
 PORTNAME=	lifelines
 PORTVERSION=	3.0.62
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	matt at gsicomp.on.ca
 COMMENT=	Advanced genealogical system
 
-GNU_CONFIGURE=	yes
+LICENSE=	MIT
+
 USES=		bison iconv tar:bzip2
+GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-.else
-CONFIGURE_ARGS+=--disable-nls
-.endif
+NLS_USES=	gettext
+NLS_CONFIGURE_OFF=	--disable-nls
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,ncursesw/curses.h,curses.h,' \
+	@${REINPLACE_CMD} -e 's,ncursesw/curses\.h,curses.h,' \
 		${WRKSRC}/src/hdrs/mycurses.h
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's,install-data-am: install-docDATA,install-data-am:,' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's,install-data-am: install-dist_pkgdataDATA install-docDATA install-man,install-data-am: install-dist_pkgdataDATA,' \
-		${WRKSRC}/docs/Makefile.in
-.endif
 
 .include <bsd.port.mk>

Added: head/misc/lifelines/files/patch-src_stdlib_icvt.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/lifelines/files/patch-src_stdlib_icvt.c	Fri Oct 23 13:09:10 2015	(r400022)
@@ -0,0 +1,11 @@
+--- src/stdlib/icvt.c.orig	2006-04-08 02:50:46 UTC
++++ src/stdlib/icvt.c
+@@ -84,7 +84,7 @@ iconv_trans (CNSTRING src, CNSTRING dest
+ 		/* assume MS-Windows makenarrow call */
+ 		inlen = 2 * wcslen((const wchar_t *)sin);
+ 	}
+-	if (!strncmp(src, "UCS-2", strlen("UCS-2"))) {
++	if (!strncmp(src, "UCS-4", strlen("UCS-4"))) {
+ 		/* assume UNIX makenarrow call */
+ 		inlen = 4 * wcslen((const wchar_t *)sin);
+ 	}