4 files changed, 146 insertions, 19 deletions

diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 80b0621188a8..5f95695f7ed0 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmic
-PORTVERSION=	1.5.0.0
+PORTVERSION=	1.5.0.1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/old
@@ -17,13 +17,10 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	cvs-src@yandex.ru
 COMMENT=	GREYC's Magic Image Converter
 
-BROKEN=		Does not compile with OpenCV 2.3.1
-
 LIB_DEPENDS=	GraphicsMagick++.6:${PORTSDIR}/graphics/GraphicsMagick13 \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		Magick++.4:${PORTSDIR}/graphics/ImageMagick \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		opencv_legacy.2:${PORTSDIR}/graphics/opencv \
 		fftw3.5:${PORTSDIR}/math/fftw3 \
 		gimp-2.0:${PORTSDIR}/graphics/gimp-app
 
@@ -56,13 +53,14 @@ PLIST_SUB+=	BASH=""
 PLIST_SUB+=	BASH="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/-lcv/-lopencv_legacy/g' \
-		-e 's/-lhighgui/-lopencv_legacy/g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \
-		-e 's/-lcv -lhighgui/-lopencv_legacy/g' \
-		${WRKSRC}/src/Makefile
+# GMIC is broken with OpenCV 2.3.1, so disable it for now
+#post-patch:
+#	@${REINPLACE_CMD} -e 's/-lcv/-lopencv_legacy/g' \
+#		-e 's/-lhighgui/-lopencv_legacy/g' \
+#		${WRKSRC}/configure
+#	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \
+#		-e 's/-lcv -lhighgui/-lopencv_legacy/g' \
+#		${WRKSRC}/src/Makefile
 
 do-install:
 	@${MKDIR} ${PREFIX}/${PLUGIN_DIR}
diff --git a/graphics/gimp-gmic-plugin/distinfo b/graphics/gimp-gmic-plugin/distinfo
index 8bc9c035369a..dcfcae077900 100644
--- a/graphics/gimp-gmic-plugin/distinfo
+++ b/graphics/gimp-gmic-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gmic_1.5.0.0.tar.gz) = f508c1cc20bc91e14535dc470e137bd8571e043278b270111fec9bb0d50f946b
-SIZE (gmic_1.5.0.0.tar.gz) = 1204904
+SHA256 (gmic_1.5.0.1.tar.gz) = 3d02069c1c472de535fae8adca6abf6ca628fec390e66a0c41e6216c23e5d0f3
+SIZE (gmic_1.5.0.1.tar.gz) = 1213407
diff --git a/graphics/gimp-gmic-plugin/files/patch-configure b/graphics/gimp-gmic-plugin/files/patch-configure
new file mode 100644
index 000000000000..c6baff451417
--- /dev/null
+++ b/graphics/gimp-gmic-plugin/files/patch-configure
@@ -0,0 +1,113 @@
+$FreeBSD$
+
+Unfortunately we can't do the usual patch configure.ac and run autoconf -- the
+tarball doesn't contain the autotools sources ><
+
+--- configure.orig	2011-08-23 18:18:22.000000000 +0400
++++ configure	2011-08-30 22:27:42.000000000 +0400
+@@ -5104,105 +5104,6 @@
+ 
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cvSobel in -lcv" >&5
+-$as_echo_n "checking for cvSobel in -lcv... " >&6; }
+-if test "${ac_cv_lib_cv_cvSobel+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcv  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char cvSobel ();
+-int
+-main ()
+-{
+-return cvSobel ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_cv_cvSobel=yes
+-else
+-  ac_cv_lib_cv_cvSobel=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cv_cvSobel" >&5
+-$as_echo "$ac_cv_lib_cv_cvSobel" >&6; }
+-if test "x$ac_cv_lib_cv_cvSobel" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCV 1
+-_ACEOF
+-
+-  LIBS="-lcv $LIBS"
+-
+-else
+-
+-    echo "***"
+-    echo "** Fatal Error : Header or library files for 'OpenCV (core)' are missing but are mandatory to compile G'MIC. **"
+-    echo "***"
+-    exit -1
+-
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhighgui" >&5
+-$as_echo_n "checking for main in -lhighgui... " >&6; }
+-if test "${ac_cv_lib_highgui_main+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lhighgui  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-return main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_highgui_main=yes
+-else
+-  ac_cv_lib_highgui_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_highgui_main" >&5
+-$as_echo "$ac_cv_lib_highgui_main" >&6; }
+-if test "x$ac_cv_lib_highgui_main" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBHIGHGUI 1
+-_ACEOF
+-
+-  LIBS="-lhighgui $LIBS"
+-
+-else
+-
+-    echo "***"
+-    echo "** Fatal Error : Header or library files for 'OpenCV (highgui)' are missing but are mandatory to compile G'MIC. **"
+-    echo "***"
+-    exit -1
+-
+-fi
+-
+-
+ # Checks for header files.
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
diff --git a/graphics/gimp-gmic-plugin/files/patch-src_Makefile b/graphics/gimp-gmic-plugin/files/patch-src_Makefile
index 18a1ef9d2fea..adda83806ee8 100644
--- a/graphics/gimp-gmic-plugin/files/patch-src_Makefile
+++ b/graphics/gimp-gmic-plugin/files/patch-src_Makefile
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- src/Makefile.orig	2011-07-08 00:22:17.000000000 +0400
-+++ src/Makefile	2011-07-10 12:19:31.000000000 +0400
+--- src/Makefile.orig	2011-08-23 18:18:27.000000000 +0400
++++ src/Makefile	2011-08-30 22:32:02.000000000 +0400
 @@ -56,7 +56,7 @@
  USR = /opt/local
  else
@@ -20,7 +20,23 @@ $FreeBSD$
  
  # Flags to enable image display, using GDI32.
  GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
-@@ -236,6 +236,14 @@
+@@ -142,15 +142,6 @@
+ ZLIB_CFLAGS = -Dcimg_use_zlib
+ ZLIB_LDFLAGS = -lz
+ 
+-# Flags to enable native support of webcams, using the OpenCV library.
+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv
+-ifeq ($(OS),Darwin)
+-OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
+-else
+-OPENCV_LDFLAGS = -lcv -lhighgui
+-# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
+-endif
+-
+ # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
+ MAGICK_CFLAGS = -Dcimg_use_magick -I$(USR)/include/GraphicsMagick
+ ifeq ($(OS),Darwin)
+@@ -236,6 +227,14 @@
  	$(MAKE) gimp
  	$(MAKE) lib
  else
@@ -35,7 +51,7 @@ $FreeBSD$
  ifeq ($(OS),Darwin)
  	@echo "**"
  	@echo "** MacOSX configuration"
-@@ -252,9 +260,10 @@
+@@ -252,9 +251,10 @@
  	$(MAKE) gimp
  endif
  endif
@@ -47,7 +63,7 @@ $FreeBSD$
  
  lib:
  	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
-@@ -269,6 +278,9 @@
+@@ -269,6 +269,9 @@
  linux:
  	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
  
@@ -55,4 +71,4 @@ $FreeBSD$
 +	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
 +
  custom:
- 	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic 
+ 	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic