 @@ -1,51 +1,53 @@
-# $NetBSD: Makefile,v 1.59 2008/02/11 00:56:42 dbj Exp $
+# $NetBSD: Makefile,v 1.60 2008/12/22 20:04:07 joerg Exp $
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "Makefile.common"
 CONFIGURE_ARGS+=	-no-tk
 CONFIGURE_ENV+=		disable_x11=yes
 BUILD_TARGET=		world
 MAKE_JOBS_SAFE=		no
 ###
 ### PLIST components
 ###
 # Stub libraries for functions missing from base system.
 .if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
     !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
     ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \
     ${OPSYS} == "Linux"
 PLIST_SRC+=	${PKGDIR}/PLIST.stub
 .endif
 # Optional components built only on certain platforms.
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 BUILD_TARGET+=	opt opt.opt
 PLIST_SRC+=	${PKGDIR}/PLIST.opt
 .  if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
       empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
 PLIST_SRC+=	${PKGDIR}/PLIST.prof
 .  endif
 .endif
 # Common ocaml files.
 PLIST_SRC+=	${PKGDIR}/PLIST
 # This is needed because ${WRKSRC}/build/partial-install.sh uses
 # $PWD as part of its script.  However, with /bin/sh on SunOS
 # (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
 # set before the cd takes place and is then passed down.  So the end
 # result is when ./build/partial-install.sh is called, PWD is set
 # to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}.  /bin/ksh, which
 # is what ${SH} is on SunOS, doesn't exhibit this behaviour.
 .if ${OPSYS} == "SunOS"
 INSTALL_MAKE_FLAGS+=	SHELL=${SH:Q}
 .endif
 .include "../../mk/bsd.pkg.mk"

 @@ -1,45 +1,48 @@
-# $NetBSD: Makefile.common,v 1.21 2008/04/25 07:13:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2008/12/22 20:04:07 joerg Exp $
 DISTNAME=	ocaml-3.10.2
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-3.10/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://caml.inria.fr/ocaml/
 COMMENT=	The latest implementation of the Caml dialect of ML
 DISTINFO_FILE=		${.CURDIR}/../../lang/ocaml/distinfo
 PATCHDIR=		${.CURDIR}/../../lang/ocaml/patches
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		BDB_LIBS=${BDB_LIBS:Q}
 CONFIGURE_ENV+=		BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
 CONFIGURE_ARGS+=	-prefix ${PREFIX}
 CONFIGURE_ARGS+=	-libs ${LDFLAGS:Q}
 CONFIGURE_ARGS+=	-with-pthread
 CONFIGURE_ARGS+=	-host ${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=	-mandir ${PREFIX}/${PKGMANDIR}
 CPPFLAGS+=		-DDB_DBM_HSEARCH
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX} \
 			MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 INSTALL_UNSTRIPPED=	yes
 .endif
 .include "../../mk/bdb.buildlink3.mk"
 post-extract: cp-power-bsd cp-gnu-config
 .PHONY: cp-power-bsd
 cp-power-bsd:
 	${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
 .PHONY: cp-gnu-config
 cp-gnu-config:
 	${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
 	${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
 .include "../../mk/pthread.buildlink3.mk"

 @@ -1,45 +1,49 @@
-# $NetBSD: Makefile,v 1.8 2008/04/12 22:43:15 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/12/22 20:04:07 joerg Exp $
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../lang/ocaml/Makefile.common"
 PKGNAME=		${DISTNAME:S/ocaml/ocaml-graphics/}
-PKGREVISION=		2
+PKGREVISION=		3
 COMMENT+=		(graphics library)
 CONFIGURE_ARGS+=	-x11include ${X11BASE}/include
 CONFIGURE_ARGS+=	-x11lib ${X11BASE}/lib
 CONFIGURE_ARGS+=	-no-tk
 BUILD_DIRS=		${WRKSRC}/otherlibs/graph
 BUILD_TARGET=		all
 INSTALL_TARGET=		install
 PLIST_VARS+=		opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
-    (${MACHINE_ARCH} == "sparc")
+    ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "x86_64"
 BUILD_TARGET+=		allopt
 INSTALL_TARGET+=	installopt
 PLIST.opt=		yes
 .endif
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 .if ${OPSYS} == "Darwin"
 PLIST_SRC+=	${PKGDIR}/PLIST.stub
 .endif
 BUILDLINK_DEPMETHOD.ocaml=	full
 SUBST_CLASSES+=		depend
 SUBST_STAGE.depend=	post-patch
 SUBST_FILES.depend=	otherlibs/graph/.depend
 SUBST_SED.depend=	-e 's,/usr/X11R6,${X11BASE},g'
 SUBST_MESSAGE.depend=	Fixing .depend in otherlibs/graph.
 INSTALLATION_DIRS+=	lib/ocaml/stublibs
 post-build:
 	@${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

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