CVS commit: pkgsrc/net/unison2.51

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Oct 28 20:02:29 UTC 2019

Modified Files:
        pkgsrc/net/unison2.51: Makefile options.mk

Log Message:
net/unison2.51: Clean up BUILDLINK_API_DEPENDS

Drop ocaml declarations as they are ancient (3.x!).

Move ocaml-lablgtk decl to options.mk where the bl3 is included, for
tidyness and readability.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/unison2.51/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/unison2.51/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/unison2.51/Makefile
diff -u pkgsrc/net/unison2.51/Makefile:1.16 pkgsrc/net/unison2.51/Makefile:1.17
--- pkgsrc/net/unison2.51/Makefile:1.16 Mon Oct 28 19:59:29 2019
+++ pkgsrc/net/unison2.51/Makefile      Mon Oct 28 20:02:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/10/28 19:59:29 gdt Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/28 20:02:29 gdt Exp $
 
 # This package is "unison-2.51.x" because 2.51 is the standard
 # approach, and hence uses the bare name.
@@ -17,13 +17,6 @@ LICENSE=     gnu-gpl-v3
 # Error: Unbound module Prefs
 #MAKE_JOBS_SAFE=       no
 
-.if (${MACHINE_ARCH} == "arm")
-BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=3.12.0nb2
-.else
-BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=3.11.2
-.endif
-BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
-
 # docs: unison-manual.pdf/html/ps/dvi
 #WRKSRC=               ${WRKDIR}/src
 USE_TOOLS+=    gmake

Index: pkgsrc/net/unison2.51/options.mk
diff -u pkgsrc/net/unison2.51/options.mk:1.1 pkgsrc/net/unison2.51/options.mk:1.2
--- pkgsrc/net/unison2.51/options.mk:1.1        Mon Apr 30 10:14:29 2018
+++ pkgsrc/net/unison2.51/options.mk    Mon Oct 28 20:02:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/04/30 10:14:29 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/10/28 20:02:29 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.unison
 PKG_SUPPORTED_OPTIONS= lablgtk
@@ -7,7 +7,10 @@ PKG_SUPPORTED_OPTIONS= lablgtk
 
 .if !empty(PKG_OPTIONS:Mlablgtk)
 MAKE_FLAGS+=   UISTYLE=gtk2
+BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
+
 DEPENDS+=      font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
+
 .include "../../x11/ocaml-lablgtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .else