Update to 3.0.46.1

PR:		87402
Submitted by:	Frank Laszlo <laszlof@vonostingroup.com>
Approved by:	Matt Emmerton <matt@gsicomp.on.ca> (maintainer)

5 files changed, 300 insertions, 16 deletions

diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index c3d5e241665c..921dfd9fc13b 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lifelines
-PORTVERSION=	3.0.37.2
+PORTVERSION=	3.0.46.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,6 +18,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_ICONV=	yes
 USE_BZIP2=	yes
+USE_BISON=	yes
 USE_GETOPT_LONG=yes
 
 MAN1=		btedit.1 dbverify.1 llines.1
diff --git a/misc/lifelines/distinfo b/misc/lifelines/distinfo
index cd1c5c112706..9def90ebce40 100644
--- a/misc/lifelines/distinfo
+++ b/misc/lifelines/distinfo
@@ -1,2 +1,2 @@
-MD5 (lifelines-3.0.37.2.tar.bz2) = b324899196051c960d4c92b03123ba43
-SIZE (lifelines-3.0.37.2.tar.bz2) = 1211309
+MD5 (lifelines-3.0.46.1.tar.bz2) = 71c8c3e9a5a1351b92263a0c490c44fc
+SIZE (lifelines-3.0.46.1.tar.bz2) = 2017473
diff --git a/misc/lifelines/files/patch-doc::Makefile.in b/misc/lifelines/files/patch-doc::Makefile.in
index 5d20fcebe87f..f287c20e804a 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	Sat Feb 14 15:19:05 2004
-+++ docs/Makefile.in	Sat Feb 14 15:25:09 2004
-@@ -163,7 +163,7 @@
- 
+--- 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 @@
+ 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)
- 
  CONFIG_CLEAN_FILES = $(OLDGENFILES) $(MANUALS)
- 
+ docdir = $(datadir)/doc/lifelines
+ doc_DATA = $(EXTRA_DIST)
diff --git a/misc/lifelines/files/patch-intl__Makefile.in b/misc/lifelines/files/patch-intl__Makefile.in
new file mode 100644
index 000000000000..81b39df5fe0a
--- /dev/null
+++ b/misc/lifelines/files/patch-intl__Makefile.in
@@ -0,0 +1,38 @@
+--- intl/Makefile.in.orig	Fri Oct 14 00:36:21 2005
++++ intl/Makefile.in	Fri Oct 14 00:38:03 2005
+@@ -152,35 +152,6 @@
+ 	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); \
diff --git a/misc/lifelines/pkg-plist b/misc/lifelines/pkg-plist
index 95c1b32b1a42..dfe21ba02f42 100644
--- a/misc/lifelines/pkg-plist
+++ b/misc/lifelines/pkg-plist
@@ -13,6 +13,127 @@ 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
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/da 2> /dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de 2> /dev/null || true
+@unexec rmdir %D/share/locale/el/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/el 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr 2> /dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/it 2> /dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sv 2> /dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/pl 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+%%DATADIR%%/2ppage.ll
+%%DATADIR%%/4gen1.ll
+%%DATADIR%%/6gen1.ll
+%%DATADIR%%/8gen1.ll
+%%DATADIR%%/af-import.ll
+%%DATADIR%%/afn_match.ll
+%%DATADIR%%/ahnenliste.ll
+%%DATADIR%%/ahnentafel.ll
+%%DATADIR%%/alive.ll
+%%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%%/bkdes16-1.ll
+%%DATADIR%%/book-latex.ll
+%%DATADIR%%/browser.ll
+%%DATADIR%%/burial_index.ll
+%%DATADIR%%/BW_descendants.ll
+%%DATADIR%%/cid.ll
+%%DATADIR%%/connect2.ll
+%%DATADIR%%/cgi_html.li
+%%DATADIR%%/common.ll
+%%DATADIR%%/cons.ll
+%%DATADIR%%/cont.ll
+%%DATADIR%%/count_dup.ll
+%%DATADIR%%/count_anc.ll
+%%DATADIR%%/count_desc.ll
+%%DATADIR%%/cron.ll
+%%DATADIR%%/count_paternal_desc.ll
+%%DATADIR%%/cousins.ll
+%%DATADIR%%/coverage.ll
+%%DATADIR%%/dates.ll
+%%DATADIR%%/db_summary.ll
+%%DATADIR%%/desc-henry.ll
+%%DATADIR%%/desc_ged.ll
+%%DATADIR%%/descged.ll
+%%DATADIR%%/desc_html.ll
+%%DATADIR%%/desc-tree.ll
+%%DATADIR%%/divorce.li
+%%DATADIR%%/drep2.ll
+%%DATADIR%%/d-rtf.ll
+%%DATADIR%%/dump-ances.ll
+%%DATADIR%%/dump_html.ll
+%%DATADIR%%/dump_html_sd.ll
+%%DATADIR%%/eol.ll
+%%DATADIR%%/est_life_span.ll
+%%DATADIR%%/extract_gedcom.ll
+%%DATADIR%%/extract_html.ll
+%%DATADIR%%/extract_set.li
+%%DATADIR%%/fam10c.ll
+%%DATADIR%%/fam16rn1.ll
+%%DATADIR%%/fam_ged.ll
+%%DATADIR%%/famgroup.ll
+%%DATADIR%%/familycheck.ll
+%%DATADIR%%/familyisfm1.ll
+%%DATADIR%%/famrep.ll
+%%DATADIR%%/famtree1.ll
+%%DATADIR%%/fileindex.ll
+%%DATADIR%%/fdesc.ll
+%%DATADIR%%/find.ll
+%%DATADIR%%/findmissing.ll
+%%DATADIR%%/fix_nameplac.ll
+%%DATADIR%%/formatted_gedcom.ll
+%%DATADIR%%/gedall.ll
+%%DATADIR%%/gedlist.ll
+%%DATADIR%%/gedlod.ll
+%%DATADIR%%/gedn.ll
+%%DATADIR%%/gedtags.ll
+%%DATADIR%%/ged_write.li
+%%DATADIR%%/genancc1.ll
+%%DATADIR%%/genancc2.ll
+%%DATADIR%%/gender_order.ll
+%%DATADIR%%/gendex.ll
+%%DATADIR%%/genetics.ll
+%%DATADIR%%/genetics2.ll
+%%DATADIR%%/getbaptism.li
+%%DATADIR%%/givens_gender.ll
+%%DATADIR%%/givens_gender_finder.ll
+%%DATADIR%%/hasnotes1.ll
+%%DATADIR%%/hp-anc.ll
+%%DATADIR%%/htmlahnen.ll
+%%DATADIR%%/html.dn.ll
+%%DATADIR%%/htmlfam.ll
+%%DATADIR%%/html.ll
+%%DATADIR%%/igi-filter.ll
+%%DATADIR%%/igi-import.ll
+%%DATADIR%%/igi-merge.ll
+%%DATADIR%%/igi-search.ll
 %%DATADIR%%/index.html
 %%DATADIR%%/listops.jpg
 %%DATADIR%%/ll-reportmanual.html
@@ -23,11 +144,135 @@ bin/llines
 %%DATADIR%%/ll-userguide.pdf
 %%DATADIR%%/ll-userguide.sv.html
 %%DATADIR%%/ll-userguide.txt
-%%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
+%%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%%/ll2html4.ll
+%%DATADIR%%/ll2visio.ll
+%%DATADIR%%/longlines.ll
+%%DATADIR%%/maritalinfo.ll
+%%DATADIR%%/marriages1.ll
+%%DATADIR%%/menu.ll
+%%DATADIR%%/name2html.ll
+%%DATADIR%%/namefreq.ll
+%%DATADIR%%/names_freq.ll
+%%DATADIR%%/namesformat1.ll
+%%DATADIR%%/net-ped.ll
+%%DATADIR%%/novel.ll
+%%DATADIR%%/nonpatronymics.ll
+%%DATADIR%%/outsources.li
+%%DATADIR%%/paf-export.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%%/pedigreelhs.ll
+%%DATADIR%%/pedtex.ll
+%%DATADIR%%/places.ll
+%%DATADIR%%/pointers.ll
+%%DATADIR%%/prompt.li
+%%DATADIR%%/ps-anc.ll
+%%DATADIR%%/ps-circle.ll
+%%DATADIR%%/ps-fan.ll
+%%DATADIR%%/ps-pedigree.ll
+%%DATADIR%%/reg_html.ll
+%%DATADIR%%/register-rtf.ll
+%%DATADIR%%/register-tex.ll
+%%DATADIR%%/register1.ll
+%%DATADIR%%/register1-dot.ll
+%%DATADIR%%/regvital.ll
+%%DATADIR%%/relate.ll
+%%DATADIR%%/related_spouses.ll
+%%DATADIR%%/relation.ll
+%%DATADIR%%/relink.ll
+%%DATADIR%%/rfc.ll
+%%DATADIR%%/rllgen.ll
+%%DATADIR%%/rootset.ll
+%%DATADIR%%/rslgen.ll
+%%DATADIR%%/rtflib.li
+%%DATADIR%%/sealing_line.ll
+%%DATADIR%%/select.ll
+%%DATADIR%%/sgsgen.ll
+%%DATADIR%%/shorten.li
+%%DATADIR%%/showlines1.ll
+%%DATADIR%%/simpleged.ll
+%%DATADIR%%/soundex1.ll
+%%DATADIR%%/soundex-isfm.ll
+%%DATADIR%%/sour2.li
+%%DATADIR%%/sources.ll
+%%DATADIR%%/sources_bib.ll
+%%DATADIR%%/sour.li
+%%DATADIR%%/src.ll
+%%DATADIR%%/src-rtf.ll
+%%DATADIR%%/ssdi_aid.ll
+%%DATADIR%%/ssdi-import.ll
+%%DATADIR%%/ssdi-search-list.ll
+%%DATADIR%%/stats.ll
+%%DATADIR%%/st_all.ll
+%%DATADIR%%/surname1.ll
+%%DATADIR%%/timeline1.ll
+%%DATADIR%%/timeline2.ll
+%%DATADIR%%/tinytafel1.ll
+%%DATADIR%%/tools.li
+%%DATADIR%%/tree_density.ll
+%%DATADIR%%/ttable.ll
+%%DATADIR%%/upl2.li
+%%DATADIR%%/verify.ll
+%%DATADIR%%/wife.ll
+%%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%%
 @dirrm %%DATADIR%%