Attachment #164207 for bug #205257

Lines 1-8 Link Here

(-)Makefile (-5 / +11 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= gmic	3	PORTNAME= gmic
4	PORTVERSION= 1.6.0.0	4	PORTVERSION= 1.6.8
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 40-47 Link Here
40		40
41	PLIST_FILES= bin/gmic \	41	PLIST_FILES= bin/gmic \
42	man/man1/gmic.1.gz \	42	man/man1/gmic.1.gz \
43	%%BASH%%etc/bash_completion.d/gmic_bashcompletion.sh \	43	%%BASH%%etc/bash_completion.d/gmic \
44	%%PLUGIN_DIR%%/gmic_gimp	44	%%PLUGIN_DIR%%/gmic_gimp \
		45	%%PLUGIN_DIR%%/cli_update168.gmic \
		46	%%PLUGIN_DIR%%/gimp_update168.gmic
45		47
46	EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}	48	EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
47	PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp	49	PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp
Lines 50-60 Link Here
50		52
51	post-patch:	53	post-patch:
52	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \	54	@${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \
		55	-e 's#/usr/local#${LOCALBASE}#g' \
53	${WRKSRC}/Makefile	56	${WRKSRC}/Makefile
54		57
55	do-install:	58	do-install:
56	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}	59	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
57	${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}	60	${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
		61	${INSTALL_DATA} ${WRKSRC}/../resources/cli_update168.gmic \
		62	${WRKSRC}/../resources/gimp_update168.gmic \
		63	${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
58	${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin	64	${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin
59	${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1	65	${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1
60	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	66	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
Lines 62-68 Link Here
62	.if ${PORT_OPTIONS:MBASH}	68	.if ${PORT_OPTIONS:MBASH}
63	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d	69	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
64	${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \	70	${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \
65	${STAGEDIR}${PREFIX}/etc/bash_completion.d	71	${STAGEDIR}${PREFIX}/etc/bash_completion.d/gmic
66	.endif	72	.endif
67		73
68	.include <bsd.port.mk>	74	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (gmic_1.6.0.0.tar.gz) = 2aa53ebab4c361c5401e23142a31b06a38ef565c533d1326d31f985f5c0c2da5	1	SHA256 (gmic_1.6.8.tar.gz) = d016f41fc9cb005d374bf681e2b7f157e43c8fd8002731cfec221167475443ff
2	SIZE (gmic_1.6.0.0.tar.gz) = 2818394	2	SIZE (gmic_1.6.8.tar.gz) = 3191772




--- Makefile.orig	2015-12-09 12:49:16 UTC
+++ Makefile
@@ -49,7 +49,7 @@
 # Set correct variables and paths.
 #----------------------------------
 OS := $(shell uname)

 ifeq ($(OS),Linux)
 OS = Unix
 endif
@@ -75,6 +75,10 @@ endif
 USR = /opt/local
 else
 PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
-USR = /usr
+USR = /usr/X11R6
 endif
 ifeq ($(OSTYPE),msys)
 EXE = .exe
 endif
+ifeq ($(OS),FreeBSD)
+OS = Unix
+USR = /usr/local
+endif
 LIB=lib
 BIN=bin
 INCLUDE=include
@@ -303,7 +307,7 @@ ifeq ($(OS),Unix)
@@ -293,6 +293,12 @@
 	@echo "**"
 	@echo "** Start building G'MIC with default Unix configuration."
 	@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-6 Link Here

(-)files/patch-Makefile (-49 / +16 lines)
1	--- Makefile.orig 2014-08-21 07:47:10 UTC	1	--- Makefile.orig 2015-12-09 12:49:16 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -48,7 +48,7 @@	3	@@ -49,7 +49,7 @@
4	# Set correct variables and paths.	4	# Set correct variables and paths.
5	#----------------------------------	5	#----------------------------------
6	OS := $(shell uname)	6	OS := $(shell uname)
Lines 9-64 Link Here
9	ifeq ($(OS),Linux)	9	ifeq ($(OS),Linux)
10	OS = Unix	10	OS = Unix
11	endif	11	endif
12	@@ -63,7 +63,7 @@	12	@@ -75,6 +75,10 @@ endif
13	USR = /opt/local
14	else
15	PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
16	-USR = /usr
17	+USR = /usr/X11R6
18	endif
19	ifeq ($(OSTYPE),msys)	13	ifeq ($(OSTYPE),msys)
20	EXE = .exe	14	EXE = .exe
21	@@ -136,7 +136,7 @@	15	endif
22	# This requires the presence of the X11 extension include and library files.	16	+ifeq ($(OS),FreeBSD)
23	# (package 'libx11-dev' on Debian).	17	+OS = Unix
24	XSHM_CFLAGS = -Dcimg_use_xshm	18	+USR = /usr/local
25	-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext	19	+endif
26	+XSHM_LIBS = -L/usr/X11R6/lib -lXext	20	LIB=lib
27		21	BIN=bin
28	# Flags to enable image display, using GDI32.	22	INCLUDE=include
29	# This requires the presence of the GDI32 include and library files.	23	@@ -303,7 +307,7 @@ ifeq ($(OS),Unix)
30	@@ -293,6 +293,12 @@
31	@echo "**"	24	@echo "**"
32	$(MAKE) linux gimp lib # zart	25	@echo "** Start building G'MIC with default Unix configuration."
		26	@echo "**"
		27	- $(MAKE) cli gimp lib zart
		28	+ $(MAKE) cli gimp
33	else	29	else
34	+ifeq ($(OS),FreeBSD)
35	+ @echo "**"
36	+ @echo "** FreeBSD configuration"
37	+ @echo "**"
38	+ $(MAKE) freebsd gimp
39	+else
40	ifeq ($(OS),Darwin)	30	ifeq ($(OS),Darwin)
41	@echo "**"	31	@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