summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2012-08-16 11:50:46 +0000
committerwiz <wiz@pkgsrc.org>2012-08-16 11:50:46 +0000
commit5de979287744e394ee76fa7ef7c84e5cac7c1ec0 (patch)
treea6155c39d3a10049bd10dd91d87d79eda2751f70 /archivers
parent305750385799ddddadc72c767e795ef4660c66ac (diff)
downloadpkgsrc-5de979287744e394ee76fa7ef7c84e5cac7c1ec0.tar.gz
Update to 1.04, provided by Jaap Boender in PR 46805:
This is an upgrade to the latest version. Changes include: - Added function Zip.add_entry_generator. (Contributed by A. Frisch.) - The "level" optional argument was sometimes not honored; fixed. - Relicensed under LGPL 2.1 or above, with Caml's special exception for static linking. The package itself has been revamped as well, with destdir support, use of PLIST_VARS, and some more minor improvements. It's also been tested to work with ocaml 4.00.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/ocaml-zip/Makefile24
-rw-r--r--archivers/ocaml-zip/PLIST7
-rw-r--r--archivers/ocaml-zip/distinfo10
-rw-r--r--archivers/ocaml-zip/patches/patch-aa3
4 files changed, 24 insertions, 20 deletions
diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile
index d4edddee306..eca0a4ebc54 100644
--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@@ -1,33 +1,31 @@
-# $NetBSD: Makefile,v 1.3 2011/12/06 00:19:22 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/16 11:50:46 wiz Exp $
#
-DISTNAME= camlzip-${VERSION}
PKGNAME= ocaml-zip-${VERSION}
-VERSION= 1.03
-PKGREVISION= 1
+DISTNAME= camlzip-${VERSION}
+VERSION= 1.04
CATEGORIES= archivers
-MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/
+MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/328/
+LICENSE= gnu-lgpl-v2.1
MAINTAINER= jaapb@kerguelen.org
-HOMEPAGE= http://cristal.inria.fr/~xleroy/software.html
+HOMEPAGE= http://forge.ocamlcore.org/projects/camlzip/
COMMENT= OCaml library to manipulate ZIP/GZIP/JAR archives
-PKG_DESTDIR_SUPPORT= user-destdir
-
-DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
BUILD_TARGET= all
+PKG_DESTDIR_SUPPORT= user-destdir
+
+PLIST_VARS+= opt
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
(${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
BUILD_TARGET+= allopt
-PLIST_SRC+= PLIST.opt
+PLIST.opt= yes
.endif
-PLIST_SRC+= PLIST
-
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 5936a6fb8b9..a484d52c1d3 100644
--- a/archivers/ocaml-zip/PLIST
+++ b/archivers/ocaml-zip/PLIST
@@ -1,13 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:28:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/08/16 11:50:46 wiz 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/distinfo b/archivers/ocaml-zip/distinfo
index 70446256c3d..cfdfd57fa9f 100644
--- a/archivers/ocaml-zip/distinfo
+++ b/archivers/ocaml-zip/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2010/02/19 22:21:30 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/08/16 11:50:46 wiz Exp $
-SHA1 (camlzip-1.03.tar.gz) = ecb4cbbdeb673d0aacdc961f38e4a14d5cf1627b
-RMD160 (camlzip-1.03.tar.gz) = fc773c0e351863538817f5c803a1b1d6cf9bc6e5
-Size (camlzip-1.03.tar.gz) = 24562 bytes
-SHA1 (patch-aa) = e92713ef987d368403dfae6b34a9af0387b48cab
+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
diff --git a/archivers/ocaml-zip/patches/patch-aa b/archivers/ocaml-zip/patches/patch-aa
index 37faea9e260..a6002ce1f8c 100644
--- a/archivers/ocaml-zip/patches/patch-aa
+++ b/archivers/ocaml-zip/patches/patch-aa
@@ -1,5 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2010/02/19 22:21:30 joerg Exp $
+$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