Index: head/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd
===================================================================
--- head/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd	(revision 565483)
+++ head/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd	(revision 565484)
@@ -1,47 +1,48 @@
 --- UniversalDetector/Makefile.freebsd.orig	2016-05-20 18:45:30 UTC
 +++ UniversalDetector/Makefile.freebsd
-@@ -1,28 +1,22 @@
+@@ -1,28 +1,23 @@
  # Compilers and linkers
  
 -OBJCC = clang
 -CC = clang
 -CXX = clang++
 +OBJCC ?= $(CC)
  LD = $(CXX)
 -AR = ar
  
  # Options for compilation
  
  GNUSTEP_OPTS =	-DGNUSTEP \
 -		-DGNU_RUNTIME=1 \
  		-D_NATIVE_OBJC_EXCEPTIONS \
 -		-fgnu-runtime \
  		-fexceptions \
  		-fobjc-exceptions \
++		-fobjc-runtime=gnustep-2.0 \
  		-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 $(LOCALBASE)/GNUstep/System/Library/Headers \
 +		-I$(LOCALBASE)/include
  
  OBJC_OPTS =	-std=gnu99
  
 @@ -45,9 +39,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 565483)
+++ head/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd	(revision 565484)
@@ -1,72 +1,73 @@
 --- XADMaster/Makefile.freebsd.orig	2016-05-20 18:45:30 UTC
 +++ XADMaster/Makefile.freebsd
-@@ -1,28 +1,21 @@
+@@ -1,28 +1,22 @@
  # Compilers and linkers
  
 -OBJCC = clang
 -CC = clang
 -CXX = clang++
 +OBJCC ?= $(CC)
  LD = $(CXX)
 -AR = ar
  
  # Options for compilation
  
  GNUSTEP_OPTS =	-DGNUSTEP \
 -		-DGNU_RUNTIME=1 \
  		-D_NATIVE_OBJC_EXCEPTIONS \
 -		-fgnu-runtime \
  		-fexceptions \
  		-fobjc-exceptions \
++		-fobjc-runtime=gnustep-2.0 \
  		-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 $(LOCALBASE)/GNUstep/System/Library/Headers \
 +		-I$(LOCALBASE)/include
  
  OBJC_OPTS =	-std=gnu99
  
 @@ -42,15 +35,15 @@ LIBS =	-Wl,--no-whole-archive \
  	-lgnustep-base \
  	-lz \
  	-lbz2 \
 +	-lwavpack \
  	-licuuc \
  	-lobjc \
  	-lm
  
  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 +67,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 +92,7 @@ lsar: $(LSAR_OBJS) $(CMDLINE_OBJS) libXADMaster.a ../U
  
  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