diff -r -u -N graphics/gimp-gmic-plugin/Makefile ../../home/pi/myp/graphics/gimp-gmic-plugin/Makefile --- graphics/gimp-gmic-plugin/Makefile 2015-12-14 21:30:20.592869000 +0100 +++ ../../home/pi/myp/graphics/gimp-gmic-plugin/Makefile 2016-02-25 22:32:24.237915000 +0100 @@ -1,8 +1,7 @@ # $FreeBSD: head/graphics/gimp-gmic-plugin/Makefile 403677 2015-12-13 16:26:12Z rm $ PORTNAME= gmic -PORTVERSION= 1.6.0.0 -PORTREVISION= 4 +PORTVERSION= 1.6.9 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- @@ -14,6 +13,7 @@ LIB_DEPENDS= libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libfftw3.so:${PORTSDIR}/math/fftw3 \ @@ -25,10 +25,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= gmake pkgconfig +USES= dos2unix gmake pkgconfig USE_GCC= yes USE_GNOME= gtk20 USE_XORG= x11 xext xrandr +DOS2UNIX_FILES= Makefile PLUGIN_DIR?= libexec/gimp/2.2/plug-ins PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} @@ -40,8 +41,10 @@ PLIST_FILES= bin/gmic \ man/man1/gmic.1.gz \ - %%BASH%%etc/bash_completion.d/gmic_bashcompletion.sh \ - %%PLUGIN_DIR%%/gmic_gimp + %%BASH%%etc/bash_completion.d/gmic \ + %%PLUGIN_DIR%%/gmic_gimp \ + %%PLUGIN_DIR%%/cli_update169.gmic \ + %%PLUGIN_DIR%%/gimp_update169.gmic EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp @@ -50,11 +53,15 @@ post-patch: @${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \ + -e 's#/usr/local#${LOCALBASE}#g' \ ${WRKSRC}/Makefile do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} + ${INSTALL_DATA} ${WRKSRC}/../resources/cli_update169.gmic \ + ${WRKSRC}/../resources/gimp_update169.gmic \ + ${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} @@ -62,7 +69,7 @@ .if ${PORT_OPTIONS:MBASH} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \ - ${STAGEDIR}${PREFIX}/etc/bash_completion.d + ${STAGEDIR}${PREFIX}/etc/bash_completion.d/gmic .endif .include diff -r -u -N graphics/gimp-gmic-plugin/distinfo ../../home/pi/myp/graphics/gimp-gmic-plugin/distinfo --- graphics/gimp-gmic-plugin/distinfo 2015-08-01 00:50:44.725978000 +0200 +++ ../../home/pi/myp/graphics/gimp-gmic-plugin/distinfo 2016-02-25 20:27:21.918377000 +0100 @@ -1,2 +1,2 @@ -SHA256 (gmic_1.6.0.0.tar.gz) = 2aa53ebab4c361c5401e23142a31b06a38ef565c533d1326d31f985f5c0c2da5 -SIZE (gmic_1.6.0.0.tar.gz) = 2818394 +SHA256 (gmic_1.6.9.tar.gz) = 8b836b4ac02a2d3963384951b6e00f2d8e19ede0b49ee93b041ef227cf9dd794 +SIZE (gmic_1.6.9.tar.gz) = 3278273 diff -r -u -N graphics/gimp-gmic-plugin/files/patch-Makefile ../../home/pi/myp/graphics/gimp-gmic-plugin/files/patch-Makefile --- graphics/gimp-gmic-plugin/files/patch-Makefile 2015-08-01 00:50:44.727356000 +0200 +++ ../../home/pi/myp/graphics/gimp-gmic-plugin/files/patch-Makefile 2016-02-25 21:35:54.699360000 +0100 @@ -1,64 +1,19 @@ ---- Makefile.orig 2014-08-21 07:47:10 UTC +--- Makefile.orig 2016-02-25 20:35:48 UTC +++ Makefile -@@ -48,7 +48,7 @@ +@@ -49,6 +49,7 @@ # Set correct variables and paths. #---------------------------------- OS := $(shell uname) --CC = g++ +CC = $(CXX) ifeq ($(OS),Linux) OS = Unix endif -@@ -63,7 +63,7 @@ - USR = /opt/local - else - PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins --USR = /usr -+USR = /usr/X11R6 - endif - ifeq ($(OSTYPE),msys) - EXE = .exe -@@ -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_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. -@@ -293,6 +293,12 @@ +@@ -323,7 +324,7 @@ ifeq ($(OS),Unix) + @echo "**" + @echo "** Start building G'MIC with default Unix configuration." @echo "**" - $(MAKE) linux gimp lib # zart +- $(MAKE) cli gimp lib zart ++ $(MAKE) cli gimp else -+ifeq ($(OS),FreeBSD) -+ @echo "**" -+ @echo "** FreeBSD configuration" -+ @echo "**" -+ $(MAKE) freebsd gimp -+else ifeq ($(OS),Darwin) @echo "**" - @echo "** MacOSX configuration." -@@ -305,9 +311,10 @@ - $(MAKE) windows gimp - endif - endif -+endif - - 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)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib -@@ -323,6 +330,9 @@ - linux: - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic - -+freebsd: -+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic -+ - solaris: - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic -