7 files changed, 123 insertions, 113 deletions

diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile
index 5380bbc8aa79..bffd9395aac2 100644
--- a/graphics/iulib/Makefile
+++ b/graphics/iulib/Makefile
@@ -6,22 +6,23 @@
 #
 
 PORTNAME=	iulib
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	A library of image understanding-related algorithms
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff
 
-WRKSRC=		${WRKDIR}/iulib
-
-OPTIONS=	SDL "Enable SDL" off \
+OPTIONS=	SDL "Enable SDL for graphical debugging" off \
 		VIDIO "Enable Video Input/Output (using ffmpeg)" off
 
 MAKE_JOBS_SAFE=	yes
+USE_PYTHON_BUILD=	yes
 USE_AUTOTOOLS=	libtool:15 aclocal:110 automake:110 autoconf:262
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
 USE_LDCONFIG=	yes
@@ -35,21 +36,16 @@ CONFIGURE_ARGS+=--without-SDL
 USE_SDL=	sdl
 .endif
 
-.if !defined(WITH_VIDIO)
-PLIST_SUB+=	VIDIO="@comment "
-.else
+.if defined(WITH_VIDIO)
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+=	VIDIO=""
-.endif
-
+.else
 post-patch:
-	@${REINPLACE_CMD} -e '/tiff/s/^/#/' ${WRKSRC}/configure.ac
-.if !defined(WITH_VIDIO)
 	@${REINPLACE_CMD} -e 's/novidio, 0/novidio, 1/' ${WRKSRC}/configure.ac
 .endif
 
 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} \
+	  && ${SETENV} ${PYTHON_CMD} genAM.py >Makefile.am \
 	  && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake)
 
 run-autotools: run-autotools-aclocal run-autotools-automake run-autotools-autoconf
diff --git a/graphics/iulib/distinfo b/graphics/iulib/distinfo
index 3c8f19927352..7db9db706523 100644
--- a/graphics/iulib/distinfo
+++ b/graphics/iulib/distinfo
@@ -1,3 +1,3 @@
-MD5 (iulib-0.3.tar.gz) = eb98f97d5b93fae6ff1e416922a4f389
-SHA256 (iulib-0.3.tar.gz) = 229f6c6b3724a442efd7306def6d2b35cd7ad38ec725adc6446632c9e8cd20f2
-SIZE (iulib-0.3.tar.gz) = 3065868
+MD5 (iulib-0.4.tgz) = 94a563c9139b1edcc5338f492da84ab1
+SHA256 (iulib-0.4.tgz) = c70dab420f5ce0ff0185c922881576f4a82eacec3feb0befa66bd7468151d99b
+SIZE (iulib-0.4.tgz) = 3288112
diff --git a/graphics/iulib/files/patch-Makefile.am b/graphics/iulib/files/patch-Makefile.am
deleted file mode 100644
index 12692e23fff7..000000000000
--- a/graphics/iulib/files/patch-Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./Makefile.am.orig	2008-10-16 03:50:34.000000000 +0900
-+++ ./Makefile.am	2009-05-22 09:19:51.000000000 +0900
-@@ -3,9 +3,9 @@
- includedir = ${prefix}/include/iulib
- colibdir = ${prefix}/include/colib
- 
--lib_LIBRARIES = libiulib.a
-+lib_LTLIBRARIES = libiulib.la
- 
--libiulib_a_SOURCES  = \
-+libiulib_la_SOURCES  = \
- $(srcdir)/imgio/autoinvert.cc  $(srcdir)/imgio/imgio.cc  $(srcdir)/imgio/io_jpeg.cc  $(srcdir)/imgio/io_pbm.cc  $(srcdir)/imgio/io_png.cc \
- $(srcdir)/imglib/imgbrushfire.cc  $(srcdir)/imglib/imgedges.cc  $(srcdir)/imglib/imgfilters.cc  $(srcdir)/imglib/imggauss.cc  $(srcdir)/imglib/imglabels.cc  $(srcdir)/imglib/imgmap.cc  $(srcdir)/imglib/imgmisc.cc  $(srcdir)/imglib/imgmorph.cc  $(srcdir)/imglib/imgops.cc  $(srcdir)/imglib/imgrescale.cc  $(srcdir)/imglib/imgthin.cc  $(srcdir)/imglib/imgtrace.cc  $(srcdir)/imglib/imggraymorph.cc \
- $(srcdir)/imgbits/imgbits.cc $(srcdir)/imgbits/imgbsmp.cc $(srcdir)/imgbits/imgbthin.cc $(srcdir)/imgbits/imgrle.cc $(srcdir)/imgbits/imgblit.cc $(srcdir)/imgbits/imgblit_c.cc
-@@ -21,28 +21,16 @@
- # conditionals
- 
- if have_sdl
--    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics.cc
-+    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics.cc
- else
--    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
-+    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
- endif
- 
- if have_vidio
--    libiulib_a_SOURCES += $(srcdir)/vidio/vidio.cc
-+    libiulib_la_SOURCES += $(srcdir)/vidio/vidio.cc
-     include_HEADERS += $(srcdir)/vidio/vidio.h
- endif
- 
- if have_v4l2
--    libiulib_a_SOURCES += $(srcdir)/vidio/v4l2cap.cc
-+    libiulib_la_SOURCES += $(srcdir)/vidio/v4l2cap.cc
- endif
--
--# make installation of colib a separate target
--
--install-colib:
--	install -d $(colibdir)
--	install $(colib_HEADERS) $(colibdir)
--
--install: all install-colib
--	install -d $(includedir)
--	install -d $(libdir)
--	install $(include_HEADERS) $(includedir)
--	install $(lib_LIBRARIES) $(libdir)
-\ No newline at end of file
diff --git a/graphics/iulib/files/patch-configure.ac b/graphics/iulib/files/patch-configure.ac
index 8d0dd4eba206..8e284f325962 100644
--- a/graphics/iulib/files/patch-configure.ac
+++ b/graphics/iulib/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- ./configure.ac.orig	2008-10-16 03:50:34.000000000 +0900
-+++ ./configure.ac	2009-05-22 09:21:25.000000000 +0900
+--- ./configure.ac.orig	2009-06-10 07:32:20.000000000 +0900
++++ ./configure.ac	2009-06-11 18:17:12.000000000 +0900
 @@ -10,7 +10,7 @@
  
  AC_PROG_CXX
