4 files changed, 109 insertions, 98 deletions

diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 921dfd9fc13b..cf53189caca6 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lifelines
-PORTVERSION=	3.0.46.1
+PORTVERSION=	3.0.50
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/lifelines/distinfo b/misc/lifelines/distinfo
index 02bbbe005adb..bd8e0ec835e6 100644
--- a/misc/lifelines/distinfo
+++ b/misc/lifelines/distinfo
@@ -1,3 +1,3 @@
-MD5 (lifelines-3.0.46.1.tar.bz2) = 71c8c3e9a5a1351b92263a0c490c44fc
-SHA256 (lifelines-3.0.46.1.tar.bz2) = 6f59795b61669a2afa9ee7f04db93e201140ecb54f9844df3999c1014c18177e
-SIZE (lifelines-3.0.46.1.tar.bz2) = 2017473
+MD5 (lifelines-3.0.50.tar.bz2) = 1d8080ad03900cb2beebeaac93b674cc
+SHA256 (lifelines-3.0.50.tar.bz2) = d13ebdfb757c84cf8600666bd003e44b11f17b83945d63821f7e2b5f92248249
+SIZE (lifelines-3.0.50.tar.bz2) = 1814769
diff --git a/misc/lifelines/files/patch-doc::Makefile.in b/misc/lifelines/files/patch-doc-Makefile.in
index f287c20e804a..1549bb1fc67b 100644
--- a/misc/lifelines/files/patch-doc::Makefile.in
+++ b/misc/lifelines/files/patch-doc-Makefile.in
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	Thu Oct 13 15:31:42 2005
-+++ docs/Makefile.in	Thu Oct 13 15:31:53 2005
-@@ -198,7 +198,7 @@
+--- docs/Makefile.in.bak	Sat Dec 24 02:42:57 2005
++++ docs/Makefile.in	Sat Jul  1 15:03:12 2006
+@@ -205,7 +205,7 @@
  MANUALS = $(MANUALS_en) $(MANUALS_sv)
  MANPAGES = btedit.1 dbverify.1 llines.1
  OLDGENFILES = lifelines.html lifelines.pdf lifelines.ps lifelines.txt
 -EXTRA_DIST = $(MANUALSSRC) $(MANUALS) $(MANPAGES)
 +EXTRA_DIST = $(MANUALSSRC) $(MANUALS)
+ man1_MANS = $(MANPAGES)
  CONFIG_CLEAN_FILES = $(OLDGENFILES) $(MANUALS)
  docdir = $(datadir)/doc/lifelines
- doc_DATA = $(EXTRA_DIST)
diff --git a/misc/lifelines/pkg-plist b/misc/lifelines/pkg-plist
index 4ba62f1ebc39..69da49d45388 100644
--- a/misc/lifelines/pkg-plist
+++ b/misc/lifelines/pkg-plist
@@ -2,6 +2,21 @@ bin/btedit
 bin/dbverify
 bin/llexec
 bin/llines
+%%PORTDOCS%%%%DOCSDIR%%/.linesrc
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.AUTOCONF
+%%PORTDOCS%%%%DOCSDIR%%/README.DEVELOPERS
+%%PORTDOCS%%%%DOCSDIR%%/README.INTERNATIONAL
+%%PORTDOCS%%%%DOCSDIR%%/README.LAYOUT
+%%PORTDOCS%%%%DOCSDIR%%/README.MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/lines.cfg
+%%PORTDOCS%%%%DOCSDIR%%/lines.cfg.input
 %%PORTDOCS%%%%DOCSDIR%%/listops.jpg
 %%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.html
 %%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.pdf
@@ -13,25 +28,14 @@ bin/llines
 %%PORTDOCS%%%%DOCSDIR%%/ll-userguide.sv.html
 %%PORTDOCS%%%%DOCSDIR%%/ll-userguide.txt
 %%PORTDOCS%%%%DOCSDIR%%/ll-userguide.xml
-%%NLS%%share/locale/da/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/de/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/el/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/it/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/lifelines.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/lifelines.mo
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
 %%DATADIR%%/2ppage.ll
 %%DATADIR%%/4gen1.ll
 %%DATADIR%%/6gen1.ll
 %%DATADIR%%/8gen1.ll
+%%DATADIR%%/BW_descendants.ll
+%%DATADIR%%/CREDIT
+%%DATADIR%%/README
+%%DATADIR%%/addsour.ll
 %%DATADIR%%/af-import.ll
 %%DATADIR%%/afn_match.ll
 %%DATADIR%%/ahnenliste.ll
