- Update to version 6.08, remove BROKEN, now hosted on GitHub [1]

- Unmute install commands [1]
- Remove GTK2 option, it's not working couple versions back

PR:		203522 [1]
Submitted by:	Alex Strangl (maintainer) [1]
MFH:		2015Q4

www/geneweb/Makefile

@@ -2,48 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	geneweb
-PORTVERSION=	6.07
+PORTVERSION=	6.08
 CATEGORIES=	www
-MASTER_SITES=	http://opensource.geneanet.org/attachments/download/240/
-DISTNAME=	gw-${PORTVERSION}-src
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	alex@stangl.us
 COMMENT=	Advanced genealogy software
 
 LICENSE=	GPLv2
 
-BROKEN=		Fails to build
-
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		camlp5:${PORTSDIR}/devel/ocaml-camlp5
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	geneanet
+GH_TAGNAME=	distrib-6-08
+
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	GTK2
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-BUILD_DEPENDS+=	ocaml-lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-MAKE_ENV+=	ENABLE_GUI=yes
-PLIST_SUB+=	GUI=""
-.else
-PLIST_SUB+=	GUI="@comment "
-.endif
-
 MAKE_ENV+=	STAGEDIR=${STAGEDIR}
 SUB_FILES+=	pkg-message
 USE_RC_SUBR=	gwd
 
 post-install:
 	(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} distrib)
-	@${INSTALL_DATA} ${WRKSRC}/etc/a.gwf ${STAGEDIR}${PREFIX}/share/geneweb
+	${INSTALL_DATA} ${WRKSRC}/etc/a.gwf ${STAGEDIR}${PREFIX}/share/geneweb
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/geneweb/distribution
 	@${CP} -a ${WRKSRC}/distribution ${STAGEDIR}${PREFIX}/share/geneweb/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gwc1
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/geneweb/distribution/gw/gwc1
-	@${INSTALL_SCRIPT} ${FILESDIR}/install.sh ${STAGEDIR}${PREFIX}/share/geneweb
+	${INSTALL_SCRIPT} ${FILESDIR}/install.sh ${STAGEDIR}${PREFIX}/share/geneweb
 
 .include <bsd.port.mk>

www/geneweb/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gw-6.07-src.tgz) = c1ecc337f8bce4d8509ca49081d098b5a44ddb6407208496e55e9a38d6bfb1f6
+SHA256 (geneanet-geneweb-6.08-distrib-6-08_GH0.tar.gz) = 082038c595cb9477212656690a02f23dabe53d4511469d6cdfba8a590f6080d7
-SIZE (gw-6.07-src.tgz) = 1855016
+SIZE (geneanet-geneweb-6.08-distrib-6-08_GH0.tar.gz) = 1791772

www/geneweb/files/patch-Makefile

@@ -1,5 +1,5 @@
---- ./Makefile.orig	2013-03-01 03:06:49.000000000 -0600
+--- ./Makefile.orig	2013-03-01 03:06:49.000000000 UTC
-+++ ./Makefile	2014-05-14 06:57:05.000000000 -0500
++++ ./Makefile	2014-05-14 06:57:05.000000000 
 @@ -1,8 +1,7 @@
  # $Id: Makefile,v 5.7 2009-03-11 10:53:30 ddr Exp $
  

www/geneweb/files/patch-dag2html__Makefile

@@ -1,5 +1,5 @@
---- ./dag2html/Makefile.orig	2013-03-01 03:06:49.000000000 -0600
+--- ./dag2html/Makefile.orig	2013-03-01 03:06:49.000000000 UTC
-+++ ./dag2html/Makefile	2014-05-14 07:00:04.000000000 -0500
++++ ./dag2html/Makefile	2014-05-14 07:00:04.000000000 
 @@ -1,7 +1,7 @@
  # $Id: Makefile,v 5.1 2007-07-11 16:15:21 ddr Exp $
  

www/geneweb/files/patch-src__Makefile

