--- Makefile.orig	2014-04-20 09:47:29.000000000 -0700

+++ Makefile	2014-06-20 22:53:14.863342337 -0700

@@ -15,7 +15,7 @@

 # $ CONFIG_OPTIONS="--ipv6 --igd2" make

 #

-CFLAGS ?= -pipe -Os

+CFLAGS ?= -pipe

 #CFLAGS = -pipe -O -g -DDEBUG

 #CFLAGS += -ansi

 CFLAGS += -Wall

@@ -45,25 +45,36 @@

 .endif

 # better way to find if we are using ipf or pf

-.if exists(/etc/rc.subr) && exists(/etc/rc.conf)

 .if $(OSNAME) == "FreeBSD"

+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)

 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \

-          if checkyesno ipfilter_enable; then \

+          if checkyesno firewall_enable; then \

+          echo "ipfw"; elif checkyesno ipfilter_enable; then \

           echo "ipf"; elif checkyesno pf_enable; then \

-          echo "pf"; else echo "ipfw"; fi

+          echo "pf"; else echo "pf"; fi

+.else

+FWNAME = pf

+.endif

 .endif

 .if $(OSNAME) == "NetBSD"

+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)

 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \

           if checkyesno ipfilter; then \

           echo "ipf"; else echo "pf"; fi

+.else

+FWNAME = pf

+.endif

 .endif

 .if $(OSNAME) == "DragonFly"

+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)

 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \

           if checkyesno ipfilter; then \

           echo "ipf"; elif checkyesno pf_enable; then \

           echo "pf"; else echo "ipfw"; fi

+.else

+FWNAME = ipfw

 .endif

 .endif