Infrastructure: sync with upstream

Taken from: FreeBSD

CHANGES

@@ -10,6 +10,12 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20150326:
+AUTHOR: [email protected]
+
+  PTHREAD_CLFAGS and PTHREAD_LIBS have been removed.  Please see entry
+  20130207 for more information.
+
 20150319:
   AUTHOR: [email protected]
 

Mk/bsd.gecko.mk

@@ -523,8 +523,8 @@ gecko-post-patch:
 			${MOZSRC}/configure \
 			${WRKSRC}/configure; do \
 		if [ -f $$f ] ; then \
-			${REINPLACE_CMD} -Ee 's|-lc_r|${PTHREAD_LIBS}|g ; \
-				s|-l?pthread|${PTHREAD_LIBS}|g ; \
+			${REINPLACE_CMD} -Ee 's|-lc_r|-pthread|g ; \
+				s|-l?pthread|-pthread}|g ; \
 				s|echo aout|echo elf|g ; \
 				s|/usr/X11R6|${LOCALBASE}|g' \
 				$$f; \

Mk/bsd.options.mk

@@ -35,6 +35,7 @@
 #
 # OPTIONS_EXCLUDE		- List of options unsupported (useful for slave ports)
 # OPTIONS_EXCLUDE_${ARCH}	- List of options unsupported on a given ${ARCH}
+# OPTIONS_EXCLUDE_${OPSYS}	- List of options unsupported on a given ${OPSYS}
 # OPTIONS_SLAVE			- This is designed for slave ports, it removes an
 #				  option from the options list inherited from the
 #				  master port and it always adds it to PORT_OPTIONS
@@ -171,7 +172,8 @@ OPTIONS_DEFINE+=	${opt}
 OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${ARCH}}
 
 # Remove options the port maintainer doesn't want
-.for opt in ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} ${OPTIONS_SLAVE}
+.for opt in ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} ${OPTIONS_SLAVE} \
+	${OPTIONS_EXCLUDE_${OPSYS}}
 OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:N${opt}}
 OPTIONS_DEFINE:=	${OPTIONS_DEFINE:N${opt}}
 PORT_OPTIONS:=		${PORT_OPTIONS:N${opt}}

Mk/bsd.port.mk

@@ -2069,9 +2069,6 @@ BUILD_FAIL_MESSAGE+=	Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reportin
 
 .include "${PORTSDIR}/Mk/bsd.ccache.mk"
 
-PTHREAD_CFLAGS?=
-PTHREAD_LIBS?=		-pthread
-
 FETCH_ENV?=		SSL_NO_VERIFY_PEER=1 SSL_NO_VERIFY_HOSTNAME=1
 FETCH_BINARY?=	/usr/bin/fetch
 FETCH_ARGS?=	-Fpr

Mk/bsd.sites.mk

@@ -1542,9 +1542,6 @@ MASTER_SITES_SUBDIRS=	APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
 			MOZDEV:${PORTNAME:tl} \
 			NETLIB:${PORTNAME} \
 			PERL_CPAN:${PORTNAME:C/-.*//} \
-			PNET:${PNET_MASTER_SITE_SUBDIR} \
-			RUBY_DBI:${RUBY_DBI_MASTER_SITE_SUBDIR} \
-			RUBY_GNOME:${RUBY_GNOME_MASTER_SITE_SUBDIR} \
 			SAVANNAH:${PORTNAME:tl} \
 			SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}