Fri Jun 22 11:36:10 2012 UTC ()
When linking with a non-builtin BDB an rpath to it libdir is needed.

Bump PKGREVISION.


(sbd)
diff -r1.77 -r1.78 pkgsrc/lang/ocaml/Makefile
diff -r1.32 -r1.33 pkgsrc/lang/ocaml/Makefile.common
cvs diff -r1.77 -r1.78 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2012/03/12 12:28:04 1.77
+++ pkgsrc/lang/ocaml/Makefile 2012/06/22 11:36:10 1.78
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.77 2012/03/12 12:28:04 fhajny Exp $ 1# $NetBSD: Makefile,v 1.78 2012/06/22 11:36:10 sbd Exp $
 2
 3PKGREVISION= 1
2 4
3PKG_DESTDIR_SUPPORT= user-destdir 5PKG_DESTDIR_SUPPORT= user-destdir
4 6
5.include "Makefile.common" 7.include "Makefile.common"
6 8
7CONFIGURE_ARGS+= -no-tk 9CONFIGURE_ARGS+= -no-tk
8CONFIGURE_ARGS+= -cc ${CC} 10CONFIGURE_ARGS+= -cc ${CC}
9CONFIGURE_ENV+= disable_x11=yes 11CONFIGURE_ENV+= disable_x11=yes
10 12
11BUILD_TARGET= world 13BUILD_TARGET= world
12MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
13UNLIMIT_RESOURCES= stacksize 15UNLIMIT_RESOURCES= stacksize
14 16
cvs diff -r1.32 -r1.33 pkgsrc/lang/ocaml/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile.common 2012/03/04 09:06:46 1.32
+++ pkgsrc/lang/ocaml/Makefile.common 2012/06/22 11:36:10 1.33
@@ -1,50 +1,55 @@ @@ -1,50 +1,55 @@
1# $NetBSD: Makefile.common,v 1.32 2012/03/04 09:06:46 asau Exp $ 1# $NetBSD: Makefile.common,v 1.33 2012/06/22 11:36:10 sbd 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-3.12.1 5DISTNAME= ocaml-3.12.1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.12/ 7MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.12/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= adam@NetBSD.org 10MAINTAINER= adam@NetBSD.org
11HOMEPAGE= http://caml.inria.fr/ocaml/ 11HOMEPAGE= http://caml.inria.fr/ocaml/
12COMMENT= The latest implementation of the Caml dialect of ML 12COMMENT= The latest implementation of the Caml dialect of ML
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q} 17CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
18CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q} 18CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
19CONFIGURE_ARGS+= -prefix ${PREFIX} 19CONFIGURE_ARGS+= -prefix ${PREFIX}
20CONFIGURE_ARGS+= -libs ${LDFLAGS:Q} 20CONFIGURE_ARGS+= -libs ${LDFLAGS:Q}
21CONFIGURE_ARGS+= -with-pthread 21CONFIGURE_ARGS+= -with-pthread
22CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q} 22CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
23CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} 23CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR}
24CPPFLAGS+= -DDB_DBM_HSEARCH 24CPPFLAGS+= -DDB_DBM_HSEARCH
25 25
26INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ 26INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \
27 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} 27 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
28DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo 28DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
29PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches 29PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
30 30
31.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
32 32
33.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" 33.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
34INSTALL_UNSTRIPPED= yes 34INSTALL_UNSTRIPPED= yes
35.endif 35.endif
36 36
37.include "../../mk/bdb.buildlink3.mk" 37.include "../../mk/bdb.buildlink3.mk"
38 38
 39BDB_LINK= ${BDB_LIBS}
 40.if empty(BDBBASE:M/usr)
 41BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
 42.endif
 43
39post-extract: cp-power-bsd cp-gnu-config 44post-extract: cp-power-bsd cp-gnu-config
40 45
41.PHONY: cp-power-bsd 46.PHONY: cp-power-bsd
42cp-power-bsd: 47cp-power-bsd:
43 ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S 48 ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
44 49
45.PHONY: cp-gnu-config 50.PHONY: cp-gnu-config
46cp-gnu-config: 51cp-gnu-config:
47 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/ 52 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
48 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/ 53 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
49 54
50.include "../../mk/pthread.buildlink3.mk" 55.include "../../mk/pthread.buildlink3.mk"