3 files changed, 50 insertions, 21 deletions

diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index 06b9a26679e4..05e5942f83f6 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Email autoresponder that gets data from LDAP
 
-LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 
 USES=		iconv gmake
@@ -19,8 +19,4 @@ USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 
-MAN8=		damnit.8 gnarwl.8
-MANCOMPRESSED=	yes
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/gnarwl/files/patch-data-Makefile b/mail/gnarwl/files/patch-data-Makefile
index 9b42fb8a38bd..000c3b1c4044 100644
--- a/mail/gnarwl/files/patch-data-Makefile
+++ b/mail/gnarwl/files/patch-data-Makefile
@@ -1,6 +1,6 @@
---- data/Makefile.orig	2005-03-13 15:30:54.000000000 +0100
-+++ data/Makefile	2009-07-27 14:34:20.000000000 +0200
-@@ -4,20 +4,22 @@
+--- data/Makefile.orig	2005-03-13 22:30:54.000000000 +0800
++++ data/Makefile	2014-06-08 20:56:18.860668685 +0800
+@@ -4,20 +4,22 @@ catch:
  all: clean spec config
  
  clean: 
@@ -16,18 +16,20 @@
 +	@gsed "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
+-	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
-+	install -m 644 header.txt $(HOMEDIR)/header.txt.sample
-+	install -m 644 footer.txt $(HOMEDIR)/footer.txt.sample
-+	install -m 644 badheaders.txt $(HOMEDIR)/badheaders.txt.sample
-+	install -m 644 blacklist.txt $(HOMEDIR)/blacklist.txt.sample
-+	install -m 600 gnarwl.cfg.sample $(CONFDIR)
-+	cat badheaders.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/badheaders.db.sample
-+	cat blacklist.txt | $(SBINDIR)/$(SBIN) -a $(HOMEDIR)/blacklist.db.sample
++	mkdir -m 755 -p  $(DESTDIR)$(HOMEDIR)/block $(DESTDIR)$(HOMEDIR)/bin $(DESTDIR)$(CONFDIR)
++	echo \|$(BINDIR)/$(BIN) > $(DESTDIR)$(HOMEDIR)/.forward
++	install -m 644 header.txt $(DESTDIR)$(HOMEDIR)/header.txt.sample
++	install -m 644 footer.txt $(DESTDIR)$(HOMEDIR)/footer.txt.sample
++	install -m 644 badheaders.txt $(DESTDIR)$(HOMEDIR)/badheaders.txt.sample
++	install -m 644 blacklist.txt $(DESTDIR)$(HOMEDIR)/blacklist.txt.sample
++	install -m 600 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 03117087869c..371eb6b18028 100644
--- a/mail/gnarwl/files/patch-doc-Makefile
+++ b/mail/gnarwl/files/patch-doc-Makefile
@@ -1,7 +1,6 @@
-diff -u --new-file --recursive ../gnarwl-3.3.orig/doc/Makefile ./doc/Makefile
---- ../gnarwl-3.3.orig/doc/Makefile	Fri Jun 13 11:29:44 2003
-+++ ./doc/Makefile	Mon Mar 29 14:29:29 2004
-@@ -8,8 +8,8 @@
+--- doc/Makefile.orig	2005-03-13 22:30:53.000000000 +0800
++++ doc/Makefile	2014-06-08 20:53:49.623678413 +0800
+@@ -8,24 +8,24 @@ clean: 
  
  manpage:
  	@echo Generating manpage...
@@ -12,3 +11,35 @@ diff -u --new-file --recursive ../gnarwl-3.3.orig/doc/Makefile ./doc/Makefile
  
  
  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 -m 755 -p $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
++	install -m 644 $(BIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
++	install -m 644 $(SBIN).$(MAN_SEC) $(DESTDIR)$(MANDIR)/man$(MAN_SEC)
++	install -m 644 FAQ $(DESTDIR)$(DOCDIR)
++	install -m 644 LICENSE $(DESTDIR)$(DOCDIR)
++	install -m 644 AUTHORS $(DESTDIR)$(DOCDIR)
++	install -m 644 INSTALL $(DESTDIR)$(DOCDIR)
++	install -m 644 ISPEnv.schema $(DESTDIR)$(DOCDIR)
++	install -m 644 ISPEnv2.schema $(DESTDIR)$(DOCDIR)
++	install -m 644 example.ldif $(DESTDIR)$(DOCDIR)
++	install -m 644 HISTORY $(DESTDIR)$(DOCDIR)
++	install -m 644 README $(DESTDIR)$(DOCDIR)
++	gzip -f -9 $(DESTDIR)$(DOCDIR)/FAQ
++	gzip -f -9 $(DESTDIR)$(DOCDIR)/HISTORY
++	gzip -f -9 $(DESTDIR)$(MANDIR)/man$(MAN_SEC)/$(BIN).$(MAN_SEC)
++	gzip -f -9 $(DESTDIR)$(MANDIR)/man$(MAN_SEC)/$(SBIN).$(MAN_SEC)