? distfiles-cvs ? distfiles-local ? bootstrap/work ? chat/icbirc/work ? converters/p5-Unicode-EastAsianWidth/work ? cross/avrdude/work ? databases/shared-mime-info/ktrace.out ? devel/boost-headers/work ? devel/boost-jam/work ? devel/elftoolchain/buildlink3.mk ? devel/elftoolchain/work ? devel/gtexinfo/work ? devel/libftdi/work ? devel/libgee/work ? devel/libusb/work ? devel/p5-Test-Trap/work ? devel/xulrunner17/work ? fonts/ghostscript-cidfonts-ryumin/: ? lang/clang/work ? lang/ruby193-base/work ? mail/sendmail/work ? misc/p5-Locale-libintl/work ? multimedia/gst-plugins0.10-base/work ? pkgtools/pbulk/work ? pkgtools/pbulk-base/work ? pkgtools/pkglint/work ? shells/zsh/work ? sysutils/checkperms/work ? textproc/enca/work ? textproc/gnome-doc-utils/work ? textproc/p5-Text-Unidecode/work ? textproc/py-libxml2/work ? textproc/py-libxslt/work ? textproc/texi2html/work ? textproc/unac/work Index: editors/emacs/modules.mk =================================================================== RCS file: /cvs/cvsroot/pkgsrc/editors/emacs/modules.mk,v retrieving revision 1.19 diff -u -u -r1.19 modules.mk --- editors/emacs/modules.mk 9 Oct 2013 09:52:30 -0000 1.19 +++ editors/emacs/modules.mk 20 Feb 2014 23:20:42 -0000 @@ -241,7 +241,7 @@ 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/bbdb/Makefile =================================================================== RCS file: /cvs/cvsroot/pkgsrc/misc/bbdb/Makefile,v retrieving revision 1.29 diff -u -u -r1.29 Makefile --- misc/bbdb/Makefile 6 Apr 2013 20:27:25 -0000 1.29 +++ misc/bbdb/Makefile 20 Feb 2014 23:21:12 -0000 @@ -12,7 +12,7 @@ COMMENT= Insidious Big Brother DataBase, a rolodex-like database Emacs program # bbdb is included in xemacs-packages -EMACS_VERSIONS_ACCEPTED= emacs24 emacs24nox emacs23 emacs23nox \ +EMACS_VERSIONS_ACCEPTED= emacs25 emacs24 emacs24nox emacs23 emacs23nox \ emacs22 emacs22nox emacs21 emacs21nox \ emacs20 CONFLICTS+= xemacs-packages-[0-9]* Index: pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk =================================================================== RCS file: /cvs/cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk,v retrieving revision 1.14 diff -u -u -r1.14 create-report-html.awk --- pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk 11 Mar 2010 16:31:43 -0000 1.14 +++ pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk 20 Feb 2014 23:21:29 -0000 @@ -225,6 +225,8 @@ 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: /cvs/cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk,v retrieving revision 1.8 diff -u -u -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 20 Feb 2014 23:21:29 -0000 @@ -64,6 +64,8 @@ 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 @@ 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: /cvs/cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pre-build,v retrieving revision 1.11 diff -u -u -r1.11 pre-build --- pkgtools/pbulk/files/pbulk/scripts/pre-build 23 Nov 2012 12:13:35 -0000 1.11 +++ pkgtools/pbulk/files/pbulk/scripts/pre-build 20 Feb 2014 23:21:29 -0000 @@ -84,9 +84,17 @@ opver=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OS_VERSION` 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 ? wip/Makefile.new ? wip/Makefile.new-2 ? wip/meta-tracker-committed ? wip/meta-tracker-keep ? wip/meta-tracker3 ? wip/mumble-0.12 ? wip/nios2-binutils-old ? wip/nios2-gcc-old ? wip/nios2-glibc ? wip/nios2-newlib ? wip/nios2-old ? wip/tee ? wip/netatalk/PLIST.new ? wip/netatalk/work ? wip/nios2-binutils/buildlink3.mk ? wip/nios2-gcc/buildlink3.mk ? wip/samba/RELEASE ? wip/samba/patches/patch-testprogs_blackbox_dbcheck-oldrelease.sh ? wip/talloc/TODO ? wip/tc-git/: Index: wip/libeio/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/libeio/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- wip/libeio/Makefile 5 Sep 2013 10:42:33 -0000 1.3 +++ wip/libeio/Makefile 20 Feb 2014 23:23:51 -0000 @@ -11,6 +11,8 @@ COMMENT= Full-featured asynchronous I/O library for C LICENSE= 2-clause-bsd OR gnu-gpl-v2 +BUILD_DEPENDS= curl-[0-9]*:../../net/curl + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= autoconf automake Index: wip/mk/git-package.mk =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/mk/git-package.mk,v retrieving revision 1.17 diff -u -u -r1.17 git-package.mk --- wip/mk/git-package.mk 11 Feb 2014 21:54:09 -0000 1.17 +++ wip/mk/git-package.mk 20 Feb 2014 23:23:51 -0000 @@ -64,7 +64,7 @@ _GIT_CMD= git _GIT_ENV= # empty -_GIT_FLAGS= --quiet --depth 1 +_GIT_FLAGS?= --quiet --depth 1 _GIT_TODAY_CMD= ${DATE} -u +'%Y-%m-%d' _GIT_TODAY= ${_GIT_TODAY_CMD:sh} _GIT_PKGVERSION_CMD= ${DATE} -u +'%Y.%m.%d'