Mon Dec 22 20:04:07 2008 UTC ()
Fix PLIST of ocaml-graphics for architectures not using the optimiser.
Add amd64 to that list. Bump revision of ocaml-graphics. Make ocaml
itself and ocaml-graphics destdir safe.


(joerg)
diff -r1.59 -r1.60 pkgsrc/lang/ocaml/Makefile
diff -r1.21 -r1.22 pkgsrc/lang/ocaml/Makefile.common
diff -r1.8 -r1.9 pkgsrc/x11/ocaml-graphics/Makefile
diff -r1.3 -r1.4 pkgsrc/x11/ocaml-graphics/PLIST
cvs diff -r1.59 -r1.60 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2008/02/11 00:56:42 1.59
+++ pkgsrc/lang/ocaml/Makefile 2008/12/22 20:04:07 1.60
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.59 2008/02/11 00:56:42 dbj Exp $ 1# $NetBSD: Makefile,v 1.60 2008/12/22 20:04:07 joerg Exp $
 2
 3PKG_DESTDIR_SUPPORT= user-destdir
2 4
3.include "Makefile.common" 5.include "Makefile.common"
4 6
5CONFIGURE_ARGS+= -no-tk 7CONFIGURE_ARGS+= -no-tk
6CONFIGURE_ENV+= disable_x11=yes 8CONFIGURE_ENV+= disable_x11=yes
7 9
8BUILD_TARGET= world 10BUILD_TARGET= world
9MAKE_JOBS_SAFE= no 11MAKE_JOBS_SAFE= no
10 12
11### 13###
12### PLIST components 14### PLIST components
13### 15###
14 16
cvs diff -r1.21 -r1.22 pkgsrc/lang/ocaml/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile.common 2008/04/25 07:13:39 1.21
+++ pkgsrc/lang/ocaml/Makefile.common 2008/12/22 20:04:07 1.22
@@ -1,38 +1,41 @@ @@ -1,38 +1,41 @@
1# $NetBSD: Makefile.common,v 1.21 2008/04/25 07:13:39 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.22 2008/12/22 20:04:07 joerg Exp $
2 2
3DISTNAME= ocaml-3.10.2 3DISTNAME= ocaml-3.10.2
4CATEGORIES= lang 4CATEGORIES= lang
5MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.10/ 5MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.10/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://caml.inria.fr/ocaml/ 9HOMEPAGE= http://caml.inria.fr/ocaml/
10COMMENT= The latest implementation of the Caml dialect of ML 10COMMENT= The latest implementation of the Caml dialect of ML
11 11
12DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo 12DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
13PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches 13PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
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_LIBS: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} \
 27 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 28
26.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
27 30
28.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" 31.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
29INSTALL_UNSTRIPPED= yes 32INSTALL_UNSTRIPPED= yes
30.endif 33.endif
31 34
32.include "../../mk/bdb.buildlink3.mk" 35.include "../../mk/bdb.buildlink3.mk"
33 36
34post-extract: cp-power-bsd cp-gnu-config 37post-extract: cp-power-bsd cp-gnu-config
35 38
36.PHONY: cp-power-bsd 39.PHONY: cp-power-bsd
37cp-power-bsd: 40cp-power-bsd:
38 ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S 41 ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
cvs diff -r1.8 -r1.9 pkgsrc/x11/ocaml-graphics/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-graphics/Makefile 2008/04/12 22:43:15 1.8
+++ pkgsrc/x11/ocaml-graphics/Makefile 2008/12/22 20:04:07 1.9
@@ -1,45 +1,49 @@ @@ -1,45 +1,49 @@
1# $NetBSD: Makefile,v 1.8 2008/04/12 22:43:15 jlam Exp $ 1# $NetBSD: Makefile,v 1.9 2008/12/22 20:04:07 joerg Exp $
 2
 3PKG_DESTDIR_SUPPORT= user-destdir
2 4
3.include "../../lang/ocaml/Makefile.common" 5.include "../../lang/ocaml/Makefile.common"
4 6
5PKGNAME= ${DISTNAME:S/ocaml/ocaml-graphics/} 7PKGNAME= ${DISTNAME:S/ocaml/ocaml-graphics/}
6PKGREVISION= 2 8PKGREVISION= 3
7 9
8COMMENT+= (graphics library) 10COMMENT+= (graphics library)
9 11
10CONFIGURE_ARGS+= -x11include ${X11BASE}/include 12CONFIGURE_ARGS+= -x11include ${X11BASE}/include
11CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib 13CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib
12CONFIGURE_ARGS+= -no-tk 14CONFIGURE_ARGS+= -no-tk
13 15
14BUILD_DIRS= ${WRKSRC}/otherlibs/graph 16BUILD_DIRS= ${WRKSRC}/otherlibs/graph
15BUILD_TARGET= all 17BUILD_TARGET= all
16INSTALL_TARGET= install 18INSTALL_TARGET= install
17 19
18PLIST_VARS+= opt 20PLIST_VARS+= opt
19.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 21.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
20 (${MACHINE_ARCH} == "sparc") 22 ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "x86_64"
21BUILD_TARGET+= allopt 23BUILD_TARGET+= allopt
22INSTALL_TARGET+= installopt 24INSTALL_TARGET+= installopt
23PLIST.opt= yes 25PLIST.opt= yes
24.endif 26.endif
25 27
26PLIST_SRC= ${WRKDIR}/.PLIST_SRC 28PLIST_SRC= ${WRKDIR}/.PLIST_SRC
27 29
28.if ${OPSYS} == "Darwin" 30.if ${OPSYS} == "Darwin"
29PLIST_SRC+= ${PKGDIR}/PLIST.stub 31PLIST_SRC+= ${PKGDIR}/PLIST.stub
30.endif 32.endif
31 33
32BUILDLINK_DEPMETHOD.ocaml= full 34BUILDLINK_DEPMETHOD.ocaml= full
33 35
34SUBST_CLASSES+= depend 36SUBST_CLASSES+= depend
35SUBST_STAGE.depend= post-patch 37SUBST_STAGE.depend= post-patch
36SUBST_FILES.depend= otherlibs/graph/.depend 38SUBST_FILES.depend= otherlibs/graph/.depend
37SUBST_SED.depend= -e 's,/usr/X11R6,${X11BASE},g' 39SUBST_SED.depend= -e 's,/usr/X11R6,${X11BASE},g'
38SUBST_MESSAGE.depend= Fixing .depend in otherlibs/graph. 40SUBST_MESSAGE.depend= Fixing .depend in otherlibs/graph.
39 41
 42INSTALLATION_DIRS+= lib/ocaml/stublibs
 43
40post-build: 44post-build:
41 @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC 45 @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
42 46
43.include "../../lang/ocaml/buildlink3.mk" 47.include "../../lang/ocaml/buildlink3.mk"
44.include "../../x11/libX11/buildlink3.mk" 48.include "../../x11/libX11/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/x11/ocaml-graphics/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-graphics/PLIST 2008/04/12 22:43:15 1.3
+++ pkgsrc/x11/ocaml-graphics/PLIST 2008/12/22 20:04:07 1.4
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.4 2008/12/22 20:04:07 joerg Exp $
2lib/ocaml/graphics.a 2${PLIST.opt}lib/ocaml/graphics.a
3lib/ocaml/graphics.cma 3lib/ocaml/graphics.cma
4lib/ocaml/graphics.cmi 4lib/ocaml/graphics.cmi
5${PLIST.opt}lib/ocaml/graphics.cmxa 5${PLIST.opt}lib/ocaml/graphics.cmxa
6lib/ocaml/graphics.mli 6lib/ocaml/graphics.mli
7lib/ocaml/graphicsX11.cmi 7lib/ocaml/graphicsX11.cmi
8lib/ocaml/graphicsX11.mli 8lib/ocaml/graphicsX11.mli
9lib/ocaml/libgraphics.a 9lib/ocaml/libgraphics.a
10lib/ocaml/stublibs/dllgraphics.so 10lib/ocaml/stublibs/dllgraphics.so
11@unexec ${RMDIR} %D/lib/ocaml/stublibs 2>/dev/null || ${TRUE} 11@unexec ${RMDIR} %D/lib/ocaml/stublibs 2>/dev/null || ${TRUE}
12@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE} 12@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}