@@ -1,5 +1,5 @@
---- ./src/Makefile.orig	2013-03-01 03:06:44.000000000 -0600
+--- ./src/Makefile.orig	2013-03-01 03:06:44.000000000 UTC
-+++ ./src/Makefile	2014-05-13 23:46:54.000000000 -0500
++++ ./src/Makefile	2014-05-13 23:46:54.000000000 
 @@ -2,7 +2,6 @@
  
  include ../tools/Makefile.inc

www/geneweb/files/patch-tools__Makefile.inc.unix

@@ -0,0 +1,14 @@
+--- ./tools/Makefile.inc.unix.orig	2015-10-03 02:32:14 UTC
++++ ./tools/Makefile.inc.unix
+@@ -5,8 +5,8 @@
+ CAMLP5_COMM=TOP=$(TOP) $(TOP)/tools/caml
+ CAMLP5F=-DUNIX
+ CAMLP5D=+camlp5
+ LIBUNIX=-cclib -lunix
+-OCAMLC=ocamlc.opt -warn-error A
+-OCAMLOPT=ocamlopt.opt -warn-error A
++OCAMLC=ocamlc.opt -warn-error "+A-d"
++OCAMLOPT=ocamlopt.opt -warn-error "+A-d"
+ OCAMLI=
+ OCAMLD=
+ STRIP=strip

www/geneweb/pkg-plist

@@ -41,10 +41,14 @@ man/man1/gwu.1.gz
 %%DATADIR%%/distribution/gw/etc/index.txt
 %%DATADIR%%/distribution/gw/etc/jquery_1_9_1_min.js
 %%DATADIR%%/distribution/gw/etc/jquery_placeholder_min.js
+%%DATADIR%%/distribution/gw/etc/js.txt
+%%DATADIR%%/distribution/gw/etc/menubar.txt
 %%DATADIR%%/distribution/gw/etc/miss_evt.txt
 %%DATADIR%%/distribution/gw/etc/moved.txt
 %%DATADIR%%/distribution/gw/etc/particles.txt
 %%DATADIR%%/distribution/gw/etc/perso.txt
+%%DATADIR%%/distribution/gw/etc/perso_header.txt
+%%DATADIR%%/distribution/gw/etc/perso_utils.txt
 %%DATADIR%%/distribution/gw/etc/perso_module/arbre_3gen_v.txt
 %%DATADIR%%/distribution/gw/etc/perso_module/arbre_3gen_v_photo.txt
 %%DATADIR%%/distribution/gw/etc/perso_module/arbre_4gen_v.txt
@@ -89,6 +93,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/distribution/gw/etc/templ502/moved.txt
 %%DATADIR%%/distribution/gw/etc/templ502/particles.txt
 %%DATADIR%%/distribution/gw/etc/templ502/perso.txt
+%%DATADIR%%/distribution/gw/etc/templ502/perso_header.txt
 %%DATADIR%%/distribution/gw/etc/templ502/random_css.txt
 %%DATADIR%%/distribution/gw/etc/templ502/redirect.txt
 %%DATADIR%%/distribution/gw/etc/templ502/relmenu.txt
@@ -139,17 +144,22 @@ man/man1/gwu.1.gz
 %%DATADIR%%/distribution/gw/etc/templm/ancsosa.txt
 %%DATADIR%%/distribution/gw/etc/templm/anctree.txt
 %%DATADIR%%/distribution/gw/etc/templm/calendar.txt
+%%DATADIR%%/distribution/gw/etc/templm/css.css
 %%DATADIR%%/distribution/gw/etc/templm/css.txt
 %%DATADIR%%/distribution/gw/etc/templm/dag.txt
 %%DATADIR%%/distribution/gw/etc/templm/deslist.txt
 %%DATADIR%%/distribution/gw/etc/templm/desmenu.txt
 %%DATADIR%%/distribution/gw/etc/templm/inc_mickroue1.txt
 %%DATADIR%%/distribution/gw/etc/templm/inc_mickroue2.txt
+%%DATADIR%%/distribution/gw/etc/templm/js.js
+%%DATADIR%%/distribution/gw/etc/templm/menubar.txt
 %%DATADIR%%/distribution/gw/etc/templm/perso.txt
-%%DATADIR%%/distribution/gw/etc/templm/perso_accesskey.txt
+%%DATADIR%%/distribution/gw/etc/templm/perso_accesskey.js
 %%DATADIR%%/distribution/gw/etc/templm/relmenu.txt
