$FreeBSD$

--- res/Makefile.orig
+++ res/Makefile
@@ -13,7 +13,8 @@
 
 MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
+ifdef WITH_ODBC
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)${LOCALBASE}/include/odbcinst.h),)
   ifneq (${OSARCH},FreeBSD)
     MODS+=res_config_odbc.so
   else
@@ -21,6 +22,7 @@
   endif
   MODS+=res_odbc.so
 endif
+endif
 
 ifneq ($(NOCRYPTO),yes)
   MODS+=res_crypto.so
@@ -37,8 +39,8 @@
 endif
 
 ifeq ($(findstring BSD,${OSARCH}),BSD)
-  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
-  SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+  CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include
+  SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
 endif
 
 ifeq (${OSARCH},CYGWIN)
@@ -55,9 +57,7 @@
 CFLAGS+=
 
 ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
   CFLAGS+=-DZAPATA_MOH
-endif
 endif # WITHOUT_ZAPTEL
 
 #
@@ -75,7 +75,7 @@
 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
-	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+	for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
 	@if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
 	  if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
 			echo "*************************************************************";\