3 files changed, 24 insertions, 26 deletions

diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index a926ddd8be8b..01d76eb83f5a 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmic
-PORTVERSION=	1.5.9.0
-PORTREVISION=	7
+PORTVERSION=	1.6.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/older_versions/ \
 		SF/${PORTNAME}/
diff --git a/graphics/gimp-gmic-plugin/distinfo b/graphics/gimp-gmic-plugin/distinfo
index 70d5b37dcaf2..377a1020e93e 100644
--- a/graphics/gimp-gmic-plugin/distinfo
+++ b/graphics/gimp-gmic-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gmic_1.5.9.0.tar.gz) = 134257ce2fe4d113c479194d99b132d18b73d618e8ac6ce3e36568a1fbaea7d6
-SIZE (gmic_1.5.9.0.tar.gz) = 2786931
+SHA256 (gmic_1.6.0.0.tar.gz) = 2aa53ebab4c361c5401e23142a31b06a38ef565c533d1326d31f985f5c0c2da5
+SIZE (gmic_1.6.0.0.tar.gz) = 2818394
diff --git a/graphics/gimp-gmic-plugin/files/patch-Makefile b/graphics/gimp-gmic-plugin/files/patch-Makefile
index fd1593ca3c13..b7a4e346feff 100644
--- a/graphics/gimp-gmic-plugin/files/patch-Makefile
+++ b/graphics/gimp-gmic-plugin/files/patch-Makefile
@@ -1,6 +1,6 @@
---- ./Makefile.orig	2014-02-10 12:56:33.000000000 +0400
-+++ ./Makefile	2014-02-23 00:09:24.000000000 +0400
-@@ -47,7 +47,7 @@
+--- Makefile.orig	2014-08-21 07:47:10 UTC
++++ Makefile
+@@ -48,7 +48,7 @@
  # Set correct variables and paths.
  #----------------------------------
  OS := $(shell uname)
@@ -9,7 +9,7 @@
  ifeq ($(OS),Linux)
  OS = Unix
  endif
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,7 @@
  USR = /opt/local
  else
  PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
@@ -18,48 +18,47 @@
  endif
  ifeq ($(OSTYPE),msys)
  EXE = .exe
-@@ -125,7 +125,7 @@
+@@ -136,7 +136,7 @@
  # This requires the presence of the X11 extension include and library files.
  # (package 'libx11-dev' on Debian).
  XSHM_CFLAGS = -Dcimg_use_xshm
--XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LDFLAGS = -L/usr/X11R6/lib -lXext
+-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
++XSHM_LIBS = -L/usr/X11R6/lib -lXext
  
  # Flags to enable image display, using GDI32.
  # This requires the presence of the GDI32 include and library files.
-@@ -294,6 +294,13 @@
- 	$(MAKE) lib
- #	$(MAKE) zart
+@@ -293,6 +293,12 @@
+ 	@echo "**"
+ 	$(MAKE) linux gimp lib  # zart
  else
 +ifeq ($(OS),FreeBSD)
 +	@echo "**"
 +	@echo "** FreeBSD configuration"
 +	@echo "**"
-+	$(MAKE) freebsd
-+	$(MAKE) gimp
++	$(MAKE) freebsd gimp
 +else
  ifeq ($(OS),Darwin)
  	@echo "**"
  	@echo "** MacOSX configuration."
-@@ -309,9 +316,10 @@
- 	$(MAKE) gimp
+@@ -305,9 +311,10 @@
+ 	$(MAKE) windows gimp
  endif
  endif
 +endif
  
  gimp:
--	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
-+	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
+-	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" "STRIP_EXE=1" gmic_gimp
++	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS)" "LIBS=$(STD_GIMP_LIBS)" "STRIP_EXE=1" gmic_gimp
  
  lib:
- 	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
-@@ -336,6 +344,9 @@
+ 	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
+@@ -323,6 +330,9 @@
  linux:
- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
  
 +freebsd:
-+	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard
++	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
 +
- custom:
- 	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
+ solaris:
+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic