Attachment #167419 for bug #205257




# $FreeBSD: head/graphics/gimp-gmic-plugin/Makefile 403677 2015-12-13 16:26:12Z rm $

PORTNAME=	gmic
PORTVERSION=	1.6.9
PORTREVISION=	4
CATEGORIES=	graphics
MASTER_SITES=	http://gmic.eu/files/source/
PKGNAMEPREFIX=	gimp-


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 \


WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src

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}


PLIST_FILES=	bin/gmic \
		man/man1/gmic.1.gz \
		%%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


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}

.if ${PORT_OPTIONS:MBASH}
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
	${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \
		${STAGEDIR}${PREFIX}/etc/bash_completion.d/gmic
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)../../home/pi/myp/graphics/gimp-gmic-plugin/distinfo (-2 / +2 lines)
1	SHA256 (gmic_1.6.0.0.tar.gz) = 2aa53ebab4c361c5401e23142a31b06a38ef565c533d1326d31f985f5c0c2da5	1	SHA256 (gmic_1.6.9.tar.gz) = 8b836b4ac02a2d3963384951b6e00f2d8e19ede0b49ee93b041ef227cf9dd794
2	SIZE (gmic_1.6.0.0.tar.gz) = 2818394	2	SIZE (gmic_1.6.9.tar.gz) = 3278273




--- Makefile.orig	2016-02-25 20:35:48 UTC
+++ Makefile
@@ -49,6 +49,7 @@
 # Set correct variables and paths.
 #----------------------------------
 OS := $(shell uname)
-CC = g++
+CC = $(CXX)
 ifeq ($(OS),Linux)
 OS = Unix
 endif
@@ -323,7 +324,7 @@ ifeq ($(OS),Unix)
 	@echo "**"
 	@echo "** Start building G'MIC with default Unix configuration."
 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 @@
 	@echo "**"
-	$(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
 

Return to bug 205257

Lines 1-8 Link Here

(-)../../home/pi/myp/graphics/gimp-gmic-plugin/Makefile (-6 / +13 lines)
1	# $FreeBSD: head/graphics/gimp-gmic-plugin/Makefile 403677 2015-12-13 16:26:12Z rm $	1	# $FreeBSD: head/graphics/gimp-gmic-plugin/Makefile 403677 2015-12-13 16:26:12Z rm $
2		2
3	PORTNAME= gmic	3	PORTNAME= gmic
4	PORTVERSION= 1.6.0.0	4	PORTVERSION= 1.6.9
5	PORTREVISION= 4
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	MASTER_SITES= http://gmic.eu/files/source/	6	MASTER_SITES= http://gmic.eu/files/source/
8	PKGNAMEPREFIX= gimp-	7	PKGNAMEPREFIX= gimp-
Lines 14-19 Link Here
14		13
15	LIB_DEPENDS= libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick \	14	LIB_DEPENDS= libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick \
16	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \	15	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
		16	libopencv_legacy.so:${PORTSDIR}/graphics/opencv \
17	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick \	17	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick \
18	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \	18	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
19	libfftw3.so:${PORTSDIR}/math/fftw3 \	19	libfftw3.so:${PORTSDIR}/math/fftw3 \
Lines 25-34 Link Here
25		25
26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src	26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
27		27
28	USES= gmake pkgconfig	28	USES= dos2unix gmake pkgconfig
29	USE_GCC= yes	29	USE_GCC= yes
30	USE_GNOME= gtk20	30	USE_GNOME= gtk20
31	USE_XORG= x11 xext xrandr	31	USE_XORG= x11 xext xrandr
		32	DOS2UNIX_FILES= Makefile
32		33
33	PLUGIN_DIR?= libexec/gimp/2.2/plug-ins	34	PLUGIN_DIR?= libexec/gimp/2.2/plug-ins
34	PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR}	35	PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR}
Lines 40-47 Link Here
40		41
41	PLIST_FILES= bin/gmic \	42	PLIST_FILES= bin/gmic \
42	man/man1/gmic.1.gz \	43	man/man1/gmic.1.gz \
43	%%BASH%%etc/bash_completion.d/gmic_bashcompletion.sh \	44	%%BASH%%etc/bash_completion.d/gmic \
44	%%PLUGIN_DIR%%/gmic_gimp	45	%%PLUGIN_DIR%%/gmic_gimp \
		46	%%PLUGIN_DIR%%/cli_update169.gmic \
		47	%%PLUGIN_DIR%%/gimp_update169.gmic
