summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorjaapb <jaapb>2016-06-25 14:15:05 +0000
committerjaapb <jaapb>2016-06-25 14:15:05 +0000
commit575c285aa999708aaa8e9a3ee51c102e4d31fe4d (patch)
treebefab11147ddb11b95a05d49a30dae39208407ff /archivers
parent8c0c1372fb7300115af97f5a6a98bd250bb92162 (diff)
downloadpkgsrc-575c285aa999708aaa8e9a3ee51c102e4d31fe4d.tar.gz
Updated package to use ocaml.mk framework. No upstream changes.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/ocaml-bz2/Makefile15
-rw-r--r--archivers/ocaml-bz2/PLIST4
2 files changed, 5 insertions, 14 deletions
diff --git a/archivers/ocaml-bz2/Makefile b/archivers/ocaml-bz2/Makefile
index d8de41840db..e679d35e0ec 100644
--- a/archivers/ocaml-bz2/Makefile
+++ b/archivers/ocaml-bz2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2016/05/05 11:45:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/25 14:15:05 jaapb Exp $
PKGNAME= ocaml-bz2-${VERSION}
DISTNAME= camlbz2-${VERSION}
VERSION= 0.6.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= archivers
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/72/
@@ -15,17 +15,10 @@ LICENSE= gnu-lgpl-v2.1
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
MAKE_JOBS_SAFE= no
+OCAML_USE_FINDLIB= yes
+.include "../../mk/ocaml.mk"
.include "../../mk/bsd.prefs.mk"
-PLIST_VARS+= opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
- (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
- (${MACHINE_ARCH} == "arm")
-PLIST.opt= yes
-.endif
-
.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ocaml-bz2/PLIST b/archivers/ocaml-bz2/PLIST
index 7fbc7f80425..9f15c4353f7 100644
--- a/archivers/ocaml-bz2/PLIST
+++ b/archivers/ocaml-bz2/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/09/16 12:30:46 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/bz2
+@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:15:05 jaapb Exp $
lib/ocaml/site-lib/bz2/META
${PLIST.opt}lib/ocaml/site-lib/bz2/bz2.a
lib/ocaml/site-lib/bz2/bz2.cma
@@ -9,4 +8,3 @@ lib/ocaml/site-lib/bz2/bz2.cmi
lib/ocaml/site-lib/bz2/bz2.mli
lib/ocaml/site-lib/bz2/dllcamlbz2.so
lib/ocaml/site-lib/bz2/libcamlbz2.a
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/bz2