@@ -40,71 +44,79 @@ bin/llines
 %%DATADIR%%/all_anc_lines.ll
 %%DATADIR%%/allfam10c.ll
 %%DATADIR%%/alllines.ll
-%%DATADIR%%/alllines.sgml.ll
 %%DATADIR%%/altern.ll
 %%DATADIR%%/anc2_ged.ll
 %%DATADIR%%/ancestors2.ll
 %%DATADIR%%/anniver.ll
 %%DATADIR%%/bday_cover.ll
 %%DATADIR%%/bias.ll
+%%DATADIR%%/bib2html.c
 %%DATADIR%%/bkdes16-1.ll
+%%DATADIR%%/boc.gif
 %%DATADIR%%/book-latex.ll
 %%DATADIR%%/browser.ll
 %%DATADIR%%/burial_index.ll
-%%DATADIR%%/BW_descendants.ll
-%%DATADIR%%/cid.ll
-%%DATADIR%%/connect2.ll
+%%DATADIR%%/bury.c
 %%DATADIR%%/cgi_html.li
+%%DATADIR%%/cid.ll
 %%DATADIR%%/common.ll
+%%DATADIR%%/connect2.ll
 %%DATADIR%%/cons.ll
 %%DATADIR%%/cont.ll
-%%DATADIR%%/count_dup.ll
 %%DATADIR%%/count_anc.ll
 %%DATADIR%%/count_desc.ll
-%%DATADIR%%/cron.ll
+%%DATADIR%%/count_dup.ll
 %%DATADIR%%/count_paternal_desc.ll
 %%DATADIR%%/cousins.ll
 %%DATADIR%%/coverage.ll
+%%DATADIR%%/cron.ll
+%%DATADIR%%/d-rtf.ll
 %%DATADIR%%/dates.ll
 %%DATADIR%%/db_summary.ll
 %%DATADIR%%/desc-henry.ll
+%%DATADIR%%/desc-tree.ll
 %%DATADIR%%/desc_ged.ll
-%%DATADIR%%/descged.ll
 %%DATADIR%%/desc_html.ll
-%%DATADIR%%/desc-tree.ll
+%%DATADIR%%/descged.ll
 %%DATADIR%%/divorce.li
 %%DATADIR%%/drep2.ll
-%%DATADIR%%/d-rtf.ll
+%%DATADIR%%/drsetup.tex
+%%DATADIR%%/drtree.tex
 %%DATADIR%%/dump-ances.ll
 %%DATADIR%%/dump_html.ll
 %%DATADIR%%/dump_html_sd.ll
 %%DATADIR%%/eol.ll
 %%DATADIR%%/est_life_span.ll
+%%DATADIR%%/ex1.tex
 %%DATADIR%%/extract_gedcom.ll
 %%DATADIR%%/extract_html.ll
 %%DATADIR%%/extract_set.li
+%%DATADIR%%/extree1.tex
+%%DATADIR%%/extree2.tex
 %%DATADIR%%/fam10c.ll
 %%DATADIR%%/fam16rn1.ll
 %%DATADIR%%/fam_ged.ll
 %%DATADIR%%/famgroup.ll
+%%DATADIR%%/fami-grps.ll
 %%DATADIR%%/familycheck.ll
 %%DATADIR%%/familyisfm1.ll
 %%DATADIR%%/famrep.ll
 %%DATADIR%%/famtree1.ll
-%%DATADIR%%/fileindex.ll
 %%DATADIR%%/fdesc.ll
+%%DATADIR%%/fileindex.ll
 %%DATADIR%%/find.ll
 %%DATADIR%%/findmissing.ll
 %%DATADIR%%/fix_nameplac.ll
 %%DATADIR%%/formatted_gedcom.ll
+%%DATADIR%%/ged_write.li
 %%DATADIR%%/gedall.ll
 %%DATADIR%%/gedlist.ll
 %%DATADIR%%/gedlod.ll
 %%DATADIR%%/gedn.ll
 %%DATADIR%%/gedtags.ll
-%%DATADIR%%/ged_write.li
+%%DATADIR%%/gen_index
+%%DATADIR%%/genancc.ll
 %%DATADIR%%/genancc1.ll
-%%DATADIR%%/genancc2.ll
 %%DATADIR%%/gender_order.ll
 %%DATADIR%%/gendex.ll
 %%DATADIR%%/genetics.ll
@@ -112,18 +124,29 @@ bin/llines
 %%DATADIR%%/getbaptism.li
 %%DATADIR%%/givens_gender.ll
 %%DATADIR%%/givens_gender_finder.ll
+%%DATADIR%%/grand.ll
 %%DATADIR%%/hasnotes1.ll
 %%DATADIR%%/hp-anc.ll