+%%DATADIR%%/distribution/gw/etc/templm/summary.js
 %%DATADIR%%/distribution/gw/etc/templm/toolbar.txt
 %%DATADIR%%/distribution/gw/etc/templm/trl.txt
+%%DATADIR%%/distribution/gw/etc/templm/upd.js
 %%DATADIR%%/distribution/gw/etc/templm/upddata.txt
 %%DATADIR%%/distribution/gw/etc/templm/updfam.txt
 %%DATADIR%%/distribution/gw/etc/templm/updind.txt
@@ -167,6 +177,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/distribution/gw/etc/toolbar.txt
 %%DATADIR%%/distribution/gw/etc/trl.txt
 %%DATADIR%%/distribution/gw/etc/upddata.txt
+%%DATADIR%%/distribution/gw/etc/upddatamenu.txt
 %%DATADIR%%/distribution/gw/etc/updfam.txt
 %%DATADIR%%/distribution/gw/etc/updhist.txt
 %%DATADIR%%/distribution/gw/etc/updhist_diff.txt
@@ -225,6 +236,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/distribution/gw/images/flags/l-lv.jpg
 %%DATADIR%%/distribution/gw/images/flags/l-nl.jpg
 %%DATADIR%%/distribution/gw/images/flags/l-no.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-oc.jpg
 %%DATADIR%%/distribution/gw/images/flags/l-pl.jpg
 %%DATADIR%%/distribution/gw/images/flags/l-pt-br.jpg
 %%DATADIR%%/distribution/gw/images/flags/l-pt.jpg
@@ -252,6 +264,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/distribution/gw/images/flags/t-lv.png
 %%DATADIR%%/distribution/gw/images/flags/t-nl.png
 %%DATADIR%%/distribution/gw/images/flags/t-no.png
+%%DATADIR%%/distribution/gw/images/flags/t-oc.png
 %%DATADIR%%/distribution/gw/images/flags/t-pl.png
 %%DATADIR%%/distribution/gw/images/flags/t-pt.png
 %%DATADIR%%/distribution/gw/images/flags/t-ro.png
@@ -280,6 +293,11 @@ man/man1/gwu.1.gz
 %%DATADIR%%/distribution/gw/images/married.png
 %%DATADIR%%/distribution/gw/images/married_no_descendants.png
 %%DATADIR%%/distribution/gw/images/maximize.png
+%%DATADIR%%/distribution/gw/images/menubar_background.png
+%%DATADIR%%/distribution/gw/images/menubar_background_hover.png
+%%DATADIR%%/distribution/gw/images/menubar_flechedroite.png
+%%DATADIR%%/distribution/gw/images/menubar_flechedroite_selected.png
+%%DATADIR%%/distribution/gw/images/menubar_sprite.png
 %%DATADIR%%/distribution/gw/images/minimise.png
 %%DATADIR%%/distribution/gw/images/not_married.png
 %%DATADIR%%/distribution/gw/images/not_married_no_descendants.png
@@ -397,10 +415,13 @@ man/man1/gwu.1.gz
 %%DATADIR%%/etc/index.txt
 %%DATADIR%%/etc/jquery_1_9_1_min.js
 %%DATADIR%%/etc/jquery_placeholder_min.js
+%%DATADIR%%/etc/js.txt
+%%DATADIR%%/etc/menubar.txt
 %%DATADIR%%/etc/miss_evt.txt
 %%DATADIR%%/etc/moved.txt
 %%DATADIR%%/etc/particles.txt
 %%DATADIR%%/etc/perso.txt
+%%DATADIR%%/etc/perso_header.txt
 %%DATADIR%%/etc/perso_module/arbre_3gen_v.txt
 %%DATADIR%%/etc/perso_module/arbre_3gen_v_photo.txt
 %%DATADIR%%/etc/perso_module/arbre_4gen_v.txt
@@ -421,6 +442,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/etc/perso_module/union_photo.txt
 %%DATADIR%%/etc/perso_module/union_simple.txt
 %%DATADIR%%/etc/perso_short.txt
