- Update to 1.8

- Pass maintainership to submitter

PR:		166472
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>

4 files changed, 62 insertions, 80 deletions

diff --git a/mail/spamguard/Makefile b/mail/spamguard/Makefile
index 813f9ff10761..83016fa4eb80 100644
--- a/mail/spamguard/Makefile
+++ b/mail/spamguard/Makefile
@@ -6,27 +6,32 @@
 #
 
 PORTNAME=	spamguard
-PORTVERSION=	1.6
+PORTVERSION=	1.8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/spamguard/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	5u623l20@gmail.com
 COMMENT=	MTA spam prevention program for qmail/postfix/sendmail
 
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
+WRKSRC=		${WRKDIR}/${PORTNAME}
+GNU_CONFIGURE=	yes
 
 DOCS=		AUTHORS CHANGELOG COPYING INSTALL \
-		POST-INSTALL README THANKS
-DOCS_TR=	BENIOKU COPYING DEGISIKLIKLER KURULUM \
-		KURULUM-SONRASI YAPILACAKLAR YAZARLAR
+		POST-INSTALL README THANKS README.DigitalUnix \
+	        THANKS TODO UPGRADE
+DOCS_TR=	BENIOKU BENIOKU.DigitalUnix COPYING DEGISIKLIKLER \
+		GUNCELLEME KURULUM KURULUM-SONRASI YAPILACAKLAR YAZARLAR
 
 SUB_FILES=	pkg-message
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/spamguard ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/*.sample ${PREFIX}/etc
+pre-configure:
+	        cd ${WRKSRC}; \
+		./autogen.sh
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/tr
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
diff --git a/mail/spamguard/distinfo b/mail/spamguard/distinfo
index 05493e8b46d7..5442bb8859e5 100644
--- a/mail/spamguard/distinfo
+++ b/mail/spamguard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spamguard-1.6.tar.gz) = d4f939e0883ad9018e1a01eac712a4d24cb53aed929f61ce7d829d31d15ec1f9
-SIZE (spamguard-1.6.tar.gz) = 142800
+SHA256 (spamguard-1.8.tar.gz) = f6097a1845681ea18f5693f959ff87ef1459e0e585bf81dbea4ab1793171ccb9
+SIZE (spamguard-1.8.tar.gz) = 26966
diff --git a/mail/spamguard/files/patch-Makefile.am b/mail/spamguard/files/patch-Makefile.am
index b6dd4c16ede4..f9efd7112dc4 100644
--- a/mail/spamguard/files/patch-Makefile.am
+++ b/mail/spamguard/files/patch-Makefile.am
@@ -1,71 +1,34 @@
---- Makefile.am.orig	Sun Oct 26 02:04:34 2003
-+++ Makefile.am	Sun Oct 26 02:07:45 2003
-@@ -4,59 +4,22 @@ bin_PROGRAMS = spamguard
- spamguard_SOURCES = functions.c  loadconfig.c  main.c  parser.c  wildmat.c
+--- Makefile.am.orig	2012-03-28 17:13:44.319243270 +0600
++++ Makefile.am	2012-03-28 17:14:10.552245509 +0600
+@@ -1,22 +1,8 @@
+ #EnderUNIX spamguard Makefile.am file
+-SUBDIRS = tr
+ bin_PROGRAMS = spamguard
+ spamguard_SOURCES = functions.c loadconfig.c main.c parser.c wildmat.c qsheff_parser.c hash.c
  spamguard_LDADD 	=
  
--EXTRA_DIST = functions.c functions.h loadconfig.c loadconfig.h main.c parser.c parser.h wildmat.c wildtmat.h spam-ignore.txt spam-ignore.txt.sample spamguard.conf spamguard.conf.sample  AUTHORS CHANGELOG COPYING INSTALL README README.DigitalUnix POST-INSTALL THANKS TODO
-+DOCS=	AUTHORS CHANGELOG COPYING INSTALL README README.DigitalUnix POST-INSTALL THANKS TODO
-+EXTRA_DIST = functions.c functions.h loadconfig.c loadconfig.h main.c parser.c parser.h wildmat.c wildtmat.h spam-ignore.txt spam-ignore.txt.sample spamguard.conf spamguard.conf.sample $(DOCS) 
- 
- install-data-local:
- 	$(mkinstalldirs) ${prefix}/share/doc/spamguard
--	$(INSTALL_DATA) $(srcdir)/AUTHORS ${prefix}/share/doc/spamguard/AUTHORS
--   
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard/
--	$(INSTALL_DATA) $(srcdir)/CHANGELOG ${prefix}/share/doc/spamguard/CHANGELOG
--
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard/
--	$(INSTALL_DATA) $(srcdir)/COPYING ${prefix}/share/doc/spamguard/COPYING
--
--
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard
--	$(INSTALL_DATA) $(srcdir)/INSTALL ${prefix}/share/doc/spamguard/INSTALL
--   
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard
--	$(INSTALL_DATA) $(srcdir)/README ${prefix}/share/doc/spamguard/README
--   
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard
--	$(INSTALL_DATA) $(srcdir)/README.DigitalUnix ${prefix}/share/doc/spamguard/README.DigitalUnix
--   
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard
--	$(INSTALL_DATA) $(srcdir)/POST-INSTALL  ${prefix}/share/doc/spamguard/POST-INSTALL
--   
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard/
--	$(INSTALL_DATA) $(srcdir)/THANKS  ${prefix}/share/doc/spamguard/THANKS
--   
--	$(mkinstalldirs) ${prefix}/share/doc/spamguard/
--	$(INSTALL_DATA) $(srcdir)/TODO ${prefix}/share/doc/spamguard/TODO
--   
--	$(mkinstalldirs) ${prefix}/etc/
-+.for file in $(DOCS)
-+	$(INSTALL_DATA) $(srcdir)/$(file) ${prefix}/share/doc/spamguard
-+.endfor
-+	$(mkinstalldirs) ${prefix}/etc
- 	$(INSTALL_DATA) $(srcdir)/spam-ignore.txt.sample ${prefix}/etc/spam-ignore.txt.sample
+-spamguard_docdir = ${prefix}/share/doc/spamguard
+-spamguard_doc_DATA = AUTHORS\
+-	CHANGELOG\
+-	COPYING\
+-	INSTALL\
+-	README\
+-	README.DigitalUnix\
+-	POST-INSTALL\
+-	THANKS\
+-	TODO\
+-	UPGRADE
+-	
 -
--	$(mkinstalldirs) ${prefix}/etc/
--	$(INSTALL_DATA) $(srcdir)/spam-ignore.txt ${prefix}/etc/spam-ignore.txt
--
--	$(mkinstalldirs) ${prefix}/etc/
- 	$(INSTALL_DATA) $(srcdir)/spamguard.conf.sample ${prefix}/etc/spamguard.conf.sample
+ spamguard_confdir = ${sysconfdir}/spamguard
+ spamguard_conf_DATA = spam-ignore.txt\
+ 	spam-ignore.txt.sample\
+@@ -36,7 +22,7 @@
+ 	qsheff_parser.h\
+ 	hash.h
  
--	$(mkinstalldirs) ${prefix}/etc/
--	$(INSTALL_DATA) $(srcdir)/spamguard.conf ${prefix}/etc/spamguard.conf
--
- uninstall-local:
--	-rm -f ${prefix}/share/doc/spamguard/AUTHORS
--	-rm -f ${prefix}/share/doc/spamguard/CHANGELOG
--	-rm -f ${prefix}/share/doc/spamguard/COPYING
--	-rm -f ${prefix}/share/doc/spamguard/INSTALL
--	-rm -f ${prefix}/share/doc/spamguard/README
--	-rm -f ${prefix}/share/doc/spamguard/README.DigitalUnix
--	-rm -f ${prefix}/share/doc/spamguard/POST-INSTALL
--	-rm -f ${prefix}/share/doc/spamguard/THANKS
--	-rm -f ${prefix}/share/doc/spamguard/TODO
-+.for file in $(DOCS)
-+	-rm -f ${prefix}/share/doc/spamguard/${file}
-+.endfor
- 	-rm -f ${prefix}/etc/spam-ignore.txt.sample
- 	-rm -f ${prefix}/etc/spamguard.conf.sample
-  
+-EXTRA_DIST = ${spamguard_doc_DATA} ${spamguard_conf_DATA} ${spamguard_headers}
++EXTRA_DIST = ${spamguard_conf_DATA} ${spamguard_headers}
+ 
+ 
+ #This is not a gnu project. So we don't have to obey gnu package needz!
diff --git a/mail/spamguard/pkg-plist b/mail/spamguard/pkg-plist
index da74d63b5a2e..92f52c9f5a26 100644
--- a/mail/spamguard/pkg-plist
+++ b/mail/spamguard/pkg-plist
@@ -1,20 +1,34 @@
 @comment $FreeBSD$
 bin/spamguard
-etc/spamguard.conf.sample
-etc/spam-ignore.txt.sample
+etc/spamguard/spam-ignore.txt
+etc/spamguard/spam-high.txt
+etc/spamguard/spamguard_qsheff.conf
+etc/spamguard/qsheff_ignore.sample
+etc/spamguard/spamguard_qsheff.conf.sample
+etc/spamguard/qsheff_ignore
+etc/spamguard/qsheff_high
+etc/spamguard/spamguard.conf
+etc/spamguard/spam-ignore.txt.sample
+etc/spamguard/spamguard.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/POST-INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.DigitalUnix
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/tr/BENIOKU
+%%PORTDOCS%%%%DOCSDIR%%/tr/BENIOKU.DigitalUnix
 %%PORTDOCS%%%%DOCSDIR%%/tr/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/tr/DEGISIKLIKLER
+%%PORTDOCS%%%%DOCSDIR%%/tr/GUNCELLEME
 %%PORTDOCS%%%%DOCSDIR%%/tr/KURULUM
 %%PORTDOCS%%%%DOCSDIR%%/tr/KURULUM-SONRASI
 %%PORTDOCS%%%%DOCSDIR%%/tr/YAPILACAKLAR
 %%PORTDOCS%%%%DOCSDIR%%/tr/YAZARLAR
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tr
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/spamguard