From nobody@FreeBSD.org  Tue Aug 30 20:39:39 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB50F106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Aug 2011 20:39:39 +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 CA6158FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Aug 2011 20:39:39 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7UKddCx066620
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Aug 2011 20:39:39 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7UKdd8M066619;
	Tue, 30 Aug 2011 20:39:39 GMT
	(envelope-from nobody)
Message-Id: <201108302039.p7UKdd8M066619@red.freebsd.org>
Date: Tue, 30 Aug 2011 20:39:39 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] graphics/gimp-gmic-plugin: update to 1.5.0.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160321
>Category:       ports
>Synopsis:       [MAINTAINER] graphics/gimp-gmic-plugin: update to 1.5.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 30 20:40:09 UTC 2011
>Closed-Date:    Sun Sep 04 15:59:54 UTC 2011
>Last-Modified:  Sun Sep  4 16:00:24 UTC 2011
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- update to 1.5.0.1
- disable OpenCV for now to unbreak the port.
  &#1089;onsequences of that should be minor, since OpenCV used _only_ in gmic command
  line utility (the actual plugin is not affected) and it used _only_ for
  accessing webcams. 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa gimp-gmic-plugin.orig/Makefile gimp-gmic-plugin/Makefile
--- gimp-gmic-plugin.orig/Makefile	2011-08-27 11:14:10.000000000 +0400
+++ gimp-gmic-plugin/Makefile	2011-08-31 00:27:22.000000000 +0400
@@ -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 @@
 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="@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 -ruNa gimp-gmic-plugin.orig/distinfo gimp-gmic-plugin/distinfo
--- gimp-gmic-plugin.orig/distinfo	2011-08-10 20:09:05.000000000 +0400
+++ gimp-gmic-plugin/distinfo	2011-08-30 22:24:20.000000000 +0400
@@ -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 -ruNa gimp-gmic-plugin.orig/files/patch-configure gimp-gmic-plugin/files/patch-configure
--- gimp-gmic-plugin.orig/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
+++ gimp-gmic-plugin/files/patch-configure	2011-08-30 22:27:56.000000000 +0400
@@ -0,0 +1,108 @@
+--- 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 -ruNa gimp-gmic-plugin.orig/files/patch-src_Makefile gimp-gmic-plugin/files/patch-src_Makefile
--- gimp-gmic-plugin.orig/files/patch-src_Makefile	2011-08-10 20:09:05.000000000 +0400
+++ gimp-gmic-plugin/files/patch-src_Makefile	2011-08-30 22:32:44.000000000 +0400
@@ -1,7 +1,7 @@
 $FreeBSD: ports/graphics/gimp-gmic-plugin/files/patch-src_Makefile,v 1.2 2011/08/10 16:09:05 crees Exp $
 
---- 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 @@
  
  # 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 @@
  ifeq ($(OS),Darwin)
  	@echo "**"
  	@echo "** MacOSX configuration"
-@@ -252,9 +260,10 @@
+@@ -252,9 +251,10 @@
  	$(MAKE) gimp
  endif
  endif
@@ -47,7 +63,7 @@
  
  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,5 @@
 +	$(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
+ 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sat Sep 3 08:40:29 UTC 2011 
Responsible-Changed-Why:  
Yet ANOTHER fix from Ruslan.... 

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

From: Chris Rees <crees@FreeBSD.org>
To: bug-followup@FreeBSD.org, cvs-src@yandex.ru
Cc:  
Subject: Re: ports/160321: [MAINTAINER] graphics/gimp-gmic-plugin: update
 to 1.5.0.1
Date: Sat, 3 Sep 2011 09:55:44 +0100

 Hm, for future reference you can't patch a Makefile generated from a 
 Makefile.in by a configure script-- you must patch the Makefile.in -- 
 Makefile doesn't actually exist on extract;
 
 [crees@zeus]~/workspace/ports/pcvs/gimp-gmic-plugin% ls 
 work/gmic-1.5.0.1/Makefile*
 work/gmic-1.5.0.1/Makefile.in
 
 I'll fix this.
 
 Chris
 
 -- 
 This message has been scanned for viruses and
 dangerous content by MailScanner, and is
 believed to be clean.
 

From: Chris Rees <crees@FreeBSD.org>
To: bug-followup@FreeBSD.org, cvs-src@yandex.ru
Cc:  
Subject: Re: ports/160321: [MAINTAINER] graphics/gimp-gmic-plugin: update
 to 1.5.0.1
Date: Sat, 3 Sep 2011 09:56:57 +0100

 D'oh, please ignore the previous email, you weren't patching 
 ${WRKSRC}/Makefile at all, it's ${WRKSRC}/src/Makefile...
 
 Sending to Tinderbox now!
 
 Chris
 
 -- 
 This message has been scanned for viruses and
 dangerous content by MailScanner, and is
 believed to be clean.
 

From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: Chris Rees <crees@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/160321: [MAINTAINER] graphics/gimp-gmic-plugin: update
 to 1.5.0.1
Date: Sat, 03 Sep 2011 12:59:30 +0400

 Chris Rees wrote on 03.09.2011 12:55:
 > Hm, for future reference you can't patch a Makefile generated from a
 > Makefile.in by a configure script-- you must patch the Makefile.in --
 > Makefile doesn't actually exist on extract;
 
 Ok, i already know this. But this is not true for this port. Makefile in 
 gmic doesn't generated by configure run, as you can check yourself.
 For that reason we already have patch in files/ that patches Makefile, 
 not Makefile.in.
 
 >
 > [crees@zeus]~/workspace/ports/pcvs/gimp-gmic-plugin% ls
 > work/gmic-1.5.0.1/Makefile*
 > work/gmic-1.5.0.1/Makefile.in
 >
 > I'll fix this.
 >
 > Chris
 >
 
 
 -- 
 Regards,
 Ruslan
 
 Tinderboxing kills... the drives.

From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: Chris Rees <crees@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/160321: [MAINTAINER] graphics/gimp-gmic-plugin: update
 to 1.5.0.1
Date: Sat, 03 Sep 2011 13:01:40 +0400

 Chris Rees wrote on 03.09.2011 12:55:
 > Hm, for future reference you can't patch a Makefile generated from a
 > Makefile.in by a configure script-- you must patch the Makefile.in --
 > Makefile doesn't actually exist on extract;
 
 Hmm, sorry i'm dumb, you are right. But to fix the build we don't care 
 about Makefile in ${WRKSRC}, the only one we care is in ${WRKSRC}/src
 
 >
 > [crees@zeus]~/workspace/ports/pcvs/gimp-gmic-plugin% ls
 > work/gmic-1.5.0.1/Makefile*
 > work/gmic-1.5.0.1/Makefile.in
 >
 > I'll fix this.
 >
 > Chris
 >
 
 
 -- 
 Regards,
 Ruslan
 
 Tinderboxing kills... the drives.
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Sun Sep 4 15:59:52 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160321: commit references a PR
Date: Sun,  4 Sep 2011 15:59:52 +0000 (UTC)

 crees       2011-09-04 15:59:39 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/gimp-gmic-plugin Makefile distinfo 
     graphics/gimp-gmic-plugin/files patch-src_Makefile 
   Added files:
     graphics/gimp-gmic-plugin/files patch-configure 
   Log:
   - Update to 1.5.0.1
   - Disable OpenCV for now to unbreak the port
   
   PR:             ports/160321
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru> (maintainer)
   
   Revision  Changes    Path
   1.10      +9 -11     ports/graphics/gimp-gmic-plugin/Makefile
   1.7       +2 -2      ports/graphics/gimp-gmic-plugin/distinfo
   1.3       +113 -0    ports/graphics/gimp-gmic-plugin/files/patch-configure (new)
   1.3       +23 -7     ports/graphics/gimp-gmic-plugin/files/patch-src_Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
