From nobody@FreeBSD.org  Wed Nov  7 22:35:24 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EF53C40A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  7 Nov 2012 22:35:23 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id D1B928FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  7 Nov 2012 22:35:23 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qA7MZNqh077576
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 7 Nov 2012 22:35:23 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qA7MZNSN077549;
	Wed, 7 Nov 2012 22:35:23 GMT
	(envelope-from nobody)
Message-Id: <201211072235.qA7MZNSN077549@red.freebsd.org>
Date: Wed, 7 Nov 2012 22:35:23 GMT
From: Michael Grnewald <michael.grunewald@laposte.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: graphics/ocaml-images Update to 4.0.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173453
>Category:       ports
>Synopsis:       graphics/ocaml-images Update to 4.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 07 22:40:00 UTC 2012
>Closed-Date:    Thu Mar 27 08:33:54 UTC 2014
>Last-Modified:  Thu Mar 27 11:40:00 UTC 2014
>Originator:     Michael Grnewald
>Release:        9
>Organization:
>Environment:
FreeBSD localhost 9.0-RELEASE FreeBSD 9.0-RELEASE #3: Sat Feb 18 17:33:06 CET 2012     root@localhost:/usr/obj/usr/src/sys/KERNEL  amd64

>Description:
- Update to 4.0.1
- Complies with PREFIX
- Findlib name is set back to `camlimages' instead of `images'
- No documentation

Documentation is available on line but not ``distributed'' as such,
so I decided to left it out.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/ocaml-images/Makefile b/ocaml-images/Makefile
index 1ac6e68..ae79c3a 100644
--- a/ocaml-images/Makefile
+++ b/ocaml-images/Makefile
@@ -7,36 +7,38 @@
 #
 
 PORTNAME=	images
-PORTVERSION=	3.0.2
-PORTREVISION=	8
+PORTVERSION=	4.0.1
 PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/ \
-		http://caml.inria.fr/distrib/bazar-ocaml/
+MASTER_SITES=	https://bitbucket.org/camlspotter/camlimages/get/
+
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	camlimages-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+
+DIST_SUBDIR=	ocaml-images
+DISTNAME=	v${PORTVERSION}
+WRKSRC =	${WRKDIR}/camlspotter-camlimages-c803efa9d5d3
 
 MAINTAINER=	michael.grunewald@laposte.net
 COMMENT=	Objective Caml image processing library
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:${PORTSDIR}/lang/ocaml-autoconf
 
-BROKEN=		does not compile
-
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf
-ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	--add-missing
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
-USE_OCAMLFIND_PLIST=	yes
 USE_OCAML_WASH=	yes
-OCAML_PKGDIRS=	camlimages
 USE_OCAML_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	-I${LOCALBASE}/include/libpng15
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--without-lablgtk
+
+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=${PREFIX}'
+
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS=	PNG "Enable PNG support" on \
@@ -52,81 +54,45 @@ OPTIONS=	PNG "Enable PNG support" on \
 
 .if !defined(WITHOUT_PNG)
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=	--with-png
-.else
-CONFIGURE_ARGS+=	--without-png
 .endif
 
 .if !defined(WITHOUT_JPEG)
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=	--with-jpeg
-.else
-CONFIGURE_ARGS+=	--without-jpeg
 .endif
 
 .if !defined(WITHOUT_TIFF)
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
-CONFIGURE_ARGS+=	--with-tiff
-.else
-CONFIGURE_ARGS+=	--without-tiff
 .endif
 
 .if !defined(WITHOUT_XPM)
 USE_XORG=	xpm
-CONFIGURE_ARGS+=	--with-xpm
-.else
-CONFIGURE_ARGS+=	--without-xpm
 .endif
 
 .if !defined(WITHOUT_GIF)
 LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
-CONFIGURE_ARGS+=	--with-gif
-.else
-CONFIGURE_ARGS+=	--without-gif
 .endif
 
 .if !defined(WITHOUT_FREETYPE)
 USE_FREETYPE=	yes
-CONFIGURE_ARGS+=	--with-freetype
-.else
-CONFIGURE_ARGS+=	--without-freetype
 .endif
 
 .if defined(WITH_GS)
 USE_GHOSTSCRIPT=	yes
-CONFIGURE_ARGS+=	--with-gs
-.else
-CONFIGURE_ARGS+=	--without-gs
 .endif
 
 .if defined(WITH_GTK2)
-CONFIGURE_ARGS+=	--with-lablgtk2
 BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-.else
-CONFIGURE_ARGS+=	--without-lablgtk2
 .endif
 
-GNU_CONFIGURE=	yes
-#USE_GMAKE=	yes
+do-configure:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile)
+	@(cd ${WRKSRC} && ${OMAKE} configure)
 
-#the default docsdir gets expanded to ${PREFIX}/share/doc/images
-#which isn't of much help when you are searching for the package docs
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-DOCSFILES=	CHANGES README LICENSE
+do-build:
+	@(cd ${WRKSRC} && ${OMAKE})
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	${DOCSFILES} doc
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/doc
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc '-name "*.jpg" -o -name "*.html"')
-	@${INSTALL_DATA} ${DOCSFILES:S,^,${WRKSRC}/,g} ${DOCSDIR}/
-.endif
-	@${ECHO_CMD} "lib/ocaml/stublibs/dllcamlimages.so" >> ${TMPPLIST}
-	@${ECHO_CMD} "lib/ocaml/stublibs/dllcamlimages_core.so" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/lib/ocaml/stublibs >/dev/null 2>&1 || ${TRUE}" >> ${TMPPLIST}
+do-install:
+	@(cd ${WRKSRC} && ${OMAKE} install)
 
 .include <bsd.port.mk>
diff --git a/ocaml-images/distinfo b/ocaml-images/distinfo
index 7661663..292653d 100644
--- a/ocaml-images/distinfo
+++ b/ocaml-images/distinfo
@@ -1,4 +1,2 @@
-SHA256 (ocaml-autoconf-1.0.tar.gz) = 67e85520f65c033c86e99e5438e51657e777579034570527c1b2c62096ecb004
-SIZE (ocaml-autoconf-1.0.tar.gz) = 11337
-SHA256 (camlimages-3.0.2.tgz) = db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
-SIZE (camlimages-3.0.2.tgz) = 1429138
+SHA256 (ocaml-images/v4.0.1.tar.gz) = b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4
+SIZE (ocaml-images/v4.0.1.tar.gz) = 2190274
diff --git a/ocaml-images/files/patch-OMakefile b/ocaml-images/files/patch-OMakefile
new file mode 100644
index 0000000..469d16c
--- /dev/null
+++ b/ocaml-images/files/patch-OMakefile
@@ -0,0 +1,20 @@
+--- OMakefile.orig	2012-11-07 22:03:19.000000000 +0100
++++ OMakefile	2012-11-07 22:04:26.000000000 +0100
+@@ -22,13 +22,13 @@
+ 
+ # 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[]=
diff --git a/ocaml-images/files/patch-configure.ac b/ocaml-images/files/patch-configure.ac
deleted file mode 100644
index a3e65e9..0000000
--- a/ocaml-images/files/patch-configure.ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2010-03-26 01:15:49.000000000 -0700
-+++ configure.ac	2010-03-26 01:15:52.000000000 -0700
-@@ -5,7 +5,6 @@
- 
- # Check ocaml
- AC_PROG_OCAML([3.08])
--AC_PROG_OCAML_TOOL(OCAMLMKLIB, ocamlmklib)
- AC_SUBST(OCAMLLIB)
- 
- # Check versions to build
diff --git a/ocaml-images/files/patch-src_OMakefile b/ocaml-images/files/patch-src_OMakefile
new file mode 100644
index 0000000..e988c5e
--- /dev/null
+++ b/ocaml-images/files/patch-src_OMakefile
@@ -0,0 +1,15 @@
+--- 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 -destdir $(PREFIX)/lib/ocaml/site-lib $(LIBRARY_PREFIX) $(INSTALL_TARGETS)
+ 
+ UNINSTALL()=
+-  value $(OCAMLFIND) remove $(LIBRARY_PREFIX)
++  value $(OCAMLFIND) remove -destdir $(PREFIX)/lib/ocaml/site-lib $(LIBRARY_PREFIX)
+ 
+ install: all
+   $(INSTALL)
diff --git a/ocaml-images/files/patch-src_gifread.c b/ocaml-images/files/patch-src_gifread.c
new file mode 100644
index 0000000..3605200
--- /dev/null
+++ b/ocaml-images/files/patch-src_gifread.c
@@ -0,0 +1,10 @@
+--- src/gifread.c.orig	2012-11-07 22:33:55.000000000 +0100
++++ src/gifread.c	2012-11-07 22:34:04.000000000 +0100
+@@ -200,7 +200,6 @@
+ 
+   if( DGifGetLine(GifFile, String_val(buf), GifFile->Image.Width ) 
+       == GIF_ERROR ){
+-    PrintGifError ();
+     failwith("DGifGetLine");
+   }
+   CAMLreturn(buf);
diff --git a/ocaml-images/files/patch-src_gifwrite.c b/ocaml-images/files/patch-src_gifwrite.c
index 301d382..15c2acb 100644
--- a/ocaml-images/files/patch-src_gifwrite.c
+++ b/ocaml-images/files/patch-src_gifwrite.c
@@ -1,5 +1,5 @@
---- ./src/gifwrite.c.orig	2010-04-09 03:01:01.000000000 -0700
-+++ ./src/gifwrite.c	2010-04-09 03:01:08.000000000 -0700
+--- src/gifwrite.c.orig	2011-06-22 20:04:32.000000000 +0200
++++ src/gifwrite.c	2012-11-07 22:32:25.000000000 +0100
 @@ -25,7 +25,7 @@
  
  #include <gif_lib.h>
@@ -9,3 +9,11 @@
  {
    CAMLparam1(list);
    CAMLlocal1(l);
+@@ -133,7 +133,6 @@
+ 
+   if ( EGifPutLine(GifFileOut, String_val(buf), GifFileOut->Image.Width) 
+        == GIF_ERROR ){
+-    PrintGifError ();
+     failwith("EGifPutLine");
+   }
+   CAMLreturn(Val_unit);
diff --git a/ocaml-images/files/patch-src_pngread.c b/ocaml-images/files/patch-src_pngread.c
new file mode 100644
index 0000000..2e5a49b
--- /dev/null
+++ b/ocaml-images/files/patch-src_pngread.c
@@ -0,0 +1,38 @@
+--- 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/ocaml-images/files/patch-src_pngwrite.c b/ocaml-images/files/patch-src_pngwrite.c
new file mode 100644
index 0000000..dc6872e
--- /dev/null
+++ b/ocaml-images/files/patch-src_pngwrite.c
@@ -0,0 +1,20 @@
+--- 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/ocaml-images/files/patch-src_tiffread.c b/ocaml-images/files/patch-src_tiffread.c
index 86b4639..895f101 100644
--- a/ocaml-images/files/patch-src_tiffread.c
+++ b/ocaml-images/files/patch-src_tiffread.c
@@ -1,11 +1,6 @@
 --- src/tiffread.c.orig	2009-10-26 13:42:03.000000000 +0100
 +++ src/tiffread.c	2010-08-28 10:47:42.000000000 +0200
-@@ -20,15 +20,21 @@
- #include <caml/alloc.h>
- #include <caml/memory.h>
- #include <caml/fail.h>
-+#include "oversized.h"
- 
+@@ -24,11 +25,16 @@
  /* These are defined in caml/config.h */
  #define int16 int16tiff
  #define uint16 uint16tiff
diff --git a/ocaml-images/pkg-plist b/ocaml-images/pkg-plist
new file mode 100644
index 0000000..afb12b6
--- /dev/null
+++ b/ocaml-images/pkg-plist
@@ -0,0 +1,149 @@
+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
+@dirrmtry lib/ocaml/site-lib/camlimages
+@dirrmtry lib/ocaml/site-lib
+@dirrmtry lib/ocaml


>Release-Note:
>Audit-Trail:

From: =?ISO-8859-15?Q?Michael_Gr=FCnewald?=
 <michael.grunewald@laposte.net>
To: bug-followup@FreeBSD.org, michael.grunewald@laposte.net
Cc:  
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Thu, 08 Nov 2012 07:01:56 +0100

 Note: in order to be applied from within graphcis/ocaml-images the patch
 must be stripped with --strip=2.
Responsible-Changed-From-To: freebsd-ports-bugs->bf 
Responsible-Changed-By: bf 
Responsible-Changed-When: Fri Jan 4 22:46:11 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173453 

From: John Marino <draco@marino.st>
To: bug-followup@FreeBSD.org, michael.grunewald@laposte.net
Cc:  
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Sun, 24 Mar 2013 02:23:01 +0100

 There's at least three problems with this port.
 
 1) patch-src_pngread.c should be removed completely.
 2) patch-src_pngwrite.c should be removed completely.
 3) There is a build dependency on devel/omake that is not documented
 
 For the first 2, src/pngread.c and src/pngwrite.c are already patched, 
 so these packages just dump all hunks to a rejects file.
 
 I have to get devel/omake building before I can continue.  Hopefully 
 there are no more problems with graphics/ocaml-images.
 
 John
 

From: John Marino <freebsdml@marino.st>
To: bug-followup@FreeBSD.org, michael.grunewald@laposte.net
Cc:  
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Sun, 24 Mar 2013 03:48:47 +0100

 I'm not sure what happened because the two png patches *were* good and 
 they were necessary.  The dependency on omake is still valid though.
 
 Speaking of which, I basically imported that from pkgsrc because the 
 current version didn't build with ocaml 4.00 and the 9.8.6rc1 needed 
 something like 26 patches!  Here's the final version of devel/omake that 
 got imported into dports:
 
 https://github.com/jrmarino/DPorts/commit/24e135f529690389cd5c215c6be0f8fbb7fbfc20
 
 And the final version of ocamlimages that got imported into dports:
 https://github.com/jrmarino/DPorts/commit/bd7b5e5463d7d32c41d1506fd6dc8fa0f0ff1283
 
 
 Permanent locations of those two are:
 https://github.com/jrmarino/DPorts/tree/master/devel/omake
 https://github.com/jrmarino/DPorts/tree/master/graphics/ocaml-images
 
 John
 
 
 

