Index: head/misc/lifelines/Makefile =================================================================== --- head/misc/lifelines/Makefile (revision 411919) +++ head/misc/lifelines/Makefile (revision 411920) @@ -1,28 +1,51 @@ # Created by: Matt Emmerton # $FreeBSD$ PORTNAME= lifelines -PORTVERSION= 3.0.62 -PORTREVISION= 1 +PORTVERSION= 3.1.1 CATEGORIES= misc -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} +MASTER_SITES= http://github.com/MarcNo/lifelines/releases/download/${PORTVERSION}/ MAINTAINER= matt@gsicomp.on.ca COMMENT= Advanced genealogical system LICENSE= MIT -USES= bison iconv ncurses tar:bzip2 GNU_CONFIGURE= yes +USES= autoreconf bison gmake iconv -OPTIONS_DEFINE= DOCS NLS -OPTIONS_SUB= yes +MAKE_JOBS_UNSAFE=yes -NLS_USES= gettext -NLS_CONFIGURE_OFF= --disable-nls +# 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. -post-patch: - @${REINPLACE_CMD} -e 's,ncursesw/curses\.h,curses.h,' \ +OPTIONS_DEFINE= BUILDDOCS DOCS NLS +OPTIONS_SUB= yes +OPTIONS_DEFAULT= DOCS NLS +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:${PORTSDIR}/textproc/xmlto \ + dblatex:${PORTSDIR}/textproc/dblatex + +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls + +.include + +pre-patch: + @${REINPLACE_CMD} -e 's,ncursesw/curses.h,curses.h,' \ ${WRKSRC}/src/hdrs/mycurses.h +.if ! ${PORT_OPTIONS:MDOCS} + @${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 Index: head/misc/lifelines/distinfo =================================================================== --- head/misc/lifelines/distinfo (revision 411919) +++ head/misc/lifelines/distinfo (revision 411920) @@ -1,2 +1,2 @@ -SHA256 (lifelines-3.0.62.tar.bz2) = 1c279958748e0f80b399bd8ea29f4030aa6db93059785d68abccf98b59c41e05 -SIZE (lifelines-3.0.62.tar.bz2) = 2289866 +SHA256 (lifelines-3.1.1.tar.gz) = 083007f81e406fce15931e5a29a7ba0380ef0b3b9c61d5eb5228ad378c7f332d +SIZE (lifelines-3.1.1.tar.gz) = 3559382 Index: head/misc/lifelines/files/patch-src_stdlib_icvt.c =================================================================== --- head/misc/lifelines/files/patch-src_stdlib_icvt.c (revision 411919) +++ head/misc/lifelines/files/patch-src_stdlib_icvt.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/stdlib/icvt.c.orig 2006-04-08 02:50:46 UTC -+++ src/stdlib/icvt.c -@@ -84,7 +84,7 @@ iconv_trans (CNSTRING src, CNSTRING dest - /* assume MS-Windows makenarrow call */ - inlen = 2 * wcslen((const wchar_t *)sin); - } -- if (!strncmp(src, "UCS-2", strlen("UCS-2"))) { -+ if (!strncmp(src, "UCS-4", strlen("UCS-4"))) { - /* assume UNIX makenarrow call */ - inlen = 4 * wcslen((const wchar_t *)sin); - } Property changes on: head/misc/lifelines/files/patch-src_stdlib_icvt.c ___________________________________________________________________ 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 (revision 411919) +++ head/misc/lifelines/files/patch-intl__Makefile.in (revision 411920) @@ -1,38 +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 @@ +--- 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); \ Index: head/misc/lifelines/pkg-descr =================================================================== --- head/misc/lifelines/pkg-descr (revision 411919) +++ head/misc/lifelines/pkg-descr (revision 411920) @@ -1,14 +1,14 @@ LifeLines is an advanced genealogical system. You can store any kind and any amount of data in a LifeLines database, and you can process and generate output based on that data in any way and in any format. LifeLines supports GEDCOM; it imports and exports GEDCOM data. LifeLines has a unique approach to report generation. LifeLines has no built-in reports. Instead all reports are generated using report programs that are written in a report programming language. Because of its flexibility and programmability, LifeLines is frequently used for genealogy applications on the World Wide Web. -WWW: http://lifelines.sourceforge.net/ +WWW: http://marcno.github.io/lifelines/ Index: head/misc/lifelines/pkg-plist =================================================================== --- head/misc/lifelines/pkg-plist (revision 411919) +++ head/misc/lifelines/pkg-plist (revision 411920) @@ -1,276 +1,294 @@ bin/btedit bin/dbverify bin/llexec bin/llines man/man1/btedit.1.gz man/man1/dbverify.1.gz man/man1/llexec.1.gz man/man1/llines.1.gz %%PORTDOCS%%%%DOCSDIR%%/.linesrc -%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%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%%/README.MAINTAINERS.rpm -%%PORTDOCS%%%%DOCSDIR%%/README.MAINTAINERS.win32 %%PORTDOCS%%%%DOCSDIR%%/lines.cfg -%%PORTDOCS%%%%DOCSDIR%%/lines.cfg.input +%%PORTDOCS%%%%DOCSDIR%%/lines.cfg.m4 +%%PORTDOCS%%%%DOCSDIR%%/listops.jpg %%PORTDOCS%%%%DOCSDIR%%/ll-devguide.html -%%PORTDOCS%%%%DOCSDIR%%/ll-devguide.xml +%%PORTDOCS%%%%DOCSDIR%%/ll-devguide.pdf +%%PORTDOCS%%%%DOCSDIR%%/ll-devguide.txt %%PORTDOCS%%%%DOCSDIR%%/ll-index.html %%PORTDOCS%%%%DOCSDIR%%/ll-index.sv.html %%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.html %%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.pdf %%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.sv.html +%%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.sv.pdf %%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.txt -%%PORTDOCS%%%%DOCSDIR%%/ll-reportmanual.xml %%PORTDOCS%%%%DOCSDIR%%/ll-userguide.html %%PORTDOCS%%%%DOCSDIR%%/ll-userguide.pdf %%PORTDOCS%%%%DOCSDIR%%/ll-userguide.sv.html +%%PORTDOCS%%%%DOCSDIR%%/ll-userguide.sv.pdf %%PORTDOCS%%%%DOCSDIR%%/ll-userguide.txt -%%PORTDOCS%%%%DOCSDIR%%/ll-userguide.xml %%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%%/afg.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%%/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%%/bury.c %%DATADIR%%/cgi_html.li %%DATADIR%%/cid.ll %%DATADIR%%/common.ll %%DATADIR%%/connect2.ll %%DATADIR%%/cons.ll %%DATADIR%%/cont.ll %%DATADIR%%/count_anc.ll %%DATADIR%%/count_desc.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%%/desc_html.ll %%DATADIR%%/descged.ll %%DATADIR%%/divorce.li %%DATADIR%%/drep2.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%%/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%%/gen_index %%DATADIR%%/genancc.ll %%DATADIR%%/genancc1.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%%/grand.ll %%DATADIR%%/hasnotes1.ll %%DATADIR%%/hp-anc.ll %%DATADIR%%/html.dn.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%%/line.ll %%DATADIR%%/listsour.ll -%%DATADIR%%/ll-devguide.html -%%DATADIR%%/ll-index.html -%%DATADIR%%/ll-index.sv.html -%%DATADIR%%/ll-reportmanual.html -%%DATADIR%%/ll-reportmanual.pdf -%%DATADIR%%/ll-reportmanual.sv.html -%%DATADIR%%/ll-reportmanual.txt -%%DATADIR%%/ll-userguide.html -%%DATADIR%%/ll-userguide.pdf -%%DATADIR%%/ll-userguide.sv.html -%%DATADIR%%/ll-userguide.txt %%DATADIR%%/ll.png %%DATADIR%%/ll2html.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%%/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%%/ped.ll %%DATADIR%%/pedigree.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-dot.ll %%DATADIR%%/register1.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%%/search_source.ll %%DATADIR%%/select.ll -%%DATADIR%%/setup.tex %%DATADIR%%/sgsgen.ll %%DATADIR%%/shorten.li %%DATADIR%%/showlines1.ll %%DATADIR%%/simpleged.ll %%DATADIR%%/soundex-isfm.ll %%DATADIR%%/soundex1.ll %%DATADIR%%/sour.li %%DATADIR%%/sour2.li %%DATADIR%%/sources.ll %%DATADIR%%/sources_bib.ll %%DATADIR%%/span.ll %%DATADIR%%/src-rtf.ll %%DATADIR%%/src.ll %%DATADIR%%/ssdi-import.ll %%DATADIR%%/ssdi-search-list.ll %%DATADIR%%/ssdi_aid.ll -%%DATADIR%%/st_all.ll %%DATADIR%%/stats.ll %%DATADIR%%/surname1.ll %%DATADIR%%/tinytafel1.ll %%DATADIR%%/tools.li %%DATADIR%%/tree.tex %%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%%/desc-tex2/README +%%DATADIR%%/desc-tex2/desc-tex.ll +%%DATADIR%%/desc-tex2/desc-tex2.ll +%%DATADIR%%/desc-tex2/drsetup.tex +%%DATADIR%%/desc-tex2/drtree.tex +%%DATADIR%%/desc-tex2/ex1.tex +%%DATADIR%%/desc-tex2/extree1.tex +%%DATADIR%%/desc-tex2/extree2.tex +%%DATADIR%%/desc-tex2/mysetup.tex +%%DATADIR%%/desc-tex2/poster.doc +%%DATADIR%%/desc-tex2/poster.tex +%%DATADIR%%/desc-tex2/poster1.tex +%%DATADIR%%/desc-tex2/poster2.tex +%%DATADIR%%/desc-tex2/pstricks.con +%%DATADIR%%/desc-tex2/pstricks.pro +%%DATADIR%%/desc-tex2/pstricks.tex +%%DATADIR%%/desc-tex2/setup.tex +%%DATADIR%%/desc-tex2/tree.tex +%%DATADIR%%/novel/novel.README +%%DATADIR%%/novel/novel.intro +%%DATADIR%%/novel/novel.ll +%%DATADIR%%/pedtex/pedtex.ll +%%DATADIR%%/pedtex/pedtex.readme +%%DATADIR%%/pedtex/setup.tex +%%DATADIR%%/pedtex/tree.tex +%%DATADIR%%/ps-fan/ps-fan.ll +%%DATADIR%%/ps-fan/ps-fan.ps +%%DATADIR%%/st/st_all.ll +%%DATADIR%%/st/st_all.ref +%%DATADIR%%/st/st_all_stdout.ref +%%DATADIR%%/st/st_aux.li +%%DATADIR%%/st/st_collate.li +%%DATADIR%%/st/st_collate_8859-1.li +%%DATADIR%%/st/st_collate_UTF-8.li +%%DATADIR%%/st/st_convert.li +%%DATADIR%%/st/st_date.li +%%DATADIR%%/st/st_db.li +%%DATADIR%%/st/st_list.li +%%DATADIR%%/st/st_name.li +%%DATADIR%%/st/st_number.li +%%DATADIR%%/st/st_string.li +%%DATADIR%%/st/st_string_UTF-8.li +%%DATADIR%%/st/st_table.li +%%DATADIR%%/st/test_fam_it.ll +%%DATADIR%%/st/test_fam_it.ref +%%DATADIR%%/st/test_forfam.ll +%%DATADIR%%/st/test_forfam.ref +%%DATADIR%%/st/test_forindi.ll +%%DATADIR%%/st/test_forindi.ref +%%DATADIR%%/st/test_indi_it.ll +%%DATADIR%%/st/test_indi_it.ref +%%DATADIR%%/st/test_othr_it.ll +%%DATADIR%%/st/test_othr_it.ref +%%DATADIR%%/st/ti.ged +%%DATADIR%%/st/trigtest.ll +%%DATADIR%%/st/trigtest.ref %%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