 @@ -1,14 +1,14 @@
-# $NetBSD: phpversion.mk,v 1.13 2010/09/23 07:38:05 taca Exp $
+# $NetBSD: phpversion.mk,v 1.14 2011/03/12 14:07:13 wiz Exp $
+#
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
 # package.
+#
 # === User-settable variables ===
+#
 # PHP_VERSION_DEFAULT
 #	The PHP version to choose when more than one is acceptable to
 #	the package. '5' means any 5.*, 52 only 5.2.*, 53 only 5.3.*
+#
 #	Possible: 5 52 53
 #	Default: 5
 @@ -126,26 +126,30 @@ _PHP_VERSION_FIRSTACCEPTED?=	${pv}
 .endfor
 .endif
 # if the default is OK for the addon pkg, take this
 .if !defined(_PHP_VERSION)
 .if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
 _PHP_VERSION=	${PHP_VERSION_DEFAULT}
 .endif
 .endif
 # take the first one accepted by the package
 .if !defined(_PHP_VERSION)
 _PHP_VERSION=	${_PHP_VERSION_FIRSTACCEPTED}
 .endif
+#
 # Variable assignment for multi-PHP packages
 MULTI+=	PHP_VERSION_REQD=${_PHP_VERSION}
 # export some of internal variables
 PKG_PHP_VERSION:=	${_PHP_VERSION:C/\.[0-9]//}
 PKG_PHP:=		PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
 # currently we have only PHP 5.x packages.
 PKG_PHP_MAJOR_VERS:=	5
 # if installed PHP isn't compatible with required PHP, bail out
 .if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
 PKG_SKIP_REASON+=	"Package accepts ${PKG_PHP}, but different version is installed"
 .endif
 MESSAGE_SUBST+=		PKG_PHP_VERSION=${PKG_PHP_VERSION} \

 @@ -1,14 +1,14 @@
-# $NetBSD: pyversion.mk,v 1.86 2011/02/25 09:47:24 wiz Exp $
+# $NetBSD: pyversion.mk,v 1.87 2011/03/12 14:07:13 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: 24 25 26 27
 #	Default: 26
+#
 # === Package-settable variables ===
 @@ -102,26 +102,30 @@ _PYTHON_VERSION=	${PYTHON_VERSION_REQD}
 _PYTHON_VERSION=	${PYTHON_VERSION_DEFAULT}
 . endif
 . endif
 # prefer an already installed version, in order of "accepted"
 . if !defined(_PYTHON_VERSION)
 . for pv in ${PYTHON_VERSIONS_ACCEPTED}
 . if defined(_PYTHON_VERSION_${pv}_OK)
 _PYTHON_VERSION?=	${pv}
 . endif
 . endfor
 . endif
 .endif
+#
 # Variable assignment for multi-python packages
 MULTI+=	PYTHON_VERSION_REQD=${_PYTHON_VERSION}
 # No supported version found, annotate to simplify statements below.
 .if !defined(_PYTHON_VERSION)
 _PYTHON_VERSION=	none
 .endif
 .if ${_PYTHON_VERSION} == "27"
 PYPKGSRCDIR=	../../lang/python27
 PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python27}:${PYPKGSRCDIR}
 PYPACKAGE=	python27
 PYVERSSUFFIX=	2.7
 PYPKGPREFIX=	py27
 PYDISTUTILS_CREATES_EGGFILES=	yes
 .elif ${_PYTHON_VERSION} == "26"

 @@ -1,14 +1,14 @@
-# $NetBSD: rubyversion.mk,v 1.59 2011/02/21 15:00:34 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.60 2011/03/12 14:07:13 wiz Exp $
+#
 .if !defined(_RUBYVERSION_MK)
 _RUBYVERSION_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 # current supported Ruby's version
 RUBY18_VERSION=		1.8.7
 RUBY19_VERSION=		1.9.2
 # patch
 RUBY18_PATCHLEVEL=	pl334
 @@ -51,26 +51,30 @@ RUBY_VERSION?=		${RUBY18_VERSION}
 RUBY_PATCH_LEVEL=	${RUBY${RUBY_VER}_PATCHLEVEL}
 .if ${RUBY_VERSION} == ${RUBY18_VERSION}
 RUBY_API_VERSION=	${RUBY18_API_VERSION}
 RUBY_VERSION_SUFFIX=	${RUBY_VERSION}${RUBY_PATCH_LEVEL:S/pl/./}
 RUBY_ABI_VERSION=	${RUBY_VERSION_SUFFIX}
 .elif ${RUBY_VERSION} == ${RUBY19_VERSION}
 RUBY_API_VERSION=	${RUBY19_API_VERSION}
 RUBY_VERSION_SUFFIX=	${RUBY_VERSION}${RUBY_PATCH_LEVEL}
 RUBY_ABI_VERSION=	${RUBY19_API_VERSION}
 .endif
