? wip
? bootstrap/work
? devel/git-base/work
? devel/gmake/work
? devel/libtool-base/work
? devel/m4/work
? devel/p5-Error/work
? devel/p5-IO-CaptureOutput/work
? devel/p5-Sub-Uplevel/work
? devel/p5-Test-Exception/work
? devel/p5-Test-Warn/work
? mail/p5-Email-Valid/work
? mail/p5-MailTools/work
? mail/p5-Net-SMTP-SSL/work
? mail/sendmail/work
? net/p5-IO-Socket-INET6/work
? net/p5-Net/work
? net/p5-Net-DNS/work
? net/p5-Net-Domain-TLD/work
? net/p5-Net-IP/work
? net/p5-Net-LibIDN/work
? net/p5-Socket6/work
? net/rsync/work
? pkgtools/pbulk/work
? pkgtools/pbulk-base/work
? security/p5-Authen-SASL/work
? security/p5-Digest-HMAC/work
? security/p5-GSSAPI/work
? security/p5-IO-Socket-SSL/work
? security/p5-Mozilla-CA/work
? security/p5-Net-SSLeay/work
? shells/zsh/work
? time/p5-TimeDate/work
? www/curl/work
Index: devel/flim/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/flim/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- devel/flim/Makefile	25 Nov 2015 12:49:46 -0000	1.37
+++ devel/flim/Makefile	22 Mar 2016 21:23:21 -0000
@@ -58,7 +58,7 @@ post-install:
 		${INSTALL_DATA} "$$f" ${DESTDIR}${EMACS_INFOPREFIX};	\
 	done
 
-.include "../../editors/emacs/modules.mk"
+.include "../../wip/emacs-current/modules.mk"
 
 BUILDLINK_API_DEPENDS.apel+=	apel>=10.7
 .include "../../devel/apel/buildlink3.mk"
Index: editors/emacs/modules.mk
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/modules.mk,v
retrieving revision 1.19
diff -u -p -r1.19 modules.mk
--- editors/emacs/modules.mk	9 Oct 2013 09:52:30 -0000	1.19
+++ editors/emacs/modules.mk	22 Mar 2016 21:23:31 -0000
@@ -241,7 +241,7 @@ _EMACS_PKGDIR_MAP= \
 	emacs23nox@../../editors/emacs23-nox11 \
 	emacs24@../../editors/emacs24 \
 	emacs24nox@../../editors/emacs24-nox11 \
-	emacs25@../../editors/emacs-snapshot \
+	emacs25@../../wip/emacs-current \
 	xemacs214@../../editors/xemacs \
 	xemacs214nox@../../editors/xemacs-nox11 \
 	xemacs215@../../editors/xemacs-current \
Index: misc/elscreen/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/elscreen/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- misc/elscreen/Makefile	13 Feb 2015 14:05:07 -0000	1.22
+++ misc/elscreen/Makefile	22 Mar 2016 21:23:58 -0000
@@ -32,6 +32,7 @@ EMACS_BUILDLINK=# empty
 # Emacs 24 or later is not supported. Try wip/elscreen-current
 # instead.
 EMACS_VERSIONS_ACCEPTED= \
+	emacs25 emacs24 \
 	emacs23 emacs23nox \
 	emacs22 emacs22nox \
 	emacs21 emacs21nox \
Index: pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk,v
retrieving revision 1.15
diff -u -p -r1.15 create-report-html.awk
--- pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk	14 May 2014 14:45:26 -0000	1.15
+++ pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk	22 Mar 2016 21:24:09 -0000
@@ -225,6 +225,8 @@ BEGIN {
 			pkgsrc_platform = substr($0, 10)
 		else if ($0 ~ "^COMPILER=")
 			pkgsrc_compiler = substr($0, 10)
+		else if ($0 ~ "^COMPILER_VERSION=")
+			compiler_version = substr($0, 18)
 		else if ($0 ~ "^BUILD_START_ISO=")
 			pkgsrc_build_start_iso = substr($0, 17)
 		else if ($0 ~ "^BUILD_END_ISO=")
Index: pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk,v
retrieving revision 1.8
diff -u -p -r1.8 create-report-txt.awk
--- pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk	1 Mar 2008 19:04:37 -0000	1.8
+++ pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk	22 Mar 2016 21:24:09 -0000
@@ -64,6 +64,8 @@ BEGIN {
 			pkgsrc_platform = substr($0, 10)
 		else if ($0 ~ "^COMPILER=")
 			pkgsrc_compiler = substr($0, 10)
+		else if ($0 ~ "^COMPILER_VERSION=")
+			compiler_version = substr($0, 18)
 		else if ($0 ~ "^BUILD_START_ISO=")
 			pkgsrc_build_start_iso = substr($0, 17)
 		else if ($0 ~ "^BUILD_START_DIR=")
@@ -122,7 +124,7 @@ BEGIN {
 	print "========================" > txt_report
 	print "" > txt_report
 	print pkgsrc_platform > txt_report
-	print "Compiler: " pkgsrc_compiler > txt_report
+	print "Compiler: " compiler_version > txt_report
 	print "" > txt_report
 	print "Build start: " pkgsrc_build_start_iso > txt_report
 	print "Build end:   " pkgsrc_build_end_iso > txt_report
Index: pkgtools/pbulk/files/pbulk/scripts/pre-build
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build,v
retrieving revision 1.14
diff -u -p -r1.14 pre-build
--- pkgtools/pbulk/files/pbulk/scripts/pre-build	12 Sep 2015 23:04:30 -0000	1.14
+++ pkgtools/pbulk/files/pbulk/scripts/pre-build	22 Mar 2016 21:24:09 -0000
@@ -110,9 +110,17 @@ esac
 
 platform=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=MACHINE_ARCH`
 compiler=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=PKGSRC_COMPILER`
+clang_version=`cd ${pkgsrc}/pkgtools/pkg_install && clang --version || echo no clang`
+cc_version=`cd ${pkgsrc}/pkgtools/pkg_install && gcc --version || cc --version || echo neither gcc nor cc `
 
 echo "PLATFORM=${opsys} ${opver}/${platform}" > ${loc}/status
 echo "COMPILER=${compiler}" >> ${loc}/status
+if [ ${compiler} = "clang" ] ;then
+echo "COMPILER_VERSION=${clang_version}" >> ${loc}/status
+else
+echo "COMPILER_VERSION=${cc_version}" >> ${loc}/status
+fi
+
 
 date '+%Y-%m-%d %H:%M|%Y%m%d.%H%M' | sed 's/^\(.*\)|\(.*\)$/BUILD_START_ISO=\1\
 BUILD_START_DIR=\2/' >> ${loc}/status