Sat Dec 31 09:15:00 2016 UTC ()
More seddery. Now it builds for me.


(dholland)
diff -r1.29 -r1.30 pkgsrc/x11/ocaml-graphics/Makefile
cvs diff -r1.29 -r1.30 pkgsrc/x11/ocaml-graphics/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-graphics/Makefile 2016/12/31 08:09:14 1.29
+++ pkgsrc/x11/ocaml-graphics/Makefile 2016/12/31 09:15:00 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2016/12/31 08:09:14 dholland Exp $ 1# $NetBSD: Makefile,v 1.30 2016/12/31 09:15:00 dholland Exp $
2 2
3.include "../../lang/ocaml/Makefile.common" 3.include "../../lang/ocaml/Makefile.common"
4DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo 4DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo
5PATCHDIR= ${PKGDIR}/../../lang/ocaml/patches 5PATCHDIR= ${PKGDIR}/../../lang/ocaml/patches
6 6
7PKGNAME= ${DISTNAME:S/ocaml/ocaml-graphics/} 7PKGNAME= ${DISTNAME:S/ocaml/ocaml-graphics/}
8PKGREVISION= 6 8PKGREVISION= 6
9 9
10COMMENT+= (graphics library) 10COMMENT+= (graphics library)
11 11
12CONFIGURE_ARGS+= -x11include ${X11BASE}/include 12CONFIGURE_ARGS+= -x11include ${X11BASE}/include
13CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib 13CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib
14 14
@@ -49,22 +49,29 @@ SUBST_SED.depend= -e 's,/usr/X11R6,${X11 @@ -49,22 +49,29 @@ SUBST_SED.depend= -e 's,/usr/X11R6,${X11
49SUBST_MESSAGE.depend= Fixing .depend in otherlibs/graph. 49SUBST_MESSAGE.depend= Fixing .depend in otherlibs/graph.
50 50
51SUBST_CLASSES+= mklib 51SUBST_CLASSES+= mklib
52SUBST_STAGE.mklib= post-patch 52SUBST_STAGE.mklib= post-patch
53SUBST_FILES.mklib= otherlibs/Makefile.shared 53SUBST_FILES.mklib= otherlibs/Makefile.shared
54SUBST_SED.mklib= -e 's,^MKLIB=.*,MKLIB=ocamlmklib,g' 54SUBST_SED.mklib= -e 's,^MKLIB=.*,MKLIB=ocamlmklib,g'
55SUBST_MESSAGE.mklib= Fixing MKLIB in otherlibs/Makefile.shared. 55SUBST_MESSAGE.mklib= Fixing MKLIB in otherlibs/Makefile.shared.
56 56
57SUBST_CLASSES+= comp 57SUBST_CLASSES+= comp
58SUBST_STAGE.comp= post-patch 58SUBST_STAGE.comp= post-patch
59SUBST_FILES.comp= otherlibs/Makefile 59SUBST_FILES.comp= otherlibs/Makefile
60SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g' 60SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g'
61SUBST_SED.comp+= -e '/^CAMLOPT=/{;N;s,^CAMLOPT=.*,CAMLOPT=ocamlopt,g;}' 61SUBST_SED.comp+= -e '/^CAMLOPT=/{;N;s,^CAMLOPT=.*,CAMLOPT=ocamlopt,g;}'
62SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT in otherlibs/Makefile. 62SUBST_SED.comp+= -e 's,^MKLIB=.*,MKLIB=ocamlmklib,g'
 63SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT MKLIB in otherlibs/Makefile.
 64
 65SUBST_CLASSES+= comp2
 66SUBST_STAGE.comp2= post-patch
 67SUBST_FILES.comp2= otherlibs/graph/Makefile
 68SUBST_SED.comp2= -e 's,..CAMLRUN..*ocamldep,ocamldep,g'
 69SUBST_MESSAGE.comp2= Fixing ocamldep in otherlibs/graph/Makefile.
63 70
64INSTALLATION_DIRS+= lib/ocaml/stublibs 71INSTALLATION_DIRS+= lib/ocaml/stublibs
65 72
66post-build: 73post-build:
67 ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC 74 ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
68 75
69.include "../../x11/libX11/buildlink3.mk" 76.include "../../x11/libX11/buildlink3.mk"
70.include "../../mk/bsd.pkg.mk" 77.include "../../mk/bsd.pkg.mk"