CVS commit: pkgsrc/databases/geneweb

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Sep 11 04:34:09 UTC 2016

Modified Files:
        pkgsrc/databases/geneweb: distinfo
Added Files:
        pkgsrc/databases/geneweb/patches: patch-src_Makefile

Log Message:
Fix broken build with latest camlp4.

XXX: this package has an abusive do-install rule.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/geneweb/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/geneweb/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/geneweb/distinfo
diff -u pkgsrc/databases/geneweb/distinfo:1.17 pkgsrc/databases/geneweb/distinfo:1.18
--- pkgsrc/databases/geneweb/distinfo:1.17      Tue Nov  3 01:56:11 2015
+++ pkgsrc/databases/geneweb/distinfo   Sun Sep 11 04:34:09 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 01:56:11 agc Exp $
+$NetBSD: distinfo,v 1.18 2016/09/11 04:34:09 dholland Exp $
 
 SHA1 (geneweb-5.01.tgz) = 4443b12d88cc8a6fa04ae903ace3f7bdb384d40e
 RMD160 (geneweb-5.01.tgz) = 75507bb35df74b92becc8514c9ad82c8f4ef886e
@@ -7,6 +7,7 @@ Size (geneweb-5.01.tgz) = 1388008 bytes
 SHA1 (patch-ac) = cf35956939ab1ce57cac2a4261f892b0a34cb053
 SHA1 (patch-ad) = 83bdd42cc3229257b9eca3433c2f09b315b5e53d
 SHA1 (patch-ged2gwb_ged2gwb.ml) = 28261aadb7b129297582105d491b79fc8c8c86e8
+SHA1 (patch-src_Makefile) = 7ac778789078eb370eb1e17e8b30c02d66bb4e41
 SHA1 (patch-src_dag.ml) = a0dfc2d6f6de185ac3786dfe4ba604f141397879
 SHA1 (patch-src_date.ml) = c69a0c0976e03cef7314d00fdbedcbf8cef7c75d
 SHA1 (patch-src_gwd.ml) = c165a4eb563b44e562f572714ab0ae5ba6af75c6

Added files:

Index: pkgsrc/databases/geneweb/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/databases/geneweb/patches/patch-src_Makefile:1.1
--- /dev/null   Sun Sep 11 04:34:09 2016
+++ pkgsrc/databases/geneweb/patches/patch-src_Makefile Sun Sep 11 04:34:09 2016
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_Makefile,v 1.1 2016/09/11 04:34:09 dholland Exp $
+
+Remove diff.cmo from the gwc and gwd builds, as it conflicts with a
+module of the same name that comes with camlp5. Use the camlp5 one
+instead; it's the same code.
+
+--- src/Makefile.orig  2007-09-12 09:58:44.000000000 +0000
++++ src/Makefile
+@@ -4,10 +4,10 @@ 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 gwc.cmo
++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 outbase.cmo gwdb.cmo pqueue.cmo progrBar.cmo 
consang.cmo consangAll.cmo checkItem.cmo check.cmo calendar.cmo notesLinks.cmo gwcomp.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 gwc2.cmo
+ CONSANG_OBJS=argl.cmo lock.cmo adef.cmo iovalue.cmo buff.cmo name.cmo mutil.cmo secure.cmo btree.cmo futil.cmo dutil.cmo progrBar.cmo database.cmo db2.cmo db2disk.cmo db2out.cmo diff.cmo 
outbase.cmo gwdb.cmo pqueue.cmo consang.cmo consangAll.cmo mk_consang.cmo
+-GWD_OBJS1=../wserver/wserver.cmo ../dag2html/dag2html.cmo 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 gwdb.cmo checkItem.cmo gutil.cmo pqueue.cmo consang.cmo num.cmo version.cmo translate.cmo gwlib.cmo notesLinks.cmo util.cmo calendar.cmo templDate.cmo templ.cmo hutil.cmo 
date.cmo update.cmo wiki.cmo history.cmo notes.cmo wiznotes.cmo srcfile.cmo dag.cmo perso.cmo updateInd.cmo updateIndOk.cmo updateFam.cmo updateFamOk.cmo place.cmo
++GWD_OBJS1=../wserver/wserver.cmo ../dag2html/dag2html.cmo 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 gwdb.cmo checkItem.cmo gutil.cmo pqueue.cmo consang.cmo num.cmo version.cmo translate.cmo gwlib.cmo notesLinks.cmo util.cmo calendar.cmo templDate.cmo templ.cmo hutil.cmo date.cmo 
update.cmo wiki.cmo history.cmo notes.cmo wiznotes.cmo srcfile.cmo dag.cmo perso.cmo updateInd.cmo updateIndOk.cmo updateFam.cmo updateFamOk.cmo place.cmo
+ GWD_OBJS2=merge.cmo mergeFamOk.cmo mergeFam.cmo mergeInd.cmo mergeIndOk.cmo mergeDup.cmo changeChildren.cmo sendImage.cmo relationLink.cmo relation.cmo descend.cmo birthday.cmo cousins.cmo alln.cmo 
some.cmo advSearchOk.cmo birthDeath.cmo title.cmo doc.cmo forum.cmo image.cmo request.cmo base64.cmo robot.cmo
+ GWD_OBJS=$(GWD_OBJS1) $(GWD_OBJS2) compilation.cmo gwd.cmo
+ GWU_OBJS=argl.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 gwdb.cmo checkItem.cmo gutil.cmo select.cmo 
calendar.cmo notesLinks.cmo progrBar.cmo gwu.cmo