Date: Wed, 27 Mar 2019 00:12:55 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496931 - in head/misc/lifelines: . files Message-ID: <201903270012.x2R0CtfP068406@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Wed Mar 27 00:12:54 2019 New Revision: 496931 URL: https://svnweb.freebsd.org/changeset/ports/496931 Log: 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 Added: head/misc/lifelines/files/patch-intl_Makefile.in (contents, props changed) head/misc/lifelines/files/patch-src_liflines_show.c (contents, props changed) Deleted: head/misc/lifelines/files/patch-intl__Makefile.in Modified: head/misc/lifelines/Makefile Modified: head/misc/lifelines/Makefile ============================================================================== --- head/misc/lifelines/Makefile Tue Mar 26 23:58:56 2019 (r496930) +++ head/misc/lifelines/Makefile Wed Mar 27 00:12:54 2019 (r496931) @@ -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> Added: head/misc/lifelines/files/patch-intl_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/lifelines/files/patch-intl_Makefile.in Wed Mar 27 00:12:54 2019 (r496931) @@ -0,0 +1,38 @@ +--- intl/Makefile.in.orig 2015-12-22 22:00:40 UTC ++++ intl/Makefile.in +@@ -152,35 +152,6 @@ install-exec: all + else \ + : ; \ + fi +- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ +- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ +- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ +- dest=$(DESTDIR)$(libdir)/charset.alias; \ +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- orig=$(DESTDIR)$(libdir)/charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- if test @GLIBC21@ = no; then \ +- orig=charset.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- fi; \ +- fi; \ +- $(mkinstalldirs) $(DESTDIR)$(localedir); \ +- test -f $(DESTDIR)$(localedir)/locale.alias \ +- && orig=$(DESTDIR)$(localedir)/locale.alias \ +- || orig=$(srcdir)/locale.alias; \ +- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ +- dest=$(DESTDIR)$(localedir)/locale.alias; \ +- sed -f ref-add.sed $$orig > $$temp; \ +- $(INSTALL_DATA) $$temp $$dest; \ +- rm -f $$temp; \ +- else \ +- : ; \ +- fi + install-data: all + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ Added: head/misc/lifelines/files/patch-src_liflines_show.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/lifelines/files/patch-src_liflines_show.c Wed Mar 27 00:12:54 2019 (r496931) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903270012.x2R0CtfP068406>