+#
 # Variable assignment for multi-ruby packages
 MULTI+=	RUBY_VERSION_REQD=${RUBY_VERSION_REQD:U${_RUBY_VERSION_DEFAULT}}
 # RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is
 #	supported by the package.  It should be defined by the packages
 #	for specific Ruby versions.
+#
 RUBY_VERSION_SUPPORTED?= 18 19
 # RUBY_VERSION_LIST defines the list of ${RUBY_VER} which is known to
 #	this framework.
+#
 RUBY_VERSION_LIST= 18 19
 # RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on
 #	any specific version of ruby command.  In this case, package's

 @@ -1,14 +1,14 @@
-# $NetBSD: apache.mk,v 1.25 2007/12/17 22:09:58 tron Exp $
+# $NetBSD: apache.mk,v 1.26 2011/03/12 14:07:13 wiz Exp $
+#
 # This file is meant to be included by packages that require an apache
 # web server.
+#
 # User-settable variables:
+#
 # PKG_APACHE_DEFAULT
 #	The default apache server to use and install. If there already
 #	is an apache installed, this will have no effect.
+#
 #	Possible values: apache13 apache2 apache22
+#
 # Package-settable variables:
 @@ -125,14 +125,18 @@ PKG_APACHE?=		${ap}
 PKG_FAIL_REASON+=	"[apache.mk] No acceptable apache package found."
 PKG_APACHE=		none
 .endif
 APACHE_PKG_PREFIX=	${_APACHE_PKG_PREFIX.${PKG_APACHE}}
 .if (${PKG_APACHE} == "apache2") && !empty(USE_APR:M[yY][eE][sS])
 .  include "../../devel/apr0/buildlink3.mk"
 .elif (${PKG_APACHE} == "apache22") && !empty(USE_APR:M[Yy][Ee][Ss])
 .  include "../../devel/apr/buildlink3.mk"
 .  include "../../devel/apr-util/buildlink3.mk"
 .endif
+#
 # Variable assignment for multi-apache packages
 MULTI+=	PKG_APACHE=${PKG_APACHE}
 .endif	# APACHE_MK

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1976 2011/02/07 10:32:32 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1977 2011/03/12 14:07:13 wiz Exp $
+#
 # This file is in the public domain.
+#
 # Please see the pkgsrc/doc/guide manual for details on the
 # variables used in this make file template.
+#
 # Default sequence for "all" is:
+#
 #    bootstrap-depends
 #    fetch
 #    checksum
 #    depends
 #    tools
 @@ -195,26 +195,33 @@ _BUILD_DEFS+=		PKGMANDIR
 _BUILD_DEFS+=		_USE_DESTDIR
 # Store the result in the +BUILD_INFO file so we can query for the build
 # options using "pkg_info -Q PKG_OPTIONS <pkg>".
+#
 .if defined(PKG_SUPPORTED_OPTIONS) && defined(PKG_OPTIONS)
 _BUILD_DEFS+=            PKG_OPTIONS
 .endif
 .if empty(DEPOT_SUBDIR)
 PKG_FAIL_REASON+=	"DEPOT_SUBDIR may not be empty."
 .endif
 # Store the build options for multi-packages, i.e. packages that can
 # be built with multiple versions of Apache, Python, Ruby, PHP etc.
+#
 .if defined(MULTI)
 _BUILD_DEFS+=            MULTI
 .endif
 # ZERO_FILESIZE_P exits with a successful return code if the given file
 #	has zero length.
 # NONZERO_FILESIZE_P exits with a successful return code if the given file
 #	has nonzero length.
+#
 _ZERO_FILESIZE_P=	${AWK} 'END { exit (NR > 0) ? 1 : 0; }'
 _NONZERO_FILESIZE_P=	${AWK} 'END { exit (NR > 0) ? 0 : 1; }'
 # Automatically increase process limit where necessary for building.
 _ULIMIT_CMD=		${UNLIMIT_RESOURCES:@_lim_@${ULIMIT_CMD_${_lim_}};@}
 _NULL_COOKIE=		${WRKDIR}/.null