- Mark CONFLICTS among mail/libspf2, mail/p5-Mail-SPF and mail/p5-Mail-SPF-Query, all of them installs PREFIX/bin/spfquery [1]

- Bump PORTREVISION for package change
- While I'm here:
  - Replace removed PTHREAD_LIBS with -pthread
  - Cleanup Makefile header
  - Add CPAN as primary WWW for mail/p5-Mail-SPF-Query

PR:		ports/177682 [1]
Submitted by:	dougb

4 files changed, 13 insertions, 22 deletions

diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile
index 9f69eb86ba26..5130052d1754 100644
--- a/mail/libspf2/Makefile
+++ b/mail/libspf2/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   libspf2
-# Date created:        07 July 2004
-# Whom:                snowchyld
-#
+# Created by: snowchyld
 # $FreeBSD$
-#
 
 PORTNAME=	libspf2
 PORTVERSION=	1.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.libspf2.org/spf/ \
 		LOCAL/sunpoet
@@ -15,14 +11,14 @@ MASTER_SITES=	http://www.libspf2.org/spf/ \
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sender Rewriting Scheme 2 C Implementation
 
-CONFLICTS=	${PORTNAME}-1.0.*
+CONFLICTS=	${PORTNAME}-1.0.* p5-Mail-SPF-[0-9]* p5-Mail-SPF-Query-[0-9]*
 
+GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/__VA_ARGS__/ s|format, ||g' ${WRKSRC}/src/include/spf_log.h
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-SPF-Query/Makefile b/mail/p5-Mail-SPF-Query/Makefile
index 9b93a9fa2093..077cf709294e 100644
--- a/mail/p5-Mail-SPF-Query/Makefile
+++ b/mail/p5-Mail-SPF-Query/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:    p5-Mail-SPF-Query
-# Date created:                         Fri Jan 16 12:32:39 PST 2004
-# Whom:                                 mharo@FreeBSD.org
-#
+# Created by: mharo@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	Mail-SPF-Query
 PORTVERSION=	1.999.1
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,7 +17,7 @@ BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-CONFLICTS=	p5-Mail-SPF-[0-9]*
+CONFLICTS=	libspf2-[0-9]* p5-Mail-SPF-[0-9]*
 
 PERL_CONFIGURE=	yes
 
diff --git a/mail/p5-Mail-SPF-Query/pkg-descr b/mail/p5-Mail-SPF-Query/pkg-descr
index 60908a8b65b4..601a1f1290a3 100644
--- a/mail/p5-Mail-SPF-Query/pkg-descr
+++ b/mail/p5-Mail-SPF-Query/pkg-descr
@@ -3,4 +3,5 @@ whitelist of their designated outbound mailers.  Given an
 envelope sender, Mail::SPF::Query determines the legitimacy
 of an SMTP client IP.
 
-WWW:	http://spf.pobox.com
+WWW: http://search.cpan.org/dist/Mail-SPF-Query/
+WWW: http://spf.pobox.com/
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 6f82a44cf573..47d16f6626a8 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:    p5-Mail-SPF
-# Date created:                         Thu Feb 8 18:46:25 CET 2007
-# Whom:                                 gmc@sonologic.nl
-#
+# Created by: gmc@sonologic.nl
 # $FreeBSD$
-#
 
 PORTNAME=	Mail-SPF
 PORTVERSION=	2.007
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -23,7 +20,7 @@ RUN_DEPENDS=	p5-Net-DNS-Resolver-Programmable>=0.002.1:${PORTSDIR}/dns/p5-Net-DN
 		p5-URI>=1.13:${PORTSDIR}/net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-CONFLICTS=	p5-Mail-SPF-Query-[0-9]*
+CONFLICTS=	libspf2-[0-9]* p5-Mail-SPF-Query-[0-9]*
 
 PERL_MODBUILD=	yes
 CONFIGURE_ARGS=	--install_path sbin=${PREFIX}/sbin