pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: non-DESTDIR status: still 46 to go



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

Please find attached a set of files and patches for advi.  It is an
update to 1.10.1 with DESTDIR support, texlive instead of teTeX 3 and
GTK 2 only (with x11/lablgtk)

Here are the details:

- - x11_lablgtk_META_file.patch updates x11/lablgtk to install the META
file used by ocaml-findlib to locate it when needed by other OCaml stuff

- - x11_ocaml-graphics_fix_PLIST_var.patch fixed the PLIST for NetBSD
where lib/ocaml/stublibs/dlllablgtk2.so is build as well

- - graphics_camlimages-4.0.1.patch updates graphics/camlimages to version
4.0.1, which is a required by print/advi.  The tarball
graphics_camlimages-4.0.1_new_files.tgz contains the new patch files for
it, the following files are no longer needed:

graphics/camlimages/PLIST.opt
graphics/camlimages/patches/patch-aa
graphics/camlimages/patches/patch-ac
graphics/camlimages/patches/patch-ad
graphics/camlimages/patches/patch-png_pngread.c
graphics/camlimages/patches/patch-png_pngwrite.c

- - print_advi-1.10.1.patch updates print/advi to 1.10.1, with the new
patch files in print_advi-1.10.1_new_files.tgz. the following files are
no longer needed:

print/advi/patches/patch-aa
print/advi/patches/patch-ab
print/advi/patches/patch-ac
print/advi/patches/patch-ad
print/advi/patches/patch-ae
print/advi/patches/patch-af
print/advi/patches/patch-ag
print/advi/patches/patch-ah
print/advi/patches/patch-ai
print/advi/patches/patch-aj
print/advi/patches/patch-ak
print/advi/patches/patch-al
print/advi/patches/patch-am
print/advi/patches/patch-an

Regards,
Nicolas

On 07.08.2011 13:55, Thomas Klausner wrote:
> Hi!
> 
> No change since last week, still 46 to go.
> 
> ArX-2.2.4nb15
> advi-1.6.0nb11
> aqsis-0.6.4nb8
> arla-0.43nb2
> cross-i386-cygwin32-1.0.0.0nb3
> cross-i386-linux-2.0.7.1nb2
> cross-i386-msdosdjgpp-2.02.0nb2
> cross-i386-netbsdpe-3.3.6
> csound5-5.01nb9
> cvsup-16.1.hnb2
> cvsup-gui-16.1.hnb3
> darcs-2.0.2nb4
> doscmd-19960502.2
> ezm3-1.2nb2
> gcc3-ada-3.3.6
> gcc3-java-3.3.6
> gcc34-ada-3.4.6nb1
> gdbada-6.3nb3
> ghc-6.8.3nb2
> hanzim-1.3nb1
> hobbit-4.0b6nb17
> ircd-hybrid-7.2.3nb3
> ispman-0.5nb5
> ja-FreeWnn-dict-1.10nb1
> ja-FreeWnn-server-bin-1.10nb6
> jessie-1.0.1
> jitterbug-1.6.2nb2
> linuxppc_lib-2000.4.6nb1
> nhc98-1.18nb2
> nn-6.7.3
> objc-3.2.6
> ocsigen-0.6.0nb2
> octave-forge-2006.03.17nb7
> pnetC-0.6.6nb2
> prelude-lml-0.9.15nb2
> skipstone-0.9.6nb9
> sope-4.5.4nb9
> sysinfo-3.5.1
> tcl-scotty-2.1.11nb4
> tk-tclX-8.3.5nb3
> tkined-1.4.11nb3
> wxhaskell-0.9.4nb16
> zaptel-netbsd-20060127nb1
> zope210-2.10.13
> zope211-2.11.8
> zope29-2.9.12
> 
>  Thomas
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (NetBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk4+4/YACgkQ3ylMjdXeRSBXUwCePhyDRMifhjkLpyhaYWIM/Q4N
ypsAnRYm2wpjJ7vzZMpNLshm0v0Hg0v/
=2D9A
-----END PGP SIGNATURE-----
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/camlimages/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile    24 May 2011 12:26:00 -0000      1.32
+++ Makefile    7 Aug 2011 18:40:49 -0000
@@ -1,52 +1,58 @@
 # $NetBSD: Makefile,v 1.32 2011/05/24 12:26:00 is Exp $
 
-DISTNAME=              camlimages-2.2.0
-PKGREVISION=           12
+VERSION=               4.0.1
+PKGNAME=               camlimages-${VERSION}
 CATEGORIES=            graphics
-MASTER_SITES=          
ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/
-EXTRACT_SUFX=          .tgz
+MASTER_SITES=          https://bitbucket.org/camlspotter/camlimages/get/
+DISTNAME=              v${VERSION}
+DIST_SUBDIR=           ${PKGNAME_NOREV}
+LICENSE=               gnu-gpl-v2
+
+FETCH_USING=           curl
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://cristal.inria.fr/camlimages/
+HOMEPAGE=              http://gallium.inria.fr/camlimages/
 COMMENT=               Image processing library for Objective Caml
 
 MAKE_JOBS_SAFE=                no
 
-BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=3.0.6
+BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=3.11.0
+
+BUILD_DEPENDS+=                omake>=0.9.8.6.0rc1:../../devel/omake
+BUILD_DEPENDS+=                ocaml-findlib>=1.2.6:../../devel/ocaml-findlib
 
-WRKSRC=                        ${WRKDIR}/camlimages-2.2
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC=             ${PKGDIR}/PLIST
-
-CONFIGURE_ARGS+=       --with-lablgtk=${PREFIX}/lib/ocaml/lablgtk
-
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-BUILD_TARGET+= all
-PLIST_SRC+=    ${PKGDIR}/PLIST.opt
-.endif
-
-PLIST_VARS+=   dll
-.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \
-    ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD"
-PLIST.dll=     yes
-.endif
+WRKSRC=                        ${WRKDIR}/camlspotter-camlimages-v4.0.1
 
+SUBST_CLASSES+=                omf
+SUBST_STAGE.omf=       post-patch
+SUBST_FILES.omf=       OMakefile
+SUBST_SED.omf=         -e 's,@PREFIX@,${PREFIX},g' \
+                       -e 's,@X11BASE@,${X11BASE},g' \
+                       -e 's%@LDFLAGS@%${LDFLAGS}%g' \
+                       -e 
's,@OCAMLFIND_DESTDIR@,${DESTDIR}${PREFIX}/lib/ocaml/site-lib,g' \
+                       -e 's,@OCAMLFIND_LDCONF@,/dev/null,g'
+SUBST_MESSAGE.omf=     Fixing vars in OMakefile
+
+do-build:
+       cd ${WRKSRC} && ${PREFIX}/bin/omake --configure --verbose
+
+do-install:
+       ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/ocaml/site-lib
+       cd ${WRKSRC} && 
OCAMLFIND_DESTDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib \
+               OCAMLFIND_LDCONF=/dev/null ${PREFIX}/bin/omake install
+       
 .include "../../lang/ocaml/buildlink3.mk"
+.include "../../devel/nspr/buildlink3.mk"
+.include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/lablgtk1/buildlink3.mk"
+.include "../../print/ghostscript/buildlink3.mk"
 .include "../../x11/lablgtk/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/ocaml-graphics/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/camlimages/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- PLIST       6 Sep 2009 21:10:32 -0000       1.7
+++ PLIST       7 Aug 2011 18:40:49 -0000
@@ -1,277 +1,147 @@
-@comment $NetBSD: PLIST,v 1.7 2009/09/06 21:10:32 tonio Exp $
-lib/ocaml/camlimages/Makefile.config
-lib/ocaml/camlimages/bitmap.cmi
-lib/ocaml/camlimages/bitmap.cmo
-lib/ocaml/camlimages/bitmap.cmx
-lib/ocaml/camlimages/bitmap.mli
-lib/ocaml/camlimages/bitmap.o
-lib/ocaml/camlimages/blend.cmi
-lib/ocaml/camlimages/blend.cmo
-lib/ocaml/camlimages/blend.cmx
-lib/ocaml/camlimages/blend.mli
-lib/ocaml/camlimages/blend.o
-lib/ocaml/camlimages/bmp.cmi
-lib/ocaml/camlimages/bmp.cmo
-lib/ocaml/camlimages/bmp.cmx
-lib/ocaml/camlimages/bmp.mli
-lib/ocaml/camlimages/bmp.o
-lib/ocaml/camlimages/camlimages.cmi
-lib/ocaml/camlimages/camlimages.cmo
-lib/ocaml/camlimages/camlimages.cmx
-lib/ocaml/camlimages/camlimages.o
-lib/ocaml/camlimages/ci_bmp.cma
-lib/ocaml/camlimages/ci_core.cma
-lib/ocaml/camlimages/ci_freetype.cma
-lib/ocaml/camlimages/ci_gif.cma
-lib/ocaml/camlimages/ci_graphics.cma
-lib/ocaml/camlimages/ci_jpeg.cma
-lib/ocaml/camlimages/ci_lablgtk.cma
-lib/ocaml/camlimages/ci_lablgtk2.cma
-lib/ocaml/camlimages/ci_png.cma
-lib/ocaml/camlimages/ci_ppm.cma
-lib/ocaml/camlimages/ci_ps.cma
-lib/ocaml/camlimages/ci_tiff.cma
-lib/ocaml/camlimages/ci_xpm.cma
-lib/ocaml/camlimages/ci_xvthumb.cma
-lib/ocaml/camlimages/cmyk32.cmi
-lib/ocaml/camlimages/cmyk32.cmo
-lib/ocaml/camlimages/cmyk32.cmx
-lib/ocaml/camlimages/cmyk32.mli
-lib/ocaml/camlimages/cmyk32.o
-lib/ocaml/camlimages/color.cmi
-lib/ocaml/camlimages/color.cmo
-lib/ocaml/camlimages/color.cmx
-lib/ocaml/camlimages/color.mli
-lib/ocaml/camlimages/color.o
-lib/ocaml/camlimages/colorhist.cmi
-lib/ocaml/camlimages/colorhist.cmo
-lib/ocaml/camlimages/colorhist.cmx
-lib/ocaml/camlimages/colorhist.o
-lib/ocaml/camlimages/config.h
-${PLIST.dll}lib/ocaml/camlimages/dllci_freetype.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_gif.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_jpeg.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_png.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_tiff.so
-${PLIST.dll}lib/ocaml/camlimages/dllci_xpm.so
-lib/ocaml/camlimages/freetype.cmi
-lib/ocaml/camlimages/freetype.cmo
-lib/ocaml/camlimages/freetype.cmx
-lib/ocaml/camlimages/freetype.mli
-lib/ocaml/camlimages/freetype.o
-lib/ocaml/camlimages/ftintf.o
-lib/ocaml/camlimages/ftlow.cmi
-lib/ocaml/camlimages/ftlow.cmo
-lib/ocaml/camlimages/ftlow.cmx
-lib/ocaml/camlimages/ftlow.mli
-lib/ocaml/camlimages/ftlow.o
-lib/ocaml/camlimages/fttext.cmi
-lib/ocaml/camlimages/fttext.cmo
-lib/ocaml/camlimages/fttext.cmx
-lib/ocaml/camlimages/fttext.mli
-lib/ocaml/camlimages/fttext.o
-lib/ocaml/camlimages/genimage.cmi
-lib/ocaml/camlimages/genimage.cmo
-lib/ocaml/camlimages/genimage.cmx
-lib/ocaml/camlimages/genimage.mli
-lib/ocaml/camlimages/genimage.o
-lib/ocaml/camlimages/geometry.cmi
-lib/ocaml/camlimages/geometry.cmo
-lib/ocaml/camlimages/geometry.cmx
-lib/ocaml/camlimages/geometry.o
-lib/ocaml/camlimages/gif.cmi
-lib/ocaml/camlimages/gif.cmo
-lib/ocaml/camlimages/gif.cmx
-lib/ocaml/camlimages/gif.mli
-lib/ocaml/camlimages/gif.o
-lib/ocaml/camlimages/gifread.o
-lib/ocaml/camlimages/gifwrite.o
-lib/ocaml/camlimages/graphic_image.cmi
-lib/ocaml/camlimages/graphic_image.cmo
-lib/ocaml/camlimages/graphic_image.cmx
-lib/ocaml/camlimages/graphic_image.mli
-lib/ocaml/camlimages/graphic_image.o
-lib/ocaml/camlimages/images.cmi
-lib/ocaml/camlimages/images.cmo
-lib/ocaml/camlimages/images.cmx
-lib/ocaml/camlimages/images.mli
-lib/ocaml/camlimages/images.o
-lib/ocaml/camlimages/index16.cmi
-lib/ocaml/camlimages/index16.cmo
-lib/ocaml/camlimages/index16.cmx
-lib/ocaml/camlimages/index16.mli
-lib/ocaml/camlimages/index16.o
-lib/ocaml/camlimages/index8.cmi
-lib/ocaml/camlimages/index8.cmo
-lib/ocaml/camlimages/index8.cmx
-lib/ocaml/camlimages/index8.mli
-lib/ocaml/camlimages/index8.o
-lib/ocaml/camlimages/info.cmi
-lib/ocaml/camlimages/info.mli
-lib/ocaml/camlimages/jis_table.cmi
-lib/ocaml/camlimages/jis_table.cmo
-lib/ocaml/camlimages/jis_table.cmx
-lib/ocaml/camlimages/jis_table.o
-lib/ocaml/camlimages/jis_unicode.cmi
-lib/ocaml/camlimages/jis_unicode.cmo
-lib/ocaml/camlimages/jis_unicode.cmx
-lib/ocaml/camlimages/jis_unicode.mli
-lib/ocaml/camlimages/jis_unicode.o
-lib/ocaml/camlimages/jpeg.cmi
-lib/ocaml/camlimages/jpeg.cmo
-lib/ocaml/camlimages/jpeg.cmx
-lib/ocaml/camlimages/jpeg.mli
-lib/ocaml/camlimages/jpeg.o
-lib/ocaml/camlimages/jpegread.o
-lib/ocaml/camlimages/jpegwrite.o
-lib/ocaml/camlimages/libci_freetype.a
-lib/ocaml/camlimages/libci_gif.a
-lib/ocaml/camlimages/libci_jpeg.a
-lib/ocaml/camlimages/libci_png.a
-lib/ocaml/camlimages/libci_tiff.a
-lib/ocaml/camlimages/libci_xpm.a
-lib/ocaml/camlimages/mstring.cmi
-lib/ocaml/camlimages/mstring.cmo
-lib/ocaml/camlimages/mstring.cmx
-lib/ocaml/camlimages/mstring.mli
-lib/ocaml/camlimages/mstring.o
-lib/ocaml/camlimages/oBmp.cmi
-lib/ocaml/camlimages/oBmp.cmo
-lib/ocaml/camlimages/oBmp.cmx
-lib/ocaml/camlimages/oBmp.o
-lib/ocaml/camlimages/oColor.cmi
-lib/ocaml/camlimages/oColor.cmo
-lib/ocaml/camlimages/oColor.cmx
-lib/ocaml/camlimages/oColor.mli
-lib/ocaml/camlimages/oColor.o
-lib/ocaml/camlimages/oFreetype.cmi
-lib/ocaml/camlimages/oFreetype.cmo
-lib/ocaml/camlimages/oFreetype.cmx
-lib/ocaml/camlimages/oFreetype.o
-lib/ocaml/camlimages/oGif.cmi
-lib/ocaml/camlimages/oGif.cmo
-lib/ocaml/camlimages/oGif.cmx
-lib/ocaml/camlimages/oGif.o
-lib/ocaml/camlimages/oGraphic.cmi
-lib/ocaml/camlimages/oGraphic.cmo
-lib/ocaml/camlimages/oGraphic.cmx
-lib/ocaml/camlimages/oGraphic.o
-lib/ocaml/camlimages/oImage.cmi
-lib/ocaml/camlimages/oImage.cmx
-lib/ocaml/camlimages/oImage.mli
-lib/ocaml/camlimages/oImage.o
-lib/ocaml/camlimages/oImages.cmi
-lib/ocaml/camlimages/oImages.cmo
-lib/ocaml/camlimages/oImages.cmx
-lib/ocaml/camlimages/oImages.mli
-lib/ocaml/camlimages/oImages.o
-lib/ocaml/camlimages/oJpeg.cmi
-lib/ocaml/camlimages/oJpeg.cmo
-lib/ocaml/camlimages/oJpeg.cmx
-lib/ocaml/camlimages/oJpeg.o
-lib/ocaml/camlimages/oPng.cmi
-lib/ocaml/camlimages/oPng.cmo
-lib/ocaml/camlimages/oPng.cmx
-lib/ocaml/camlimages/oPng.o
-lib/ocaml/camlimages/oPpm.cmi
-lib/ocaml/camlimages/oPpm.cmo
-lib/ocaml/camlimages/oPpm.cmx
-lib/ocaml/camlimages/oPpm.o
-lib/ocaml/camlimages/oPs.cmi
-lib/ocaml/camlimages/oPs.cmo
-lib/ocaml/camlimages/oPs.cmx
-lib/ocaml/camlimages/oPs.o
-lib/ocaml/camlimages/oTiff.cmi
-lib/ocaml/camlimages/oTiff.cmo
-lib/ocaml/camlimages/oTiff.cmx
-lib/ocaml/camlimages/oTiff.o
-lib/ocaml/camlimages/oXimage.cmi
-lib/ocaml/camlimages/oXimage.cmo
-lib/ocaml/camlimages/oXimage.cmx
-lib/ocaml/camlimages/oXimage.mli
-lib/ocaml/camlimages/oXimage.o
-lib/ocaml/camlimages/oXimage2.cmi
-lib/ocaml/camlimages/oXimage2.cmo
-lib/ocaml/camlimages/oXimage2.cmx
-lib/ocaml/camlimages/oXimage2.mli
-lib/ocaml/camlimages/oXimage2.o
-lib/ocaml/camlimages/oXpm.cmi
-lib/ocaml/camlimages/oXpm.cmo
-lib/ocaml/camlimages/oXpm.cmx
-lib/ocaml/camlimages/oXpm.o
-lib/ocaml/camlimages/oXvthumb.cmi
-lib/ocaml/camlimages/oXvthumb.cmo
-lib/ocaml/camlimages/oXvthumb.cmx
-lib/ocaml/camlimages/oXvthumb.mli
-lib/ocaml/camlimages/oXvthumb.o
-lib/ocaml/camlimages/png.cmi
-lib/ocaml/camlimages/png.cmo
-lib/ocaml/camlimages/png.cmx
-lib/ocaml/camlimages/png.mli
-lib/ocaml/camlimages/png.o
-lib/ocaml/camlimages/pngread.o
-lib/ocaml/camlimages/pngwrite.o
-lib/ocaml/camlimages/ppm.cmi
-lib/ocaml/camlimages/ppm.cmo
-lib/ocaml/camlimages/ppm.cmx
-lib/ocaml/camlimages/ppm.mli
-lib/ocaml/camlimages/ppm.o
-lib/ocaml/camlimages/ps.cmi
-lib/ocaml/camlimages/ps.cmo
-lib/ocaml/camlimages/ps.cmx
-lib/ocaml/camlimages/ps.mli
-lib/ocaml/camlimages/ps.o
-lib/ocaml/camlimages/reduce.cmi
-lib/ocaml/camlimages/reduce.cmo
-lib/ocaml/camlimages/reduce.cmx
-lib/ocaml/camlimages/reduce.mli
-lib/ocaml/camlimages/reduce.o
-lib/ocaml/camlimages/region.cmi
-lib/ocaml/camlimages/region.cmo
-lib/ocaml/camlimages/region.cmx
-lib/ocaml/camlimages/region.mli
-lib/ocaml/camlimages/region.o
-lib/ocaml/camlimages/rgb24.cmi
-lib/ocaml/camlimages/rgb24.cmo
-lib/ocaml/camlimages/rgb24.cmx
-lib/ocaml/camlimages/rgb24.mli
-lib/ocaml/camlimages/rgb24.o
-lib/ocaml/camlimages/rgba32.cmi
-lib/ocaml/camlimages/rgba32.cmo
-lib/ocaml/camlimages/rgba32.cmx
-lib/ocaml/camlimages/rgba32.mli
-lib/ocaml/camlimages/rgba32.o
-lib/ocaml/camlimages/tiff.cmi
-lib/ocaml/camlimages/tiff.cmo
-lib/ocaml/camlimages/tiff.cmx
-lib/ocaml/camlimages/tiff.mli
-lib/ocaml/camlimages/tiff.o
-lib/ocaml/camlimages/tiffread.o
-lib/ocaml/camlimages/tiffwrite.o
-lib/ocaml/camlimages/tmpfile.cmi
-lib/ocaml/camlimages/tmpfile.cmo
-lib/ocaml/camlimages/tmpfile.cmx
-lib/ocaml/camlimages/tmpfile.mli
-lib/ocaml/camlimages/tmpfile.o
-lib/ocaml/camlimages/ximage.cmi
-lib/ocaml/camlimages/ximage.cmo
-lib/ocaml/camlimages/ximage.cmx
-lib/ocaml/camlimages/ximage.mli
-lib/ocaml/camlimages/ximage.o
-lib/ocaml/camlimages/ximage2.cmi
-lib/ocaml/camlimages/ximage2.cmo
-lib/ocaml/camlimages/ximage2.cmx
-lib/ocaml/camlimages/ximage2.mli
-lib/ocaml/camlimages/ximage2.o
-lib/ocaml/camlimages/xpm.cmi
-lib/ocaml/camlimages/xpm.cmo
-lib/ocaml/camlimages/xpm.cmx
-lib/ocaml/camlimages/xpm.mli
-lib/ocaml/camlimages/xpm.o
-lib/ocaml/camlimages/xpmread.o
-lib/ocaml/camlimages/xpmwrite.o
-lib/ocaml/camlimages/xvthumb.cmi
-lib/ocaml/camlimages/xvthumb.cmo
-lib/ocaml/camlimages/xvthumb.cmx
-lib/ocaml/camlimages/xvthumb.mli
-lib/ocaml/camlimages/xvthumb.o
+@comment $NetBSD$
+lib/ocaml/site-lib/camlimages/META
+lib/ocaml/site-lib/camlimages/bitmap.cmi
+lib/ocaml/site-lib/camlimages/bitmap.mli
+lib/ocaml/site-lib/camlimages/blend.cmi
+lib/ocaml/site-lib/camlimages/blend.mli
+lib/ocaml/site-lib/camlimages/bmp.cmi
+lib/ocaml/site-lib/camlimages/bmp.mli
+lib/ocaml/site-lib/camlimages/camlimages.cmi
+lib/ocaml/site-lib/camlimages/camlimages_all.a
+lib/ocaml/site-lib/camlimages/camlimages_all.cma
+lib/ocaml/site-lib/camlimages/camlimages_all.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_core.a
+lib/ocaml/site-lib/camlimages/camlimages_core.cma
+lib/ocaml/site-lib/camlimages/camlimages_core.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_freetype.a
+lib/ocaml/site-lib/camlimages/camlimages_freetype.cma
+lib/ocaml/site-lib/camlimages/camlimages_freetype.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_gif.a
+lib/ocaml/site-lib/camlimages/camlimages_gif.cma
+lib/ocaml/site-lib/camlimages/camlimages_gif.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_graphics.a
+lib/ocaml/site-lib/camlimages/camlimages_graphics.cma
+lib/ocaml/site-lib/camlimages/camlimages_graphics.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_jpeg.a
+lib/ocaml/site-lib/camlimages/camlimages_jpeg.cma
+lib/ocaml/site-lib/camlimages/camlimages_jpeg.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.a
+lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cma
+lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_png.a
+lib/ocaml/site-lib/camlimages/camlimages_png.cma
+lib/ocaml/site-lib/camlimages/camlimages_png.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_ps.a
+lib/ocaml/site-lib/camlimages/camlimages_ps.cma
+lib/ocaml/site-lib/camlimages/camlimages_ps.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_supported.a
+lib/ocaml/site-lib/camlimages/camlimages_supported.cma
+lib/ocaml/site-lib/camlimages/camlimages_supported.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_tiff.a
+lib/ocaml/site-lib/camlimages/camlimages_tiff.cma
+lib/ocaml/site-lib/camlimages/camlimages_tiff.cmxa
+lib/ocaml/site-lib/camlimages/camlimages_xpm.a
+lib/ocaml/site-lib/camlimages/camlimages_xpm.cma
+lib/ocaml/site-lib/camlimages/camlimages_xpm.cmxa
+lib/ocaml/site-lib/camlimages/cmyk32.cmi
+lib/ocaml/site-lib/camlimages/cmyk32.mli
+lib/ocaml/site-lib/camlimages/color.cmi
+lib/ocaml/site-lib/camlimages/color.mli
+lib/ocaml/site-lib/camlimages/colorhist.cmi
+lib/ocaml/site-lib/camlimages/colorhist.mli
+lib/ocaml/site-lib/camlimages/dllcamlimages_all.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_freetype.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_gif.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_jpeg.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_png.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_supported.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_tiff.so
+lib/ocaml/site-lib/camlimages/dllcamlimages_xpm.so
+lib/ocaml/site-lib/camlimages/freetype.cmi
+lib/ocaml/site-lib/camlimages/freetype.mli
+lib/ocaml/site-lib/camlimages/ftlow.cmi
+lib/ocaml/site-lib/camlimages/ftlow.mli
+lib/ocaml/site-lib/camlimages/fttext.cmi
+lib/ocaml/site-lib/camlimages/fttext.mli
+lib/ocaml/site-lib/camlimages/genimage.cmi
+lib/ocaml/site-lib/camlimages/genimage.mli
+lib/ocaml/site-lib/camlimages/geometry.cmi
+lib/ocaml/site-lib/camlimages/geometry.mli
+lib/ocaml/site-lib/camlimages/gif.cmi
+lib/ocaml/site-lib/camlimages/gif.mli
+lib/ocaml/site-lib/camlimages/graphic_image.cmi
+lib/ocaml/site-lib/camlimages/graphic_image.mli
+lib/ocaml/site-lib/camlimages/image_intf.cmi
+lib/ocaml/site-lib/camlimages/image_intf.mli
+lib/ocaml/site-lib/camlimages/imagegdk.cmi
+lib/ocaml/site-lib/camlimages/imagegdk.mli
+lib/ocaml/site-lib/camlimages/images.cmi
+lib/ocaml/site-lib/camlimages/images.mli
+lib/ocaml/site-lib/camlimages/index16.cmi
+lib/ocaml/site-lib/camlimages/index16.mli
+lib/ocaml/site-lib/camlimages/index8.cmi
+lib/ocaml/site-lib/camlimages/index8.mli
+lib/ocaml/site-lib/camlimages/info.cmi
+lib/ocaml/site-lib/camlimages/info.mli
+lib/ocaml/site-lib/camlimages/jis_table.cmi
+lib/ocaml/site-lib/camlimages/jis_unicode.cmi
+lib/ocaml/site-lib/camlimages/jis_unicode.mli
+lib/ocaml/site-lib/camlimages/jpeg.cmi
+lib/ocaml/site-lib/camlimages/jpeg.mli
+lib/ocaml/site-lib/camlimages/libcamlimages_all.a
+lib/ocaml/site-lib/camlimages/libcamlimages_freetype.a
+lib/ocaml/site-lib/camlimages/libcamlimages_gif.a
+lib/ocaml/site-lib/camlimages/libcamlimages_jpeg.a
+lib/ocaml/site-lib/camlimages/libcamlimages_png.a
+lib/ocaml/site-lib/camlimages/libcamlimages_supported.a
+lib/ocaml/site-lib/camlimages/libcamlimages_tiff.a
+lib/ocaml/site-lib/camlimages/libcamlimages_xpm.a
+lib/ocaml/site-lib/camlimages/mstring.cmi
+lib/ocaml/site-lib/camlimages/mstring.mli
+lib/ocaml/site-lib/camlimages/oBmp.cmi
+lib/ocaml/site-lib/camlimages/oColor.cmi
+lib/ocaml/site-lib/camlimages/oColor.mli
+lib/ocaml/site-lib/camlimages/oFreetype.cmi
+lib/ocaml/site-lib/camlimages/oGif.cmi
+lib/ocaml/site-lib/camlimages/oGraphic.cmi
+lib/ocaml/site-lib/camlimages/oImages.cmi
+lib/ocaml/site-lib/camlimages/oImages.mli
+lib/ocaml/site-lib/camlimages/oJpeg.cmi
+lib/ocaml/site-lib/camlimages/oJpeg.mli
+lib/ocaml/site-lib/camlimages/oPng.cmi
+lib/ocaml/site-lib/camlimages/oPng.mli
+lib/ocaml/site-lib/camlimages/oPpm.cmi
+lib/ocaml/site-lib/camlimages/oPs.cmi
+lib/ocaml/site-lib/camlimages/oTiff.cmi
+lib/ocaml/site-lib/camlimages/oXimage.cmi
+lib/ocaml/site-lib/camlimages/oXimage.mli
+lib/ocaml/site-lib/camlimages/oXimage2.cmi
+lib/ocaml/site-lib/camlimages/oXpm.cmi
+lib/ocaml/site-lib/camlimages/oXvthumb.cmi
+lib/ocaml/site-lib/camlimages/oXvthumb.mli
+lib/ocaml/site-lib/camlimages/png.cmi
+lib/ocaml/site-lib/camlimages/png.mli
+lib/ocaml/site-lib/camlimages/ppm.cmi
+lib/ocaml/site-lib/camlimages/ppm.mli
+lib/ocaml/site-lib/camlimages/ps.cmi
+lib/ocaml/site-lib/camlimages/ps.mli
+lib/ocaml/site-lib/camlimages/reduce.cmi
+lib/ocaml/site-lib/camlimages/reduce.mli
+lib/ocaml/site-lib/camlimages/region.cmi
+lib/ocaml/site-lib/camlimages/region.mli
+lib/ocaml/site-lib/camlimages/rgb24.cmi
+lib/ocaml/site-lib/camlimages/rgb24.mli
+lib/ocaml/site-lib/camlimages/rgba32.cmi
+lib/ocaml/site-lib/camlimages/rgba32.mli
+lib/ocaml/site-lib/camlimages/tiff.cmi
+lib/ocaml/site-lib/camlimages/tiff.mli
+lib/ocaml/site-lib/camlimages/tmpfile.cmi
+lib/ocaml/site-lib/camlimages/tmpfile.mli
+lib/ocaml/site-lib/camlimages/units.cmi
+lib/ocaml/site-lib/camlimages/ximage.cmi
+lib/ocaml/site-lib/camlimages/ximage.mli
+lib/ocaml/site-lib/camlimages/ximage2.cmi
+lib/ocaml/site-lib/camlimages/xpm.cmi
+lib/ocaml/site-lib/camlimages/xpm.mli
+lib/ocaml/site-lib/camlimages/xvthumb.cmi
+lib/ocaml/site-lib/camlimages/xvthumb.mli
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/camlimages/buildlink3.mk,v
retrieving revision 1.9
diff -u -p -r1.9 buildlink3.mk
--- buildlink3.mk       20 Mar 2009 19:24:37 -0000      1.9
+++ buildlink3.mk       7 Aug 2011 18:40:49 -0000
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=        camlimages
 .if !defined(CAMLIMAGES_BUILDLINK3_MK)
 CAMLIMAGES_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.camlimages+=     camlimages>=2.2.0
-BUILDLINK_ABI_DEPENDS.camlimages?=     camlimages>=2.2.0nb1
+BUILDLINK_API_DEPENDS.camlimages+=     camlimages>=4.0.1
+BUILDLINK_ABI_DEPENDS.camlimages?=     camlimages>=4.0.1
 BUILDLINK_PKGSRCDIR.camlimages?=       ../../graphics/camlimages
 .endif # CAMLIMAGES_BUILDLINK3_MK
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/camlimages/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo    24 May 2011 12:26:00 -0000      1.7
+++ distinfo    7 Aug 2011 18:40:49 -0000
@@ -1,10 +1,9 @@
 $NetBSD: distinfo,v 1.7 2011/05/24 12:26:00 is Exp $
 
-SHA1 (camlimages-2.2.0.tgz) = bc0062739be5ca9236f28145f17f840bf3f295ee
-RMD160 (camlimages-2.2.0.tgz) = 0f108ef3da565aeb0ab10d00e45819399af36d8c
-Size (camlimages-2.2.0.tgz) = 1385525 bytes
-SHA1 (patch-aa) = 8f1818e6b1a782066acb2ad6399514aa61e0e1f8
-SHA1 (patch-ac) = 3c2de383d335b03599be81a9ac32382493b726b1
-SHA1 (patch-ad) = 543280151e06269dd82d256bc9e53645a9186b5f
-SHA1 (patch-png_pngread.c) = b4d696e75c728be9a766424b41afbe5bb9446685
-SHA1 (patch-png_pngwrite.c) = 6894fc49bc0e752df550331c77c859362650c626
+SHA1 (camlimages-4.0.1/v4.0.1.tar.gz) = 
4c1eee28f02749f53ed8345b448ce11375ce6dce
+RMD160 (camlimages-4.0.1/v4.0.1.tar.gz) = 
6ae0f4c2ad3f0a8d7f4d84109d413e0b4bc1a86b
+Size (camlimages-4.0.1/v4.0.1.tar.gz) = 2190252 bytes
+SHA1 (patch-OMakefile) = e40b10c3a28fd88ed7b2759857cb2e96002ae946
+SHA1 (patch-src_pngread.c) = 6787d9263267567cf621e9889af5c82cea04a9a8
+SHA1 (patch-src_pngwrite.c) = 3c0f5c67bcede0a93e8f6741f320aa9d040b789d
+SHA1 (patch-src_tiffread.c) = b2cc500de2b04fe5684decd21682c8f17e6c56fd

Attachment: graphics_camlimages-4.0.1_new_files.tgz
Description: Binary data

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/advi/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile    22 Apr 2011 13:44:31 -0000      1.36
+++ Makefile    7 Aug 2011 18:45:59 -0000
@@ -1,65 +1,64 @@
-# $NetBSD: Makefile,v 1.36 2011/04/22 13:44:31 obache Exp $
+# $NetBSD: Makefile,v 1.35 2011/03/09 16:51:51 drochner Exp $
 
-DISTNAME=              advi-1.6.0
-PKGREVISION=           11
+DISTNAME=              advi-1.10.1
 CATEGORIES=            print
-MASTER_SITES=          ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
-EXTRACT_SUFX=          .tgz
+MASTER_SITES=          http://gallium.inria.fr/advi/
+EXTRACT_SUFX=          .tar.gz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://cristal.inria.fr/advi/
+HOMEPAGE=              http://gallium.inria.fr/advi/
 COMMENT=               Active-DVI Presenter
+LICENSE=               gnu-lgpl-v2
+
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_DEPENDS+=                ocaml>=3.04:../../lang/ocaml
+BUILD_DEPENDS+=                ocaml-findlib>=1.2.6:../../devel/ocaml-findlib
+DEPENDS+=              camlimages>=4.0.0:../../graphics/camlimages
+DEPENDS+=              texlive-tetex>=2010:../../print/texlive-tetex
 
-TEX_ACCEPTED=          teTeX3
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake gs:run
-CONFIGURE_ARGS+=       --libdir=${PKG_LOCALTEXMFPREFIX:Q}
-
-# subst.mk ignores the files it thinks are not text files
-_SUBST_IS_TEXT_FILE=   true
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/share/texmf-dist
+CONFIGURE_ARGS+=       --with-gs=${PREFIX}/bin/gs
 
-SUBST_CLASSES+=                gspath
-SUBST_MESSAGE.gspath=  Fixing gs pathname in binary.
-SUBST_STAGE.gspath=    pre-configure
-SUBST_FILES.gspath=    config.ml.in
-SUBST_SED.gspath=      -e "s,@PATH_GS@,${PREFIX}/bin/gs,g"
-
-SUBST_CLASSES+=                paths
-SUBST_MESSAGE.paths=   Fixing config file path.
-SUBST_STAGE.paths=     post-configure
-SUBST_FILES.paths=     userfile.ml
-SUBST_SED.paths=       -e "s:/etc/advirc:${PKG_SYSCONFDIR}/advirc:g"
+INSTALL_UNSTRIPPED=    yes
 
-.include "../../print/teTeX/module.mk"
+SUBST_CLASSES+=                gs
+SUBST_STAGE.gs=                post-configure
+SUBST_FILES.gs=                src/config.ml.in
+SUBST_SED.gs=          -e 's,@GS@,gs,'
+SUBST_MESSAGE.gs=      Fixing hard-coded path to gs
 
 post-extract:
        ${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc
-       ${CP} ${WRKSRC}/doc/eng.htm ${WRKSRC}/doc/index.html
        ${MKDIR} ${WRKSRC}/doc.orig
        ${CP} ${WRKSRC}/doc/*.dvi ${WRKSRC}/doc.orig
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/advi
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/advi
        cd ${WRKSRC}/doc && ${INSTALL_DATA} *.ps *.pdf \
-               ${PREFIX}/share/doc/advi
+               ${DESTDIR}${PREFIX}/share/doc/advi
        cd ${WRKSRC}/doc.orig && ${INSTALL_DATA} *.dvi \
-               ${PREFIX}/share/doc/advi
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/advi
-       cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.css *.jpg *.gif \
-               ${PREFIX}/share/doc/html/advi
-       cd ${PREFIX}/share/doc/html/advi && ${LN} -sf ../../advi/manual.* .
+               ${DESTDIR}${PREFIX}/share/doc/advi
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/advi
+       cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif \
+               ${DESTDIR}${PREFIX}/share/doc/html/advi
+       cd ${DESTDIR}${PREFIX}/share/doc/html/advi && ${LN} -sf 
../../advi/manual.* .
 
+.include "../../print/kpathsea/texmf.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../graphics/camlimages/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../devel/nspr/buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/lablgtk1/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/advi/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- PLIST       14 Jun 2009 18:11:53 -0000      1.4
+++ PLIST       7 Aug 2011 18:45:59 -0000
@@ -1,45 +1,34 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:11:53 joerg Exp $
+@comment $NetBSD$
 bin/advi
-man/man1/advi.1
-share/doc/advi/advi_remote.dvi
+bin/advi.byt
+lib/ocaml/stublibs/dlladvi.so
 share/doc/advi/manual.dvi
 share/doc/advi/manual.pdf
 share/doc/advi/manual.ps
-share/doc/advi/mathmode.dvi
 share/doc/advi/scratch_draw_splash.dvi
-share/doc/advi/scratch_draw_splash.ps
 share/doc/advi/scratch_write_splash.dvi
-share/doc/advi/scratch_write_splash.ps
 share/doc/advi/splash.dvi
-share/doc/advi/splash.ps
-share/doc/html/advi/advi-j.jpg
-share/doc/html/advi/advi.jpg
-share/doc/html/advi/advi_remote.html
 share/doc/html/advi/advilogo.anim.gif
 share/doc/html/advi/advilogo.gif
 share/doc/html/advi/bar.gif
-share/doc/html/advi/eng.html
+share/doc/html/advi/faq.html
 share/doc/html/advi/index.html
 share/doc/html/advi/inria.gif
 share/doc/html/advi/manual.dvi
 share/doc/html/advi/manual.html
 share/doc/html/advi/manual.pdf
 share/doc/html/advi/manual.ps
-share/doc/html/advi/manual001.gif
-share/doc/html/advi/manual002.gif
-share/doc/html/advi/style.css
-${PKG_LOCALTEXMFPREFIX}/advi/advi-annot.sty
-${PKG_LOCALTEXMFPREFIX}/advi/advi-graphicx.sty
-${PKG_LOCALTEXMFPREFIX}/advi/advi-slides.sty
-${PKG_LOCALTEXMFPREFIX}/advi/advi.sty
-${PKG_LOCALTEXMFPREFIX}/advi/advilogo.eps
-${PKG_LOCALTEXMFPREFIX}/advi/argv.sty
-${PKG_LOCALTEXMFPREFIX}/advi/bar.eps
-${PKG_LOCALTEXMFPREFIX}/advi/bubble.sty
-${PKG_LOCALTEXMFPREFIX}/advi/caml.eps
-${PKG_LOCALTEXMFPREFIX}/advi/jpfonts.conf
-${PKG_LOCALTEXMFPREFIX}/advi/scratch_draw_splash.dvi
-${PKG_LOCALTEXMFPREFIX}/advi/scratch_write_splash.dvi
-${PKG_LOCALTEXMFPREFIX}/advi/splash.dvi
-${PKG_LOCALTEXMFPREFIX}/advi/superpose.sty
-${PKG_LOCALTEXMFPREFIX}/advi/xwindows-colors.sty
+share/doc/html/advi/manualxxx.html
+share/doc/html/advi/screen-shots.html
+share/texmf-dist/tex/latex/advi/advi-annot.sty
+share/texmf-dist/tex/latex/advi/advi-graphicx.sty
+share/texmf-dist/tex/latex/advi/advi-slides.sty
+share/texmf-dist/tex/latex/advi/advi.sty
+share/texmf-dist/tex/latex/advi/advilogo.eps
+share/texmf-dist/tex/latex/advi/argv.sty
+share/texmf-dist/tex/latex/advi/bar.eps
+share/texmf-dist/tex/latex/advi/bubble.sty
+share/texmf-dist/tex/latex/advi/caml.eps
+share/texmf-dist/tex/latex/advi/pgfsys-dvips.def
+share/texmf-dist/tex/latex/advi/superpose.sty
+share/texmf-dist/tex/latex/advi/xwindows-colors.sty
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/advi/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    28 May 2010 16:45:12 -0000      1.5
+++ distinfo    7 Aug 2011 18:45:59 -0000
@@ -1,19 +1,8 @@
-$NetBSD: distinfo,v 1.5 2010/05/28 16:45:12 joerg Exp $
+$NetBSD$
 
-SHA1 (advi-1.6.0.tgz) = 8c033df906f3e208471506f64ffa0b175c1c5ee8
-RMD160 (advi-1.6.0.tgz) = 55bc5f2742964f29bc694997c3dd9573f8c71964
-Size (advi-1.6.0.tgz) = 11436152 bytes
-SHA1 (patch-aa) = 1e5eb89fc756d1a9a9aeca5e2da1a19d366da8e1
-SHA1 (patch-ab) = 2f9a2c22a2a8a6b79f09436a46332daf59c94638
-SHA1 (patch-ac) = 7461e39cfc42d476b5c9e07493415ee2013815ca
-SHA1 (patch-ad) = 5ec6fcdfac79cc9ceeb0314b937cec2e431c6c7c
-SHA1 (patch-ae) = 99eb3c8e731e0019a4e9012071403621fb9d670a
-SHA1 (patch-af) = 0096612f7cca942219df81d3a285ef6edad1d7bc
-SHA1 (patch-ag) = ecb347a6b95f90056335d9015824ac80c3860ae2
-SHA1 (patch-ah) = 6773de8e41be9dbc033ba28861da411170c017d1
-SHA1 (patch-ai) = c6a3d5f956dcdf79f9f4ad33d0f596a567efe72f
-SHA1 (patch-aj) = 87737dc00a68e7c020cec98b039eecf0f7cadf1a
-SHA1 (patch-ak) = 831b0bbc22b25e1160809ad7db981d03eb3388ca
-SHA1 (patch-al) = 97c591d60aefbc15c5ef1624f74b12be57daf6d8
-SHA1 (patch-am) = 8bacf3de7ef836183543b12b5dca66d97bfd4ae4
-SHA1 (patch-an) = 85bc55e6409e1be813693425e5b7d7cc2ca6f23d
+SHA1 (advi-1.10.1.tar.gz) = eedadf8d461b233eb352ba90fd312c094e643344
+RMD160 (advi-1.10.1.tar.gz) = 9962992f6512d185ead94d2a44ef11e454b80563
+Size (advi-1.10.1.tar.gz) = 9769604 bytes
+SHA1 (patch-Makefile.in) = 0b4d12fc78aca422434c1149fa2fda3495ed06c4
+SHA1 (patch-configure) = 844f3129c9b1d4f6c12328158c4dbdf194cc6548
+SHA1 (patch-src_Makefile.in) = 40b654af7296ea6af5b0668981b69a4f9d46cb1d

Attachment: print_advi-1.10.1_new_files.tgz
Description: Binary data

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/lablgtk/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile    21 Jul 2011 13:06:07 -0000      1.48
+++ Makefile    6 Aug 2011 12:09:05 -0000
@@ -39,6 +39,12 @@ PLIST.stubs= yes
 
 .include "options.mk"
 
+INSTALLATION_DIRS+=    lib/ocaml/site-lib
+
+post-install:
+       cd ${DESTDIR}${PREFIX}/lib/ocaml/site-lib && ${LN} -s ../lablgtk2
+       ${INSTALL_DATA} ${WRKSRC}/META ${DESTDIR}${PREFIX}/lib/ocaml/lablgtk2
+
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/lablgtk/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- PLIST       28 Aug 2010 16:13:25 -0000      1.12
+++ PLIST       6 Aug 2011 12:09:05 -0000
@@ -255,6 +255,8 @@ lib/ocaml/lablgtk2/varcc
 lib/ocaml/lablgtk2/win32.h
 lib/ocaml/lablgtk2/wrappers.h
 lib/ocaml/lablgtk2/xml_lexer.mli
+lib/ocaml/lablgtk2/META
+lib/ocaml/site-lib/lablgtk2
 ${PLIST.stubs}lib/ocaml/stublibs/dlllablgtk2.so
 @comment in ocaml: lib/ocaml/stublibs
 @comment in ocaml: lib/ocaml
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/ocaml-graphics/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile    7 Nov 2010 18:36:08 -0000       1.11
+++ Makefile    6 Aug 2011 13:22:58 -0000
@@ -7,6 +7,7 @@ DISTINFO_FILE= ${PKGDIR}/../../lang/ocam
 PATCHDIR= ${PKGDIR}/../../lang/ocaml/patches
 
 PKGNAME=               ${DISTNAME:S/ocaml/ocaml-graphics/}
+PKGREVISION=           4 # Can it be independant from lang/ocaml?
 
 COMMENT+=              (graphics library)
 
@@ -30,7 +31,8 @@ PLIST_VARS+=          natdynlib
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
 .  if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
       !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
-      !empty(MACHINE_PLATFORM:MFreeBSD-*-*)
+      !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
+      !empty(MACHINE_PLATFORM:MNetBSD-*-*)
 PLIST.natdynlib=               yes
 .  endif
 .endif


Home | Main Index | Thread Index | Old Index