diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index a9904cbe5bf0..9c92c8b2a379 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -1,27 +1,25 @@
 # Created by: Xavier Beaudouin <kiwi@oav.net>
 
 PORTNAME=	gnarwl
 PORTVERSION=	3.6
 PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.onyxbits.de/sites/default/files/download/15/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Email autoresponder that gets data from LDAP
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: mail_status
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: mail_status
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgdbm.so:databases/gdbm
-BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:textproc/gsed
 
 USES=		iconv gmake groff tar:tgz
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --localstatedir="${PREFIX}/var"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/mail/gnarwl/files/patch-Makefile.in b/mail/gnarwl/files/patch-Makefile.in
index 4e0f27d88cb8..4d8d90255446 100644
--- a/mail/gnarwl/files/patch-Makefile.in
+++ b/mail/gnarwl/files/patch-Makefile.in
@@ -1,22 +1,22 @@
 --- Makefile.in.orig	2008-06-24 22:31:33.000000000 +0200
 +++ Makefile.in	2009-07-27 13:47:35.000000000 +0200
 @@ -10,7 +10,7 @@
  BIN=gnarwl
  SBIN=damnit
  MAN_SEC=8
 -VER=$(shell basename `pwd` | sed s\\$(BIN)-\\\\)
-+VER=$(shell basename `pwd` | gsed s\\$(BIN)-\\\\)
++VER=$(shell basename `pwd` | sed s,$(BIN)-,,)
  
  ##
  # Path settings (no trailing slashes!)
 @@ -39,8 +39,8 @@
  ##
  
  CC=@CC@
 -CFLAGS=-DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -g -Wall -O2 -I..
 -LFLAGS=-lldap -lgdbm -ldl -lresolv
-+CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -Wall -I.. @CPPFLAGS@
++CFLAGS=@CFLAGS@ -DLDAP_DEPRECATED -DBLOCKDIR=\"$(BLOCKDIR)\" -DCFGFILE=\"$(CONFDIR)/gnarwl.cfg\" -DVERSION=\"$(VER)\" -fcommon -Wall -I.. @CPPFLAGS@
 +LFLAGS=@LDFLAGS@ @LIBS@
  
  ##
  ## No serviceable parts below
diff --git a/mail/gnarwl/files/patch-data-Makefile b/mail/gnarwl/files/patch-data-Makefile
index f6fa5497cadb..3ed8fa16d00a 100644
--- a/mail/gnarwl/files/patch-data-Makefile
+++ b/mail/gnarwl/files/patch-data-Makefile
@@ -1,39 +1,39 @@
 --- data/Makefile.orig	2005-03-13 14:30:54 UTC
 +++ data/Makefile
 @@ -1,23 +1,25 @@
  catch:
  	$(MAKE) -C .. all
  
 -all: clean spec config
 +all: spec config
  
  clean: 
 -	rm -f $(BIN)-$(VER).spec gnarwl.cfg
 +	rm -f $(BIN)-$(VER).spec gnarwl.cfg.sample
  
  config:
 -	@sed "s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_VER_\\$(VER)\\g ; s\\_MAN_SEC_\\$(MAN_SEC)\\g" < config.tmpl > gnarwl.cfg
-+	@gsed "s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_VER_\\$(VER)\\g ; s\\_MAN_SEC_\\$(MAN_SEC)\\g" < config.tmpl > gnarwl.cfg.sample
++	@sed "s,_HOMEDIR_,$(HOMEDIR),g ; s,_VER_,$(VER),g ; s,_MAN_SEC_,$(MAN_SEC),g" < config.tmpl > gnarwl.cfg.sample
  
  spec:
 -	@sed "s\\_BIN_\\$(BIN)\\g ; s\\_VER_\\$(VER)\\g; s\\_SBIN_\\$(SBIN)\\g; s\\_SEC_\\$(MAN_SEC)\\g" < spec.tmpl > $(BIN)-$(VER).spec 
-+	@gsed "s\\_BIN_\\$(BIN)\\g ; s\\_VER_\\$(VER)\\g; s\\_SBIN_\\$(SBIN)\\g; s\\_SEC_\\$(MAN_SEC)\\g" < spec.tmpl > $(BIN)-$(VER).spec 
++	@sed "s,_BIN_,$(BIN),g ; s,_VER_,$(VER),g; s,_SBIN_,$(SBIN),g; s,_SEC_,$(MAN_SEC),g" < spec.tmpl > $(BIN)-$(VER).spec
  
  install:
 -	mkdir -m 755 -p  $(HOMEDIR)/block $(HOMEDIR)/bin $(CONFDIR)
 -	echo \|$(BINDIR)/$(BIN) > $(HOMEDIR)/.forward
 -	install -m 644 header.txt $(HOMEDIR)
 -	install -m 644 footer.txt $(HOMEDIR)
 -	install -m 600 gnarwl.cfg $(CONFDIR)
 -	cat badheaders.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/badheaders.db
 -	cat blacklist.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/blacklist.db
 +	mkdir -p  $(DESTDIR)$(HOMEDIR)/block $(DESTDIR)$(HOMEDIR)/bin $(DESTDIR)$(CONFDIR)
 +	echo \|$(BINDIR)/$(BIN) > $(DESTDIR)$(HOMEDIR)/.forward
 +	$(BSD_INSTALL_DATA) header.txt $(DESTDIR)$(HOMEDIR)/header.txt.sample
 +	$(BSD_INSTALL_DATA) footer.txt $(DESTDIR)$(HOMEDIR)/footer.txt.sample
 +	$(BSD_INSTALL_DATA) badheaders.txt $(DESTDIR)$(HOMEDIR)/badheaders.txt.sample
 +	$(BSD_INSTALL_DATA) blacklist.txt $(DESTDIR)$(HOMEDIR)/blacklist.txt.sample
 +	$(BSD_INSTALL_DATA) gnarwl.cfg.sample $(DESTDIR)$(CONFDIR)
 +	cat badheaders.txt | $(DESTDIR)$(SBINDIR)/$(SBIN) -a $(DESTDIR)$(HOMEDIR)/badheaders.db.sample
 +	cat blacklist.txt | $(DESTDIR)$(SBINDIR)/$(SBIN) -a $(DESTDIR)$(HOMEDIR)/blacklist.db.sample
  
diff --git a/mail/gnarwl/files/patch-doc-Makefile b/mail/gnarwl/files/patch-doc-Makefile
index 55c14989315e..7f272e8a1a79 100644
--- a/mail/gnarwl/files/patch-doc-Makefile
+++ b/mail/gnarwl/files/patch-doc-Makefile
@@ -1,51 +1,51 @@
 --- doc/Makefile.orig	2005-03-13 14:30:53 UTC
 +++ doc/Makefile
 @@ -1,31 +1,29 @@
  catch:
  	$(MAKE) -C .. all
  
 -all: clean manpage
 +all: manpage
  
  clean: 
  	rm -f *~ $(BIN).$(MAN_SEC)* $(SBIN).$(MAN_SEC)* DEADJOE
  
  manpage:
  	@echo Generating manpage...
 -	@sed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(BIN).man | groff -man -Tascii > $(BIN).$(MAN_SEC)
 -	@sed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(SBIN).man | groff -man -Tascii > $(SBIN).$(MAN_SEC)
-+	@gsed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(BIN).man | groff -man -Tascii > $(BIN).$(MAN_SEC)
-+	@gsed "s\\_CONFDIR_\\$(CONFDIR)\\g ; s\\_HOMEDIR_\\$(HOMEDIR)\\g ; s\\_MANSEC_\\$(MAN_SEC)\\g" < $(SBIN).man | groff -man -Tascii > $(SBIN).$(MAN_SEC)
++	@sed "s,_CONFDIR_,$(CONFDIR),g ; s,_HOMEDIR_,$(HOMEDIR),g ; s,_MANSEC_,$(MAN_SEC),g" < $(BIN).man | groff -man -Tascii > $(BIN).$(MAN_SEC)
++	@sed "s,_CONFDIR_,$(CONFDIR),g ; s,_HOMEDIR_,$(HOMEDIR),g ; s,_MANSEC_,$(MAN_SEC),g" < $(SBIN).man | groff -man -Tascii > $(SBIN).$(MAN_SEC)
  
  
  install:
 -	mkdir -m 755 -p $(DOCDIR) $(MANDIR)/man$(MAN_SEC)
 -	install -m 644 $(BIN).$(MAN_SEC) $(MANDIR)/man$(MAN_SEC)
 -	install -m 644 $(SBIN).$(MAN_SEC) $(MANDIR)/man$(MAN_SEC)
 -	install -m 644 FAQ $(DOCDIR)
 -	install -m 644 LICENSE $(DOCDIR)
 -	install -m 644 AUTHORS $(DOCDIR)
 -	install -m 644 INSTALL $(DOCDIR)
 -	install -m 644 ISPEnv.schema $(DOCDIR)
 -	install -m 644 ISPEnv2.schema $(DOCDIR)
 -	install -m 644 example.ldif $(DOCDIR)
 -	install -m 644 HISTORY $(DOCDIR)
 -	install -m 644 README $(DOCDIR)
 -	gzip -f -9 $(DOCDIR)/FAQ
 -	gzip -f -9 $(DOCDIR)/HISTORY
 -	gzip -f -9 $(MANDIR)/man$(MAN_SEC)/$(BIN).$(MAN_SEC)
 -	gzip -f -9 $(MANDIR)/man$(MAN_SEC)/$(SBIN).$(MAN_SEC)
 +	mkdir -p $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
 +	$(BSD_INSTALL_MAN) $(BIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
 +	$(BSD_INSTALL_MAN) $(SBIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
 +	gzip -f -9 FAQ
 +	gzip -f -9 HISTORY
 +	$(BSD_INSTALL_DATA) FAQ.gz $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) HISTORY.gz $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) LICENSE $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) AUTHORS $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) INSTALL $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) ISPEnv.schema $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) ISPEnv2.schema $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) example.ldif $(DESTDIR)$(DOCDIR)
 +	$(BSD_INSTALL_DATA) README $(DESTDIR)$(DOCDIR)