From owner-svn-ports-all@FreeBSD.ORG Sat Oct 4 12:33:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DBFC519; Sat, 4 Oct 2014 12:33:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A613D0F; Sat, 4 Oct 2014 12:33:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s94CXS7j026291; Sat, 4 Oct 2014 12:33:28 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s94CXSes026288; Sat, 4 Oct 2014 12:33:28 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201410041233.s94CXSes026288@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Sat, 4 Oct 2014 12:33:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369954 - in head/graphics/gimp-gmic-plugin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Oct 2014 12:33:29 -0000 Author: rm Date: Sat Oct 4 12:33:27 2014 New Revision: 369954 URL: https://svnweb.freebsd.org/changeset/ports/369954 QAT: https://qat.redports.org/buildarchive/r369954/ Log: graphics/gimp-gmic-plugin: update to 1.6.0.0 Modified: head/graphics/gimp-gmic-plugin/Makefile head/graphics/gimp-gmic-plugin/distinfo head/graphics/gimp-gmic-plugin/files/patch-Makefile Modified: head/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/Makefile Sat Oct 4 12:09:13 2014 (r369953) +++ head/graphics/gimp-gmic-plugin/Makefile Sat Oct 4 12:33:27 2014 (r369954) @@ -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}/ Modified: head/graphics/gimp-gmic-plugin/distinfo ============================================================================== --- head/graphics/gimp-gmic-plugin/distinfo Sat Oct 4 12:09:13 2014 (r369953) +++ head/graphics/gimp-gmic-plugin/distinfo Sat Oct 4 12:33:27 2014 (r369954) @@ -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 Modified: head/graphics/gimp-gmic-plugin/files/patch-Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/files/patch-Makefile Sat Oct 4 12:09:13 2014 (r369953) +++ head/graphics/gimp-gmic-plugin/files/patch-Makefile Sat Oct 4 12:33:27 2014 (r369954) @@ -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