summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ocaml-cairo/Makefile1
-rw-r--r--graphics/ocaml-images/Makefile91
-rw-r--r--graphics/ocaml-images/distinfo5
-rw-r--r--graphics/ocaml-images/files/patch-OMakefile46
-rw-r--r--graphics/ocaml-images/files/patch-configure13
-rw-r--r--graphics/ocaml-images/files/patch-src_OMakefile15
-rw-r--r--graphics/ocaml-images/files/patch-src_bitmap.ml11
-rw-r--r--graphics/ocaml-images/files/patch-src_gifread.c34
-rw-r--r--graphics/ocaml-images/files/patch-src_gifwrite.c55
-rw-r--r--graphics/ocaml-images/files/patch-src_jpegread.c11
-rw-r--r--graphics/ocaml-images/files/patch-src_pngread.c38
-rw-r--r--graphics/ocaml-images/files/patch-src_pngwrite.c20
-rw-r--r--graphics/ocaml-images/files/patch-src_tiffread.c36
-rw-r--r--graphics/ocaml-images/files/patch-src_tiffwrite.c39
-rw-r--r--graphics/ocaml-images/pkg-plist471
-rw-r--r--graphics/ocaml-lablgl/Makefile24
-rw-r--r--graphics/ocaml-lablgl/pkg-plist200
17 files changed, 494 insertions, 616 deletions
diff --git a/graphics/ocaml-cairo/Makefile b/graphics/ocaml-cairo/Makefile
index a5068dbdefcf..d85c7179bd62 100644
--- a/graphics/ocaml-cairo/Makefile
+++ b/graphics/ocaml-cairo/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cairo
PORTVERSION= 0.6.4
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= ocaml-
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index e7b8b66e8708..1ae483880840 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -1,40 +1,30 @@
PORTNAME= images
-PORTVERSION= 4.0.1
-PORTREVISION= 13
+PORTVERSION= 5.0.4
PORTEPOCH= 2
CATEGORIES= graphics
-MASTER_SITES= https://bitbucket.org/camlspotter/camlimages/get/
PKGNAMEPREFIX= ocaml-
DISTNAME= v${PORTVERSION}
-DIST_SUBDIR= ocaml-images
MAINTAINER= michael.grunewald@laposte.net
COMMENT= Objective Caml image processing library
WWW= http://pauillac.inria.fr/camlimages/
-BROKEN= Unfetchable and fails to build
-DEPRECATED= Upstream is gone and failing to build for months
-EXPIRATION_DATE=2024-03-31
+LICENSE= LGPL21
-BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf
-BUILD_DEPENDS+= omake:devel/omake
+BUILD_DEPENDS= cppo:devel/ocaml-cppo \
+ ${SA_DIR}/stdio/META:devel/ocaml-stdio
+USES= ocaml:dune
+USE_GITLAB= yes
+GL_ACCOUNT= camlspotter
+GL_PROJECT= camlimages
USE_OCAML= yes
-USE_OCAML_FINDLIB= yes
+USE_OCAML_LDCONFIG= yes
+OCAML_LDLIBS=
+OCAML_PACKAGES= camlimages
-OCAML_PKGDIRS= camlimages
-OCAML_LDLIBS= ${OCAML_SITELIBDIR}/camlimages
-
-OMAKESUBS+= -e s@%%INCLUDESPORTS%%@${LOCALBASE}/include@
-OMAKESUBS+= -e s@%%INCLUDESX11%%@${LOCALBASE}/include/X11@
-OMAKESUBS+= -e s@%%INCLUDESPNG%%@${LOCALBASE}/include/libpng15@
-OMAKESUBS+= -e s@%%LDFLAGSPORTS%%@-L${LOCALBASE}/lib@
-
-OMAKE= omake 'PREFIX=${STAGEDIR}${PREFIX}'
-OMARGS= --dotomake .omake --force-dotomake
-WRKSRC= ${WRKDIR}/camlspotter-camlimages-c803efa9d5d3
-
-MAKE_JOBS_UNSAFE= yes
+DOCSDIR= ${OCAML_DOCSDIR}/camlimages
+PORTDOCS= README.md
OPTIONS_DEFINE= PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT GTK2 DOCS
OPTIONS_DEFAULT=PNG JPEG TIFF XPM GIF FREETYPE GHOSTSCRIPT
@@ -65,28 +55,49 @@ GTK2_CONFIGURE_WITH= liblgtk2
GTK2_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2
GTK2_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2
-BINARY_ALIAS= freetype-config=true
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MXPM}
USES+= xorg
-USE_XORG= xpm
+USE_XORG= x11 xpm
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's,shell-success-null,shell-success,' \
- ${WRKSRC}/OMyMakeroot
-
-do-configure:
- @(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile)
- (cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure)
-
-do-build:
- (cd ${WRKSRC} && ${OMAKE} ${OMARGS})
-
-do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_LDLIBS}
- (cd ${WRKSRC} && ${OMAKE} ${OMARGS} install)
+SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR}
+
+post-install:
+ @${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/dllcamlimages_exif_stubs.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/core/camlimages.cmxs \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/exif/camlimages_exif.cmxs
+
+post-install-FREETYPE-on:
+ ${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/dllcamlimages_freetype_stubs.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/freetype/camlimages_freetype.cmxs
+
+post-install-GIF-on:
+ ${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/dllcamlimages_gif_stubs.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/gif/camlimages_gif.cmxs
+
+post-install-JPEG-on:
+ ${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/dllcamlimages_jpeg_stubs.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/jpeg/camlimages_jpeg.cmxs
+
+post-install-PNG-on:
+ ${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/dllcamlimages_png_stubs.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/png/camlimages_png.cmxs
+
+post-install-TIFF-on:
+ ${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/dllcamlimages_tiff_stubs.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/tiff/camlimages_tiff.cmxs
+
+post-install-XPM-on:
+ ${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/dllcamlimages_xpm_stubs.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlimages/xpm/camlimages_xpm.cmxs
.include <bsd.port.mk>
diff --git a/graphics/ocaml-images/distinfo b/graphics/ocaml-images/distinfo
index 292653df98ca..2a12e87b0792 100644
--- a/graphics/ocaml-images/distinfo
+++ b/graphics/ocaml-images/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ocaml-images/v4.0.1.tar.gz) = b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4
-SIZE (ocaml-images/v4.0.1.tar.gz) = 2190274
+TIMESTAMP = 1706851240
+SHA256 (camlimages-5.0.4.tar.bz2) = 1c9a68bdc3d348c9f859d490dadf384926213e47a584159832f7fc4a20242865
+SIZE (camlimages-5.0.4.tar.bz2) = 788111
diff --git a/graphics/ocaml-images/files/patch-OMakefile b/graphics/ocaml-images/files/patch-OMakefile
deleted file mode 100644
index 8f6675f254fc..000000000000
--- a/graphics/ocaml-images/files/patch-OMakefile
+++ /dev/null
@@ -1,46 +0,0 @@
---- OMakefile.orig 2011-06-22 18:04:32 UTC
-+++ OMakefile
-@@ -22,13 +22,13 @@ if $(defined WithOMyApt)
-
- # Specify non standard include directories
- INCLUDES[]=
-- /usr/include/X11
-- /usr/local/include
-+ %%INCLUDESPORTS%%
-+ %%INCLUDESX11%%
-+ %%INCLUDESPNG%%
-
- # Specify non standard library directories
- LDFLAGS[]+=
--# for example,
--# LDFLAGS[]+= -L/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/
-+ %%LDFLAGSPORTS%%
-
- # Specify directories where X's rgb.txt can be found
- PATH_RGB_TXT[]=
-@@ -95,6 +95,8 @@ print_configured() =
- exit 1
-
- CFLAGS = $(addprefix -I , $(INCLUDES))
-+ OCAMLCFLAGS = -unsafe-string
-+ OCAMLOPTFLAGS = -unsafe-string
-
- WORD_SIZE = $(Word_size)
-
-@@ -175,13 +177,13 @@ print_configured() =
- OCAMLPACKS+=graphics
- export
-
-- SUPPORT_FREETYPE = $(Check_prog_in_path freetype-config)
-+ SUPPORT_FREETYPE = $(Check_prog_in_path pkg-config)
- PATH_FREETYPE_CONFIG = $(WHERE)
- LDFLAGS_freetype=
- if $(SUPPORT_FREETYPE)
- println(SUPPORT_FREETYPE=$(SUPPORT_FREETYPE)!)
-- CFLAGS= $(CFLAGS) $(shell freetype-config --cflags)
-- LDFLAGS_freetype= $(shell freetype-config --libs)
-+ CFLAGS= $(CFLAGS) $(shell pkg-config freetype2 --cflags)
-+ LDFLAGS_freetype= $(shell pkg-config freetype2 --libs)
- export
- if $(SUPPORT_FREETYPE)
- SUPPORTED_NON_FORMATS+=freetype
diff --git a/graphics/ocaml-images/files/patch-configure b/graphics/ocaml-images/files/patch-configure
deleted file mode 100644
index 224ee1fca92e..000000000000
--- a/graphics/ocaml-images/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig 2021-08-07 07:17:08 UTC
-+++ configure
-@@ -8108,8 +8108,8 @@ fi
-
-
- if test -n "$FREETYPE_CONFIG"; then
-- LIBFREETYPE=`freetype-config --libs`
-- INCFREETYPE=`freetype-config --cflags`
-+ LIBFREETYPE=`pkg-config freetype2 --libs`
-+ INCFREETYPE=`pkg-config freetype2 --cflags`
- SUPPORT_FREETYPE="true"
- fi
- fi
diff --git a/graphics/ocaml-images/files/patch-src_OMakefile b/graphics/ocaml-images/files/patch-src_OMakefile
deleted file mode 100644
index c6d85cfd4037..000000000000
--- a/graphics/ocaml-images/files/patch-src_OMakefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/OMakefile.orig 2012-11-07 22:43:27.000000000 +0100
-+++ src/OMakefile 2012-11-07 22:44:22.000000000 +0100
-@@ -262,10 +262,10 @@
- $(glob i, *.so)
-
- INSTALL()=
-- value $(OCAMLFIND) install $(LIBRARY_PREFIX) $(INSTALL_TARGETS)
-+ value $(OCAMLFIND) install -ldconf ignore -destdir $(PREFIX)/lib/ocaml/site-lib $(LIBRARY_PREFIX) $(INSTALL_TARGETS)
-
- UNINSTALL()=
-- value $(OCAMLFIND) remove $(LIBRARY_PREFIX)
-+ value $(OCAMLFIND) remove -ldconf ignore -destdir $(PREFIX)/lib/ocaml/site-lib $(LIBRARY_PREFIX)
-
- install: all
- $(INSTALL)
diff --git a/graphics/ocaml-images/files/patch-src_bitmap.ml b/graphics/ocaml-images/files/patch-src_bitmap.ml
deleted file mode 100644
index eec47155e7a5..000000000000
--- a/graphics/ocaml-images/files/patch-src_bitmap.ml
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bitmap.ml.orig 2011-06-22 18:04:32 UTC
-+++ src/bitmap.ml
-@@ -186,7 +186,7 @@ module Make(B:Bitdepth) = struct
-
- let swap_out_eldest words =
- let sorted =
-- Sort.list (fun b1 b2 -> b1.last_used < b2.last_used) !swappable_blocks in
-+ List.sort (fun b1 b2 -> compare b1.last_used b2.last_used) !swappable_blocks in
- let rec swapper sorted i =
- match sorted with
- | [] -> ()
diff --git a/graphics/ocaml-images/files/patch-src_gifread.c b/graphics/ocaml-images/files/patch-src_gifread.c
deleted file mode 100644
index c2b49558342c..000000000000
--- a/graphics/ocaml-images/files/patch-src_gifread.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/gifread.c.orig 2011-06-22 18:04:32 UTC
-+++ src/gifread.c
-@@ -140,7 +140,11 @@ value dGifOpenFileName( value name )
- GifFileType *GifFile;
- int i;
-
-+#if GIFLIB_MAJOR >= 5
-+ if((GifFile = DGifOpenFileName( String_val(name), NULL )) == NULL){
-+#else
- if((GifFile = DGifOpenFileName( String_val(name) )) == NULL){
-+#endif
- failwith("DGifOpenFileName");
- }
-
-@@ -161,7 +165,11 @@ value dGifCloseFile( value hdl )
- segmentation faults */
- ((GifFileType *)hdl)->Image.ColorMap = NULL;
-
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+ DGifCloseFile( (GifFileType *) hdl, NULL );
-+#else
- DGifCloseFile( (GifFileType *) hdl );
-+#endif
- CAMLreturn(Val_unit);
- }
-
-@@ -200,7 +208,6 @@ value dGifGetLine( value hdl )
-
- if( DGifGetLine(GifFile, String_val(buf), GifFile->Image.Width )
- == GIF_ERROR ){
-- PrintGifError ();
- failwith("DGifGetLine");
- }
- CAMLreturn(buf);
diff --git a/graphics/ocaml-images/files/patch-src_gifwrite.c b/graphics/ocaml-images/files/patch-src_gifwrite.c
deleted file mode 100644
index 0fbcede2549c..000000000000
--- a/graphics/ocaml-images/files/patch-src_gifwrite.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/gifwrite.c.orig 2011-06-22 18:04:32 UTC
-+++ src/gifwrite.c
-@@ -25,7 +25,7 @@
-
- #include <gif_lib.h>
-
--int list_length( value list )
-+static int list_length( value list )
- {
- CAMLparam1(list);
- CAMLlocal1(l);
-@@ -52,7 +52,11 @@ ColorMapObject *ColorMapObject_val( valu
- fprintf(stderr, "Creating map with length = %d ...\n", len);
- fflush(stderr);
- */
-+#if GIFLIB_MAJOR >= 5
-+ cmapobj = GifMakeMapObject( len, NULL );
-+#else
- cmapobj = MakeMapObject( len, NULL );
-+#endif
- for(i=0; i< len; i++){
- cmapobj->Colors[i].Red = Int_val(Field(Field(cmap,i),0));
- cmapobj->Colors[i].Green = Int_val(Field(Field(cmap,i),1));
-@@ -68,7 +72,11 @@ value eGifOpenFileName( name )
-
- GifFileType *GifFileOut;
-
-+#if GIFLIB_MAJOR >= 5
-+ if ((GifFileOut = EGifOpenFileName( String_val( name ), 0, NULL) )== NULL) {
-+#else
- if ((GifFileOut = EGifOpenFileName( String_val( name ), 0) )== NULL) {
-+#endif
- failwith("EGifOpenFileName");
- }
- /* gcc -fwritable-strings is required to compile libungif */
-@@ -88,7 +96,11 @@ value eGifCloseFile( value hdl )
- segmentation faults */
- ((GifFileType *)hdl)->Image.ColorMap = NULL;
-
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+ EGifCloseFile( (GifFileType *) hdl, NULL );
-+#else
- EGifCloseFile( (GifFileType *) hdl );
-+#endif
- CAMLreturn(Val_unit);
- }
-
-@@ -133,7 +145,6 @@ value eGifPutLine( value oc, value buf )
-
- if ( EGifPutLine(GifFileOut, String_val(buf), GifFileOut->Image.Width)
- == GIF_ERROR ){
-- PrintGifError ();
- failwith("EGifPutLine");
- }
- CAMLreturn(Val_unit);
diff --git a/graphics/ocaml-images/files/patch-src_jpegread.c b/graphics/ocaml-images/files/patch-src_jpegread.c
deleted file mode 100644
index 4369ab05fd9d..000000000000
--- a/graphics/ocaml-images/files/patch-src_jpegread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jpegread.c.orig 2011-06-22 20:04:32.000000000 +0200
-+++ src/jpegread.c
-@@ -417,7 +417,7 @@
- jpeg_read_scanlines( cinfop, row, 1 );
- row[0] += scanline_bytes;
- }
-- CAMLreturn0;
-+ CAMLreturn(0);
- }
-
- value close_jpeg_file_for_read( jpegh )
diff --git a/graphics/ocaml-images/files/patch-src_pngread.c b/graphics/ocaml-images/files/patch-src_pngread.c
deleted file mode 100644
index 2e5a49bf9c4f..000000000000
--- a/graphics/ocaml-images/files/patch-src_pngread.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/pngread.c.orig 2009-10-26 13:42:03.000000000 +0100
-+++ src/pngread.c 2012-05-05 07:08:53.000000000 +0200
-@@ -69,7 +69,7 @@
- }
-
- /* error handling */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
- fclose(fp);
-@@ -134,7 +134,7 @@
- png_set_rows(png_ptr, info_ptr, row_pointers);
-
- /* Later, we can return something */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
- fclose(fp);
-@@ -243,7 +243,7 @@
- }
-
- /* error handling */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
- fclose(fp);
-@@ -302,7 +302,7 @@
- png_set_rows(png_ptr, info_ptr, row_pointers);
-
- /* Later, we can return something */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
- fclose(fp);
diff --git a/graphics/ocaml-images/files/patch-src_pngwrite.c b/graphics/ocaml-images/files/patch-src_pngwrite.c
deleted file mode 100644
index dc6872e299d7..000000000000
--- a/graphics/ocaml-images/files/patch-src_pngwrite.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pngwrite.c.orig 2009-10-26 13:42:03.000000000 +0100
-+++ src/pngwrite.c 2012-05-06 13:01:28.000000000 +0200
-@@ -62,7 +62,7 @@
- }
-
- /* error handling */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_write_struct(&png_ptr, &info_ptr);
- fclose(fp);
-@@ -171,7 +171,7 @@
- }
-
- /* error handling */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_write_struct(&png_ptr, &info_ptr);
- fclose(fp);
diff --git a/graphics/ocaml-images/files/patch-src_tiffread.c b/graphics/ocaml-images/files/patch-src_tiffread.c
deleted file mode 100644
index 73b684a3408e..000000000000
--- a/graphics/ocaml-images/files/patch-src_tiffread.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/tiffread.c.orig 2011-06-22 20:04:32.000000000 +0200
-+++ src/tiffread.c
-@@ -23,14 +23,22 @@
-
- #include "oversized.h"
-
-+/* Avoid redefinitions */
-+#undef int16
-+#undef uint16
- /* These are defined in caml/config.h */
- #define int16 int16tiff
- #define uint16 uint16tiff
- #define int32 int32tiff
- #define uint32 uint32tiff
-+#define int64 int64tiff
-+#define uint64 uint64tiff
-
- #include <tiffio.h>
-
-+#undef int64
-+#undef uint64
-+
- extern value *imglib_error;
-
- value open_tiff_file_for_read( name )
-@@ -70,6 +78,10 @@
- failwith_oversized("tiff");
- }
-
-+ if (oversized (imagewidth, imagelength)) {
-+ failwith_oversized("tiff");
-+ }
-+
- if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
- if( imagebits != 8 ){
- failwith("Sorry, tiff rgb file must be 24bit-color");
diff --git a/graphics/ocaml-images/files/patch-src_tiffwrite.c b/graphics/ocaml-images/files/patch-src_tiffwrite.c
deleted file mode 100644
index 280158a1d7dd..000000000000
--- a/graphics/ocaml-images/files/patch-src_tiffwrite.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/tiffwrite.c.orig 2011-06-22 20:04:32.000000000 +0200
-+++ src/tiffwrite.c
-@@ -20,11 +20,16 @@
- #include <caml/memory.h>
- #include <caml/fail.h>
-
-+/* Avoid redefinitions */
-+#undef int16
-+#undef uint16
- /* These are defined in caml/config.h */
- #define int16 int16tiff
- #define uint16 uint16tiff
- #define int32 int32tiff
- #define uint32 uint32tiff
-+#define int64 int64tiff
-+#define uint64 uint64tiff
-
- #include <tiffio.h>
-
-@@ -32,6 +37,8 @@
- #undef uint16
- #undef int32
- #undef uint32
-+#undef int64
-+#undef uint64
-
- extern value *imglib_error;
-
-@@ -56,8 +63,8 @@ value open_tiff_file_for_write( value file,
- /* Resolution */
- /* FillOrder */
-
-- TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32) image_width);
-- TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32) image_height);
-+ TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, image_width);
-+ TIFFSetField(tif, TIFFTAG_IMAGELENGTH, image_height);
- TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
- TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3);
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
diff --git a/graphics/ocaml-images/pkg-plist b/graphics/ocaml-images/pkg-plist
index 695d08fae127..925614efe999 100644
--- a/graphics/ocaml-images/pkg-plist
+++ b/graphics/ocaml-images/pkg-plist
@@ -1,146 +1,325 @@
-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
-%%FREETYPE%%lib/ocaml/site-lib/camlimages/camlimages_freetype.a
-%%FREETYPE%%lib/ocaml/site-lib/camlimages/camlimages_freetype.cma
-%%FREETYPE%%lib/ocaml/site-lib/camlimages/camlimages_freetype.cmxa
-%%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.a
-%%GIF%%lib/ocaml/site-lib/camlimages/camlimages_gif.cma
-%%GIF%%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
-%%GTK2%%lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.a
-%%GTK2%%lib/ocaml/site-lib/camlimages/camlimages_lablgtk2.cma
-%%GTK2%%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
-%%FREETYPE%%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
-%%FREETYPE%%lib/ocaml/site-lib/camlimages/freetype.cmi
-lib/ocaml/site-lib/camlimages/freetype.mli
-%%FREETYPE%%lib/ocaml/site-lib/camlimages/ftlow.cmi
-lib/ocaml/site-lib/camlimages/ftlow.mli
-%%FREETYPE%%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
-%%GTK2%%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
-%%FREETYPE%%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
-%%FREETYPE%%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
-%%GTK2%%lib/ocaml/site-lib/camlimages/oXimage.cmi
-lib/ocaml/site-lib/camlimages/oXimage.mli
-%%GTK2%%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
-%%GTK2%%lib/ocaml/site-lib/camlimages/ximage.cmi
-lib/ocaml/site-lib/camlimages/ximage.mli
-%%GTK2%%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
+%%OCAML_SITELIBDIR%%/camlimages/META
+%%OCAML_SITELIBDIR%%/camlimages/dune-package
+%%OCAML_SITELIBDIR%%/camlimages/opam
+%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_exif_stubs.so
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.a
+%%OCAML_SITELIBDIR%%/camlimages/core/bitmap.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/bitmap.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/bitmap.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/bitmap.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/bitmap.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/bitmap.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/blend.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/blend.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/blend.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/blend.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/blend.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/blend.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/bmp.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/bmp.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/bmp.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/bmp.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/bmp.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/bmp.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/dummy_supported.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.cma
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/images.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.cmxa
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/cmyk32.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/cmyk32.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/cmyk32.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/cmyk32.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/cmyk32.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/cmyk32.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/color.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/color.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/color.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/color.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/color.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/color.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/colorhist.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/colorhist.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/colorhist.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/colorhist.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/colorhist.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/colorhist.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/genimage.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/genimage.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/dummy_supported.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/dummy_supported.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/dummy_supported.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/genimage.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/genimage.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/genimage.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/genimage.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_unicode.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/geometry.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/geometry.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/geometry.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/geometry.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/geometry.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/geometry.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/image_intf.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/image_intf.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/image_intf.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/image_intf.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/images.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/images.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/images.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/images.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/images.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/index16.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/index16.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/index16.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/index16.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/index16.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/index16.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/index8.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/index8.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/index8.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/index8.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/index8.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/index8.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/info.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/info.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/info.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/info.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_table.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_table.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_table.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_table.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_unicode.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_unicode.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_unicode.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_unicode.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/jis_unicode.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/mstring.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/mstring.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/mstring.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/mstring.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/mstring.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/mstring.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/oBmp.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/oBmp.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/oBmp.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/oBmp.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/oColor.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/oColor.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/oColor.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/oColor.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/oColor.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/oColor.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/oImages.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/oImages.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/oImages.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/oImages.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/ps.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/ps.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/oImages.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/oImages.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/oPpm.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/oPpm.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/oPpm.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/oPpm.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/oPs.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/oPs.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/oPs.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/oPs.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/oXvthumb.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/oXvthumb.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/oXvthumb.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/oXvthumb.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/oXvthumb.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/oXvthumb.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/ppm.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/ppm.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/ppm.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/ppm.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/ppm.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/ppm.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/ps.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/ps.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/ps.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/ps.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/reduce.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/tmpfile.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/reduce.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/reduce.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/reduce.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/reduce.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/reduce.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/region.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/region.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/region.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/region.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/region.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/region.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/rgb24.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/rgb24.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/rgb24.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/rgb24.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/rgb24.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/rgb24.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/rgba32.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/rgba32.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/rgba32.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/rgba32.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/rgba32.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/rgba32.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/tmpfile.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/tmpfile.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/tmpfile.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/tmpfile.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/tmpfile.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/units.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/units.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/units.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/units.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/util.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/util.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/util.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/util.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/util.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/util.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/xvthumb.cmi
+%%OCAML_SITELIBDIR%%/camlimages/core/xvthumb.cmt
+%%OCAML_SITELIBDIR%%/camlimages/core/xvthumb.cmti
+%%OCAML_SITELIBDIR%%/camlimages/core/xvthumb.cmx
+%%OCAML_SITELIBDIR%%/camlimages/core/xvthumb.ml
+%%OCAML_SITELIBDIR%%/camlimages/core/xvthumb.mli
+%%OCAML_SITELIBDIR%%/camlimages/core/camlimages.cmxs
+%%OCAML_SITELIBDIR%%/camlimages/exif/camlimages_exif.cmxa
+%%OCAML_SITELIBDIR%%/camlimages/exif/camlimages_exif.a
+%%OCAML_SITELIBDIR%%/camlimages/exif/camlimages_exif.cma
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifanalyze.cmi
+%%OCAML_SITELIBDIR%%/camlimages/exif/exif.cmi
+%%OCAML_SITELIBDIR%%/camlimages/exif/exif.cmt
+%%OCAML_SITELIBDIR%%/camlimages/exif/exif.cmti
+%%OCAML_SITELIBDIR%%/camlimages/exif/exif.cmx
+%%OCAML_SITELIBDIR%%/camlimages/exif/exif.ml
+%%OCAML_SITELIBDIR%%/camlimages/exif/exif.mli
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifanalyze.cmt
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifanalyze.cmx
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifanalyze.ml
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifutil.cmi
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifutil.cmt
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifutil.cmx
+%%OCAML_SITELIBDIR%%/camlimages/exif/exifutil.ml
+%%OCAML_SITELIBDIR%%/camlimages/exif/libcamlimages_exif_stubs.a
+%%OCAML_SITELIBDIR%%/camlimages/exif/camlimages_exif.cmxs
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_freetype_stubs.so
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/camlimages_freetype.cmxa
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/camlimages_freetype.a
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/camlimages_freetype.cma
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/camlimages_freetype.cmxs
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/freetype.cmi
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/freetype.cmt
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/freetype.cmti
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/freetype.cmx
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/freetype.ml
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/freetype.mli
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/ftlow.cmi
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/ftlow.cmt
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/ftlow.cmti
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/ftlow.cmx
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/ftlow.ml
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/ftlow.mli
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/fttext.cmi
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/fttext.cmt
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/fttext.cmti
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/fttext.cmx
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/fttext.ml
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/fttext.mli
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/oFreetype.cmi
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/oFreetype.cmt
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/libcamlimages_freetype_stubs.a
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/oFreetype.cmx
+%%FREETYPE%%%%OCAML_SITELIBDIR%%/camlimages/freetype/oFreetype.ml
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_gif_stubs.so
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/libcamlimages_gif_stubs.a
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/camlimages_gif.a
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/camlimages_gif.cma
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/camlimages_gif.cmxa
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/gif.cmi
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/gif.cmt
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/gif.cmti
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/gif.cmx
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/gif.ml
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/gif.mli
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/camlimages_gif.cmxs
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/oGif.cmi
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/oGif.cmt
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/oGif.cmx
+%%GIF%%%%OCAML_SITELIBDIR%%/camlimages/gif/oGif.ml
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_jpeg_stubs.so
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/camlimages_jpeg.cmxa
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/camlimages_jpeg.a
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/camlimages_jpeg.cma
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/camlimages_jpeg.cmxs
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/jpeg.cmi
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/jpeg.cmt
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/jpeg.cmti
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/jpeg.cmx
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/jpeg.ml
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/jpeg.mli
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/oJpeg.cmi
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/oJpeg.cmt
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/libcamlimages_jpeg_stubs.a
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/oJpeg.cmti
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/oJpeg.cmx
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/oJpeg.ml
+%%JPEG%%%%OCAML_SITELIBDIR%%/camlimages/jpeg/oJpeg.mli
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_png_stubs.so
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/libcamlimages_png_stubs.a
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/camlimages_png.a
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/camlimages_png.cma
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/camlimages_png.cmxa
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/camlimages_png.cmxs
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/oPng.cmi
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/oPng.cmt
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/oPng.cmti
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/oPng.cmx
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/oPng.ml
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/oPng.mli
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/png.cmi
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/png.cmt
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/png.cmti
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/png.cmx
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/png.ml
+%%PNG%%%%OCAML_SITELIBDIR%%/camlimages/png/png.mli
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_tiff_stubs.so
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/camlimages_tiff.cmxa
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/camlimages_tiff.a
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/camlimages_tiff.cma
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/tiff.mli
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/tiff.ml
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/libcamlimages_tiff_stubs.a
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/oTiff.cmi
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/oTiff.cmt
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/oTiff.cmx
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/oTiff.ml
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/tiff.cmi
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/tiff.cmt
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/tiff.cmti
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/tiff.cmx
+%%TIFF%%%%OCAML_SITELIBDIR%%/camlimages/tiff/camlimages_tiff.cmxs
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/dllcamlimages_xpm_stubs.so
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/libcamlimages_xpm_stubs.a
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/camlimages_xpm.a
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/camlimages_xpm.cma
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/camlimages_xpm.cmxa
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/camlimages_xpm.cmxs
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/oXpm.cmi
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/oXpm.cmt
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/oXpm.cmx
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/oXpm.ml
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/xpm.cmi
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/xpm.cmt
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/xpm.cmti
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/xpm.cmx
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/xpm.ml
+%%XPM%%%%OCAML_SITELIBDIR%%/camlimages/xpm/xpm.mli
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index d42088005a9f..f5f5ca506bc8 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= lablgl
PORTVERSION= 1.05
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
@@ -17,11 +17,13 @@ CONFLICTS= ocaml-nox11
USES= gl gmake tk xorg
USE_XORG= x11 xext xmu
-USE_GL= glut
+USE_GL= gl glu glut
USE_OCAML= yes
-USE_OCAML_WASH= yes
-USE_OCAML_CAMLP4=yes
+USE_OCAML_CAMLP4= yes
+USE_OCAML_LDCONFIG= yes
USE_OCAML_TK= yes
+OCAML_LDLIBS= ${OCAML_SITELIBDIR}/lablGL
+
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE= yes
@@ -49,9 +51,9 @@ post-patch:
-e "s,/usr/local,${LOCALBASE},g" \
-e "s,^\(BINDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/bin,g" \
-e "s,^\(RANLIB[ \t]*=\).*,\1ranlib,g" \
- -e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \
- -e "s,^#\(DLLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/stublibs,g" \
- -e "s,^#\(INSTALLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/lablGL,g" \
+ -e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/${OCAML_LIBDIR},g" \
+ -e "s,^#\(DLLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lablGL,g" \
+ -e "s,^#\(INSTALLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lablGL,g" \
-e "s!^#\(COPTS[ \t]*=\).*!\1-c ${CFLAGS}!g" \
-e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \
-e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER}\
@@ -63,12 +65,10 @@ post-patch:
-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \
-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \
-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \
+ -e '/^OCAMLINC=/s,\+labltk,+site-lib/labltk -I +labltk,' \
${WRKSRC}/src/Makefile ${WRKSRC}/LablGlut/src/Makefile \
${WRKSRC}/Togl/src/Makefile
-pre-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs
-
post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/lablglut
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/togl
@@ -78,5 +78,9 @@ post-install:
${STAGEDIR}${EXAMPLESDIR}/togl '! -name Makefile')
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+ @${STRIP_CMD} \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lablGL/dlllablgl.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lablGL/dlllablglut.so \
+ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lablGL/dlltogl.so
.include <bsd.port.mk>
diff --git a/graphics/ocaml-lablgl/pkg-plist b/graphics/ocaml-lablgl/pkg-plist
index 6334fb4e8db3..ab121d1c4262 100644
--- a/graphics/ocaml-lablgl/pkg-plist
+++ b/graphics/ocaml-lablgl/pkg-plist
@@ -1,105 +1,105 @@
bin/lablgl
bin/lablglut
-lib/ocaml/lablGL/build.ml
-lib/ocaml/lablGL/gl.cmi
-lib/ocaml/lablGL/gl.cmx
-lib/ocaml/lablGL/gl.ml
-lib/ocaml/lablGL/gl.mli
-lib/ocaml/lablGL/glArray.cmi
-lib/ocaml/lablGL/glArray.cmx
-lib/ocaml/lablGL/glArray.ml
-lib/ocaml/lablGL/glArray.mli
-lib/ocaml/lablGL/glClear.cmi
-lib/ocaml/lablGL/glClear.cmx
-lib/ocaml/lablGL/glClear.ml
-lib/ocaml/lablGL/glClear.mli
-lib/ocaml/lablGL/glDraw.cmi
-lib/ocaml/lablGL/glDraw.cmx
-lib/ocaml/lablGL/glDraw.ml
-lib/ocaml/lablGL/glDraw.mli
-lib/ocaml/lablGL/glFunc.cmi
-lib/ocaml/lablGL/glFunc.cmx
-lib/ocaml/lablGL/glFunc.ml
-lib/ocaml/lablGL/glFunc.mli
-lib/ocaml/lablGL/glLight.cmi
-lib/ocaml/lablGL/glLight.cmx
-lib/ocaml/lablGL/glLight.ml
-lib/ocaml/lablGL/glLight.mli
-lib/ocaml/lablGL/glList.cmi
-lib/ocaml/lablGL/glList.cmx
-lib/ocaml/lablGL/glList.ml
-lib/ocaml/lablGL/glList.mli
-lib/ocaml/lablGL/glMap.cmi
-lib/ocaml/lablGL/glMap.cmx
-lib/ocaml/lablGL/glMap.ml
-lib/ocaml/lablGL/glMap.mli
-lib/ocaml/lablGL/glMat.cmi
-lib/ocaml/lablGL/glMat.cmx
-lib/ocaml/lablGL/glMat.ml
-lib/ocaml/lablGL/glMat.mli
-lib/ocaml/lablGL/glMisc.cmi
-lib/ocaml/lablGL/glMisc.cmx
-lib/ocaml/lablGL/glMisc.ml
-lib/ocaml/lablGL/glMisc.mli
-lib/ocaml/lablGL/glPix.cmi
-lib/ocaml/lablGL/glPix.cmx
-lib/ocaml/lablGL/glPix.ml
-lib/ocaml/lablGL/glPix.mli
-lib/ocaml/lablGL/glShader.cmi
-lib/ocaml/lablGL/glShader.cmx
-lib/ocaml/lablGL/glShader.ml
-lib/ocaml/lablGL/glShader.mli
-lib/ocaml/lablGL/glTex.cmi
-lib/ocaml/lablGL/glTex.cmx
-lib/ocaml/lablGL/glTex.ml
-lib/ocaml/lablGL/glTex.mli
-lib/ocaml/lablGL/gluMat.cmi
-lib/ocaml/lablGL/gluMat.cmx
-lib/ocaml/lablGL/gluMat.ml
-lib/ocaml/lablGL/gluMat.mli
-lib/ocaml/lablGL/gluMisc.cmi
-lib/ocaml/lablGL/gluMisc.cmx
-lib/ocaml/lablGL/gluMisc.ml
-lib/ocaml/lablGL/gluMisc.mli
-lib/ocaml/lablGL/gluNurbs.cmi
-lib/ocaml/lablGL/gluNurbs.cmx
-lib/ocaml/lablGL/gluNurbs.ml
-lib/ocaml/lablGL/gluNurbs.mli
-lib/ocaml/lablGL/gluQuadric.cmi
-lib/ocaml/lablGL/gluQuadric.cmx
-lib/ocaml/lablGL/gluQuadric.ml
-lib/ocaml/lablGL/gluQuadric.mli
-lib/ocaml/lablGL/gluTess.cmi
-lib/ocaml/lablGL/gluTess.cmx
-lib/ocaml/lablGL/gluTess.ml
-lib/ocaml/lablGL/gluTess.mli
-lib/ocaml/lablGL/glut.cmi
-lib/ocaml/lablGL/glut.cmx
-lib/ocaml/lablGL/glut.ml
-lib/ocaml/lablGL/glut.mli
-lib/ocaml/lablGL/lablgl.a
-lib/ocaml/lablGL/lablgl.cma
-lib/ocaml/lablGL/lablgl.cmxa
-lib/ocaml/lablGL/lablglut.a
-lib/ocaml/lablGL/lablglut.cma
-lib/ocaml/lablGL/lablglut.cmxa
-lib/ocaml/lablGL/liblablgl.a
-lib/ocaml/lablGL/liblablglut.a
-lib/ocaml/lablGL/libtogl.a
-lib/ocaml/lablGL/raw.cmi
-lib/ocaml/lablGL/raw.cmx
-lib/ocaml/lablGL/raw.ml
-lib/ocaml/lablGL/raw.mli
-lib/ocaml/lablGL/togl.a
-lib/ocaml/lablGL/togl.cma
-lib/ocaml/lablGL/togl.cmi
-lib/ocaml/lablGL/togl.cmx
-lib/ocaml/lablGL/togl.cmxa
-lib/ocaml/lablGL/togl.ml
-lib/ocaml/lablGL/togl.mli
-lib/ocaml/stublibs/dlllablgl.so
-lib/ocaml/stublibs/dlllablglut.so
-lib/ocaml/stublibs/dlltogl.so
+%%OCAML_SITELIBDIR%%/lablGL/build.ml
+%%OCAML_SITELIBDIR%%/lablGL/dlllablgl.so
+%%OCAML_SITELIBDIR%%/lablGL/dlllablglut.so
+%%OCAML_SITELIBDIR%%/lablGL/dlltogl.so
+%%OCAML_SITELIBDIR%%/lablGL/gl.cmi
+%%OCAML_SITELIBDIR%%/lablGL/gl.cmx
+%%OCAML_SITELIBDIR%%/lablGL/gl.ml
+%%OCAML_SITELIBDIR%%/lablGL/gl.mli
+%%OCAML_SITELIBDIR%%/lablGL/glArray.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glArray.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glArray.ml
+%%OCAML_SITELIBDIR%%/lablGL/glArray.mli
+%%OCAML_SITELIBDIR%%/lablGL/glClear.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glClear.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glClear.ml
+%%OCAML_SITELIBDIR%%/lablGL/glClear.mli
+%%OCAML_SITELIBDIR%%/lablGL/glDraw.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glDraw.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glDraw.ml
+%%OCAML_SITELIBDIR%%/lablGL/glDraw.mli
+%%OCAML_SITELIBDIR%%/lablGL/glFunc.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glFunc.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glFunc.ml
+%%OCAML_SITELIBDIR%%/lablGL/glFunc.mli
+%%OCAML_SITELIBDIR%%/lablGL/glLight.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glLight.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glLight.ml
+%%OCAML_SITELIBDIR%%/lablGL/glLight.mli
+%%OCAML_SITELIBDIR%%/lablGL/glList.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glList.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glList.ml
+%%OCAML_SITELIBDIR%%/lablGL/glList.mli
+%%OCAML_SITELIBDIR%%/lablGL/glMap.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glMap.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glMap.ml
+%%OCAML_SITELIBDIR%%/lablGL/glMap.mli
+%%OCAML_SITELIBDIR%%/lablGL/glMat.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glMat.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glMat.ml
+%%OCAML_SITELIBDIR%%/lablGL/glMat.mli
+%%OCAML_SITELIBDIR%%/lablGL/glMisc.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glMisc.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glMisc.ml
+%%OCAML_SITELIBDIR%%/lablGL/glMisc.mli
+%%OCAML_SITELIBDIR%%/lablGL/glPix.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glPix.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glPix.ml
+%%OCAML_SITELIBDIR%%/lablGL/glPix.mli
+%%OCAML_SITELIBDIR%%/lablGL/glShader.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glShader.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glShader.ml
+%%OCAML_SITELIBDIR%%/lablGL/glShader.mli
+%%OCAML_SITELIBDIR%%/lablGL/glTex.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glTex.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glTex.ml
+%%OCAML_SITELIBDIR%%/lablGL/glTex.mli
+%%OCAML_SITELIBDIR%%/lablGL/gluMat.cmi
+%%OCAML_SITELIBDIR%%/lablGL/gluMat.cmx
+%%OCAML_SITELIBDIR%%/lablGL/gluMat.ml
+%%OCAML_SITELIBDIR%%/lablGL/gluMat.mli
+%%OCAML_SITELIBDIR%%/lablGL/gluMisc.cmi
+%%OCAML_SITELIBDIR%%/lablGL/gluMisc.cmx
+%%OCAML_SITELIBDIR%%/lablGL/gluMisc.ml
+%%OCAML_SITELIBDIR%%/lablGL/gluMisc.mli
+%%OCAML_SITELIBDIR%%/lablGL/gluNurbs.cmi
+%%OCAML_SITELIBDIR%%/lablGL/gluNurbs.cmx
+%%OCAML_SITELIBDIR%%/lablGL/gluNurbs.ml
+%%OCAML_SITELIBDIR%%/lablGL/gluNurbs.mli
+%%OCAML_SITELIBDIR%%/lablGL/gluQuadric.cmi
+%%OCAML_SITELIBDIR%%/lablGL/gluQuadric.cmx
+%%OCAML_SITELIBDIR%%/lablGL/gluQuadric.ml
+%%OCAML_SITELIBDIR%%/lablGL/gluQuadric.mli
+%%OCAML_SITELIBDIR%%/lablGL/gluTess.cmi
+%%OCAML_SITELIBDIR%%/lablGL/gluTess.cmx
+%%OCAML_SITELIBDIR%%/lablGL/gluTess.ml
+%%OCAML_SITELIBDIR%%/lablGL/gluTess.mli
+%%OCAML_SITELIBDIR%%/lablGL/glut.cmi
+%%OCAML_SITELIBDIR%%/lablGL/glut.cmx
+%%OCAML_SITELIBDIR%%/lablGL/glut.ml
+%%OCAML_SITELIBDIR%%/lablGL/glut.mli
+%%OCAML_SITELIBDIR%%/lablGL/lablgl.a
+%%OCAML_SITELIBDIR%%/lablGL/lablgl.cma
+%%OCAML_SITELIBDIR%%/lablGL/lablgl.cmxa
+%%OCAML_SITELIBDIR%%/lablGL/lablglut.a
+%%OCAML_SITELIBDIR%%/lablGL/lablglut.cma
+%%OCAML_SITELIBDIR%%/lablGL/lablglut.cmxa
+%%OCAML_SITELIBDIR%%/lablGL/liblablgl.a
+%%OCAML_SITELIBDIR%%/lablGL/liblablglut.a
+%%OCAML_SITELIBDIR%%/lablGL/libtogl.a
+%%OCAML_SITELIBDIR%%/lablGL/raw.cmi
+%%OCAML_SITELIBDIR%%/lablGL/raw.cmx
+%%OCAML_SITELIBDIR%%/lablGL/raw.ml
+%%OCAML_SITELIBDIR%%/lablGL/raw.mli
+%%OCAML_SITELIBDIR%%/lablGL/togl.a
+%%OCAML_SITELIBDIR%%/lablGL/togl.cma
+%%OCAML_SITELIBDIR%%/lablGL/togl.cmi
+%%OCAML_SITELIBDIR%%/lablGL/togl.cmx
+%%OCAML_SITELIBDIR%%/lablGL/togl.cmxa
+%%OCAML_SITELIBDIR%%/lablGL/togl.ml
+%%OCAML_SITELIBDIR%%/lablGL/togl.mli
%%PORTDOCS%%%%DOCSDIR%%/README
%%EXAMPLESDIR%%/lablglut/README
%%EXAMPLESDIR%%/lablglut/caml-images/ChangeLog
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 19:30:06 +0000