 @@ -1,14 +1,14 @@
-$NetBSD: CHANGES-2014,v 1.202 2014/01/12 00:24:21 prlw1 Exp $
+$NetBSD: CHANGES-2014,v 1.203 2014/01/12 09:01:50 wiz Exp $
 Changes to the packages collection and infrastructure in 2014:
 	Updated games/supertuxkart to 0.8.1 [ryoon 2014-01-01]
 	Updated devel/libgetopt to 1.4.5 [ryoon 2014-01-01]
 	Added devel/p5-Data-GUID version 0.048 [ryoon 2014-01-01]
 	Added devel/p5-Role-Basic version 0.13 [ryoon 2014-01-01]
 	Added devel/p5-Symbol-Global-Name version 0.04 [ryoon 2014-01-01]
 	Added mail/p5-Email-Address-List version 0.01 [ryoon 2014-01-01]
 	Added security/p5-Crypt-X509 version 0.51 [ryoon 2014-01-01]
 	Added time/p5-Date-Extract version 0.04 [ryoon 2014-01-01]
 	Updated misc/p5-Locale-Maketext-Fuzzy to 0.11 [ryoon 2014-01-01]
 	Updated devel/rt4 to 4.2.1 [ryoon 2014-01-01]
 @@ -217,13 +217,14 @@ Changes to the packages collection and i
 	Updated emulators/qemu to 1.6.2 [adam 2014-01-11]
 	Updated lang/tcl to 8.6.1 [adam 2014-01-11]
 	Updated x11/tk to 8.6.1 [adam 2013-01-11]
 	Updated lang/php54 to 5.4.24 [taca 2014-01-11]
 	Updated lang/php55 to 5.5.8 [taca 2014-01-11]
 	Updated www/drupal7 to 7.25 [taca 2014-01-11]
 	Updated devel/deforaos-libsystem to 0.1.7 [khorben 2014-01-11]
 	Updated x11/deforaos-libsystem to 0.1.0 [khorben 2014-01-11]
 	Updated sysutils/deforaos-browser to 0.4.13 [khorben 2014-01-11]
 	Updated graphics/gnome-icon-theme to 3.10.0 [prlw1 2014-01-11]
 	Updated graphics/gnome-icon-theme-symbolic to 3.10.1 [prlw1 2014-01-11]
 	Updated editors/vim-share to 7.4.141 [morr 2014-01-11]
 	Updated graphics/gdk-pixbuf2 to 2.30.2 [prlw1 2014-01-12]
 	Removed lang/python32 successor lang/python33 [wiz 2014-01-12]

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.363 2013/12/31 17:08:08 wiz Exp $
+# $NetBSD: Makefile,v 1.364 2014/01/12 09:01:50 wiz Exp $
+#
 COMMENT=	Programming languages
 SUBDIR+=	Cg-compiler
 SUBDIR+=	LuaJIT
 SUBDIR+=	LuaJIT2
 SUBDIR+=	STk
 SUBDIR+=	a60
 SUBDIR+=	abcl
 SUBDIR+=	algol68g
 SUBDIR+=	asn1c
 SUBDIR+=	awka
 @@ -145,27 +145,26 @@ SUBDIR+=	php54
 SUBDIR+=	php55
 SUBDIR+=	picoc
 SUBDIR+=	pict
 SUBDIR+=	polyml
 SUBDIR+=	py-basicproperty
 SUBDIR+=	py-cxfreeze
 SUBDIR+=	py-psyco
 SUBDIR+=	py-pyrex
 SUBDIR+=	py26-html-docs
 SUBDIR+=	py27-html-docs
 #SUBDIR+=	python		# only contains Makefile fragments
 SUBDIR+=	python26
 SUBDIR+=	python27
 SUBDIR+=	python32
 SUBDIR+=	python33
 SUBDIR+=	racket
 SUBDIR+=	racket-textual
 SUBDIR+=	rakudo-star
 SUBDIR+=	rcfunge
 SUBDIR+=	rexx-imc
 SUBDIR+=	rexx-regina
 SUBDIR+=	ruby
 SUBDIR+=	ruby-coffee-script
 SUBDIR+=	ruby-coffee-script-source
 SUBDIR+=	ruby-doc-stdlib
 SUBDIR+=	ruby-execjs
 SUBDIR+=	ruby18

 @@ -1,14 +1,14 @@
-# $NetBSD: egg.mk,v 1.15 2012/12/10 03:15:48 tsarna Exp $
+# $NetBSD: egg.mk,v 1.16 2014/01/12 09:01:50 wiz Exp $
+#
 # Common logic to handle Python Eggs
