--- ./Makefile.orig	2014-02-10 12:56:33.000000000 +0400
+++ ./Makefile	2014-02-23 00:09:24.000000000 +0400
@@ -47,7 +47,7 @@
 # Set correct variables and paths.
 #----------------------------------
 OS := $(shell uname)
-CC = g++
+CC = $(CXX)
 ifeq ($(OS),Linux)
 OS = Unix
 endif
@@ -62,7 +62,7 @@
 USR = /opt/local
 else
 PLUGINDIR = `gimptool-2.0 --gimpplugindir`/plug-ins
-USR = /usr
+USR = /usr/X11R6
 endif
 ifeq ($(OSTYPE),msys)
 EXE = .exe
@@ -125,7 +125,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
 
 # 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
 else
+ifeq ($(OS),FreeBSD)
+	@echo "**"
+	@echo "** FreeBSD configuration"
+	@echo "**"
+	$(MAKE) freebsd
+	$(MAKE) gimp
+else
 ifeq ($(OS),Darwin)
 	@echo "**"
 	@echo "** MacOSX configuration."
@@ -309,9 +316,10 @@
 	$(MAKE) 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
 
 lib:
 	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
@@ -336,6 +344,9 @@
 linux:
 	$(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_cli_standard
+
 custom:
 	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
 
