Index: head/misc/lifelines/Makefile
===================================================================
--- head/misc/lifelines/Makefile	(revision 496930)
+++ head/misc/lifelines/Makefile	(revision 496931)
@@ -1,50 +1,49 @@
 # Created by: Matt Emmerton <matt@gsicomp.on.ca>
 # $FreeBSD$
 
 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
 # norm which uses --with-docs (aka DOCS) to do so.  We patch the Makefiles
 # below in pre-patch.
 # Lifelines uses --with-docs to indicate that the full XML docbook toolcahin
 # needs to be installed to build the docs.  We use BUILDDOCS for that purpose.
 
 OPTIONS_DEFINE=		BUILDDOCS DOCS NLS
 OPTIONS_SUB=		yes
 BUILDDOCS_DESC=		Build documentation (requires docbook toolchain)
 DOCS_DESC=		Install documentation
 NLS_DESC=		Build with NLS support
 
 BUILDDOCS_CONFIGURE_WITH=	docs
 BUILDDOCS_BUILD_DEPENDS=	xmlto:textproc/xmlto \
 				dblatex:textproc/dblatex
 
 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>
Index: head/misc/lifelines/files/patch-intl__Makefile.in
===================================================================
--- head/misc/lifelines/files/patch-intl__Makefile.in	(revision 496930)
+++ head/misc/lifelines/files/patch-intl__Makefile.in	(nonexistent)
@@ -1,38 +0,0 @@
---- 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); \

Property changes on: head/misc/lifelines/files/patch-intl__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/misc/lifelines/files/patch-intl_Makefile.in
===================================================================
--- head/misc/lifelines/files/patch-intl_Makefile.in	(nonexistent)
+++ head/misc/lifelines/files/patch-intl_Makefile.in	(revision 496931)
@@ -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); \

Property changes on: head/misc/lifelines/files/patch-intl_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/misc/lifelines/files/patch-src_liflines_show.c
===================================================================
--- head/misc/lifelines/files/patch-src_liflines_show.c	(nonexistent)
+++ head/misc/lifelines/files/patch-src_liflines_show.c	(revision 496931)
@@ -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);

Property changes on: head/misc/lifelines/files/patch-src_liflines_show.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property