+#
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../lang/python/pyversion.mk"
 # This file should be included to package python "distributions" which
 # use setuptools to create an egg.  Some distributions use distutils,
 # which creates an egg-info file; those should use distutils.mk
 EGG_NAME?=	${DISTNAME}
 PYDISTUTILSPKG=	yes
 @@ -26,22 +26,22 @@ PY_PATCHPLIST=	yes
 PLIST_SUBST+=	EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
 PLIST_SUBST+=	EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 PRINT_PLIST_AWK+=	{ gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
 			       "$${EGG_INFODIR}") }
 PRINT_PLIST_AWK+=	{ gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \
 			       "$${EGG_NAME}-nspkg.pth") }
 _PYSETUPTOOLSINSTALLARGS=	--single-version-externally-managed
 .if ${_USE_DESTDIR} == "no"
 _PYSETUPTOOLSINSTALLARGS+=	--root=/
 .endif
-.if ${_PYTHON_VERSION} == "31" || ${_PYTHON_VERSION} == "32" || ${_PYTHON_VERSION} == "33"
+.if ${_PYTHON_VERSION} == "33"
 DEPENDS+=	${PYPKGPREFIX}-distribute-[0-9]*:../../devel/py-distribute
 .else
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c9:../../devel/py-setuptools
 .endif
 INSTALLATION_DIRS+=	${PYSITELIB}
 .include "../../lang/python/extension.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: extension.mk,v 1.35 2013/11/10 13:05:54 obache Exp $
+# $NetBSD: extension.mk,v 1.36 2014/01/12 09:01:50 wiz Exp $
 .include "../../lang/python/pyversion.mk"
 # Packages that are a non-egg distutils extension should set
 # PYDISTUTILSPKG=YES and include this mk file.
 # This mk fragment is included to handle packages that create
 # extensions to python, which by definition are those that place files
 # in ${PYSITELIB}.  Extensions can be implemented via setuptools as
 # eggs (see egg.mk), via distutils (confusing, with an egg-info file,
 # even though they are not eggs), or via more ad hocs methods.
 .if defined(PYDISTUTILSPKG)
 @@ -51,22 +51,22 @@ do-test:
 # are present, and therefore the default value of PY_NO_EGG=yes causes
 # pkgsrc not to conform to python norms.  The reason for this behavior
 # appears to be that creating egg info files was new in Python 2.5.
 PY_NO_EGG?=		yes
 .if !empty(PY_NO_EGG:M[yY][eE][sS])
 # see python26/patches/patch-av
 INSTALL_ENV+=		PKGSRC_PYTHON_NO_EGG=defined
 .endif
 .if defined(PY_PATCHPLIST)
 PLIST_SUBST+=	PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
 .endif
-# prepare Python>=32 bytecode file location change
+# prepare Python>=3.2 bytecode file location change
 # http://www.python.org/dev/peps/pep-3147/
-.if empty(_PYTHON_VERSION:M2?) && ${_PYTHON_VERSION} != "31"
+.if empty(_PYTHON_VERSION:M2?)
 PY_PEP3147?=	yes
 .endif
 .if defined(PY_PEP3147) && !empty(PY_PEP3147:M[yY][eE][sS])
 PLIST_AWK+=	-f ${PKGSRCDIR}/lang/python/plist-python.awk
 PLIST_AWK_ENV+=	PYTHON_SOABI="cpython-${_PYTHON_VERSION}"
 .endif

 @@ -1,57 +1,57 @@
-# $NetBSD: pyversion.mk,v 1.109 2013/05/12 00:19:55 riastradh Exp $
+# $NetBSD: pyversion.mk,v 1.110 2014/01/12 09:01:50 wiz Exp $
 # This file determines which Python version is used as a dependency for
 # a package.
+#
 # === User-settable variables ===
+#
 # PYTHON_VERSION_DEFAULT
 #	The preferred Python version to use.
+#
-#	Possible values: 26 27 32 33
+#	Possible values: 26 27 33
 #	Default: 27
+#
 # === Infrastructure variables ===
+#
 # PYTHON_VERSION_REQD
 #	Python version to use. This variable should not be set in
 #	packages.  Normally it is used by bulk build tools.
+#
 #	Possible: ${PYTHON_VERSIONS_ACCEPTED}
 #	Default:  ${PYTHON_VERSION_DEFAULT}
+#
 # === Package-settable variables ===
+#
 # PYTHON_VERSIONS_ACCEPTED
 #	The Python versions that are acceptable for the package. The
 #	order of the entries matters, since earlier entries are
 #	preferred over later ones.
+#
-#	Possible values: 33 32 27 26
+#	Possible values: 33 27 26
-#	Default: (33 32) 27 26
+#	Default: (33) 27 26
+#
 # PYTHON_VERSIONS_INCLUDE_3X
 #	Wether the default PYTHON_VERSIONS_ACCEPTED should include
 #	3.x versions for for this package or not.
 #	This variable must be set before including bsd.prefs.mk.
