svn commit: r311830 - in head/dns: autotrust dnrd dnsflood maradns pdnsd

[Pietro Cerutti]

Author: gahr
Date: Thu Feb  7 12:52:44 2013
New Revision: 311830
URL: http://svnweb.freebsd.org/changeset/ports/311830

Log:
  - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: dns)
  
  Approved by:	portmgr

Modified:
  head/dns/autotrust/Makefile
  head/dns/dnrd/Makefile   (contents, props changed)
  head/dns/dnsflood/Makefile   (contents, props changed)
  head/dns/maradns/Makefile
  head/dns/pdnsd/Makefile   (contents, props changed)

Modified: head/dns/autotrust/Makefile
==============================================================================
--- head/dns/autotrust/Makefile	Thu Feb  7 12:37:48 2013	(r311829)
+++ head/dns/autotrust/Makefile	Thu Feb  7 12:52:44 2013	(r311830)
@@ -18,8 +18,8 @@ LIB_DEPENDS+=	ldns:${PORTSDIR}/dns/ldns 
 		unbound:${PORTSDIR}/dns/unbound
 
 GNU_CONFIGURE=	yes
-CFLAGS=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS=		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 MAN8=		autotrust.8
 

Modified: head/dns/dnrd/Makefile
==============================================================================
--- head/dns/dnrd/Makefile	Thu Feb  7 12:37:48 2013	(r311829)
+++ head/dns/dnrd/Makefile	Thu Feb  7 12:52:44 2013	(r311830)
@@ -16,7 +16,6 @@ COMMENT=		A proxy DNS daemon
 USE_GMAKE=		yes
 USE_RC_SUBR=		${PORTNAME}
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
 MAN8=		dnrd.8
 DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README

Modified: head/dns/dnsflood/Makefile
==============================================================================
--- head/dns/dnsflood/Makefile	Thu Feb  7 12:37:48 2013	(r311829)
+++ head/dns/dnsflood/Makefile	Thu Feb  7 12:52:44 2013	(r311830)
@@ -25,8 +25,6 @@ USE_RC_SUBR=	dnsflood
 PORTDOCS=	README
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/makefiles/Makefile-FreeBSD
 	@${LN} -sf ${WRKSRC}/makefiles/Makefile-FreeBSD ${WRKSRC}/Makefile
 
 do-install:

Modified: head/dns/maradns/Makefile
==============================================================================
--- head/dns/maradns/Makefile	Thu Feb  7 12:37:48 2013	(r311829)
+++ head/dns/maradns/Makefile	Thu Feb  7 12:52:44 2013	(r311830)
@@ -13,7 +13,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 REINPLACE_ARGS=	-i ""
-MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+MAKE_ENV=	FLAGS="${CFLAGS}"
 CONFIGURE_ENV=	LANG=
 
 USE_BZIP2=	yes
@@ -32,8 +32,7 @@ post-patch:
 		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g'
 	@${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|make|\$$\{MAKE\}|g ; \
-		 s|^FLAGS =|#FLAGS =|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g'
+		 s|^FLAGS =|#FLAGS =|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${PREFIX}/sbin

Modified: head/dns/pdnsd/Makefile
==============================================================================
--- head/dns/pdnsd/Makefile	Thu Feb  7 12:37:48 2013	(r311829)
+++ head/dns/pdnsd/Makefile	Thu Feb  7 12:52:44 2013	(r311830)
@@ -36,7 +36,7 @@ DOCSRCDIR=	${WRKSRC}/doc
 DOC_FILES=	html/dl.html html/doc.html html/faq.html html/index.html
 DOC_FILES+=	txt/faq.txt txt/intro.txt txt/manual.txt
 
-CFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	-pthread
 
 OPTIONS=	IPV6	"IPv6 support"	on