Updated package to version 1.05, which adds native support for ocaml-findlib.

6 files changed, 10 insertions, 66 deletions

diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile
index 7be1ebf8ad3..239ed091ad7 100644
--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2012/12/03 10:53:38 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2013/04/03 12:29:40 jaapb Exp $
 #
 
 PKGNAME=	ocaml-zip-${VERSION}
 DISTNAME=	camlzip-${VERSION}
-VERSION=	1.04
-PKGREVISION=	2
+VERSION=	1.05
 CATEGORIES=	archivers
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/328/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1037/
 LICENSE=	gnu-lgpl-v2.1
 
 MAINTAINER=	jaapb@kerguelen.org
@@ -14,6 +13,8 @@ HOMEPAGE=	http://forge.ocamlcore.org/projects/camlzip/
 COMMENT=	OCaml library to manipulate ZIP/GZIP/JAR archives
 
 BUILD_TARGET=	all
+INSTALL_TARGET=	install-findlib
+USE_TOOLS+=	gmake
 
 PLIST_VARS+=	opt
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
@@ -23,9 +24,6 @@ BUILD_TARGET+=	allopt
 PLIST.opt=	yes
 .endif
 
-post-extract:
-	${CP} ${FILESDIR}/META ${WRKSRC}/META
-
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ocaml-zip/PLIST b/archivers/ocaml-zip/PLIST
index a484d52c1d3..bce2b514ca8 100644
--- a/archivers/ocaml-zip/PLIST
+++ b/archivers/ocaml-zip/PLIST
@@ -1,18 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/16 11:50:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 12:29:40 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/zip
 lib/ocaml/site-lib/zip/META
 lib/ocaml/site-lib/zip/dllcamlzip.so
 lib/ocaml/site-lib/zip/gzip.cmi
-${PLIST.opt}lib/ocaml/site-lib/zip/gzip.cmx
 lib/ocaml/site-lib/zip/gzip.mli
 lib/ocaml/site-lib/zip/libcamlzip.a
 ${PLIST.opt}lib/ocaml/site-lib/zip/zip.a
 lib/ocaml/site-lib/zip/zip.cma
 lib/ocaml/site-lib/zip/zip.cmi
-${PLIST.opt}lib/ocaml/site-lib/zip/zip.cmx
 ${PLIST.opt}lib/ocaml/site-lib/zip/zip.cmxa
 lib/ocaml/site-lib/zip/zip.mli
 lib/ocaml/site-lib/zip/zlib.cmi
-${PLIST.opt}lib/ocaml/site-lib/zip/zlib.cmx
 lib/ocaml/site-lib/zip/zlib.mli
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/zip
diff --git a/archivers/ocaml-zip/PLIST.opt b/archivers/ocaml-zip/PLIST.opt
deleted file mode 100644
index e6ca327c9bc..00000000000
--- a/archivers/ocaml-zip/PLIST.opt
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2008/09/02 11:45:32 obache Exp $
-lib/ocaml/site-lib/zip/gzip.cmx
-lib/ocaml/site-lib/zip/zip.a
-lib/ocaml/site-lib/zip/zip.cmx
-lib/ocaml/site-lib/zip/zip.cmxa
-lib/ocaml/site-lib/zip/zlib.cmx
diff --git a/archivers/ocaml-zip/distinfo b/archivers/ocaml-zip/distinfo
index cfdfd57fa9f..7568eb85af8 100644
--- a/archivers/ocaml-zip/distinfo
+++ b/archivers/ocaml-zip/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/08/16 11:50:46 wiz Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 12:29:40 jaapb Exp $
 
-SHA1 (camlzip-1.04.tar.gz) = 43660307fba6243bf2e2e0c8c6ac078477c9d9f9
-RMD160 (camlzip-1.04.tar.gz) = 37a1aae1f84ee30c5f2f0ee2e4b603bf2b5bf397
-Size (camlzip-1.04.tar.gz) = 25691 bytes
-SHA1 (patch-aa) = e642f1187f5d4809b05775f1aa30c56abe2df006
+SHA1 (camlzip-1.05.tar.gz) = 0c32485958dd1a9c18f6f0abe1d2bf8e62caef74
+RMD160 (camlzip-1.05.tar.gz) = f54260638f4bbf43275907285d811a319077c0c8
+Size (camlzip-1.05.tar.gz) = 25817 bytes
diff --git a/archivers/ocaml-zip/files/META b/archivers/ocaml-zip/files/META
deleted file mode 100644
index 738476a495d..00000000000
--- a/archivers/ocaml-zip/files/META
+++ /dev/null
@@ -1,7 +0,0 @@
-name="camlzip"
-version="1.04"
-description="reading and writing ZIP, JAR and GZIP files"
-requires="unix"
-archive(byte)="zip.cma"
-archive(native)="zip.cmxa"
-linkopts = ""
diff --git a/archivers/ocaml-zip/patches/patch-aa b/archivers/ocaml-zip/patches/patch-aa
deleted file mode 100644
index a6002ce1f8c..00000000000
--- a/archivers/ocaml-zip/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2012/08/16 11:50:46 wiz Exp $
-
-Install in correct location using ocamlfind
---- Makefile.orig	2002-04-22 15:28:57.000000000 +0000
-+++ Makefile
-@@ -11,7 +11,7 @@ ZLIB_INCLUDE=/usr/local/include
- 
- # Where to install the library.  By default: sub-directory 'zip' of
- # OCaml's standard library directory.
--INSTALLDIR=`$(OCAMLC) -where`/zip
-+INSTALLDIR=`$(OCAMLC) -where`/site-lib
- 
- ### End of configuration section
- 
-@@ -55,18 +55,10 @@ clean:
- 	rm -f *.o *.a
- 
- install:
--	mkdir -p $(INSTALLDIR)
--	cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
--	if test -f dllcamlzip.so; then \
--	  cp dllcamlzip.so $(INSTALLDIR); \
--          ldconf=`$(OCAMLC) -where`/ld.conf; \
--          installdir=$(INSTALLDIR); \
--          if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \
--          then echo $$installdir >> $$ldconf; fi \
--        fi
--
--installopt:
--	cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR)
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INSTALLDIR)
-+	ocamlfind install -ldconf /dev/null -destdir ${DESTDIR}$(INSTALLDIR) -optional zip META zip.cma zip.cmi gzip.cmi zip.mli \
-+	gzip.mli libcamlzip.a dllcamlzip.so zip.cmxa zip.a zip.cmx gzip.cmx \
-+	zlib.mli zlib.cmi zlib.cmx
- 
- depend:
- 	gcc -MM -I$(ZLIB_INCLUDE) *.c > .depend