+#
 #	Possible values: yes no
 #	Default: no
+#
 # PYTHON_VERSIONS_INCOMPATIBLE
 #	The Python versions that are NOT acceptable for the package.
+#
-#	Possible values: 26 27 32 33
+#	Possible values: 26 27 33
 #	Default: (depends on the platform)
+#
 # PYTHON_FOR_BUILD_ONLY
 #	Whether Python is needed only at build time or at run time.
+#
 #	Possible values: yes no tool
 #	Default: no
+#
 # PYTHON_SELF_CONFLICT
 #	If set to "yes", additional CONFLICTS entries are added for
 #	registering a conflict between pyNN-<modulename> packages.
+#
 #	Possible values: yes no
 @@ -84,35 +84,34 @@ PYTHON_PYVERSION_MK=	defined
 PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
 .elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
       defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
 PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
 .endif
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=		PYTHON_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=	PYPACKAGE
 PYTHON_VERSION_DEFAULT?=		27
 .if ${PYTHON_VERSIONS_INCLUDE_3X:U:tl} == "yes"
-PYTHON_VERSIONS_ACCEPTED?=		33 32 27 26
+PYTHON_VERSIONS_ACCEPTED?=		33 27 26
 .else
 PYTHON_VERSIONS_ACCEPTED?=		27 26
 .endif
 PYTHON_VERSIONS_INCOMPATIBLE?=		# empty by default
 BUILDLINK_API_DEPENDS.python26?=		python26>=2.6
 BUILDLINK_API_DEPENDS.python27?=		python27>=2.7
 BUILDLINK_API_DEPENDS.python32?=		python32>=3.2
 BUILDLINK_API_DEPENDS.python33?=		python33>=3.3
 # transform the list into individual variables
 .for pv in ${PYTHON_VERSIONS_ACCEPTED}
 .if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
 _PYTHON_VERSION_${pv}_OK=	yes
 _PYTHON_VERSIONS_ACCEPTED+=	${pv}
 .endif
 .endfor
+#
 # choose a python version where to add,
 # try to be intelligent
 @@ -156,33 +155,26 @@ CONFLICTS +=	${PKGNAME:S/py${_PYTHON_VER
 .endfor
 .endif # PYCONFLICTS
+#
 PLIST_VARS+=	py2x py3x
 .if ${_PYTHON_VERSION} == "33"
 PYPKGSRCDIR=	../../lang/python33
 PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python33}:${PYPKGSRCDIR}
 PYPACKAGE=	python33
 PYVERSSUFFIX=	3.3
 PYPKGPREFIX=	py33
 PLIST.py3x=	yes
 .elif ${_PYTHON_VERSION} == "32"
 PYPKGSRCDIR=	../../lang/python32
 PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python32}:${PYPKGSRCDIR}
 PYPACKAGE=	python32
 PYVERSSUFFIX=	3.2
 PYPKGPREFIX=	py32
 PLIST.py3x=	yes
 .elif ${_PYTHON_VERSION} == "27"
 PYPKGSRCDIR=	../../lang/python27
 PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python27}:${PYPKGSRCDIR}
 PYPACKAGE=	python27
 PYVERSSUFFIX=	2.7
 PYPKGPREFIX=	py27
 PLIST.py2x=	yes
 .elif ${_PYTHON_VERSION} == "26"
 PYPKGSRCDIR=	../../lang/python26
 PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python26}:${PYPKGSRCDIR}
 PYPACKAGE=	python26
 PYVERSSUFFIX=	2.6
 PYPKGPREFIX=	py26

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.12 2013/10/31 23:38:30 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2014/01/12 09:01:51 wiz Exp $
-DISTNAME=	bulk-medium-20131031
+DISTNAME=	bulk-medium-20140112
 CATEGORIES=	meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	dholland@NetBSD.org
 COMMENT=	Meta-package for a standard medium-sized limited bulk build
 META_PACKAGE=	yes
 RESTRICTED=		Just for test build purpose
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 @@ -82,27 +82,26 @@ BUILD_DEPENDS+=	netpbm-[0-9]*:../../grap
 BUILD_DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 BUILD_DEPENDS+=	${PYPKGPREFIX}-matplotlib-gtk-[0-9]*:../../graphics/py-matplotlib-gtk2
 BUILD_DEPENDS+=	${PYPKGPREFIX}-matplotlib-tk-[0-9]*:../../graphics/py-matplotlib-tk
 BUILD_DEPENDS+=	gawk-[0-9]*:../../lang/gawk
 BUILD_DEPENDS+=	php>=5.3<5.4:../../lang/php53
 BUILD_DEPENDS+=	php>=5.4<5.5:../../lang/php54
 BUILD_DEPENDS+=	ruby18-base-[0-9]*:../../lang/ruby18-base
 BUILD_DEPENDS+=	ruby193-base-[0-9]*:../../lang/ruby193-base
 BUILD_DEPENDS+=	sun-jdk6-[0-9]*:../../lang/sun-jdk6
 BUILD_DEPENDS+=	sun-jre6-[0-9]*:../../lang/sun-jre6
 BUILD_DEPENDS+=	openjdk7-[0-9]*:../../lang/openjdk7
 BUILD_DEPENDS+=	openjdk7-bin-[0-9]*:../../lang/openjdk7-bin
 BUILD_DEPENDS+=	python26-[0-9]*:../../lang/python26
 BUILD_DEPENDS+=	python32-[0-9]*:../../lang/python32
 BUILD_DEPENDS+=	python33-[0-9]*:../../lang/python33
 BUILD_DEPENDS+=	tcl-[0-9]*:../../lang/tcl
 BUILD_DEPENDS+=	fetchmail-[0-9]*:../../mail/fetchmail
 BUILD_DEPENDS+=	imap-uw-[0-9]*:../../mail/imap-uw
 BUILD_DEPENDS+=	mailman-[0-9]*:../../mail/mailman
 BUILD_DEPENDS+=	mhonarc-[0-9]*:../../mail/mhonarc
 BUILD_DEPENDS+=	mutt-[0-9]*:../../mail/mutt
 BUILD_DEPENDS+=	re-alpine-[0-9]*:../../mail/re-alpine
 BUILD_DEPENDS+=	spamassassin-[0-9]*:../../mail/spamassassin
 BUILD_DEPENDS+=	bind>=9.6<9.7:../../net/bind96
 BUILD_DEPENDS+=	bind>=9.8<9.9:../../net/bind98
 BUILD_DEPENDS+=	bind>=9.9<9.10:../../net/bind99
 BUILD_DEPENDS+=	clive-[0-9]*:../../net/clive

 @@ -1,14 +1,14 @@