diff --git a/graphics/iulib/files/patch-genAM.py b/graphics/iulib/files/patch-genAM.py
new file mode 100644
index 000000000000..b2e25b12d6ef
--- /dev/null
+++ b/graphics/iulib/files/patch-genAM.py
@@ -0,0 +1,67 @@
+--- ./genAM.py.orig	2009-06-10 07:32:20.000000000 +0900
++++ ./genAM.py	2009-06-11 18:24:46.000000000 +0900
+@@ -25,12 +25,12 @@
+ # Primary Repository: http://ocropus.googlecode.com/svn/trunk/
+ # Web Sites: www.iupr.org, www.dfki.de
+ 
+-AM_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib
++AM_CPPFLAGS = -I$(srcdir)/colib -I$(srcdir)/imgio -I$(srcdir)/imglib -I$(srcdir)/imgbits -I$(srcdir)/utils -I$(srcdir)/vidio
+ 
+ includedir = ${prefix}/include/iulib
+ colibdir = ${prefix}/include/colib
+ 
+-lib_LIBRARIES = libiulib.a
++lib_LTLIBRARIES = libiulib.la
+ """
+ 
+ dirs = """
+@@ -39,7 +39,7 @@
+     imgbits
+ """.split()
+ 
+-print "libiulib_a_SOURCES = ",
++print "libiulib_la_SOURCES = ",
+ for d in dirs:
+     print '\\'
+     for cc in glob.glob(d + "/*.cc"):
+@@ -82,35 +82,23 @@
+ print """
+ # conditionals
+ if have_sdl
+-    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics.cc
+-    libiulib_a_SOURCES += $(srcdir)/utils/SDL_lines.cc
++    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics.cc
++    libiulib_la_SOURCES += $(srcdir)/utils/SDL_lines.cc
+     include_HEADERS += $(srcdir)/utils/SDL_lines.h
+ else
+-    libiulib_a_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
++    libiulib_la_SOURCES += $(srcdir)/utils/dgraphics_nosdl.cc
+ endif
+ 
+ if have_vidio
+-    libiulib_a_SOURCES += $(srcdir)/vidio/vidio.cc
++    libiulib_la_SOURCES += $(srcdir)/vidio/vidio.cc
+ endif
+ 
+ # We install it always because iulib.h always includes it.
+ include_HEADERS += $(srcdir)/vidio/vidio.h
+ 
+ if have_v4l2
+-    libiulib_a_SOURCES += $(srcdir)/vidio/v4l2cap.cc
++    libiulib_la_SOURCES += $(srcdir)/vidio/v4l2cap.cc
+ endif
+-
+-# make installation of colib a separate target
+-
+-install-colib:
+-	install -d $(colibdir)
+-	install $(colib_HEADERS) $(colibdir)
+-
+-install: all install-colib
+-	install -d $(includedir)
+-	install -d $(libdir)
+-	install $(include_HEADERS) $(includedir)
+-	install $(lib_LIBRARIES) $(libdir)
+ """
+ 
+ print
diff --git a/graphics/iulib/files/patch-vidio__vidio.cc b/graphics/iulib/files/patch-vidio__vidio.cc
index 2e773af22b84..76532d2723f0 100644
--- a/graphics/iulib/files/patch-vidio__vidio.cc
+++ b/graphics/iulib/files/patch-vidio__vidio.cc
@@ -1,5 +1,5 @@
---- ./vidio/vidio.cc.orig	2008-10-16 03:50:34.000000000 +0900
-+++ ./vidio/vidio.cc	2009-05-22 09:19:51.000000000 +0900
+--- ./vidio/vidio.cc.orig	2009-06-10 07:32:20.000000000 +0900
++++ ./vidio/vidio.cc	2009-06-11 18:24:08.000000000 +0900
 @@ -27,7 +27,6 @@
  extern "C" {
  #include <assert.h>
@@ -8,12 +8,3 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <ctype.h>
-@@ -481,7 +480,7 @@
-             av_freep(&oc->streams[i]);
-         }
- 
--        url_fclose(&oc->pb);
-+        url_fclose(oc->pb);
- 
-         // free the stream
-         av_free(oc);
diff --git a/graphics/iulib/pkg-plist b/graphics/iulib/pkg-plist
index db76b1998eaa..052882deaee6 100644
--- a/graphics/iulib/pkg-plist
+++ b/graphics/iulib/pkg-plist
@@ -1,52 +1,56 @@
-include/colib/rowarrays.h
+include/colib/checks.h
+include/colib/classifier.h
+include/colib/clib.h
+include/colib/colib.h
+include/colib/compat.h
 include/colib/coords.h
+include/colib/debugf.h
+include/colib/deprecation.h
+include/colib/env.h
+include/colib/hash.h
+include/colib/heap.h
+include/colib/iarith.h
+include/colib/iustring.h
 include/colib/misc.h
 include/colib/narray-ops.h
-include/colib/narray.h
-include/colib/vec2.h
-include/colib/checks.h
-include/colib/counted.h
-include/colib/strbuf.h
-include/colib/objlist.h
 include/colib/narray-util.h
-include/colib/nustring.h
-include/colib/clib.h
+include/colib/narray.h
 include/colib/nbest.h
-include/colib/smartptr.h
-include/colib/iarith.h
-include/colib/hash.h
-include/colib/compat.h
-include/colib/classifier.h
+include/colib/nustring.h
+include/colib/objlist.h
 include/colib/quicksort.h
-include/colib/ocrinterfaces.h
-include/colib/env.h
-include/colib/colib.h
-include/colib/heap.h
+include/colib/rowarrays.h
+include/colib/smartptr.h
+include/colib/strbuf.h
+include/colib/unionfind.h
+include/colib/vec2.h
 include/iulib/autoinvert.h
+include/iulib/bithacks.h
+include/iulib/dgraphics.h
+include/iulib/imgbitptr.h
+include/iulib/imgbits.h
+include/iulib/imgbrushfire.h
+include/iulib/imgedges.h
+include/iulib/imgfilters.h
+include/iulib/imggauss.h
+include/iulib/imggraymorph.h
 include/iulib/imgio.h
-include/iulib/io_pbm.h
-include/iulib/io_png.h
-include/iulib/io_jpeg.h
-include/iulib/imgtrace.h
-include/iulib/imgthin.h
-include/iulib/imgmorph.h
-include/iulib/imgmisc.h
-include/iulib/imgops.h
 include/iulib/imglabels.h
 include/iulib/imglib.h
-include/iulib/imgfilters.h
 include/iulib/imgmap.h
+include/iulib/imgmisc.h
+include/iulib/imgmorph.h
+include/iulib/imgops.h
 include/iulib/imgrescale.h
-include/iulib/imggauss.h
-include/iulib/imgedges.h
-include/iulib/imggraymorph.h
-include/iulib/imgbrushfire.h
-include/iulib/dgraphics.h
-include/iulib/imgbits.h
-include/iulib/imgbitptr.h
 include/iulib/imgrle.h
-include/iulib/bithacks.h
-%%VIDIO%%include/iulib/vidio.h
+include/iulib/imgthin.h
+include/iulib/imgtrace.h
+include/iulib/io_jpeg.h
+include/iulib/io_pbm.h
+include/iulib/io_png.h
+include/iulib/io_tiff.h
+include/iulib/iulib.h
+include/iulib/vidio.h
 lib/libiulib.a
 lib/libiulib.la
 lib/libiulib.so