-%%DATADIR%%/htmlahnen.ll
 %%DATADIR%%/html.dn.ll
-%%DATADIR%%/htmlfam.ll
 %%DATADIR%%/html.ll
+%%DATADIR%%/htmlahnen.ll
+%%DATADIR%%/htmlfam.ll
 %%DATADIR%%/igi-filter.ll
 %%DATADIR%%/igi-import.ll
 %%DATADIR%%/igi-merge.ll
 %%DATADIR%%/igi-search.ll
 %%DATADIR%%/index.html
+%%DATADIR%%/index1.ll
+%%DATADIR%%/index_html.ll
+%%DATADIR%%/index_mm.ll
+%%DATADIR%%/indiv.ll
+%%DATADIR%%/infant_mortality.ll
+%%DATADIR%%/interestset.li
+%%DATADIR%%/ldsgedcom.li
+%%DATADIR%%/least_related.ll
+%%DATADIR%%/line.ll
 %%DATADIR%%/listops.jpg
+%%DATADIR%%/listsour.ll
 %%DATADIR%%/ll-reportmanual.html
 %%DATADIR%%/ll-reportmanual.pdf
 %%DATADIR%%/ll-reportmanual.sv.html
@@ -132,54 +155,62 @@ bin/llines
 %%DATADIR%%/ll-userguide.pdf
 %%DATADIR%%/ll-userguide.sv.html
 %%DATADIR%%/ll-userguide.txt
-%%DATADIR%%/index1.ll
-%%DATADIR%%/index_html.ll
-%%DATADIR%%/index_mm.ll
-%%DATADIR%%/interestset.li
-%%DATADIR%%/indiv.ll
-%%DATADIR%%/infant_mortality.ll
-%%DATADIR%%/ldsgedcom.li
-%%DATADIR%%/line.ll
-%%DATADIR%%/least_related.ll
-%%DATADIR%%/listsour.ll
+%%DATADIR%%/ll.png
 %%DATADIR%%/ll2html4.ll
 %%DATADIR%%/ll2visio.ll
+%%DATADIR%%/lldb.ll
 %%DATADIR%%/longlines.ll
 %%DATADIR%%/maritalinfo.ll
+%%DATADIR%%/marriages.ll
 %%DATADIR%%/marriages1.ll
 %%DATADIR%%/menu.ll
+%%DATADIR%%/mysetup.tex
 %%DATADIR%%/name2html.ll
 %%DATADIR%%/namefreq.ll
 %%DATADIR%%/names_freq.ll
 %%DATADIR%%/namesformat1.ll
 %%DATADIR%%/net-ped.ll
-%%DATADIR%%/novel.ll
 %%DATADIR%%/nonpatronymics.ll
+%%DATADIR%%/novel.README
+%%DATADIR%%/novel.intro
+%%DATADIR%%/novel.ll
 %%DATADIR%%/outsources.li
 %%DATADIR%%/paf-export.ll
+%%DATADIR%%/paf-import.ll
 %%DATADIR%%/pafcompat.ll
 %%DATADIR%%/partition.ll
 %%DATADIR%%/pdesc.ll
-%%DATADIR%%/paf-import.ll
 %%DATADIR%%/ped.ll
 %%DATADIR%%/pedigree.ll
-%%DATADIR%%/pedigreel.ll
 %%DATADIR%%/pedigree_html.ll
+%%DATADIR%%/pedigreel.ll
 %%DATADIR%%/pedigreelhs.ll
 %%DATADIR%%/pedtex.ll
+%%DATADIR%%/pedtex.readme
 %%DATADIR%%/places.ll
 %%DATADIR%%/pointers.ll
+%%DATADIR%%/poster.doc
+%%DATADIR%%/poster.tex
+%%DATADIR%%/poster1.tex
+%%DATADIR%%/poster2.tex
 %%DATADIR%%/prompt.li
 %%DATADIR%%/ps-anc.ll
 %%DATADIR%%/ps-circle.ll
 %%DATADIR%%/ps-fan.ll
+%%DATADIR%%/ps-fan.ps
 %%DATADIR%%/ps-pedigree.ll
+%%DATADIR%%/ps-pedigree.ps
+%%DATADIR%%/pstricks.con
+%%DATADIR%%/pstricks.pro
+%%DATADIR%%/pstricks.tex
+%%DATADIR%%/refn.ll
 %%DATADIR%%/reg_html.ll
 %%DATADIR%%/register-rtf.ll
 %%DATADIR%%/register-tex.ll
-%%DATADIR%%/register1.ll
 %%DATADIR%%/register1-dot.ll
+%%DATADIR%%/register1.ll
 %%DATADIR%%/regvital.ll
+%%DATADIR%%/regvital1.ll
 %%DATADIR%%/relate.ll
 %%DATADIR%%/related_spouses.ll
 %%DATADIR%%/relation.ll
@@ -191,29 +222,33 @@ bin/llines
 %%DATADIR%%/rtflib.li
 %%DATADIR%%/sealing_line.ll
 %%DATADIR%%/select.ll
+%%DATADIR%%/setup.tex
 %%DATADIR%%/sgsgen.ll
 %%DATADIR%%/shorten.li
 %%DATADIR%%/showlines1.ll
 %%DATADIR%%/simpleged.ll
-%%DATADIR%%/soundex1.ll
 %%DATADIR%%/soundex-isfm.ll
+%%DATADIR%%/soundex1.ll
+%%DATADIR%%/sour.li
 %%DATADIR%%/sour2.li
 %%DATADIR%%/sources.ll
 %%DATADIR%%/sources_bib.ll
-%%DATADIR%%/sour.li
-%%DATADIR%%/src.ll
+%%DATADIR%%/span.ll
 %%DATADIR%%/src-rtf.ll
-%%DATADIR%%/ssdi_aid.ll
+%%DATADIR%%/src.ll
 %%DATADIR%%/ssdi-import.ll
 %%DATADIR%%/ssdi-search-list.ll
-%%DATADIR%%/stats.ll
+%%DATADIR%%/ssdi_aid.ll
 %%DATADIR%%/st_all.ll
+%%DATADIR%%/stats.ll
 %%DATADIR%%/surname1.ll
 %%DATADIR%%/timeline1.ll
 %%DATADIR%%/timeline2.ll
 %%DATADIR%%/tinytafel1.ll
 %%DATADIR%%/tools.li
+%%DATADIR%%/tree.tex
 %%DATADIR%%/tree_density.ll
+%%DATADIR%%/trigtest.ll
 %%DATADIR%%/ttable.ll
 %%DATADIR%%/upl2.li
 %%DATADIR%%/verify.ll
@@ -221,46 +256,22 @@ bin/llines
 %%DATADIR%%/xml-dtd.ll
 %%DATADIR%%/xmlize.ll
 %%DATADIR%%/zombies.ll
-%%DATADIR%%/boc.gif
-%%DATADIR%%/ll.png
-%%DATADIR%%/gen_index
-%%DATADIR%%/bib2html.c
-%%DATADIR%%/bury.c
-%%DATADIR%%/drtree.tex
-%%DATADIR%%/extree2.tex
-%%DATADIR%%/poster2.tex
-%%DATADIR%%/pstricks.con
-%%DATADIR%%/README
-%%DATADIR%%/ex1.tex
-%%DATADIR%%/mysetup.tex
-%%DATADIR%%/poster.doc
-%%DATADIR%%/pstricks.pro
-%%DATADIR%%/setup.tex
-%%DATADIR%%/drsetup.tex
-%%DATADIR%%/extree1.tex
-%%DATADIR%%/poster1.tex
-%%DATADIR%%/poster.tex
-%%DATADIR%%/pstricks.tex
-%%DATADIR%%/tree.tex
-%%DATADIR%%/novel.head
-%%DATADIR%%/novel.intro
-%%DATADIR%%/novel.README
-%%DATADIR%%/pedtex.readme
-%%DATADIR%%/ps-fan.ps
-%%DATADIR%%/ps-pedigree.ps
-%%DATADIR%%/st_aux.li
-%%DATADIR%%/st_collate.li
-%%DATADIR%%/st_collate_8859-1.li
-%%DATADIR%%/st_collate_UTF-8.li
-%%DATADIR%%/st_convert.li
-%%DATADIR%%/st_date.li
-%%DATADIR%%/st_db.li
-%%DATADIR%%/st_list.li
-%%DATADIR%%/st_name.li
-%%DATADIR%%/st_number.li
-%%DATADIR%%/st_string.li
-%%DATADIR%%/st_string_UTF-8.li
-%%DATADIR%%/st_table.li
-%%DATADIR%%/CREDIT
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%NLS%%share/locale/da/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/de/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/el/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/es/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/it/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/lifelines.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/lifelines.mo
+@dirrm %%NLS%%share/locale/rw/LC_MESSAGES
+@dirrm %%NLS%%share/locale/rw
+@dirrm %%NLS%%share/locale/pl/LC_MESSAGES
+@dirrm %%NLS%%share/locale/pl
+@dirrm %%NLS%%share/locale/el/LC_MESSAGES
+@dirrm %%NLS%%share/locale/el
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%