45		48
46	EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}	49	EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
47	PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp	50	PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp
Lines 50-60 Link Here
50		53
51	post-patch:	54	post-patch:
52	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \	55	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \
		56	-e 's#/usr/local#${LOCALBASE}#g' \
53	${WRKSRC}/Makefile	57	${WRKSRC}/Makefile
54		58
55	do-install:	59	do-install:
56	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}	60	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
57	${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}	61	${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
		62	${INSTALL_DATA} ${WRKSRC}/../resources/cli_update169.gmic \
		63	${WRKSRC}/../resources/gimp_update169.gmic \
		64	${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
58	${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin	65	${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin
59	${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1	66	${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
60	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	67	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
Lines 62-68 Link Here
62	.if ${PORT_OPTIONS:MBASH}	69	.if ${PORT_OPTIONS:MBASH}
63	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d	70	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
64	${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \	71	${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \
65	${STAGEDIR}${PREFIX}/etc/bash_completion.d	72	${STAGEDIR}${PREFIX}/etc/bash_completion.d/gmic
66	.endif	73	.endif
67		74
68	.include <bsd.port.mk>	75	.include <bsd.port.mk>

Lines 1-64 Link Here

(-)../../home/pi/myp/graphics/gimp-gmic-plugin/files/patch-Makefile (-52 / +7 lines)
1	--- Makefile.orig 2014-08-21 07:47:10 UTC	1	--- Makefile.orig 2016-02-25 20:35:48 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -48,7 +48,7 @@	3	@@ -49,6 +49,7 @@
4	# Set correct variables and paths.	4	# Set correct variables and paths.
5	#----------------------------------	5	#----------------------------------
6	OS := $(shell uname)	6	OS := $(shell uname)
7	-CC = g++
8	+CC = $(CXX)	7	+CC = $(CXX)
9	ifeq ($(OS),Linux)	8	ifeq ($(OS),Linux)
10	OS = Unix	9	OS = Unix
11	endif	10	endif
12	@@ -63,7 +63,7 @@	11	@@ -323,7 +324,7 @@ ifeq ($(OS),Unix)
13	USR = /opt/local	12	@echo "**"
14	else	13	@echo "** Start building G'MIC with default Unix configuration."
15	PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
16	-USR = /usr
17	+USR = /usr/X11R6
18	endif
19	ifeq ($(OSTYPE),msys)
20	EXE = .exe
21	@@ -136,7 +136,7 @@
22	# This requires the presence of the X11 extension include and library files.
23	# (package 'libx11-dev' on Debian).
24	XSHM_CFLAGS = -Dcimg_use_xshm
25	-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
26	+XSHM_LIBS = -L/usr/X11R6/lib -lXext
27
28	# Flags to enable image display, using GDI32.
29	# This requires the presence of the GDI32 include and library files.
30	@@ -293,6 +293,12 @@
31	@echo "**"	14	@echo "**"
32	$(MAKE) linux gimp lib # zart	15	- $(MAKE) cli gimp lib zart
		16	+ $(MAKE) cli gimp
33	else	17	else
34	+ifeq ($(OS),FreeBSD)
35	+ @echo "**"
36	+ @echo "** FreeBSD configuration"
37	+ @echo "**"
38	+ $(MAKE) freebsd gimp
39	+else
40	ifeq ($(OS),Darwin)	18	ifeq ($(OS),Darwin)
41	@echo "**"	19	@echo "**"
42	@echo "** MacOSX configuration."
43	@@ -305,9 +311,10 @@
44	$(MAKE) windows gimp
45	endif
46	endif
47	+endif
48
49	gimp:
50	- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" "STRIP_EXE=1" gmic_gimp
51	+ $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS)" "LIBS=$(STD_GIMP_LIBS)" "STRIP_EXE=1" gmic_gimp
52
53	lib:
54	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
55	@@ -323,6 +330,9 @@
56	linux:
57	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
58
59	+freebsd:
60	+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
61	+
62	solaris:
63	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic
64