Tue Jun 11 14:52:40 2013 UTC ()
- Patched package to compile with new version of net/ocamlnet


(jaapb)
diff -r1.2 -r1.3 pkgsrc/textproc/ocaml-tyxml/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/ocaml-tyxml/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/textproc/ocaml-tyxml/patches/patch-lib_Makefile
cvs diff -r1.2 -r1.3 pkgsrc/textproc/ocaml-tyxml/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-tyxml/distinfo 2012/12/14 14:44:53 1.2
+++ pkgsrc/textproc/ocaml-tyxml/distinfo 2013/06/11 14:52:39 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2012/12/14 14:44:53 jaapb Exp $ 1$NetBSD: distinfo,v 1.3 2013/06/11 14:52:39 jaapb Exp $
2 2
3SHA1 (tyxml-2.2.0.tar.gz) = b60fa2f0ba7fa1a6c412c432f65ca110b143bbe8 3SHA1 (tyxml-2.2.0.tar.gz) = b60fa2f0ba7fa1a6c412c432f65ca110b143bbe8
4RMD160 (tyxml-2.2.0.tar.gz) = 8cd613dbf1bbe6f439a5c5001b812288081aa3c8 4RMD160 (tyxml-2.2.0.tar.gz) = 8cd613dbf1bbe6f439a5c5001b812288081aa3c8
5Size (tyxml-2.2.0.tar.gz) = 105748 bytes 5Size (tyxml-2.2.0.tar.gz) = 105748 bytes
6SHA1 (patch-Makefile) = b272c7b9adec929c5f79085cf58ce0b4d02a870c 6SHA1 (patch-Makefile) = 4cb1aeac6a3eda3b0d010dd66472c9119e0cf481
 7SHA1 (patch-lib_Makefile) = 8b8b2ca1ebaea07480e82523d3ca56a11439ebf2
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/ocaml-tyxml/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-tyxml/patches/Attic/patch-Makefile 2012/06/04 13:13:15 1.1.1.1
+++ pkgsrc/textproc/ocaml-tyxml/patches/Attic/patch-Makefile 2013/06/11 14:52:40 1.2
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: patch-Makefile,v 1.1.1.1 2012/06/04 13:13:15 wiz Exp $ 1$NetBSD: patch-Makefile,v 1.2 2013/06/11 14:52:40 jaapb Exp $
2 2
3Changes to Makefile for DESTDIR support 3--- Makefile.orig 2012-12-07 15:15:22.000000000 +0000
4--- Makefile.orig 2012-02-24 18:16:01.000000000 +0000 
5+++ Makefile 4+++ Makefile
6@@ -53,18 +53,18 @@ files/META.tyxml: files/META.in Makefile 5@@ -52,19 +52,20 @@ files/META.tyxml: files/META.in Makefile
 6 $< > $@
7  7
8 install: 8 install:
 9+ mkdir -p ${INSTALLDIR}
9 $(OCAMLFIND) install ${PACKAGENAME} \ 10 $(OCAMLFIND) install ${PACKAGENAME} \
10- -patch-version ${VERSION} \ 11- -patch-version ${VERSION} \
11+ -patch-version ${VERSION} -destdir ${INSTALLDIR} \ 12+ -patch-version ${VERSION} -destdir ${INSTALLDIR} \
12 files/META ${INTF} ${IMPL} ${NATIMPL} \ 13 files/META ${INTF} ${IMPL} ${NATIMPL} \
13 ${MLI_TO_INSTALL} 14 ${MLI_TO_INSTALL}
14  15
15 install-byte: 16 install-byte:
16 $(OCAMLFIND) install ${PACKAGENAME} \ 17 $(OCAMLFIND) install ${PACKAGENAME} \
17- -patch-version ${VERSION} \ 18- -patch-version ${VERSION} \
18+ -patch-version ${VERSION} -destdir ${INSTALLDIR} \ 19+ -patch-version ${VERSION} -destdir ${INSTALLDIR} \
19 files/META ${INTF} ${IMPL} ${MLI_TO_INSTALL} 20 files/META ${INTF} ${IMPL} ${MLI_TO_INSTALL}
20  21
21 install-opt: 22 install-opt:
File Added: pkgsrc/textproc/ocaml-tyxml/patches/Attic/patch-lib_Makefile
$NetBSD: patch-lib_Makefile,v 1.1 2013/06/11 14:52:40 jaapb Exp $

--- lib/Makefile.orig	2012-12-07 15:15:22.000000000 +0000
+++ lib/Makefile
@@ -13,7 +13,7 @@ DUCE_INTF  := xml_sigs_duce.mli xhtml_ty
 
 DUCE_FILES := xml_print_duce.ml xhtml_duce.ml
 
-LIBS     := -package netstring
+LIBS     := -package netstring,netstring-pcre
 
 # SYNTAX := -ppopt ../syntax/pa_include.cmo -package camlp4 -syntax camlp4o