From alex@stangl.us  Sun Feb 10 06:37:18 2013
Return-Path: <alex@stangl.us>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 1DF62255
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Feb 2013 06:37:18 +0000 (UTC)
	(envelope-from alex@stangl.us)
Received: from stangl.us (stangl.us [66.93.193.95])
	by mx1.freebsd.org (Postfix) with ESMTP id 28B4AB10
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Feb 2013 06:37:16 +0000 (UTC)
Received: from scout.stangl.us (localhost [127.0.0.1])
	by scout.stangl.us (Postfix) with ESMTP id 9D24417022
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Feb 2013 00:29:03 -0600 (CST)
Received: from stangl.us ([127.0.0.1])
	by scout.stangl.us (scout.stangl.us [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id I3JluD_I4_h6 for <FreeBSD-gnats-submit@freebsd.org>;
	Sun, 10 Feb 2013 00:28:46 -0600 (CST)
Received: by scout.stangl.us (Postfix, from userid 1001)
	id 2DF851701E; Sun, 10 Feb 2013 00:28:46 -0600 (CST)
Message-Id: <20130210062846.2DF851701E@scout.stangl.us>
Date: Sun, 10 Feb 2013 00:28:46 -0600 (CST)
From: Alex Stangl <alex@stangl.us>
Reply-To: Alex Stangl <alex@stangl.us>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update www/geneweb port to v6.06
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         175999
>Category:       ports
>Synopsis:       Update www/geneweb port to v6.06
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 10 06:40:00 UTC 2013
>Closed-Date:    Wed Feb 13 09:44:00 UTC 2013
>Last-Modified:  Wed Feb 13 09:50:01 UTC 2013
>Originator:     Alex Stangl
>Release:        FreeBSD 9.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD scout.stangl.us 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec 4 06:55:39 UTC 2012 root@obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Update www/geneweb port to v6.06 using the attached diffs.
NOTE: geneweb now includes an optional GUI setup that depends upon gtk2. I
have added a gtk2 option so the user has to specifically request this, and
won't accidentally pull in a bunch of unnecessary dependencies if they
don't need to.

>How-To-Repeat:
	
>Fix:
Apply attached diff.

	

--- geneweb.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 311563)
+++ Makefile	(working copy)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	geneweb
-PORTVERSION=	6.05
+PORTVERSION=	6.06
 CATEGORIES=	www
-MASTER_SITES=	http://opensource.geneanet.org/attachments/download/190/
+MASTER_SITES=	http://opensource.geneanet.org/attachments/download/211/
 DISTNAME=	gw-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
@@ -18,6 +18,18 @@
 
 HAS_CONFIGURE=	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
+
 MAN1=		ged2gwb.1 gwb2ged.1 gwc.1 gwc2.1 gwu.1 gwd.1 consang.1 gwsetup.1
 
 SUB_FILES+=	pkg-message
Index: distinfo
===================================================================
--- distinfo	(revision 311563)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (gw-6.05-src.tgz) = 78603491a288966cc630c4aac2e1507f08f190c5dee71ed0fcc01143bfb286ba
-SIZE (gw-6.05-src.tgz) = 3151826
+SHA256 (gw-6.06-src.tgz) = 6b493369d0935c80e7f08d61d8b8c1c42e765cdc39ec038474b45e6412f0fb4c
+SIZE (gw-6.06-src.tgz) = 1783868
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(revision 311563)
+++ files/patch-Makefile	(working copy)
@@ -1,5 +1,5 @@
---- Makefile.orig	2012-06-04 02:56:55.000000000 -0500
-+++ Makefile	2012-12-01 00:19:22.000000000 -0600
+--- Makefile.orig	2012-12-02 15:04:17.000000000 -0600
++++ Makefile	2013-02-03 09:45:27.000000000 -0600
 @@ -1,6 +1,5 @@
  # $Id: Makefile,v 5.7 2009-03-11 10:53:30 ddr Exp $
  
@@ -7,3 +7,80 @@
  LANGDIR=$(PREFIX)/share/geneweb
  MANDIR=$(PREFIX)/man/man1
  DESTDIR=distribution
+@@ -18,7 +17,9 @@
+ 	cd gwb2ged; $(MAKE) all
+ 	cd setup; $(MAKE) all
+ 	cd gwtp; $(MAKE) all
++.if defined(ENABLE_GUI)
+ 	cd gui; $(MAKE) all
++.endif
+ 
+ opt::
+ 	cd wserver; $(MAKE) opt
+@@ -28,7 +29,9 @@
+ 	cd gwb2ged; $(MAKE) opt
+ 	cd setup; $(MAKE) opt
+ 	cd gwtp; $(MAKE) opt
++.if defined(ENABLE_GUI)
+ 	cd gui; $(MAKE) opt
++.endif
+ 
+ install:
+ 	mkdir -p $(PREFIX)/bin
+@@ -65,7 +68,12 @@
+ 	rm -rf $(PREFIX)/share/geneweb
+ 	cd $(MANDIR); rm -f $(MANPAGES)
+ 
++
++.if defined(ENABLE_GUI)
++distrib: new_distrib wrappers wrappers_gui
++.else
+ distrib: new_distrib wrappers
++.endif
+ 
+ wrappers:
+ 	if test "$(CAMLP5F)" = "-DWIN95"; then \
+@@ -79,7 +87,6 @@
+ 	  echo -ne 'endlocal\r\n' >> $(DESTDIR)/gwsetup.bat; \
+ 	  echo -ne 'cd bases\r\n' >> $(DESTDIR)/gwsetup.bat; \
+ 	  echo -ne 'start /MIN ..\\gw\\gwsetup -lang fr -gd ..\\gw\r\n' >> $(DESTDIR)/gwsetup.bat; \
+-	  echo -ne 'start ..\\gw\\gui' > $(DESTDIR)/geneweb_gui.bat; \
+ 	else \
+ 	  (echo '#!/bin/sh'; \
+ 	   echo 'mkdir -p bases'; \
+@@ -89,9 +96,16 @@
+ 	   echo 'mkdir -p bases'; \
+ 	   echo 'cd bases'; \
+ 	   echo 'exec ../gw/gwsetup -gd ../gw "$$@"') > $(DESTDIR)/gwsetup; \
++	  chmod +x $(DESTDIR)/gwd $(DESTDIR)/gwsetup; \
++	fi
++
++wrappers_gui:
++	if test "$(CAMLP5F)" = "-DWIN95"; then \
++	  echo -ne 'start ..\\gw\\gui' > $(DESTDIR)/geneweb_gui.bat; \
++	else \
+ 	  (echo '#!/bin/sh'; \
+ 	   echo 'exec ../gw/gui') > $(DESTDIR)/geneweb_gui; \
+-	  chmod +x $(DESTDIR)/gwd $(DESTDIR)/gwsetup $(DESTDIR)/geneweb_gui; \
++	  chmod +x $(DESTDIR)/geneweb_gui; \
+ 	fi
+ 
+ new_distrib: classical_distrib
+@@ -110,8 +124,10 @@
+ 	cp setup/lang/*.htm $(DESTDIR)/gw/setup/lang/.
+ 	cp setup/lang/lexicon.txt $(DESTDIR)/gw/setup/lang/.
+ 	cp setup/gwsetup $(DESTDIR)/gw/gwsetup$(EXE)
++.if defined(ENABLE_GUI)
+ 	cp gui/gw/gui_lex.txt $(DESTDIR)/gw/.
+ 	cp gui/gui $(DESTDIR)/gw/gui$(EXE)
++.endif
+ 	cp LICENSE $(DESTDIR)/LICENSE.txt
+ 	cp etc/START.htm $(DESTDIR)/.
+ 	cp CHANGES $(DESTDIR)/CHANGES.txt
+@@ -180,4 +196,6 @@
+ 	cd gwb2ged; $(MAKE) depend
+ 	cd setup; $(MAKE) depend
+ 	cd gwtp; $(MAKE) depend
++.if defined(ENABLE_GUI)
+ 	cd gui; $(MAKE) depend
++.endif
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 311563)
+++ pkg-descr	(working copy)
@@ -5,4 +5,7 @@
 of relationship and consanguinity computing, developed in
 collaboration with Didier Remy, research Director at INRIA.
 
+Feel free to enable option GTK2 to try the new GUI. It's
+only disabled by default to avoid accidental GTK2 dependencies.
+
 WWW: http://opensource.geneanet.org/projects/geneweb/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 311563)
+++ pkg-plist	(working copy)
@@ -29,6 +29,7 @@
 %%DATADIR%%/distribution/gw/etc/desmenu.txt
 %%DATADIR%%/distribution/gw/etc/favicon.txt
 %%DATADIR%%/distribution/gw/etc/forum.txt
+%%DATADIR%%/distribution/gw/etc/hed.txt
 %%DATADIR%%/distribution/gw/etc/index.txt
 %%DATADIR%%/distribution/gw/etc/moved.txt
 %%DATADIR%%/distribution/gw/etc/particles.txt
@@ -52,6 +53,7 @@
 %%DATADIR%%/distribution/gw/etc/perso_module/union_evolue.txt
 %%DATADIR%%/distribution/gw/etc/perso_module/union_photo.txt
 %%DATADIR%%/distribution/gw/etc/perso_module/union_simple.txt
+%%DATADIR%%/distribution/gw/etc/perso_short.txt
 %%DATADIR%%/distribution/gw/etc/random_css.txt
 %%DATADIR%%/distribution/gw/etc/redirect.txt
 %%DATADIR%%/distribution/gw/etc/relmenu.txt
@@ -120,6 +122,7 @@
 %%DATADIR%%/distribution/gw/etc/templh/deslist.txt
 %%DATADIR%%/distribution/gw/etc/templh/perso.txt
 %%DATADIR%%/distribution/gw/etc/templm/accent.txt
+%%DATADIR%%/distribution/gw/etc/templm/advanced.txt
 %%DATADIR%%/distribution/gw/etc/templm/anclist.txt
 %%DATADIR%%/distribution/gw/etc/templm/ancmenu.txt
 %%DATADIR%%/distribution/gw/etc/templm/ancsosa.txt
@@ -129,9 +132,13 @@
 %%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/my_base/trl.txt
+%%DATADIR%%/distribution/gw/etc/templm/inc_mickroue1.txt
+%%DATADIR%%/distribution/gw/etc/templm/inc_mickroue2.txt
 %%DATADIR%%/distribution/gw/etc/templm/perso.txt
+%%DATADIR%%/distribution/gw/etc/templm/perso_accesskey.txt
 %%DATADIR%%/distribution/gw/etc/templm/relmenu.txt
+%%DATADIR%%/distribution/gw/etc/templm/toolbar.txt
+%%DATADIR%%/distribution/gw/etc/templm/trl.txt
 %%DATADIR%%/distribution/gw/etc/templm/updfam.txt
 %%DATADIR%%/distribution/gw/etc/templm/updind.txt
 %%DATADIR%%/distribution/gw/etc/templm/updmenu.txt
@@ -146,6 +153,8 @@
 %%DATADIR%%/distribution/gw/etc/templx/relations.txt
 %%DATADIR%%/distribution/gw/etc/templx/sources.txt
 %%DATADIR%%/distribution/gw/etc/toolbar.txt
+%%DATADIR%%/distribution/gw/etc/trl.txt
+%%DATADIR%%/distribution/gw/etc/upddata.txt
 %%DATADIR%%/distribution/gw/etc/updfam.txt
 %%DATADIR%%/distribution/gw/etc/updhist.txt
 %%DATADIR%%/distribution/gw/etc/updind.txt
@@ -184,43 +193,77 @@
 %%DATADIR%%/distribution/gw/images/favicon_gwsetup.png
 %%DATADIR%%/distribution/gw/images/female.png
 %%DATADIR%%/distribution/gw/images/file.png
+%%DATADIR%%/distribution/gw/images/flags/l-af.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-bg.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-br.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-ca.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-cs.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-da.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-de.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-en.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-eo.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-es.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-et.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-fi.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-fr.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-he.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-is.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-it.jpg
+%%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-pl.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-pt-br.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-pt.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-ro.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-ru.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-sl.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-sv.jpg
+%%DATADIR%%/distribution/gw/images/flags/l-zh.jpg
+%%DATADIR%%/distribution/gw/images/flags/t-af.png
+%%DATADIR%%/distribution/gw/images/flags/t-bg.png
+%%DATADIR%%/distribution/gw/images/flags/t-br.png
+%%DATADIR%%/distribution/gw/images/flags/t-ca.png
+%%DATADIR%%/distribution/gw/images/flags/t-cs.png
+%%DATADIR%%/distribution/gw/images/flags/t-da.png
+%%DATADIR%%/distribution/gw/images/flags/t-de.png
+%%DATADIR%%/distribution/gw/images/flags/t-en.png
+%%DATADIR%%/distribution/gw/images/flags/t-eo.png
+%%DATADIR%%/distribution/gw/images/flags/t-es.png
+%%DATADIR%%/distribution/gw/images/flags/t-et.png
+%%DATADIR%%/distribution/gw/images/flags/t-fi.png
+%%DATADIR%%/distribution/gw/images/flags/t-fr.png
+%%DATADIR%%/distribution/gw/images/flags/t-he.png
+%%DATADIR%%/distribution/gw/images/flags/t-is.png
+%%DATADIR%%/distribution/gw/images/flags/t-it.png
+%%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-pl.png
+%%DATADIR%%/distribution/gw/images/flags/t-pt.png
+%%DATADIR%%/distribution/gw/images/flags/t-ro.png
+%%DATADIR%%/distribution/gw/images/flags/t-ru.png
+%%DATADIR%%/distribution/gw/images/flags/t-sl.png
+%%DATADIR%%/distribution/gw/images/flags/t-sv.png
+%%DATADIR%%/distribution/gw/images/flags/t-zh.png
 %%DATADIR%%/distribution/gw/images/folder.png
 %%DATADIR%%/distribution/gw/images/geneweb_start.png
+%%DATADIR%%/distribution/gw/images/gui_create.png
+%%DATADIR%%/distribution/gw/images/gui_doc.png
+%%DATADIR%%/distribution/gw/images/gui_log.png
+%%DATADIR%%/distribution/gw/images/gui_quit.png
+%%DATADIR%%/distribution/gw/images/gui_setup.png
 %%DATADIR%%/distribution/gw/images/gwback.jpg
 %%DATADIR%%/distribution/gw/images/gwlogo.png
 %%DATADIR%%/distribution/gw/images/icone_gwd.ico
 %%DATADIR%%/distribution/gw/images/icone_gwsetup.ico
 %%DATADIR%%/distribution/gw/images/img_documentation.png
-%%DATADIR%%/distribution/gw/images/l-af.jpg
-%%DATADIR%%/distribution/gw/images/l-bg.jpg
-%%DATADIR%%/distribution/gw/images/l-br.jpg
-%%DATADIR%%/distribution/gw/images/l-ca.jpg
-%%DATADIR%%/distribution/gw/images/l-cs.jpg
-%%DATADIR%%/distribution/gw/images/l-da.jpg
-%%DATADIR%%/distribution/gw/images/l-de.jpg
-%%DATADIR%%/distribution/gw/images/l-en.jpg
-%%DATADIR%%/distribution/gw/images/l-eo.jpg
-%%DATADIR%%/distribution/gw/images/l-es.jpg
-%%DATADIR%%/distribution/gw/images/l-et.jpg
-%%DATADIR%%/distribution/gw/images/l-fi.jpg
-%%DATADIR%%/distribution/gw/images/l-fr.jpg
-%%DATADIR%%/distribution/gw/images/l-he.jpg
-%%DATADIR%%/distribution/gw/images/l-is.jpg
-%%DATADIR%%/distribution/gw/images/l-it.jpg
-%%DATADIR%%/distribution/gw/images/l-lv.jpg
-%%DATADIR%%/distribution/gw/images/l-nl.jpg
-%%DATADIR%%/distribution/gw/images/l-no.jpg
-%%DATADIR%%/distribution/gw/images/l-pl.jpg
-%%DATADIR%%/distribution/gw/images/l-pt-br.jpg
-%%DATADIR%%/distribution/gw/images/l-pt.jpg
-%%DATADIR%%/distribution/gw/images/l-ro.jpg
-%%DATADIR%%/distribution/gw/images/l-ru.jpg
-%%DATADIR%%/distribution/gw/images/l-sl.jpg
-%%DATADIR%%/distribution/gw/images/l-sv.jpg
-%%DATADIR%%/distribution/gw/images/l-zh.jpg
+%%DATADIR%%/distribution/gw/images/img_unknown_man.png
+%%DATADIR%%/distribution/gw/images/img_unknown_woman.png
 %%DATADIR%%/distribution/gw/images/left.png
 %%DATADIR%%/distribution/gw/images/logo_bas.png
 %%DATADIR%%/distribution/gw/images/male.png
+%%DATADIR%%/distribution/gw/images/marriage.png
 %%DATADIR%%/distribution/gw/images/married.png
 %%DATADIR%%/distribution/gw/images/married_no_descendants.png
 %%DATADIR%%/distribution/gw/images/maximize.png
@@ -233,11 +276,13 @@
 %%DATADIR%%/distribution/gw/images/picto_anniversaire_small.png
 %%DATADIR%%/distribution/gw/images/picto_branch.png
 %%DATADIR%%/distribution/gw/images/picto_branche_patronymique.png
+%%DATADIR%%/distribution/gw/images/picto_calendar.png
 %%DATADIR%%/distribution/gw/images/picto_cle.png
 %%DATADIR%%/distribution/gw/images/picto_fleche_blanche.png
 %%DATADIR%%/distribution/gw/images/picto_fleche_bleu.png
 %%DATADIR%%/distribution/gw/images/picto_loupe.png
 %%DATADIR%%/distribution/gw/images/picto_molette.png
+%%DATADIR%%/distribution/gw/images/picto_numeric_order.png
 %%DATADIR%%/distribution/gw/images/picto_parente.png
 %%DATADIR%%/distribution/gw/images/picto_rel_asc.png
 %%DATADIR%%/distribution/gw/images/picto_rel_small.png
@@ -249,32 +294,6 @@
 %%DATADIR%%/distribution/gw/images/right.png
 %%DATADIR%%/distribution/gw/images/sexunknown.png
 %%DATADIR%%/distribution/gw/images/sosa.png
-%%DATADIR%%/distribution/gw/images/t-af.png
-%%DATADIR%%/distribution/gw/images/t-bg.png
-%%DATADIR%%/distribution/gw/images/t-br.png
-%%DATADIR%%/distribution/gw/images/t-ca.png
-%%DATADIR%%/distribution/gw/images/t-cs.png
-%%DATADIR%%/distribution/gw/images/t-da.png
-%%DATADIR%%/distribution/gw/images/t-de.png
-%%DATADIR%%/distribution/gw/images/t-en.png
-%%DATADIR%%/distribution/gw/images/t-eo.png
-%%DATADIR%%/distribution/gw/images/t-es.png
-%%DATADIR%%/distribution/gw/images/t-et.png
-%%DATADIR%%/distribution/gw/images/t-fi.png
-%%DATADIR%%/distribution/gw/images/t-fr.png
-%%DATADIR%%/distribution/gw/images/t-he.png
-%%DATADIR%%/distribution/gw/images/t-is.png
-%%DATADIR%%/distribution/gw/images/t-it.png
-%%DATADIR%%/distribution/gw/images/t-lv.png
-%%DATADIR%%/distribution/gw/images/t-nl.png
-%%DATADIR%%/distribution/gw/images/t-no.png
-%%DATADIR%%/distribution/gw/images/t-pl.png
-%%DATADIR%%/distribution/gw/images/t-pt.png
-%%DATADIR%%/distribution/gw/images/t-ro.png
-%%DATADIR%%/distribution/gw/images/t-ru.png
-%%DATADIR%%/distribution/gw/images/t-sl.png
-%%DATADIR%%/distribution/gw/images/t-sv.png
-%%DATADIR%%/distribution/gw/images/t-zh.png
 %%DATADIR%%/distribution/gw/images/up.png
 %%DATADIR%%/distribution/gw/lang/alias_lg.txt
 %%DATADIR%%/distribution/gw/lang/lex_utf8.txt
@@ -335,6 +354,7 @@
 %%DATADIR%%/distribution/gw/setup/lang/rename.htm
 %%DATADIR%%/distribution/gw/setup/lang/save.htm
 %%DATADIR%%/distribution/gw/setup/lang/simple.htm
+%%DATADIR%%/distribution/gw/setup/lang/simple2.htm
 %%DATADIR%%/distribution/gw/setup/lang/traces.htm
 %%DATADIR%%/distribution/gw/setup/lang/update_nldb.htm
 %%DATADIR%%/distribution/gw/setup/lang/update_nldb_ok.htm
@@ -342,6 +362,9 @@
 %%DATADIR%%/distribution/gw/update_nldb
 %%DATADIR%%/distribution/gwd
 %%DATADIR%%/distribution/gwsetup
+%%GUI%%%%DATADIR%%/distribution/geneweb_gui
+%%GUI%%%%DATADIR%%/distribution/gw/gui_lex.txt
+%%GUI%%%%DATADIR%%/distribution/gw/gui
 %%DATADIR%%/etc/accent.txt
 %%DATADIR%%/etc/advanced.txt
 %%DATADIR%%/etc/anclist.txt
@@ -358,6 +381,7 @@
 %%DATADIR%%/etc/desmenu.txt
 %%DATADIR%%/etc/favicon.txt
 %%DATADIR%%/etc/forum.txt
+%%DATADIR%%/etc/hed.txt
 %%DATADIR%%/etc/index.txt
 %%DATADIR%%/etc/moved.txt
 %%DATADIR%%/etc/particles.txt
@@ -381,6 +405,7 @@
 %%DATADIR%%/etc/perso_module/union_evolue.txt
 %%DATADIR%%/etc/perso_module/union_photo.txt
 %%DATADIR%%/etc/perso_module/union_simple.txt
+%%DATADIR%%/etc/perso_short.txt
 %%DATADIR%%/etc/random_css.txt
 %%DATADIR%%/etc/redirect.txt
 %%DATADIR%%/etc/relmenu.txt
@@ -449,6 +474,7 @@
 %%DATADIR%%/etc/templh/deslist.txt
 %%DATADIR%%/etc/templh/perso.txt
 %%DATADIR%%/etc/templm/accent.txt
+%%DATADIR%%/etc/templm/advanced.txt
 %%DATADIR%%/etc/templm/anclist.txt
 %%DATADIR%%/etc/templm/ancmenu.txt
 %%DATADIR%%/etc/templm/ancsosa.txt
@@ -458,9 +484,13 @@
 %%DATADIR%%/etc/templm/dag.txt
 %%DATADIR%%/etc/templm/deslist.txt
 %%DATADIR%%/etc/templm/desmenu.txt
-%%DATADIR%%/etc/templm/my_base/trl.txt
+%%DATADIR%%/etc/templm/inc_mickroue1.txt
+%%DATADIR%%/etc/templm/inc_mickroue2.txt
 %%DATADIR%%/etc/templm/perso.txt
+%%DATADIR%%/etc/templm/perso_accesskey.txt
 %%DATADIR%%/etc/templm/relmenu.txt
+%%DATADIR%%/etc/templm/toolbar.txt
+%%DATADIR%%/etc/templm/trl.txt
 %%DATADIR%%/etc/templm/updfam.txt
 %%DATADIR%%/etc/templm/updind.txt
 %%DATADIR%%/etc/templm/updmenu.txt
@@ -475,6 +505,8 @@
 %%DATADIR%%/etc/templx/relations.txt
 %%DATADIR%%/etc/templx/sources.txt
 %%DATADIR%%/etc/toolbar.txt
+%%DATADIR%%/etc/trl.txt
+%%DATADIR%%/etc/upddata.txt
 %%DATADIR%%/etc/updfam.txt
 %%DATADIR%%/etc/updhist.txt
 %%DATADIR%%/etc/updind.txt
@@ -495,43 +527,77 @@
 %%DATADIR%%/images/favicon_gwsetup.png
 %%DATADIR%%/images/female.png
 %%DATADIR%%/images/file.png
+%%DATADIR%%/images/flags/l-af.jpg
+%%DATADIR%%/images/flags/l-bg.jpg
+%%DATADIR%%/images/flags/l-br.jpg
+%%DATADIR%%/images/flags/l-ca.jpg
+%%DATADIR%%/images/flags/l-cs.jpg
+%%DATADIR%%/images/flags/l-da.jpg
+%%DATADIR%%/images/flags/l-de.jpg
+%%DATADIR%%/images/flags/l-en.jpg
+%%DATADIR%%/images/flags/l-eo.jpg
+%%DATADIR%%/images/flags/l-es.jpg
+%%DATADIR%%/images/flags/l-et.jpg
+%%DATADIR%%/images/flags/l-fi.jpg
+%%DATADIR%%/images/flags/l-fr.jpg
+%%DATADIR%%/images/flags/l-he.jpg
+%%DATADIR%%/images/flags/l-is.jpg
+%%DATADIR%%/images/flags/l-it.jpg
+%%DATADIR%%/images/flags/l-lv.jpg
+%%DATADIR%%/images/flags/l-nl.jpg
+%%DATADIR%%/images/flags/l-no.jpg
+%%DATADIR%%/images/flags/l-pl.jpg
+%%DATADIR%%/images/flags/l-pt-br.jpg
+%%DATADIR%%/images/flags/l-pt.jpg
+%%DATADIR%%/images/flags/l-ro.jpg
+%%DATADIR%%/images/flags/l-ru.jpg
+%%DATADIR%%/images/flags/l-sl.jpg
+%%DATADIR%%/images/flags/l-sv.jpg
+%%DATADIR%%/images/flags/l-zh.jpg
+%%DATADIR%%/images/flags/t-af.png
+%%DATADIR%%/images/flags/t-bg.png
+%%DATADIR%%/images/flags/t-br.png
+%%DATADIR%%/images/flags/t-ca.png
+%%DATADIR%%/images/flags/t-cs.png
+%%DATADIR%%/images/flags/t-da.png
+%%DATADIR%%/images/flags/t-de.png
+%%DATADIR%%/images/flags/t-en.png
+%%DATADIR%%/images/flags/t-eo.png
+%%DATADIR%%/images/flags/t-es.png
+%%DATADIR%%/images/flags/t-et.png
+%%DATADIR%%/images/flags/t-fi.png
+%%DATADIR%%/images/flags/t-fr.png
+%%DATADIR%%/images/flags/t-he.png
+%%DATADIR%%/images/flags/t-is.png
+%%DATADIR%%/images/flags/t-it.png
+%%DATADIR%%/images/flags/t-lv.png
+%%DATADIR%%/images/flags/t-nl.png
+%%DATADIR%%/images/flags/t-no.png
+%%DATADIR%%/images/flags/t-pl.png
+%%DATADIR%%/images/flags/t-pt.png
+%%DATADIR%%/images/flags/t-ro.png
+%%DATADIR%%/images/flags/t-ru.png
+%%DATADIR%%/images/flags/t-sl.png
+%%DATADIR%%/images/flags/t-sv.png
+%%DATADIR%%/images/flags/t-zh.png
 %%DATADIR%%/images/folder.png
 %%DATADIR%%/images/geneweb_start.png
+%%DATADIR%%/images/gui_create.png
+%%DATADIR%%/images/gui_doc.png
+%%DATADIR%%/images/gui_log.png
+%%DATADIR%%/images/gui_quit.png
+%%DATADIR%%/images/gui_setup.png
 %%DATADIR%%/images/gwback.jpg
 %%DATADIR%%/images/gwlogo.png
 %%DATADIR%%/images/icone_gwd.ico
 %%DATADIR%%/images/icone_gwsetup.ico
 %%DATADIR%%/images/img_documentation.png
-%%DATADIR%%/images/l-af.jpg
-%%DATADIR%%/images/l-bg.jpg
-%%DATADIR%%/images/l-br.jpg
-%%DATADIR%%/images/l-ca.jpg
-%%DATADIR%%/images/l-cs.jpg
-%%DATADIR%%/images/l-da.jpg
-%%DATADIR%%/images/l-de.jpg
-%%DATADIR%%/images/l-en.jpg
-%%DATADIR%%/images/l-eo.jpg
-%%DATADIR%%/images/l-es.jpg
-%%DATADIR%%/images/l-et.jpg
-%%DATADIR%%/images/l-fi.jpg
-%%DATADIR%%/images/l-fr.jpg
-%%DATADIR%%/images/l-he.jpg
-%%DATADIR%%/images/l-is.jpg
-%%DATADIR%%/images/l-it.jpg
-%%DATADIR%%/images/l-lv.jpg
-%%DATADIR%%/images/l-nl.jpg
-%%DATADIR%%/images/l-no.jpg
-%%DATADIR%%/images/l-pl.jpg
-%%DATADIR%%/images/l-pt-br.jpg
-%%DATADIR%%/images/l-pt.jpg
-%%DATADIR%%/images/l-ro.jpg
-%%DATADIR%%/images/l-ru.jpg
-%%DATADIR%%/images/l-sl.jpg
-%%DATADIR%%/images/l-sv.jpg
-%%DATADIR%%/images/l-zh.jpg
+%%DATADIR%%/images/img_unknown_man.png
+%%DATADIR%%/images/img_unknown_woman.png
 %%DATADIR%%/images/left.png
 %%DATADIR%%/images/logo_bas.png
 %%DATADIR%%/images/male.png
+%%DATADIR%%/images/marriage.png
 %%DATADIR%%/images/married.png
 %%DATADIR%%/images/married_no_descendants.png
 %%DATADIR%%/images/maximize.png
@@ -544,11 +610,13 @@
 %%DATADIR%%/images/picto_anniversaire_small.png
 %%DATADIR%%/images/picto_branch.png
 %%DATADIR%%/images/picto_branche_patronymique.png
+%%DATADIR%%/images/picto_calendar.png
 %%DATADIR%%/images/picto_cle.png
 %%DATADIR%%/images/picto_fleche_blanche.png
 %%DATADIR%%/images/picto_fleche_bleu.png
 %%DATADIR%%/images/picto_loupe.png
 %%DATADIR%%/images/picto_molette.png
+%%DATADIR%%/images/picto_numeric_order.png
 %%DATADIR%%/images/picto_parente.png
 %%DATADIR%%/images/picto_rel_asc.png
 %%DATADIR%%/images/picto_rel_small.png
@@ -560,32 +628,6 @@
 %%DATADIR%%/images/right.png
 %%DATADIR%%/images/sexunknown.png
 %%DATADIR%%/images/sosa.png
-%%DATADIR%%/images/t-af.png
-%%DATADIR%%/images/t-bg.png
-%%DATADIR%%/images/t-br.png
-%%DATADIR%%/images/t-ca.png
-%%DATADIR%%/images/t-cs.png
-%%DATADIR%%/images/t-da.png
-%%DATADIR%%/images/t-de.png
-%%DATADIR%%/images/t-en.png
-%%DATADIR%%/images/t-eo.png
-%%DATADIR%%/images/t-es.png
-%%DATADIR%%/images/t-et.png
-%%DATADIR%%/images/t-fi.png
-%%DATADIR%%/images/t-fr.png
-%%DATADIR%%/images/t-he.png
-%%DATADIR%%/images/t-is.png
-%%DATADIR%%/images/t-it.png
-%%DATADIR%%/images/t-lv.png
-%%DATADIR%%/images/t-nl.png
-%%DATADIR%%/images/t-no.png
-%%DATADIR%%/images/t-pl.png
-%%DATADIR%%/images/t-pt.png
-%%DATADIR%%/images/t-ro.png
-%%DATADIR%%/images/t-ru.png
-%%DATADIR%%/images/t-sl.png
-%%DATADIR%%/images/t-sv.png
-%%DATADIR%%/images/t-zh.png
 %%DATADIR%%/images/up.png
 %%DATADIR%%/install.sh
 %%DATADIR%%/lang/alias_lg.txt
@@ -595,9 +637,9 @@
 %%DATADIR%%/lang/start_utf8.txt
 %%DATADIR%%/lang/version.txt
 @dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/images/flags
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/etc/templx
-@dirrm %%DATADIR%%/etc/templm/my_base
 @dirrm %%DATADIR%%/etc/templm
 @dirrm %%DATADIR%%/etc/templh
 @dirrm %%DATADIR%%/etc/templf
@@ -612,11 +654,11 @@
 @dirrm %%DATADIR%%/distribution/gw/setup
 @dirrm %%DATADIR%%/distribution/gw/old
 @dirrm %%DATADIR%%/distribution/gw/lang
+@dirrm %%DATADIR%%/distribution/gw/images/flags
 @dirrm %%DATADIR%%/distribution/gw/images
 @dirrm %%DATADIR%%/distribution/gw/gwtp_tmp/lang
 @dirrm %%DATADIR%%/distribution/gw/gwtp_tmp
 @dirrm %%DATADIR%%/distribution/gw/etc/templx
-@dirrm %%DATADIR%%/distribution/gw/etc/templm/my_base
 @dirrm %%DATADIR%%/distribution/gw/etc/templm
 @dirrm %%DATADIR%%/distribution/gw/etc/templh
 @dirrm %%DATADIR%%/distribution/gw/etc/templf
--- geneweb.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Tue Feb 12 18:46:02 UTC 2013 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175999 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Wed Feb 13 09:43:59 UTC 2013 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175999 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175999: commit references a PR
Date: Wed, 13 Feb 2013 09:43:53 +0000 (UTC)

 Author: rm
 Date: Wed Feb 13 09:43:37 2013
 New Revision: 312150
 URL: http://svnweb.freebsd.org/changeset/ports/312150
 
 Log:
   - update to 6.06
   - add option to let user build experimental GTK2 UI
   
   PR:		175999
   Submitted by:	Alex Stangl <alex@stangl.us> (maintainer)
 
 Modified:
   head/www/geneweb/Makefile
   head/www/geneweb/distinfo
   head/www/geneweb/files/patch-Makefile
   head/www/geneweb/pkg-descr
   head/www/geneweb/pkg-plist
 
 Modified: head/www/geneweb/Makefile
 ==============================================================================
 --- head/www/geneweb/Makefile	Wed Feb 13 09:39:44 2013	(r312149)
 +++ head/www/geneweb/Makefile	Wed Feb 13 09:43:37 2013	(r312150)
 @@ -2,9 +2,9 @@
  # $FreeBSD$
  
  PORTNAME=	geneweb
 -PORTVERSION=	6.05
 +PORTVERSION=	6.06
  CATEGORIES=	www
 -MASTER_SITES=	http://opensource.geneanet.org/attachments/download/190/
 +MASTER_SITES=	http://opensource.geneanet.org/attachments/download/211/
  DISTNAME=	gw-${PORTVERSION}-src
  EXTRACT_SUFX=	.tgz
  
 @@ -18,6 +18,18 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/o
  
  HAS_CONFIGURE=	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
 +
  MAN1=		ged2gwb.1 gwb2ged.1 gwc.1 gwc2.1 gwu.1 gwd.1 consang.1 gwsetup.1
  
  SUB_FILES+=	pkg-message
 
 Modified: head/www/geneweb/distinfo
 ==============================================================================
 --- head/www/geneweb/distinfo	Wed Feb 13 09:39:44 2013	(r312149)
 +++ head/www/geneweb/distinfo	Wed Feb 13 09:43:37 2013	(r312150)
 @@ -1,2 +1,2 @@
 -SHA256 (gw-6.05-src.tgz) = 78603491a288966cc630c4aac2e1507f08f190c5dee71ed0fcc01143bfb286ba
 -SIZE (gw-6.05-src.tgz) = 3151826
 +SHA256 (gw-6.06-src.tgz) = 6b493369d0935c80e7f08d61d8b8c1c42e765cdc39ec038474b45e6412f0fb4c
 +SIZE (gw-6.06-src.tgz) = 1783868
 
 Modified: head/www/geneweb/files/patch-Makefile
 ==============================================================================
 --- head/www/geneweb/files/patch-Makefile	Wed Feb 13 09:39:44 2013	(r312149)
 +++ head/www/geneweb/files/patch-Makefile	Wed Feb 13 09:43:37 2013	(r312150)
 @@ -1,5 +1,5 @@
 ---- Makefile.orig	2012-06-04 02:56:55.000000000 -0500
 -+++ Makefile	2012-12-01 00:19:22.000000000 -0600
 +--- Makefile.orig	2012-12-02 15:04:17.000000000 -0600
 ++++ Makefile	2013-02-03 09:45:27.000000000 -0600
  @@ -1,6 +1,5 @@
   # $Id: Makefile,v 5.7 2009-03-11 10:53:30 ddr Exp $
   
 @@ -7,3 +7,80 @@
   LANGDIR=$(PREFIX)/share/geneweb
   MANDIR=$(PREFIX)/man/man1
   DESTDIR=distribution
 +@@ -18,7 +17,9 @@
 + 	cd gwb2ged; $(MAKE) all
 + 	cd setup; $(MAKE) all
 + 	cd gwtp; $(MAKE) all
 ++.if defined(ENABLE_GUI)
 + 	cd gui; $(MAKE) all
 ++.endif
 + 
 + opt::
 + 	cd wserver; $(MAKE) opt
 +@@ -28,7 +29,9 @@
 + 	cd gwb2ged; $(MAKE) opt
 + 	cd setup; $(MAKE) opt
 + 	cd gwtp; $(MAKE) opt
 ++.if defined(ENABLE_GUI)
 + 	cd gui; $(MAKE) opt
 ++.endif
 + 
 + install:
 + 	mkdir -p $(PREFIX)/bin
 +@@ -65,7 +68,12 @@
 + 	rm -rf $(PREFIX)/share/geneweb
 + 	cd $(MANDIR); rm -f $(MANPAGES)
 + 
 ++
 ++.if defined(ENABLE_GUI)
 ++distrib: new_distrib wrappers wrappers_gui
 ++.else
 + distrib: new_distrib wrappers
 ++.endif
 + 
 + wrappers:
 + 	if test "$(CAMLP5F)" = "-DWIN95"; then \
 +@@ -79,7 +87,6 @@
 + 	  echo -ne 'endlocal\r\n' >> $(DESTDIR)/gwsetup.bat; \
 + 	  echo -ne 'cd bases\r\n' >> $(DESTDIR)/gwsetup.bat; \
 + 	  echo -ne 'start /MIN ..\\gw\\gwsetup -lang fr -gd ..\\gw\r\n' >> $(DESTDIR)/gwsetup.bat; \
 +-	  echo -ne 'start ..\\gw\\gui' > $(DESTDIR)/geneweb_gui.bat; \
 + 	else \
 + 	  (echo '#!/bin/sh'; \
 + 	   echo 'mkdir -p bases'; \
 +@@ -89,9 +96,16 @@
 + 	   echo 'mkdir -p bases'; \
 + 	   echo 'cd bases'; \
 + 	   echo 'exec ../gw/gwsetup -gd ../gw "$$@"') > $(DESTDIR)/gwsetup; \
 ++	  chmod +x $(DESTDIR)/gwd $(DESTDIR)/gwsetup; \
 ++	fi
 ++
 ++wrappers_gui:
 ++	if test "$(CAMLP5F)" = "-DWIN95"; then \
 ++	  echo -ne 'start ..\\gw\\gui' > $(DESTDIR)/geneweb_gui.bat; \
 ++	else \
 + 	  (echo '#!/bin/sh'; \
 + 	   echo 'exec ../gw/gui') > $(DESTDIR)/geneweb_gui; \
 +-	  chmod +x $(DESTDIR)/gwd $(DESTDIR)/gwsetup $(DESTDIR)/geneweb_gui; \
 ++	  chmod +x $(DESTDIR)/geneweb_gui; \
 + 	fi
 + 
 + new_distrib: classical_distrib
 +@@ -110,8 +124,10 @@
 + 	cp setup/lang/*.htm $(DESTDIR)/gw/setup/lang/.
 + 	cp setup/lang/lexicon.txt $(DESTDIR)/gw/setup/lang/.
 + 	cp setup/gwsetup $(DESTDIR)/gw/gwsetup$(EXE)
 ++.if defined(ENABLE_GUI)
 + 	cp gui/gw/gui_lex.txt $(DESTDIR)/gw/.
 + 	cp gui/gui $(DESTDIR)/gw/gui$(EXE)
 ++.endif
 + 	cp LICENSE $(DESTDIR)/LICENSE.txt
 + 	cp etc/START.htm $(DESTDIR)/.
 + 	cp CHANGES $(DESTDIR)/CHANGES.txt
 +@@ -180,4 +196,6 @@
 + 	cd gwb2ged; $(MAKE) depend
 + 	cd setup; $(MAKE) depend
 + 	cd gwtp; $(MAKE) depend
 ++.if defined(ENABLE_GUI)
 + 	cd gui; $(MAKE) depend
 ++.endif
 
 Modified: head/www/geneweb/pkg-descr
 ==============================================================================
 --- head/www/geneweb/pkg-descr	Wed Feb 13 09:39:44 2013	(r312149)
 +++ head/www/geneweb/pkg-descr	Wed Feb 13 09:43:37 2013	(r312150)
 @@ -5,4 +5,7 @@ or in a Web environment. It uses very ef
  of relationship and consanguinity computing, developed in
  collaboration with Didier Remy, research Director at INRIA.
  
 +Feel free to enable option GTK2 to try the new GUI. It's
 +only disabled by default to avoid accidental GTK2 dependencies.
 +
  WWW: http://opensource.geneanet.org/projects/geneweb/
 
 Modified: head/www/geneweb/pkg-plist
 ==============================================================================
 --- head/www/geneweb/pkg-plist	Wed Feb 13 09:39:44 2013	(r312149)
 +++ head/www/geneweb/pkg-plist	Wed Feb 13 09:43:37 2013	(r312150)
 @@ -29,6 +29,7 @@ bin/gwu
  %%DATADIR%%/distribution/gw/etc/desmenu.txt
  %%DATADIR%%/distribution/gw/etc/favicon.txt
  %%DATADIR%%/distribution/gw/etc/forum.txt
 +%%DATADIR%%/distribution/gw/etc/hed.txt
  %%DATADIR%%/distribution/gw/etc/index.txt
  %%DATADIR%%/distribution/gw/etc/moved.txt
  %%DATADIR%%/distribution/gw/etc/particles.txt
 @@ -52,6 +53,7 @@ bin/gwu
  %%DATADIR%%/distribution/gw/etc/perso_module/union_evolue.txt
  %%DATADIR%%/distribution/gw/etc/perso_module/union_photo.txt
  %%DATADIR%%/distribution/gw/etc/perso_module/union_simple.txt
 +%%DATADIR%%/distribution/gw/etc/perso_short.txt
  %%DATADIR%%/distribution/gw/etc/random_css.txt
  %%DATADIR%%/distribution/gw/etc/redirect.txt
  %%DATADIR%%/distribution/gw/etc/relmenu.txt
 @@ -120,6 +122,7 @@ bin/gwu
  %%DATADIR%%/distribution/gw/etc/templh/deslist.txt
  %%DATADIR%%/distribution/gw/etc/templh/perso.txt
  %%DATADIR%%/distribution/gw/etc/templm/accent.txt
 +%%DATADIR%%/distribution/gw/etc/templm/advanced.txt
  %%DATADIR%%/distribution/gw/etc/templm/anclist.txt
  %%DATADIR%%/distribution/gw/etc/templm/ancmenu.txt
  %%DATADIR%%/distribution/gw/etc/templm/ancsosa.txt
 @@ -129,9 +132,13 @@ bin/gwu
  %%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/my_base/trl.txt
 +%%DATADIR%%/distribution/gw/etc/templm/inc_mickroue1.txt
 +%%DATADIR%%/distribution/gw/etc/templm/inc_mickroue2.txt
  %%DATADIR%%/distribution/gw/etc/templm/perso.txt
 +%%DATADIR%%/distribution/gw/etc/templm/perso_accesskey.txt
  %%DATADIR%%/distribution/gw/etc/templm/relmenu.txt
 +%%DATADIR%%/distribution/gw/etc/templm/toolbar.txt
 +%%DATADIR%%/distribution/gw/etc/templm/trl.txt
  %%DATADIR%%/distribution/gw/etc/templm/updfam.txt
  %%DATADIR%%/distribution/gw/etc/templm/updind.txt
  %%DATADIR%%/distribution/gw/etc/templm/updmenu.txt
 @@ -146,6 +153,8 @@ bin/gwu
  %%DATADIR%%/distribution/gw/etc/templx/relations.txt
  %%DATADIR%%/distribution/gw/etc/templx/sources.txt
  %%DATADIR%%/distribution/gw/etc/toolbar.txt
 +%%DATADIR%%/distribution/gw/etc/trl.txt
 +%%DATADIR%%/distribution/gw/etc/upddata.txt
  %%DATADIR%%/distribution/gw/etc/updfam.txt
  %%DATADIR%%/distribution/gw/etc/updhist.txt
  %%DATADIR%%/distribution/gw/etc/updind.txt
 @@ -184,43 +193,77 @@ bin/gwu
  %%DATADIR%%/distribution/gw/images/favicon_gwsetup.png
  %%DATADIR%%/distribution/gw/images/female.png
  %%DATADIR%%/distribution/gw/images/file.png
 +%%DATADIR%%/distribution/gw/images/flags/l-af.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-bg.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-br.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-ca.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-cs.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-da.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-de.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-en.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-eo.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-es.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-et.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-fi.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-fr.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-he.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-is.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-it.jpg
 +%%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-pl.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-pt-br.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-pt.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-ro.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-ru.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-sl.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-sv.jpg
 +%%DATADIR%%/distribution/gw/images/flags/l-zh.jpg
 +%%DATADIR%%/distribution/gw/images/flags/t-af.png
 +%%DATADIR%%/distribution/gw/images/flags/t-bg.png
 +%%DATADIR%%/distribution/gw/images/flags/t-br.png
 +%%DATADIR%%/distribution/gw/images/flags/t-ca.png
 +%%DATADIR%%/distribution/gw/images/flags/t-cs.png
 +%%DATADIR%%/distribution/gw/images/flags/t-da.png
 +%%DATADIR%%/distribution/gw/images/flags/t-de.png
 +%%DATADIR%%/distribution/gw/images/flags/t-en.png
 +%%DATADIR%%/distribution/gw/images/flags/t-eo.png
 +%%DATADIR%%/distribution/gw/images/flags/t-es.png
 +%%DATADIR%%/distribution/gw/images/flags/t-et.png
 +%%DATADIR%%/distribution/gw/images/flags/t-fi.png
 +%%DATADIR%%/distribution/gw/images/flags/t-fr.png
 +%%DATADIR%%/distribution/gw/images/flags/t-he.png
 +%%DATADIR%%/distribution/gw/images/flags/t-is.png
 +%%DATADIR%%/distribution/gw/images/flags/t-it.png
 +%%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-pl.png
 +%%DATADIR%%/distribution/gw/images/flags/t-pt.png
 +%%DATADIR%%/distribution/gw/images/flags/t-ro.png
 +%%DATADIR%%/distribution/gw/images/flags/t-ru.png
 +%%DATADIR%%/distribution/gw/images/flags/t-sl.png
 +%%DATADIR%%/distribution/gw/images/flags/t-sv.png
 +%%DATADIR%%/distribution/gw/images/flags/t-zh.png
  %%DATADIR%%/distribution/gw/images/folder.png
  %%DATADIR%%/distribution/gw/images/geneweb_start.png
 +%%DATADIR%%/distribution/gw/images/gui_create.png
 +%%DATADIR%%/distribution/gw/images/gui_doc.png
 +%%DATADIR%%/distribution/gw/images/gui_log.png
 +%%DATADIR%%/distribution/gw/images/gui_quit.png
 +%%DATADIR%%/distribution/gw/images/gui_setup.png
  %%DATADIR%%/distribution/gw/images/gwback.jpg
  %%DATADIR%%/distribution/gw/images/gwlogo.png
  %%DATADIR%%/distribution/gw/images/icone_gwd.ico
  %%DATADIR%%/distribution/gw/images/icone_gwsetup.ico
  %%DATADIR%%/distribution/gw/images/img_documentation.png
 -%%DATADIR%%/distribution/gw/images/l-af.jpg
 -%%DATADIR%%/distribution/gw/images/l-bg.jpg
 -%%DATADIR%%/distribution/gw/images/l-br.jpg
 -%%DATADIR%%/distribution/gw/images/l-ca.jpg
 -%%DATADIR%%/distribution/gw/images/l-cs.jpg
 -%%DATADIR%%/distribution/gw/images/l-da.jpg
 -%%DATADIR%%/distribution/gw/images/l-de.jpg
 -%%DATADIR%%/distribution/gw/images/l-en.jpg
 -%%DATADIR%%/distribution/gw/images/l-eo.jpg
 -%%DATADIR%%/distribution/gw/images/l-es.jpg
 -%%DATADIR%%/distribution/gw/images/l-et.jpg
 -%%DATADIR%%/distribution/gw/images/l-fi.jpg
 -%%DATADIR%%/distribution/gw/images/l-fr.jpg
 -%%DATADIR%%/distribution/gw/images/l-he.jpg
 -%%DATADIR%%/distribution/gw/images/l-is.jpg
 -%%DATADIR%%/distribution/gw/images/l-it.jpg
 -%%DATADIR%%/distribution/gw/images/l-lv.jpg
 -%%DATADIR%%/distribution/gw/images/l-nl.jpg
 -%%DATADIR%%/distribution/gw/images/l-no.jpg
 -%%DATADIR%%/distribution/gw/images/l-pl.jpg
 -%%DATADIR%%/distribution/gw/images/l-pt-br.jpg
 -%%DATADIR%%/distribution/gw/images/l-pt.jpg
 -%%DATADIR%%/distribution/gw/images/l-ro.jpg
 -%%DATADIR%%/distribution/gw/images/l-ru.jpg
 -%%DATADIR%%/distribution/gw/images/l-sl.jpg
 -%%DATADIR%%/distribution/gw/images/l-sv.jpg
 -%%DATADIR%%/distribution/gw/images/l-zh.jpg
 +%%DATADIR%%/distribution/gw/images/img_unknown_man.png
 +%%DATADIR%%/distribution/gw/images/img_unknown_woman.png
  %%DATADIR%%/distribution/gw/images/left.png
  %%DATADIR%%/distribution/gw/images/logo_bas.png
  %%DATADIR%%/distribution/gw/images/male.png
 +%%DATADIR%%/distribution/gw/images/marriage.png
  %%DATADIR%%/distribution/gw/images/married.png
  %%DATADIR%%/distribution/gw/images/married_no_descendants.png
  %%DATADIR%%/distribution/gw/images/maximize.png
 @@ -233,11 +276,13 @@ bin/gwu
  %%DATADIR%%/distribution/gw/images/picto_anniversaire_small.png
  %%DATADIR%%/distribution/gw/images/picto_branch.png
  %%DATADIR%%/distribution/gw/images/picto_branche_patronymique.png
 +%%DATADIR%%/distribution/gw/images/picto_calendar.png
  %%DATADIR%%/distribution/gw/images/picto_cle.png
  %%DATADIR%%/distribution/gw/images/picto_fleche_blanche.png
  %%DATADIR%%/distribution/gw/images/picto_fleche_bleu.png
  %%DATADIR%%/distribution/gw/images/picto_loupe.png
  %%DATADIR%%/distribution/gw/images/picto_molette.png
 +%%DATADIR%%/distribution/gw/images/picto_numeric_order.png
  %%DATADIR%%/distribution/gw/images/picto_parente.png
  %%DATADIR%%/distribution/gw/images/picto_rel_asc.png
  %%DATADIR%%/distribution/gw/images/picto_rel_small.png
 @@ -249,32 +294,6 @@ bin/gwu
  %%DATADIR%%/distribution/gw/images/right.png
  %%DATADIR%%/distribution/gw/images/sexunknown.png
  %%DATADIR%%/distribution/gw/images/sosa.png
 -%%DATADIR%%/distribution/gw/images/t-af.png
 -%%DATADIR%%/distribution/gw/images/t-bg.png
 -%%DATADIR%%/distribution/gw/images/t-br.png
 -%%DATADIR%%/distribution/gw/images/t-ca.png
 -%%DATADIR%%/distribution/gw/images/t-cs.png
 -%%DATADIR%%/distribution/gw/images/t-da.png
 -%%DATADIR%%/distribution/gw/images/t-de.png
 -%%DATADIR%%/distribution/gw/images/t-en.png
 -%%DATADIR%%/distribution/gw/images/t-eo.png
 -%%DATADIR%%/distribution/gw/images/t-es.png
 -%%DATADIR%%/distribution/gw/images/t-et.png
 -%%DATADIR%%/distribution/gw/images/t-fi.png
 -%%DATADIR%%/distribution/gw/images/t-fr.png
 -%%DATADIR%%/distribution/gw/images/t-he.png
 -%%DATADIR%%/distribution/gw/images/t-is.png
 -%%DATADIR%%/distribution/gw/images/t-it.png
 -%%DATADIR%%/distribution/gw/images/t-lv.png
 -%%DATADIR%%/distribution/gw/images/t-nl.png
 -%%DATADIR%%/distribution/gw/images/t-no.png
 -%%DATADIR%%/distribution/gw/images/t-pl.png
 -%%DATADIR%%/distribution/gw/images/t-pt.png
 -%%DATADIR%%/distribution/gw/images/t-ro.png
 -%%DATADIR%%/distribution/gw/images/t-ru.png
 -%%DATADIR%%/distribution/gw/images/t-sl.png
 -%%DATADIR%%/distribution/gw/images/t-sv.png
 -%%DATADIR%%/distribution/gw/images/t-zh.png
  %%DATADIR%%/distribution/gw/images/up.png
  %%DATADIR%%/distribution/gw/lang/alias_lg.txt
  %%DATADIR%%/distribution/gw/lang/lex_utf8.txt
 @@ -335,6 +354,7 @@ bin/gwu
  %%DATADIR%%/distribution/gw/setup/lang/rename.htm
  %%DATADIR%%/distribution/gw/setup/lang/save.htm
  %%DATADIR%%/distribution/gw/setup/lang/simple.htm
 +%%DATADIR%%/distribution/gw/setup/lang/simple2.htm
  %%DATADIR%%/distribution/gw/setup/lang/traces.htm
  %%DATADIR%%/distribution/gw/setup/lang/update_nldb.htm
  %%DATADIR%%/distribution/gw/setup/lang/update_nldb_ok.htm
 @@ -342,6 +362,9 @@ bin/gwu
  %%DATADIR%%/distribution/gw/update_nldb
  %%DATADIR%%/distribution/gwd
  %%DATADIR%%/distribution/gwsetup
 +%%GUI%%%%DATADIR%%/distribution/geneweb_gui
 +%%GUI%%%%DATADIR%%/distribution/gw/gui_lex.txt
 +%%GUI%%%%DATADIR%%/distribution/gw/gui
  %%DATADIR%%/etc/accent.txt
  %%DATADIR%%/etc/advanced.txt
  %%DATADIR%%/etc/anclist.txt
 @@ -358,6 +381,7 @@ bin/gwu
  %%DATADIR%%/etc/desmenu.txt
  %%DATADIR%%/etc/favicon.txt
  %%DATADIR%%/etc/forum.txt
 +%%DATADIR%%/etc/hed.txt
  %%DATADIR%%/etc/index.txt
  %%DATADIR%%/etc/moved.txt
  %%DATADIR%%/etc/particles.txt
 @@ -381,6 +405,7 @@ bin/gwu
  %%DATADIR%%/etc/perso_module/union_evolue.txt
  %%DATADIR%%/etc/perso_module/union_photo.txt
  %%DATADIR%%/etc/perso_module/union_simple.txt
 +%%DATADIR%%/etc/perso_short.txt
  %%DATADIR%%/etc/random_css.txt
  %%DATADIR%%/etc/redirect.txt
  %%DATADIR%%/etc/relmenu.txt
 @@ -449,6 +474,7 @@ bin/gwu
  %%DATADIR%%/etc/templh/deslist.txt
  %%DATADIR%%/etc/templh/perso.txt
  %%DATADIR%%/etc/templm/accent.txt
 +%%DATADIR%%/etc/templm/advanced.txt
  %%DATADIR%%/etc/templm/anclist.txt
  %%DATADIR%%/etc/templm/ancmenu.txt
  %%DATADIR%%/etc/templm/ancsosa.txt
 @@ -458,9 +484,13 @@ bin/gwu
  %%DATADIR%%/etc/templm/dag.txt
  %%DATADIR%%/etc/templm/deslist.txt
  %%DATADIR%%/etc/templm/desmenu.txt
 -%%DATADIR%%/etc/templm/my_base/trl.txt
 +%%DATADIR%%/etc/templm/inc_mickroue1.txt
 +%%DATADIR%%/etc/templm/inc_mickroue2.txt
  %%DATADIR%%/etc/templm/perso.txt
 +%%DATADIR%%/etc/templm/perso_accesskey.txt
  %%DATADIR%%/etc/templm/relmenu.txt
 +%%DATADIR%%/etc/templm/toolbar.txt
 +%%DATADIR%%/etc/templm/trl.txt
  %%DATADIR%%/etc/templm/updfam.txt
  %%DATADIR%%/etc/templm/updind.txt
  %%DATADIR%%/etc/templm/updmenu.txt
 @@ -475,6 +505,8 @@ bin/gwu
  %%DATADIR%%/etc/templx/relations.txt
  %%DATADIR%%/etc/templx/sources.txt
  %%DATADIR%%/etc/toolbar.txt
 +%%DATADIR%%/etc/trl.txt
 +%%DATADIR%%/etc/upddata.txt
  %%DATADIR%%/etc/updfam.txt
  %%DATADIR%%/etc/updhist.txt
  %%DATADIR%%/etc/updind.txt
 @@ -495,43 +527,77 @@ bin/gwu
  %%DATADIR%%/images/favicon_gwsetup.png
  %%DATADIR%%/images/female.png
  %%DATADIR%%/images/file.png
 +%%DATADIR%%/images/flags/l-af.jpg
 +%%DATADIR%%/images/flags/l-bg.jpg
 +%%DATADIR%%/images/flags/l-br.jpg
 +%%DATADIR%%/images/flags/l-ca.jpg
 +%%DATADIR%%/images/flags/l-cs.jpg
 +%%DATADIR%%/images/flags/l-da.jpg
 +%%DATADIR%%/images/flags/l-de.jpg
 +%%DATADIR%%/images/flags/l-en.jpg
 +%%DATADIR%%/images/flags/l-eo.jpg
 +%%DATADIR%%/images/flags/l-es.jpg
 +%%DATADIR%%/images/flags/l-et.jpg
 +%%DATADIR%%/images/flags/l-fi.jpg
 +%%DATADIR%%/images/flags/l-fr.jpg
 +%%DATADIR%%/images/flags/l-he.jpg
 +%%DATADIR%%/images/flags/l-is.jpg
 +%%DATADIR%%/images/flags/l-it.jpg
 +%%DATADIR%%/images/flags/l-lv.jpg
 +%%DATADIR%%/images/flags/l-nl.jpg
 +%%DATADIR%%/images/flags/l-no.jpg
 +%%DATADIR%%/images/flags/l-pl.jpg
 +%%DATADIR%%/images/flags/l-pt-br.jpg
 +%%DATADIR%%/images/flags/l-pt.jpg
 +%%DATADIR%%/images/flags/l-ro.jpg
 +%%DATADIR%%/images/flags/l-ru.jpg
 +%%DATADIR%%/images/flags/l-sl.jpg
 +%%DATADIR%%/images/flags/l-sv.jpg
 +%%DATADIR%%/images/flags/l-zh.jpg
 +%%DATADIR%%/images/flags/t-af.png
 +%%DATADIR%%/images/flags/t-bg.png
 +%%DATADIR%%/images/flags/t-br.png
 +%%DATADIR%%/images/flags/t-ca.png
 +%%DATADIR%%/images/flags/t-cs.png
 +%%DATADIR%%/images/flags/t-da.png
 +%%DATADIR%%/images/flags/t-de.png
 +%%DATADIR%%/images/flags/t-en.png
 +%%DATADIR%%/images/flags/t-eo.png
 +%%DATADIR%%/images/flags/t-es.png
 +%%DATADIR%%/images/flags/t-et.png
 +%%DATADIR%%/images/flags/t-fi.png
 +%%DATADIR%%/images/flags/t-fr.png
 +%%DATADIR%%/images/flags/t-he.png
 +%%DATADIR%%/images/flags/t-is.png
 +%%DATADIR%%/images/flags/t-it.png
 +%%DATADIR%%/images/flags/t-lv.png
 +%%DATADIR%%/images/flags/t-nl.png
 +%%DATADIR%%/images/flags/t-no.png
 +%%DATADIR%%/images/flags/t-pl.png
 +%%DATADIR%%/images/flags/t-pt.png
 +%%DATADIR%%/images/flags/t-ro.png
 +%%DATADIR%%/images/flags/t-ru.png
 +%%DATADIR%%/images/flags/t-sl.png
 +%%DATADIR%%/images/flags/t-sv.png
 +%%DATADIR%%/images/flags/t-zh.png
  %%DATADIR%%/images/folder.png
  %%DATADIR%%/images/geneweb_start.png
 +%%DATADIR%%/images/gui_create.png
 +%%DATADIR%%/images/gui_doc.png
 +%%DATADIR%%/images/gui_log.png
 +%%DATADIR%%/images/gui_quit.png
 +%%DATADIR%%/images/gui_setup.png
  %%DATADIR%%/images/gwback.jpg
  %%DATADIR%%/images/gwlogo.png
  %%DATADIR%%/images/icone_gwd.ico
  %%DATADIR%%/images/icone_gwsetup.ico
  %%DATADIR%%/images/img_documentation.png
 -%%DATADIR%%/images/l-af.jpg
 -%%DATADIR%%/images/l-bg.jpg
 -%%DATADIR%%/images/l-br.jpg
 -%%DATADIR%%/images/l-ca.jpg
 -%%DATADIR%%/images/l-cs.jpg
 -%%DATADIR%%/images/l-da.jpg
 -%%DATADIR%%/images/l-de.jpg
 -%%DATADIR%%/images/l-en.jpg
 -%%DATADIR%%/images/l-eo.jpg
 -%%DATADIR%%/images/l-es.jpg
 -%%DATADIR%%/images/l-et.jpg
 -%%DATADIR%%/images/l-fi.jpg
 -%%DATADIR%%/images/l-fr.jpg
 -%%DATADIR%%/images/l-he.jpg
 -%%DATADIR%%/images/l-is.jpg
 -%%DATADIR%%/images/l-it.jpg
 -%%DATADIR%%/images/l-lv.jpg
 -%%DATADIR%%/images/l-nl.jpg
 -%%DATADIR%%/images/l-no.jpg
 -%%DATADIR%%/images/l-pl.jpg
 -%%DATADIR%%/images/l-pt-br.jpg
 -%%DATADIR%%/images/l-pt.jpg
 -%%DATADIR%%/images/l-ro.jpg
 -%%DATADIR%%/images/l-ru.jpg
 -%%DATADIR%%/images/l-sl.jpg
 -%%DATADIR%%/images/l-sv.jpg
 -%%DATADIR%%/images/l-zh.jpg
 +%%DATADIR%%/images/img_unknown_man.png
 +%%DATADIR%%/images/img_unknown_woman.png
  %%DATADIR%%/images/left.png
  %%DATADIR%%/images/logo_bas.png
  %%DATADIR%%/images/male.png
 +%%DATADIR%%/images/marriage.png
  %%DATADIR%%/images/married.png
  %%DATADIR%%/images/married_no_descendants.png
  %%DATADIR%%/images/maximize.png
 @@ -544,11 +610,13 @@ bin/gwu
  %%DATADIR%%/images/picto_anniversaire_small.png
  %%DATADIR%%/images/picto_branch.png
  %%DATADIR%%/images/picto_branche_patronymique.png
 +%%DATADIR%%/images/picto_calendar.png
  %%DATADIR%%/images/picto_cle.png
  %%DATADIR%%/images/picto_fleche_blanche.png
  %%DATADIR%%/images/picto_fleche_bleu.png
  %%DATADIR%%/images/picto_loupe.png
  %%DATADIR%%/images/picto_molette.png
 +%%DATADIR%%/images/picto_numeric_order.png
  %%DATADIR%%/images/picto_parente.png
  %%DATADIR%%/images/picto_rel_asc.png
  %%DATADIR%%/images/picto_rel_small.png
 @@ -560,32 +628,6 @@ bin/gwu
  %%DATADIR%%/images/right.png
  %%DATADIR%%/images/sexunknown.png
  %%DATADIR%%/images/sosa.png
 -%%DATADIR%%/images/t-af.png
 -%%DATADIR%%/images/t-bg.png
 -%%DATADIR%%/images/t-br.png
 -%%DATADIR%%/images/t-ca.png
 -%%DATADIR%%/images/t-cs.png
 -%%DATADIR%%/images/t-da.png
 -%%DATADIR%%/images/t-de.png
 -%%DATADIR%%/images/t-en.png
 -%%DATADIR%%/images/t-eo.png
 -%%DATADIR%%/images/t-es.png
 -%%DATADIR%%/images/t-et.png
 -%%DATADIR%%/images/t-fi.png
 -%%DATADIR%%/images/t-fr.png
 -%%DATADIR%%/images/t-he.png
 -%%DATADIR%%/images/t-is.png
 -%%DATADIR%%/images/t-it.png
 -%%DATADIR%%/images/t-lv.png
 -%%DATADIR%%/images/t-nl.png
 -%%DATADIR%%/images/t-no.png
 -%%DATADIR%%/images/t-pl.png
 -%%DATADIR%%/images/t-pt.png
 -%%DATADIR%%/images/t-ro.png
 -%%DATADIR%%/images/t-ru.png
 -%%DATADIR%%/images/t-sl.png
 -%%DATADIR%%/images/t-sv.png
 -%%DATADIR%%/images/t-zh.png
  %%DATADIR%%/images/up.png
  %%DATADIR%%/install.sh
  %%DATADIR%%/lang/alias_lg.txt
 @@ -595,9 +637,9 @@ bin/gwu
  %%DATADIR%%/lang/start_utf8.txt
  %%DATADIR%%/lang/version.txt
  @dirrm %%DATADIR%%/lang
 +@dirrm %%DATADIR%%/images/flags
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%/etc/templx
 -@dirrm %%DATADIR%%/etc/templm/my_base
  @dirrm %%DATADIR%%/etc/templm
  @dirrm %%DATADIR%%/etc/templh
  @dirrm %%DATADIR%%/etc/templf
 @@ -612,11 +654,11 @@ bin/gwu
  @dirrm %%DATADIR%%/distribution/gw/setup
  @dirrm %%DATADIR%%/distribution/gw/old
  @dirrm %%DATADIR%%/distribution/gw/lang
 +@dirrm %%DATADIR%%/distribution/gw/images/flags
  @dirrm %%DATADIR%%/distribution/gw/images
  @dirrm %%DATADIR%%/distribution/gw/gwtp_tmp/lang
  @dirrm %%DATADIR%%/distribution/gw/gwtp_tmp
  @dirrm %%DATADIR%%/distribution/gw/etc/templx
 -@dirrm %%DATADIR%%/distribution/gw/etc/templm/my_base
  @dirrm %%DATADIR%%/distribution/gw/etc/templm
  @dirrm %%DATADIR%%/distribution/gw/etc/templh
  @dirrm %%DATADIR%%/distribution/gw/etc/templf
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
