- update to 1.5.8.3

- remove BASH option description - it's already in bsd.options.desc.mk
- switch to gcc, because clang produces unusable binary - it's crashing all the
  way. This is the reason for MFH
- install examples

Changelog: http://www.flickr.com/groups/gmic/discuss/72157639728004585/

MFH:	2014Q1

3 files changed, 17 insertions, 13 deletions

diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 00a4ca0e58ae..77f4da52446a 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmic
-PORTVERSION=	1.5.8.1
+PORTVERSION=	1.5.8.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/old
@@ -21,13 +21,12 @@ LIB_DEPENDS=	libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick13 \
 
 OPTIONS_DEFINE=	BASH
 OPTIONS_SUB=	yes
-BASH_DESC=	Install programmable completions for Bash
 BASH_RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-OPTIONS_EXCLUDE=NLS DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 USES=		gmake
+USE_GCC=	yes
 USE_GNOME=	gtk20
 USE_XORG=	x11 xext xrandr
 
@@ -45,6 +44,9 @@ PLIST_FILES=	bin/gmic \
 		%%PLUGIN_DIR%%/gmic_gimp
 PLIST_DIRSTRY=	%%PLUGIN_DIR%%
 
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PORTEXAMPLES=	gmic_in_script.scm gmic_use_lib.cpp
+
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -56,6 +58,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 .if ${PORT_OPTIONS:MBASH}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_SCRIPT} ${WRKSRC}/gmic_bashcompletion.sh \
diff --git a/graphics/gimp-gmic-plugin/distinfo b/graphics/gimp-gmic-plugin/distinfo
index 8803c07ffc40..517e6d4b6a69 100644
--- a/graphics/gimp-gmic-plugin/distinfo
+++ b/graphics/gimp-gmic-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gmic_1.5.8.1.tar.gz) = 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea
-SIZE (gmic_1.5.8.1.tar.gz) = 2265467
+SHA256 (gmic_1.5.8.3.tar.gz) = ed200f839c6b7cfa7df37a5b286d6dc106708a4466fe8d5e316b0a92681ad983
+SIZE (gmic_1.5.8.3.tar.gz) = 2341936
diff --git a/graphics/gimp-gmic-plugin/files/patch-Makefile b/graphics/gimp-gmic-plugin/files/patch-Makefile
index bae4f8685ab4..4adcb2bdc9c7 100644
--- a/graphics/gimp-gmic-plugin/files/patch-Makefile
+++ b/graphics/gimp-gmic-plugin/files/patch-Makefile
@@ -1,11 +1,11 @@
---- ./Makefile.orig	2013-09-18 14:58:08.000000000 +0400
-+++ ./Makefile	2013-09-20 17:26:01.000000000 +0400
+--- ./Makefile.orig	2014-02-10 12:56:33.000000000 +0400
++++ ./Makefile	2014-02-23 00:09:24.000000000 +0400
 @@ -47,7 +47,7 @@
  # Set correct variables and paths.
  #----------------------------------
  OS := $(shell uname)
 -CC = g++
-+CC = c++
++CC = $(CXX)
  ifeq ($(OS),Linux)
  OS = Unix
  endif
@@ -18,7 +18,7 @@
  endif
  ifeq ($(OSTYPE),msys)
  EXE = .exe
-@@ -117,7 +117,7 @@
+@@ -125,7 +125,7 @@
  # This requires the presence of the X11 extension include and library files.
  # (package 'libx11-dev' on Debian).
  XSHM_CFLAGS = -Dcimg_use_xshm
@@ -27,9 +27,9 @@
  
  # Flags to enable image display, using GDI32.
  # This requires the presence of the GDI32 include and library files.
-@@ -282,6 +282,13 @@
+@@ -294,6 +294,13 @@
  	$(MAKE) lib
- 	$(MAKE) zart
+ #	$(MAKE) zart
  else
 +ifeq ($(OS),FreeBSD)
 +	@echo "**"
@@ -41,7 +41,7 @@
  ifeq ($(OS),Darwin)
  	@echo "**"
  	@echo "** MacOSX configuration."
-@@ -297,9 +304,10 @@
+@@ -309,9 +316,10 @@
  	$(MAKE) gimp
  endif
  endif
@@ -53,7 +53,7 @@
  
  lib:
  	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-@@ -324,6 +332,9 @@
+@@ -336,6 +344,9 @@
  linux:
  	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic