diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2019-03-27 00:12:54 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2019-03-27 00:12:54 +0000 |
| commit | c2640d06ae220e9c3938dbe2142676fd60d7694a (patch) | |
| tree | e22973ca4b6f39847a98b123e80bed9f9f4453e7 | |
| parent | af71bac37e484dcd0c6dc3c9e96870f749c570f9 (diff) | |
| download | freebsd-ports-c2640d06ae220e9c3938dbe2142676fd60d7694a.zip | |
misc/lifelines: Fix "person" entries show extraneous "Y" in DATE fields
- Fix patch files
- Modernize with OPTIONS
PR: 208698
Submitted by: matt@gsicomp.on.ca
Reported by: david@catwhisker.org
Approved by: matt@gsicomp.on.ca
| -rw-r--r-- | misc/lifelines/Makefile | 11 | ||||
| -rw-r--r-- | misc/lifelines/files/patch-intl_Makefile.in (renamed from misc/lifelines/files/patch-intl__Makefile.in) | 0 | ||||
| -rw-r--r-- | misc/lifelines/files/patch-src_liflines_show.c | 14 |
3 files changed, 19 insertions, 6 deletions
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile index a4372f76912f..1170a2427cc2 100644 --- a/misc/lifelines/Makefile +++ b/misc/lifelines/Makefile @@ -4,16 +4,17 @@ PORTNAME= lifelines PORTVERSION= 3.1.1 CATEGORIES= misc -MASTER_SITES= https://github.com/MarcNo/lifelines/releases/download/${PORTVERSION}/ +MASTER_SITES= https://github.com/MarcNo/lifelines/releases/download/${PORTVERSION}/ MAINTAINER= matt@gsicomp.on.ca COMMENT= Advanced genealogical system LICENSE= MIT -GNU_CONFIGURE= yes USES= autoreconf bison gmake iconv ncurses +GNU_CONFIGURE= yes + MAKE_JOBS_UNSAFE=yes # Lifelines always installs documenatation. This is contrary to the FreeBSD @@ -35,16 +36,14 @@ BUILDDOCS_BUILD_DEPENDS= xmlto:textproc/xmlto \ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -.include <bsd.port.options.mk> - pre-patch: @${REINPLACE_CMD} -e 's,ncursesw/curses.h,curses.h,' \ ${WRKSRC}/src/hdrs/mycurses.h -.if ! ${PORT_OPTIONS:MDOCS} + +pre-patch-DOCS-off: @${REINPLACE_CMD} -e 's,^doc_DATA.*,doc_DATA = .linesrc lines.cfg,' \ ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's,^doc_DATA.*,doc_DATA=,' \ ${WRKSRC}/docs/manual/Makefile.am -.endif .include <bsd.port.mk> diff --git a/misc/lifelines/files/patch-intl__Makefile.in b/misc/lifelines/files/patch-intl_Makefile.in index 6790415d8117..6790415d8117 100644 --- a/misc/lifelines/files/patch-intl__Makefile.in +++ b/misc/lifelines/files/patch-intl_Makefile.in diff --git a/misc/lifelines/files/patch-src_liflines_show.c b/misc/lifelines/files/patch-src_liflines_show.c new file mode 100644 index 000000000000..df1bdfd1ee4f --- /dev/null +++ b/misc/lifelines/files/patch-src_liflines_show.c @@ -0,0 +1,14 @@ +--- src/liflines/show.c.orig 2015-12-22 22:00:40 UTC ++++ src/liflines/show.c +@@ -254,7 +254,10 @@ disp_person_birthdeath (ZSTR zstr, RECORD irec, struct + zs_apps(ztemp, place); + } + if (!date && !place) { +- zs_apps(ztemp, "Y"); ++ // Git #308: INDI with BIRT/DEAT without DATE/PLAC displays "Y" ++ // The 3.0.62 behaviour was to display nothing. ++ // This sounds more appropriate so reverting to that behaviour. ++ //zs_apps(ztemp, "Y"); + } + if (ct>1) { + zs_appf(ztemp, " (%d alt)", ct-1); |