Updated package to latest version, 1.0.0 (and changed distribution method).

Changes include:

ocaml-expat-1.0.0

  - New maintainer (whitequark@whitequark.org)
  - Support for the bytes type
  - Build system improvements to support cross-compilation and systems
    without shared libraries

3 files changed, 35 insertions, 32 deletions

diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile
index a3e295f7852..a39e3377b7c 100644
--- a/textproc/ocaml-expat/Makefile
+++ b/textproc/ocaml-expat/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.11 2016/12/30 11:17:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2017/07/11 12:38:24 jaapb Exp $
 #
 
-DISTNAME=	ocaml-expat-0.9.1
-PKGREVISION=	8
+VERSION=	1.0.0
+GITHUB_PROJECT=	ocaml-expat
+GITHUB_TAG=	v${VERSION}
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=	textproc
-MASTER_SITES=	http://mmzeeman.home.xs4all.nl/ocaml/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=whitequark/}
 
 MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	http://mmzeeman.home.xs4all.nl/ocaml/
+HOMEPAGE=	http://github.com/whitequark/ocaml-expat
 COMMENT=	OCaml bindings for the expat library
 LICENSE=	mit
 
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c
-BUILD_TARGET=	all
-
 OCAML_USE_FINDLIB=	yes
 
 .include "../../mk/ocaml.mk"
 
+BUILD_TARGET=	all
 .if (${OCAML_USE_OPT_COMPILER} == "yes")
-BUILD_TARGET+=	allopt expat.cmxs
+BUILD_TARGET+=	allopt
 .endif
 
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/textproc/ocaml-expat/distinfo b/textproc/ocaml-expat/distinfo
index aa757a56e76..cf9d12e8537 100644
--- a/textproc/ocaml-expat/distinfo
+++ b/textproc/ocaml-expat/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:59:41 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/07/11 12:38:24 jaapb Exp $
 
-SHA1 (ocaml-expat-0.9.1.tar.gz) = c0a65558cf996ac727fe5c61224d3e19dfd7d02a
-RMD160 (ocaml-expat-0.9.1.tar.gz) = be731eacff0a114d948cfaedfafe9b9fc6dc54e7
-SHA512 (ocaml-expat-0.9.1.tar.gz) = 0dca5bb3279e248acd76bc1b14511c58f2e60d8c40d806f3d270b6a47ab0e90efb636faed0dd8c34cf00a0b0834aa458421f4f9718d2a8c43dcf77854c11b3f4
-Size (ocaml-expat-0.9.1.tar.gz) = 25223 bytes
-SHA1 (patch-Makefile) = 3058f21e05c664dcb2799bdf987191876056c9cc
+SHA1 (ocaml-expat-1.0.0.tar.gz) = f46d64e9866252d3b7eff10341552c2f1172af5b
+RMD160 (ocaml-expat-1.0.0.tar.gz) = f740b013c512df105e011fa5bdd1c3c9ea37a0dd
+SHA512 (ocaml-expat-1.0.0.tar.gz) = 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897
+Size (ocaml-expat-1.0.0.tar.gz) = 58149 bytes
+SHA1 (patch-Makefile) = bf3e0693a0112e33c6561f70ebb1350639a1dfdc
diff --git a/textproc/ocaml-expat/patches/patch-Makefile b/textproc/ocaml-expat/patches/patch-Makefile
index f1a09ef3265..a764feeb29d 100644
--- a/textproc/ocaml-expat/patches/patch-Makefile
+++ b/textproc/ocaml-expat/patches/patch-Makefile
@@ -1,8 +1,9 @@
-$NetBSD: patch-Makefile,v 1.3 2013/06/16 09:45:19 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.4 2017/07/11 12:38:24 jaapb Exp $
 
 Correct location for expat, add DESTDIR support, and correct depend for clang
 Also, make possible compilation of shared library
---- Makefile.orig	2005-03-13 14:00:29.000000000 +0000
+
+--- Makefile.orig	2016-12-30 13:33:39.000000000 +0000
 +++ Makefile
 @@ -3,8 +3,8 @@
  
@@ -15,39 +16,40 @@ Also, make possible compilation of shared library
  
  NAME=expat
  OBJECTS=expat.cmo
-@@ -13,6 +13,7 @@ C_OBJECTS=expat_stubs.o
+@@ -13,6 +13,7 @@ C_OBJECTS=expat_stubs$(EXT_OBJ)
  
  ARCHIVE=$(NAME).cma
  XARCHIVE=$(ARCHIVE:.cma=.cmxa)
 +XSARCHIVE=$(ARCHIVE:.cma=.cmxs)
  CARCHIVE_NAME=mlexpat
- CARCHIVE=lib$(CARCHIVE_NAME).a
+ CARCHIVE=lib$(CARCHIVE_NAME)$(EXT_LIB)
  
-@@ -32,7 +33,7 @@ all: $(ARCHIVE)
- allopt:  $(XARCHIVE)
+@@ -32,10 +33,10 @@ include $(OCAMLDIR)/Makefile.config
+ .PHONY: all
+ all: $(ARCHIVE)
+ .PHONY: allopt
+-allopt:  $(XARCHIVE)
++allopt:  $(XARCHIVE) $(XSARCHIVE)
  
  depend: *.c *.ml *.mli
--	gcc -MM *.c > depend	
-+	$(CC) -MM -I$(PREFIX)/lib/ocaml *.c > depend	
+-	gcc -I $(OCAMLDIR) -MM *.c > depend
++	$(CC) -I $(OCAMLDIR) -MM *.c > depend
  	$(OCAMLDEP) *.mli *.ml >> depend
  
  ## Library creation
-@@ -45,12 +46,16 @@ $(ARCHIVE): $(CARCHIVE) $(OBJECTS)
+@@ -48,11 +49,14 @@ $(ARCHIVE): $(CARCHIVE) $(OBJECTS)
  $(XARCHIVE): $(CARCHIVE) $(XOBJECTS)
  	$(OCAMLMKLIB) -o $(NAME) $(XOBJECTS) -oc $(CARCHIVE_NAME) \
  	-L$(EXPAT_LIBDIR) $(EXPAT_LIB)
-+$(XSARCHIVE): $(XOBJECTS) $(CARCHIVE)
++$(XSARCHIVE): $(XARCHIVE)
 +	$(OCAMLOPT) -linkall -shared -o $(XSARCHIVE) $(XOBJECTS) $(CARCHIVE) \
 +	-ccopt -L$(EXPAT_LIBDIR) -cclib $(EXPAT_LIB)
  
  ## Installation
  .PHONY: install
  install: all
--	{ test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(NAME).a"; }; \
--	$(OCAMLFIND) install $(NAME) META $(NAME).cmi $(NAME).mli $(ARCHIVE) \
-+	{ test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(XSARCHIVE) $(NAME).a"; }; \
-+	$(OCAMLFIND) install -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib \
-+	-ldconf ignore $(NAME) META $(NAME).cmi $(NAME).mli $(ARCHIVE) \
- 	dll$(CARCHIVE_NAME).so lib$(CARCHIVE_NAME).a $$extra
- 
- .PHONY: uninstall
+-	{ test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(NAME)$(EXT_LIB)"; }; \
++	{ test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(XSARCHIVE) $(NAME)$(EXT_LIB)"; }; \
+ 	$(OCAMLFIND) install $(NAME) META $(NAME).cmi $(NAME).mli $(ARCHIVE) \
+ 	lib$(CARCHIVE_NAME)$(EXT_LIB) $$extra \
+ 	-optional dll$(CARCHIVE_NAME)$(EXT_DLL)