+%%DATADIR%%/etc/perso_utils.txt
 %%DATADIR%%/etc/random_css.txt
 %%DATADIR%%/etc/redirect.txt
 %%DATADIR%%/etc/relmenu.txt
@@ -445,6 +467,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/etc/templ502/moved.txt
 %%DATADIR%%/etc/templ502/particles.txt
 %%DATADIR%%/etc/templ502/perso.txt
+%%DATADIR%%/etc/templ502/perso_header.txt
 %%DATADIR%%/etc/templ502/random_css.txt
 %%DATADIR%%/etc/templ502/redirect.txt
 %%DATADIR%%/etc/templ502/relmenu.txt
@@ -495,17 +518,22 @@ man/man1/gwu.1.gz
 %%DATADIR%%/etc/templm/ancsosa.txt
 %%DATADIR%%/etc/templm/anctree.txt
 %%DATADIR%%/etc/templm/calendar.txt
+%%DATADIR%%/etc/templm/css.css
 %%DATADIR%%/etc/templm/css.txt
 %%DATADIR%%/etc/templm/dag.txt
 %%DATADIR%%/etc/templm/deslist.txt
 %%DATADIR%%/etc/templm/desmenu.txt
 %%DATADIR%%/etc/templm/inc_mickroue1.txt
 %%DATADIR%%/etc/templm/inc_mickroue2.txt
+%%DATADIR%%/etc/templm/js.js
+%%DATADIR%%/etc/templm/menubar.txt
 %%DATADIR%%/etc/templm/perso.txt
-%%DATADIR%%/etc/templm/perso_accesskey.txt
+%%DATADIR%%/etc/templm/perso_accesskey.js
 %%DATADIR%%/etc/templm/relmenu.txt
+%%DATADIR%%/etc/templm/summary.js
 %%DATADIR%%/etc/templm/toolbar.txt
 %%DATADIR%%/etc/templm/trl.txt
+%%DATADIR%%/etc/templm/upd.js
 %%DATADIR%%/etc/templm/upddata.txt
 %%DATADIR%%/etc/templm/updfam.txt
 %%DATADIR%%/etc/templm/updind.txt
@@ -523,6 +551,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/etc/toolbar.txt
 %%DATADIR%%/etc/trl.txt
 %%DATADIR%%/etc/upddata.txt
+%%DATADIR%%/etc/upddatamenu.txt
 %%DATADIR%%/etc/updfam.txt
 %%DATADIR%%/etc/updhist.txt
 %%DATADIR%%/etc/updhist_diff.txt
@@ -563,6 +592,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/images/flags/l-lv.jpg
 %%DATADIR%%/images/flags/l-nl.jpg
 %%DATADIR%%/images/flags/l-no.jpg
+%%DATADIR%%/images/flags/l-oc.jpg
 %%DATADIR%%/images/flags/l-pl.jpg
 %%DATADIR%%/images/flags/l-pt-br.jpg
 %%DATADIR%%/images/flags/l-pt.jpg
@@ -590,6 +620,7 @@ man/man1/gwu.1.gz
 %%DATADIR%%/images/flags/t-lv.png
 %%DATADIR%%/images/flags/t-nl.png
 %%DATADIR%%/images/flags/t-no.png
+%%DATADIR%%/images/flags/t-oc.png
 %%DATADIR%%/images/flags/t-pl.png
 %%DATADIR%%/images/flags/t-pt.png
 %%DATADIR%%/images/flags/t-ro.png
@@ -618,6 +649,11 @@ man/man1/gwu.1.gz
 %%DATADIR%%/images/married.png
 %%DATADIR%%/images/married_no_descendants.png
 %%DATADIR%%/images/maximize.png
+%%DATADIR%%/images/menubar_background.png
+%%DATADIR%%/images/menubar_background_hover.png
+%%DATADIR%%/images/menubar_flechedroite.png
+%%DATADIR%%/images/menubar_flechedroite_selected.png
+%%DATADIR%%/images/menubar_sprite.png
 %%DATADIR%%/images/minimise.png
 %%DATADIR%%/images/not_married.png
 %%DATADIR%%/images/not_married_no_descendants.png