4 files changed, 20 insertions, 75 deletions

diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 102688bbe0c2..934a9a2dd740 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmic
-PORTVERSION=	1.4.9.0
-PORTREVISION=	2
+PORTVERSION=	1.5.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/old
@@ -38,8 +37,8 @@ USE_XORG=	x11 xext xrandr
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
 PLIST_SUB+=	PLUGIN_DIR=${PLUGIN_DIR}
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	"-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 CFLAGS:=	${CFLAGS:N-O*:N-pipe}
 CXXFLAGS:=	${CXXFLAGS:N-O*:N-pipe}
 
diff --git a/graphics/gimp-gmic-plugin/distinfo b/graphics/gimp-gmic-plugin/distinfo
index 5f8bea878cd4..8bc9c035369a 100644
--- a/graphics/gimp-gmic-plugin/distinfo
+++ b/graphics/gimp-gmic-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gmic_1.4.9.0.tar.gz) = 7b074d5869d19c6bcab7eded221743ddd9b6357c74996aae805d0de8293e810f
-SIZE (gmic_1.4.9.0.tar.gz) = 962450
+SHA256 (gmic_1.5.0.0.tar.gz) = f508c1cc20bc91e14535dc470e137bd8571e043278b270111fec9bb0d50f946b
+SIZE (gmic_1.5.0.0.tar.gz) = 1204904
diff --git a/graphics/gimp-gmic-plugin/files/patch-configure b/graphics/gimp-gmic-plugin/files/patch-configure
deleted file mode 100644
index e52ab7923a91..000000000000
--- a/graphics/gimp-gmic-plugin/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.orig	2011-02-07 11:24:18.000000000 +0300
-+++ configure	2011-02-07 20:19:00.000000000 +0300
-@@ -4807,52 +4807,6 @@
- 
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5
--$as_echo_n "checking for main in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_main+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl  $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_nsl_main=yes
--else
--  ac_cv_lib_nsl_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_nsl_main" >&5
--$as_echo "$ac_cv_lib_nsl_main" >&6; }
--if test "x$ac_cv_lib_nsl_main" = x""yes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBNSL 1
--_ACEOF
--
--  LIBS="-lnsl $LIBS"
--
--else
--
--    echo "***"
--    echo "** Fatal Error : Header or library files for 'libnsl' are missing but are mandatory to compile G'MIC. **"
--    echo "***"
--    exit -1
--
--fi
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpng" >&5
- $as_echo_n "checking for main in -lpng... " >&6; }
- if test "${ac_cv_lib_png_main+set}" = set; then :
diff --git a/graphics/gimp-gmic-plugin/files/patch-src_Makefile b/graphics/gimp-gmic-plugin/files/patch-src_Makefile
index df60eb549c7b..18a1ef9d2fea 100644
--- a/graphics/gimp-gmic-plugin/files/patch-src_Makefile
+++ b/graphics/gimp-gmic-plugin/files/patch-src_Makefile
@@ -1,15 +1,17 @@
---- src/Makefile.orig	2011-02-07 11:24:18.000000000 +0300
-+++ src/Makefile	2011-02-08 00:08:10.000000000 +0300
+$FreeBSD$
+
+--- src/Makefile.orig	2011-07-08 00:22:17.000000000 +0400
++++ src/Makefile	2011-07-10 12:19:31.000000000 +0400
 @@ -56,7 +56,7 @@
  USR = /opt/local
  else
- PLUGINDIR=`gimptool-2.0 --gimpplugindir`/plug-ins
+ PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
 -USR = /usr
 +USR = /usr/X11R6
  endif
  ifeq ($(OS),MINGW32_NT-5.1)
  EXE = .exe
-@@ -101,7 +101,7 @@
+@@ -112,7 +112,7 @@
  
  # Flags to enable fast display, using XShm.
  XSHM_CFLAGS = -Dcimg_use_xshm
@@ -17,10 +19,10 @@
 +XSHM_LDFLAGS = -L/usr/X11R6/lib -lXext
  
  # Flags to enable image display, using GDI32.
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -222,6 +222,14 @@
- 	$(MAKE) bashcompletion
+ GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
+@@ -236,6 +236,14 @@
  	$(MAKE) gimp
+ 	$(MAKE) lib
  else
 +ifeq ($(OS),FreeBSD)
 +	@echo "**"
@@ -33,25 +35,24 @@
  ifeq ($(OS),Darwin)
  	@echo "**"
  	@echo "** MacOSX configuration"
-@@ -238,9 +246,10 @@
+@@ -252,9 +260,10 @@
  	$(MAKE) gimp
  endif
  endif
 +endif
  
  gimp:
--	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS)" "STRIP_EXE=1" gmic_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
  
  lib:
- 	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
-@@ -255,6 +264,9 @@
+ 	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
+@@ -269,6 +278,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)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
  
 +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