From: =?ISO-8859-1?Q?Michael_Gr=FCnewald?=
 <michael.grunewald@laposte.net>
To: John Marino <draco@marino.st>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Thu, 28 Mar 2013 07:57:42 +0100

 Hi John,
 
 thank you for your feedback,
 
 John Marino wrote:
 > There's at least three problems with this port.
 > 
 > 1) patch-src_pngread.c should be removed completely.
 > 2) patch-src_pngwrite.c should be removed completely.
 > 3) There is a build dependency on devel/omake that is not documented
 > 
 > For the first 2, src/pngread.c and src/pngwrite.c are already patched,
 > so these packages just dump all hunks to a rejects file.
 
 I did not see this:
 
 In pngread.c I have
 
   /* error handling */
   if (setjmp(png_ptr->jmpbuf)) {
     /* Free all of the memory associated with the png_ptr and info_ptr */
 
 and my patch file says something like
 
 @@ -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);
 
 What makes you think the source is already patched?
 
 > I have to get devel/omake building before I can continue.  Hopefully
 > there are no more problems with graphics/ocaml-images.
 
 I will add the required dependency!
 
 Best regards,
 Michael
 

From: John Marino <draco@marino.st>
To: =?ISO-8859-1?Q?Michael_Gr=FCnewald?= <michael.grunewald@laposte.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Thu, 28 Mar 2013 09:19:12 +0100

 On 3/28/2013 07:57, Michael Grnewald wrote:
 >
 > What makes you think the source is already patched?
 >
 >> I have to get devel/omake building before I can continue.  Hopefully
 >> there are no more problems with graphics/ocaml-images.
 >
 > I will add the required dependency!
 
 Hi Michael,
 I submitted a follow-up to that post that answers your question.
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/173453
 
 Summary: That statement was a mistake, the source is not already patched.
 
 Please read the complete follow-up though!
 John
Responsible-Changed-From-To: bf->marino 
Responsible-Changed-By: marino 
Responsible-Changed-When: Wed Mar 26 17:59:30 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173453 

From: John Marino <freebsd.contact@marino.st>
To: bug-followup@FreeBSD.org, michael.grunewald@laposte.net
Cc:  
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Wed, 26 Mar 2014 19:02:19 +0100

 Hi Michael,
 As you may have noticed, I pulled in Ocaml 4.00.1 from DPorts.  I knew
 it was not the very latest version, nor is the port staged.  Therefore
 I'm leaving this PR open and I just took over responsibility for it.
 
 What I would like you to do is check out the latest version of
 lang/ocaml (4.00.1) and update to 4.0.1 or whatever is now the latest,
 and at the same time provide stage support.
 
 And tweak whatever else you think is necessary -- you are the maintainer
 after all. I got the ball rolling for you again, and now it's back in
 your court.
 
 John

From: John Marino <freebsd.contact@marino.st>
To: bug-followup@FreeBSD.org, michael.grunewald@laposte.net
Cc:  
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Thu, 27 Mar 2014 09:16:37 +0100

 Hi Michael,
 I just realized that this PR is for ocaml-images, which is already at
 4.0.1.  I thought this was a duplicate PR for lang/ocaml with same
 version of 4.0.1.
 
 I will close this, but please submit a new PR for the update of
 lang/ocaml 4.00.1.  I just checked and 4.00.1 seems to be the latest (I
 thought there was a newer version), but this port still needs to be staged.
 
 There may be other fixes that got lost when I closed the related PR.
 
 Thanks,
 John
State-Changed-From-To: open->closed 
State-Changed-By: marino 
State-Changed-When: Thu Mar 27 08:33:53 UTC 2014 
State-Changed-Why:  
port has been updated to latest, but not directly from this PR 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173453 

From: =?windows-1252?Q?Michael_Gr=FCnewald?=
 <michael.grunewald@laposte.net>
To: marino@freebsd.org, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173453: graphics/ocaml-images Update to 4.0.1
Date: Thu, 27 Mar 2014 12:30:23 +0100

 Hi John,
 
 thank you for your feedback!
 
 John Marino wrote:
 
 > I just realized that this PR is for ocaml-images, which is already at
 > 4.0.1.  I thought this was a duplicate PR for lang/ocaml with same
 > version of 4.0.1.
 > 
 > I will close this, but please submit a new PR for the update of
 > lang/ocaml 4.00.1.  I just checked and 4.00.1 seems to be the latest (I
 > thought there was a newer version), but this port still needs to be staged.
 
 I will go to these things by next Sunday  I will update the PRs to keep
 track of my progress.
 
 Best regards,
 Michael
 
>Unformatted:
