Thu Mar 14 14:44:58 2013 UTC ()
PKGREVISIOn does not belong in Makefile.common.


(wiz)
diff -r1.84 -r1.85 pkgsrc/lang/ocaml/Makefile
diff -r1.36 -r1.37 pkgsrc/lang/ocaml/Makefile.common
cvs diff -r1.84 -r1.85 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2013/03/14 14:37:56 1.84
+++ pkgsrc/lang/ocaml/Makefile 2013/03/14 14:44:58 1.85
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.84 2013/03/14 14:37:56 is Exp $ 1# $NetBSD: Makefile,v 1.85 2013/03/14 14:44:58 wiz Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
 5PKGREVISION= 2
 6
5CONFIGURE_ARGS+= -no-tk 7CONFIGURE_ARGS+= -no-tk
6CONFIGURE_ARGS+= -cc ${CC} 8CONFIGURE_ARGS+= -cc ${CC}
7CONFIGURE_ENV+= disable_x11=yes 9CONFIGURE_ENV+= disable_x11=yes
8 10
9BUILD_TARGET= world 11BUILD_TARGET= world
10MAKE_JOBS_SAFE= no 12MAKE_JOBS_SAFE= no
11UNLIMIT_RESOURCES= stacksize 13UNLIMIT_RESOURCES= stacksize
12 14
13### 15###
14### PLIST components 16### PLIST components
15### 17###
16 18
17# Stub libraries for functions missing from base system. 19# Stub libraries for functions missing from base system.
cvs diff -r1.36 -r1.37 pkgsrc/lang/ocaml/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile.common 2013/03/14 14:37:56 1.36
+++ pkgsrc/lang/ocaml/Makefile.common 2013/03/14 14:44:58 1.37
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile.common,v 1.36 2013/03/14 14:37:56 is Exp $ 1# $NetBSD: Makefile.common,v 1.37 2013/03/14 14:44:58 wiz Exp $
2 2
3# used by x11/labltk/Makefile 3# used by x11/labltk/Makefile
4# used by x11/ocaml-graphics/Makefile 4# used by x11/ocaml-graphics/Makefile
5DISTNAME= ocaml-4.00.1 5DISTNAME= ocaml-4.00.1
6PKGREVISION= 2 
7CATEGORIES= lang 6CATEGORIES= lang
8MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.00/ 7MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.00/
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10 9
11MAINTAINER= jaapb@NetBSD.org 10MAINTAINER= jaapb@NetBSD.org
12HOMEPAGE= http://caml.inria.fr/ocaml/ 11HOMEPAGE= http://caml.inria.fr/ocaml/
13COMMENT= The latest implementation of the Caml dialect of ML 12COMMENT= The latest implementation of the Caml dialect of ML
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16USE_TOOLS+= gmake 15USE_TOOLS+= gmake
17HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
18CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q} 17CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
19CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q} 18CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}