Index: head/archivers/unarchiver/Makefile
===================================================================
--- head/archivers/unarchiver/Makefile	(revision 406038)
+++ head/archivers/unarchiver/Makefile	(revision 406039)
@@ -1,45 +1,52 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	unar
 PORTVERSION=	1.9.1
 CATEGORIES=	archivers gnustep
 MASTER_SITES=	http://wakaba.c3.cx/releases/TheUnarchiver/
 DISTNAME=	${PORTNAME}${PORTVERSION}_src
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Unarchiver for a vast variety of file formats
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 # XXX: USES=gnustep overrides MAKEFILE we set below, so depend explicitly
 LIB_DEPENDS=	libgnustep-base.so:${PORTSDIR}/lang/gnustep-base \
 		libwavpack.so:${PORTSDIR}/audio/wavpack
 
 USES=		gmake zip
 
 MAKEFILE=	Makefile.freebsd
 WRKSRC=		${WRKDIR}/The\ Unarchiver
 BUILD_WRKSRC=	${WRKSRC}/XADMaster
 
 PLIST_FILES=	bin/lsar bin/unar man/man1/lsar.1.gz man/man1/unar.1.gz
 PORTDOCS=	README.md
 PORTEXAMPLES=	lsar.bash_completion unar.bash_completion
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024
+CC=		clang
+CXX=		clang++
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/XADMaster/??ar ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/Extra/??ar.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Extra/??ar.bash_completion \
 		${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd
===================================================================
--- head/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd	(revision 406038)
+++ head/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd	(revision 406039)
@@ -1,26 +1,42 @@
 --- UniversalDetector/Makefile.freebsd.orig	2015-09-23 20:24:59 UTC
 +++ UniversalDetector/Makefile.freebsd
 @@ -1,10 +1,7 @@
  # Compilers and linkers
  
 -OBJCC = clang
 -CC = clang
 -CXX = clang++
 +OBJCC ?= $(CC)
  LD = $(CXX)
 -AR = ar
  
  # Options for compilation
  
-@@ -16,10 +13,9 @@ GNUSTEP_OPTS =	-DGNUSTEP \
+@@ -16,13 +13,12 @@ GNUSTEP_OPTS =	-DGNUSTEP \
  		-fobjc-exceptions \
  		-fconstant-string-class=NSConstantString
  
 -GCC_OPTS = 	-O2 \
 +GCC_OPTS = 	$(CFLAGS) \
  		-Wno-import \
  		-Wno-multichar \
 -		-g \
  		-D_FILE_OFFSET_BITS=64 \
- 		-isystem /usr/local/GNUstep/System/Library/Headers \
- 		-I/usr/local/include
+-		-isystem /usr/local/GNUstep/System/Library/Headers \
+-		-I/usr/local/include
++		-isystem $(LOCALBASE)/GNUstep/System/Library/Headers \
++		-I$(LOCALBASE)/include
+ 
+ OBJC_OPTS =	-std=gnu99
+ 
+@@ -46,8 +42,8 @@ LIBS =  -Wl,--no-whole-archive \
+ ALL_LDFLAGS =	-Wl,--whole-archive \
+ 		-fexceptions \
+ 		-fgnu-runtime \
+-		-L/usr/local/GNUstep/System/Library/Libraries \
+-		-L/usr/local/lib \
++		-L$(LOCALBASE)/GNUstep/System/Library/Libraries \
++		-L$(LOCALBASE)/lib \
+ 		$(LDFLAGS)
+ 
+ # Paths
Index: head/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd
===================================================================
--- head/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd	(revision 406038)
+++ head/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd	(revision 406039)
@@ -1,52 +1,68 @@
 --- XADMaster/Makefile.freebsd.orig	2015-09-23 20:24:59 UTC
 +++ XADMaster/Makefile.freebsd
 @@ -1,10 +1,7 @@
  # Compilers and linkers
  
 -OBJCC = clang
 -CC = clang
 -CXX = clang++
 +OBJCC ?= $(CC)
  LD = $(CXX)
 -AR = ar
  
  # Options for compilation
  
-@@ -16,10 +13,8 @@ GNUSTEP_OPTS =	-DGNUSTEP \
+@@ -16,13 +13,11 @@ GNUSTEP_OPTS =	-DGNUSTEP \
  		-fobjc-exceptions \
  		-fconstant-string-class=NSConstantString
  
 -GCC_OPTS = 	-O2 \
 -		-Wno-import \
 +GCC_OPTS = 	$(CFLAGS) -Wno-import \
  		-Wno-multichar \
 -		-g \
  		-D_FILE_OFFSET_BITS=64 \
- 		-isystem /usr/local/GNUstep/System/Library/Headers \
- 		-I/usr/local/include
+-		-isystem /usr/local/GNUstep/System/Library/Headers \
+-		-I/usr/local/include
++		-isystem $(LOCALBASE)/GNUstep/System/Library/Headers \
++		-I$(LOCALBASE)/include
+ 
+ OBJC_OPTS =	-std=gnu99
+ 
 @@ -42,6 +37,7 @@ LIBS =	-Wl,--no-whole-archive \
  	-lgnustep-base \
  	-lz \
  	-lbz2 \
 +	-lwavpack \
  	-licuuc \
  	-lobjc \
  	-lm
+@@ -49,8 +45,8 @@ LIBS =	-Wl,--no-whole-archive \
+ ALL_LDFLAGS =	-Wl,--whole-archive \
+ 		-fexceptions \
+ 		-fgnu-runtime \
+-		-L/usr/local/lib \
+-		-L/usr/local/GNUstep/System/Library/Libraries \
++		-L$(LOCALBASE)/lib \
++		-L$(LOCALBASE)/GNUstep/System/Library/Libraries \
+ 		$(LDFLAGS)
+ 
+ # Paths
 @@ -74,7 +70,7 @@ libXADMaster.a: $(LIBRARY_OBJS)
  	$(AR) rcs $@ $^
  
  ../UniversalDetector/libUniversalDetector.a:
 -	gmake -C ../UniversalDetector -f Makefile.linux
 +	$(MAKE) -C ../UniversalDetector -f Makefile.freebsd
  
  XADTest2: $(XADTEST2_OBJS) libXADMaster.a ../UniversalDetector/libUniversalDetector.a
  	$(LD) $(ALL_LDFLAGS) -o $@ $^ $(LIBS)
 @@ -99,7 +95,7 @@ lsar: $(LSAR_OBJS) $(CMDLINE_OBJS) libXA
  
  clean:
  	rm -rf $(BUILD_DIR) $(EXECUTABLE_FILES) $(LIBRARY_FILES)
 -	gmake -C ../UniversalDetector -f Makefile.linux clean
 +	$(MAKE) -C ../UniversalDetector -f Makefile.freebsd clean
  
  .PHONY: ../UniversalDetector/libUniversalDetector.a clean