-# $NetBSD: makevars.map,v 1.238 2013/09/01 05:30:15 obache Exp $
+# $NetBSD: makevars.map,v 1.239 2014/01/12 09:01:50 wiz Exp $
+#
 # This file contains the guessed type of some variables, according to
 # their current use in pkgsrc.
+#
 # The type YesNo is used for variables that are checked using
 #     .if defined(VAR) && !empty(VAR:M[Yy][Ee][Ss])
+#
 # The type Yes is used for variables that are checked using
 #     .if defined(VAR)
+#
 # Type type List is used for lists of things. There are two types of lists,
 # InternalList and List, which are described in the pkgsrc guide, chapter
 @@ -628,27 +628,27 @@ PLIST_TYPE		{ dynamic static }
 PREPEND_PATH		List of Pathname
 PREFIX			Pathname [*:u]			# ???
 PREV_PKGPATH		Pathname [*:u]	# doesn't exist any longer
 PRINT_PLIST_AWK		AwkCommand [*:a]
 PRIVILEGED_STAGES	List of { install package clean }
 PTHREAD_AUTO_VARS	YesNo [m:s]
 PTHREAD_CFLAGS		List of CFlag [$system]
 PTHREAD_LDFLAGS		List of LdFlag [$system]
 PTHREAD_LIBS		List of LdFlag [$system]
 PTHREAD_OPTS		List of { native optional require } [m:as,c:a,b:a]
 PTHREAD_TYPE		Identifier [$system]
 # ^^ or "native" or "none".
 PY_PATCHPLIST		Yes [$package]
-PYPKGPREFIX		{ py26 py27 py31 py32 } [*:pu, pyversion.mk:s, *:]
+PYPKGPREFIX		{ py26 py27 py33 } [*:pu, pyversion.mk:s, *:]
 PYTHON_FOR_BUILD_ONLY	Yes [$package]
 PYTHON_PATCH_SCRIPTS	List of Pathmask [$package_list]
 PYTHON_VERSIONS_ACCEPTED List of Version [$package]
 PYTHON_VERSIONS_INCOMPATIBLE List of Version [$package]
 PYTHON_VERSION_DEFAULT	Version [$user]
 PYTHON_VERSION_REQD	Version [$user]
 RANLIB			ShellCommand [$system]
 RCD_SCRIPTS		List of Filename [$package_list]
 RCD_SCRIPT_SRC.*	List of Pathname [m:s]
 REPLACE.*		String [m:s]
 REPLACE_AWK		List of Pathmask [$package_list]
 REPLACE_BASH		List of Pathmask [$package_list]
 REPLACE_EMACS		List of Pathmask