kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 6.07

Browse source 
- Support staging

PR:		ports/189848
Submitted by:	Alex Stangl <alex@stangl.us> (maintainer)
This commit is contained in:
Carlo Strub 2014-05-16 21:16:50 +00:00
parent 31d81cbb2b
commit e17f5d1157
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=354265
8 changed files with 28833 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
www/geneweb/Makefile
View file

@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= geneweb
PORTVERSION= 6.06
PORTVERSION= 6.07
CATEGORIES= www
MASTER_SITES= http://opensource.geneanet.org/attachments/download/211/
MASTER_SITES= http://opensource.geneanet.org/attachments/download/240/
DISTNAME= gw-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
@ -21,7 +21,6 @@ MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= GTK2
NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGTK2}
@ -32,18 +31,17 @@ PLIST_SUB+= GUI=""
PLIST_SUB+= GUI="@comment "
.endif
MAN1= ged2gwb.1 gwb2ged.1 gwc.1 gwc2.1 gwu.1 gwd.1 consang.1 gwsetup.1
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 ${PREFIX}/share/geneweb
${MKDIR} ${PREFIX}/share/geneweb/distribution
${CP} -a ${WRKSRC}/distribution ${PREFIX}/share/geneweb/
${INSTALL_SCRIPT} ${FILESDIR}/install.sh ${PREFIX}/share/geneweb
${CHMOD} -R go+r ${PREFIX}/share/geneweb ${_MANPAGES}
@${CAT} ${PKGMESSAGE}
@${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
.include <bsd.port.mk>

4
www/geneweb/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (gw-6.06-src.tgz) = 6b493369d0935c80e7f08d61d8b8c1c42e765cdc39ec038474b45e6412f0fb4c
SIZE (gw-6.06-src.tgz) = 1783868
SHA256 (gw-6.07-src.tgz) = c1ecc337f8bce4d8509ca49081d098b5a44ddb6407208496e55e9a38d6bfb1f6
SIZE (gw-6.07-src.tgz) = 1855016

129
www/geneweb/files/patch-Makefile
View file

@ -1,86 +1,65 @@
--- Makefile.orig 2012-12-02 15:04:17.000000000 -0600
+++ Makefile 2013-02-03 09:45:27.000000000 -0600
@@ -1,6 +1,5 @@
--- ./Makefile.orig 2013-03-01 03:06:49.000000000 -0600
+++ ./Makefile 2014-05-14 06:57:05.000000000 -0500
@@ -1,8 +1,7 @@
# $Id: Makefile,v 5.7 2009-03-11 10:53:30 ddr Exp $
-PREFIX=/usr
LANGDIR=$(PREFIX)/share/geneweb
MANDIR=$(PREFIX)/man/man1
-LANGDIR=$(PREFIX)/share/geneweb
-MANDIR=$(PREFIX)/man/man1
+LANGDIR=$(STAGEDIR)$(PREFIX)/share/geneweb
+MANDIR=$(STAGEDIR)$(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
MANPAGES=ged2gwb.1 gwb2ged.1 gwc.1 gwc2.1 gwu.1 gwd.1 consang.1 gwsetup.1
opt::
cd wserver; $(MAKE) opt
@@ -28,7 +29,9 @@
cd gwb2ged; $(MAKE) opt
cd setup; $(MAKE) opt
@@ -29,16 +28,16 @@
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
- mkdir -p $(PREFIX)/bin
- cp src/gwc $(PREFIX)/bin/gwc$(EXE)
- cp src/gwc1 $(PREFIX)/bin/gwc1$(EXE)
- cp src/gwc2 $(PREFIX)/bin/gwc2$(EXE)
- cp src/consang $(PREFIX)/bin/consang$(EXE)
- cp src/gwd $(PREFIX)/bin/gwd$(EXE)
- cp src/gwu $(PREFIX)/bin/gwu$(EXE)
- cp ged2gwb/ged2gwb $(PREFIX)/bin/ged2gwb$(EXE)
- cp ged2gwb/ged2gwb2 $(PREFIX)/bin/ged2gwb2$(EXE)
- cp gwb2ged/gwb2ged $(PREFIX)/bin/gwb2ged$(EXE)
+ mkdir -p $(STAGEDIR)$(PREFIX)/bin
+ cp src/gwc $(STAGEDIR)$(PREFIX)/bin/gwc$(EXE)
+ cp src/gwc1 $(STAGEDIR)$(PREFIX)/bin/gwc1$(EXE)
+ cp src/gwc2 $(STAGEDIR)$(PREFIX)/bin/gwc2$(EXE)
+ cp src/consang $(STAGEDIR)$(PREFIX)/bin/consang$(EXE)
+ cp src/gwd $(STAGEDIR)$(PREFIX)/bin/gwd$(EXE)
+ cp src/gwu $(STAGEDIR)$(PREFIX)/bin/gwu$(EXE)
+ cp ged2gwb/ged2gwb $(STAGEDIR)$(PREFIX)/bin/ged2gwb$(EXE)
+ cp ged2gwb/ged2gwb2 $(STAGEDIR)$(PREFIX)/bin/ged2gwb2$(EXE)
+ cp gwb2ged/gwb2ged $(STAGEDIR)$(PREFIX)/bin/gwb2ged$(EXE)
mkdir -p $(LANGDIR)/lang
cp hd/lang/*.txt $(LANGDIR)/lang/.
mkdir -p $(LANGDIR)/images
@@ -52,15 +51,15 @@
cd man; cp $(MANPAGES) $(MANDIR)/.
uninstall:
- rm -f $(PREFIX)/bin/gwc$(EXE)
- rm -f $(PREFIX)/bin/gwc1$(EXE)
- rm -f $(PREFIX)/bin/gwc2$(EXE)
- rm -f $(PREFIX)/bin/consang$(EXE)
- rm -f $(PREFIX)/bin/gwd$(EXE)
- rm -f $(PREFIX)/bin/gwu$(EXE)
- rm -f $(PREFIX)/bin/ged2gwb$(EXE)
- rm -f $(PREFIX)/bin/gwb2ged$(EXE)
- rm -rf $(PREFIX)/share/geneweb
+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwc$(EXE)
+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwc1$(EXE)
+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwc2$(EXE)
+ rm -f $(STAGEDIR)$(PREFIX)/bin/consang$(EXE)
+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwd$(EXE)
+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwu$(EXE)
+ rm -f $(STAGEDIR)$(PREFIX)/bin/ged2gwb$(EXE)
+ rm -f $(STAGEDIR)$(PREFIX)/bin/gwb2ged$(EXE)
+ rm -rf $(STAGEDIR)$(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

12
www/geneweb/files/patch-dag2html__Makefile Normal file
View file

@ -0,0 +1,12 @@
--- ./dag2html/Makefile.orig 2013-03-01 03:06:49.000000000 -0600
+++ ./dag2html/Makefile 2014-05-14 07:00:04.000000000 -0500
@@ -1,7 +1,7 @@
# $Id: Makefile,v 5.1 2007-07-11 16:15:21 ddr Exp $
-BINDIR=/usr/local/bin
-MANDIR=/usr/local/share/man/man1
+BINDIR=$(STAGING)$(PREFIX)/bin
+MANDIR=$(STAGING)$(PREFIX)/share/man/man1
OCAMLC=ocamlc
OCAMLOPT=ocamlopt
OCARGS=

28683
www/geneweb/files/patch-ged2gwb__utf8.ml Normal file
View file

File diff suppressed because it is too large Load diff

10
www/geneweb/files/patch-src__Makefile Normal file
View file

@ -0,0 +1,10 @@
--- ./src/Makefile.orig 2013-03-01 03:06:44.000000000 -0600
+++ ./src/Makefile 2014-05-13 23:46:54.000000000 -0500
@@ -2,7 +2,6 @@
include ../tools/Makefile.inc
-PREFIX=/usr
OCAMLI=-I ../wserver -I ../dag2html
GWC_OBJS=argl.cmo lock.cmo adef.cmo iovalue.cmo buff.cmo name.cmo mutil.cmo secure.cmo btree.cmo futil.cmo dutil.cmo database.cmo db2.cmo db2disk.cmo diff.cmo outbase.cmo gwdb.cmo pqueue.cmo progrBar.cmo consang.cmo consangAll.cmo checkItem.cmo check.cmo calendar.cmo notesLinks.cmo gwcomp.cmo db1link.cmo gwc.cmo
GWC2_OBJS=calendar.cmo adef.cmo iovalue.cmo buff.cmo name.cmo mutil.cmo gwcomp.cmo argl.cmo lock.cmo progrBar.cmo secure.cmo iochan.cmo futil.cmo db2.cmo db2out.cmo notesLinks.cmo db2disk.cmo dutil.cmo btree.cmo database.cmo gwdb.cmo consang.cmo consangAll.cmo checkItem.cmo check.cmo db2link.cmo gwc2.cmo

10
www/geneweb/files/pkg-message.in
View file

@ -16,4 +16,14 @@ http://opensource.geneanet.org/projects/geneweb/wiki
and/or to the GeneWeb mailing list GeneWeb@yahoogroups.com if you need
help.
Main Makefile in GeneWeb 6.07 does not build the experimental GUI, however
it remains in the codebase. GTK2 option is being retained in this port in
case the GUI becomes part of the main Makefile again in a later version.
If you notice odd failures, e.g., when editing a family, make sure you are
using an up-to-date template. Additional attributes, e.g., occupation got
added around v6.06, and if your template does not include this, you will
likely experience problems as the code throws an exception when trying to
edit a family.
==========================================================================

88
www/geneweb/pkg-plist
View file

@ -7,6 +7,14 @@ bin/gwc1
bin/gwc2
bin/gwd
bin/gwu
man/man1/consang.1.gz
man/man1/ged2gwb.1.gz
man/man1/gwb2ged.1.gz
man/man1/gwc.1.gz
man/man1/gwc2.1.gz
man/man1/gwd.1.gz
man/man1/gwsetup.1.gz
man/man1/gwu.1.gz
%%DATADIR%%/a.gwf
%%DATADIR%%/distribution/CHANGES.txt
%%DATADIR%%/distribution/LICENSE.txt
@ -31,6 +39,9 @@ bin/gwu
%%DATADIR%%/distribution/gw/etc/forum.txt
%%DATADIR%%/distribution/gw/etc/hed.txt
%%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/miss_evt.txt
%%DATADIR%%/distribution/gw/etc/moved.txt
%%DATADIR%%/distribution/gw/etc/particles.txt
%%DATADIR%%/distribution/gw/etc/perso.txt
@ -139,6 +150,7 @@ bin/gwu
%%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/upddata.txt
%%DATADIR%%/distribution/gw/etc/templm/updfam.txt
%%DATADIR%%/distribution/gw/etc/templm/updind.txt
%%DATADIR%%/distribution/gw/etc/templm/updmenu.txt
@ -157,6 +169,7 @@ bin/gwu
%%DATADIR%%/distribution/gw/etc/upddata.txt
%%DATADIR%%/distribution/gw/etc/updfam.txt
%%DATADIR%%/distribution/gw/etc/updhist.txt
%%DATADIR%%/distribution/gw/etc/updhist_diff.txt
%%DATADIR%%/distribution/gw/etc/updind.txt
%%DATADIR%%/distribution/gw/etc/updmenu.txt
%%DATADIR%%/distribution/gw/etc/welcome.txt
@ -278,6 +291,8 @@ bin/gwu
%%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_edit_big.png
%%DATADIR%%/distribution/gw/images/picto_edit_small.png
%%DATADIR%%/distribution/gw/images/picto_fleche_blanche.png
%%DATADIR%%/distribution/gw/images/picto_fleche_bleu.png
%%DATADIR%%/distribution/gw/images/picto_loupe.png
@ -362,9 +377,6 @@ 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
@ -383,6 +395,9 @@ bin/gwu
%%DATADIR%%/etc/forum.txt
%%DATADIR%%/etc/hed.txt
%%DATADIR%%/etc/index.txt
%%DATADIR%%/etc/jquery_1_9_1_min.js
%%DATADIR%%/etc/jquery_placeholder_min.js
%%DATADIR%%/etc/miss_evt.txt
%%DATADIR%%/etc/moved.txt
%%DATADIR%%/etc/particles.txt
%%DATADIR%%/etc/perso.txt
@ -491,6 +506,7 @@ bin/gwu
%%DATADIR%%/etc/templm/relmenu.txt
%%DATADIR%%/etc/templm/toolbar.txt
%%DATADIR%%/etc/templm/trl.txt
%%DATADIR%%/etc/templm/upddata.txt
%%DATADIR%%/etc/templm/updfam.txt
%%DATADIR%%/etc/templm/updind.txt
%%DATADIR%%/etc/templm/updmenu.txt
@ -509,6 +525,7 @@ bin/gwu
%%DATADIR%%/etc/upddata.txt
%%DATADIR%%/etc/updfam.txt
%%DATADIR%%/etc/updhist.txt
%%DATADIR%%/etc/updhist_diff.txt
%%DATADIR%%/etc/updind.txt
%%DATADIR%%/etc/updmenu.txt
%%DATADIR%%/etc/welcome.txt
@ -612,6 +629,8 @@ bin/gwu
%%DATADIR%%/images/picto_branche_patronymique.png
%%DATADIR%%/images/picto_calendar.png
%%DATADIR%%/images/picto_cle.png
%%DATADIR%%/images/picto_edit_big.png
%%DATADIR%%/images/picto_edit_small.png
%%DATADIR%%/images/picto_fleche_blanche.png
%%DATADIR%%/images/picto_fleche_bleu.png
%%DATADIR%%/images/picto_loupe.png
@ -636,40 +655,39 @@ bin/gwu
%%DATADIR%%/lang/start.txt
%%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
@dirrm %%DATADIR%%/etc/templh
@dirrm %%DATADIR%%/etc/templf
@dirrm %%DATADIR%%/etc/templd
@dirrm %%DATADIR%%/etc/templc
@dirrm %%DATADIR%%/etc/templb
@dirrm %%DATADIR%%/etc/templa
@dirrm %%DATADIR%%/etc/templ502
@dirrm %%DATADIR%%/etc/perso_module
@dirrm %%DATADIR%%/etc
@dirrm %%DATADIR%%/distribution/gw/setup/lang
@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/etc/perso_module
@dirrm %%DATADIR%%/distribution/gw/etc/templ502
@dirrm %%DATADIR%%/distribution/gw/etc/templa
@dirrm %%DATADIR%%/distribution/gw/etc/templb
@dirrm %%DATADIR%%/distribution/gw/etc/templc
@dirrm %%DATADIR%%/distribution/gw/etc/templd
@dirrm %%DATADIR%%/distribution/gw/etc/templf
@dirrm %%DATADIR%%/distribution/gw/etc/templh
@dirrm %%DATADIR%%/distribution/gw/etc/templm
@dirrm %%DATADIR%%/distribution/gw/etc/templx
@dirrm %%DATADIR%%/distribution/gw/etc
@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
@dirrm %%DATADIR%%/distribution/gw/etc/templh
@dirrm %%DATADIR%%/distribution/gw/etc/templf
@dirrm %%DATADIR%%/distribution/gw/etc/templd
@dirrm %%DATADIR%%/distribution/gw/etc/templc
@dirrm %%DATADIR%%/distribution/gw/etc/templb
@dirrm %%DATADIR%%/distribution/gw/etc/templa
@dirrm %%DATADIR%%/distribution/gw/etc/templ502
@dirrm %%DATADIR%%/distribution/gw/etc/perso_module
@dirrm %%DATADIR%%/distribution/gw/etc
@dirrm %%DATADIR%%/distribution/gw/images/flags
@dirrm %%DATADIR%%/distribution/gw/images
@dirrm %%DATADIR%%/distribution/gw/lang
@dirrmtry %%DATADIR%%/distribution/gw/old
@dirrm %%DATADIR%%/distribution/gw/setup/lang
@dirrm %%DATADIR%%/distribution/gw/setup
@dirrm %%DATADIR%%/distribution/gw
@dirrm %%DATADIR%%/distribution
@dirrm %%DATADIR%%/etc/perso_module
@dirrm %%DATADIR%%/etc/templ502
@dirrm %%DATADIR%%/etc/templa
@dirrm %%DATADIR%%/etc/templb
@dirrm %%DATADIR%%/etc/templc
@dirrm %%DATADIR%%/etc/templd
@dirrm %%DATADIR%%/etc/templf
@dirrm %%DATADIR%%/etc/templh
@dirrm %%DATADIR%%/etc/templm
@dirrm %%DATADIR%%/etc/templx
@dirrm %%DATADIR%%/etc
@dirrm %%DATADIR%%/images/flags
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%/lang
@dirrm %%DATADIR%%
@exec mkdir -p %D/%%DATADIR%%/distribution/gw/old