Massive renaming, pkgfs is now called xbps.

Also known as "xtraeme's build package system".

--HG--
extra : convert_revision : 119840ceae588fef65d6dcab651f607f54fa0be6

README

@@ -1,6 +1,6 @@
-pkgfs - Build packages from s(cratch|ource)
+xbps - xtraeme's build package system.
 
-It is a simple package system manager that uses Xstow to allow packages
+It is a simple build package system that uses Xstow to allow packages
 to be available at a master directory.
 
 Multiple versions of a package can be installed, because they can be enabled
@@ -12,19 +12,19 @@ versions of the same package by "stowning" or "unstowning" them.
 ------------------------------------------------------------------------------
 
 Once you download it, you should edit the configuration file located at the
-pkgfs directory. By default it uses the pkgfs directory in your $HOME.
+xbps directory. By default it uses the xbps directory in your $HOME.
 
-If PKGFS_CONFIG_FILE is not set or specified from the command line with the
+If XBPS_CONFIG_FILE is not set or specified from the command line with the
 -c flag, it will first try to use the default location at
-/usr/local/etc/pkgfs.conf, and as last resort in current directory.
+/usr/local/etc/xbps.conf, and as last resort in current directory.
 
-Once that you read the "pkgfs.conf" file and configured it, you can start
+Once that you read the "xbps.conf" file and configured it, you can start
 installing packages by using the command:
 
-	$ pkgfs.sh install glib
+	$ xbps.sh install glib
 
-While installing your first package, if pkgfs couldn't find the Xstow program
-specified at the configuration file with PKGFS_XSTOW_CMD, the Xstow package
+While installing your first package, if xbps couldn't find the Xstow program
+specified at the configuration file with XBPS_XSTOW_CMD, the Xstow package
 will be installed and "stowned".
 
 If the package is properly installed, it will be "stowned" automatically.
@@ -33,56 +33,56 @@ on which ``Xstow
 
 To remove a currently installed (and stowned) package, you can use:
 
-	$ pkgfs.sh remove glib
+	$ xbps.sh remove glib
 
 Please note that when you remove it, the package will also be removed
-from PKGFS_DESTDIR and previously "unstowned".
+from XBPS_DESTDIR and previously "unstowned".
 
-pkgfs uses some db(1) btree files, to record what packages are currently
+xbps uses some db(1) btree files, to record what packages are currently
 "stowned". Once you install successfully or stown a package, the package
-will be registered in PKGFS_DESTDIR/.pkgfs-registered-pkg.db.
+will be registered in XBPS_DESTDIR/.xbps-registered-pkg.db.
 
 While "unstowning" a package, it won't be available anymore in the master
 directory and therefore it probably won't work if used from
-PKGFS_DESTDIR/<pkgname>.
+XBPS_DESTDIR/<pkgname>.
 
-Summary, to stow an already installed package (into PKGFS_DESTDIR/<pkgname>):
+Summary, to stow an already installed package (into XBPS_DESTDIR/<pkgname>):
 
-	$ pkgfs.sh stow glib
+	$ xbps.sh stow glib
 
 and to unstow an already installed (stowned) package:
 
-	$ pkgfs.sh unstow glib
+	$ xbps.sh unstow glib
 
 You can also print some stuff about any template, e.g:
 
-	$ pkgfs.sh info glib
+	$ xbps.sh info glib
 
 To list installed (stowned) packages, use this:
 
-	$ pkgfs.sh list
+	$ xbps.sh list
 
 To only extract the distfiles, without configuring/building/installing:
 
-	$ pkgfs.sh extract foo
+	$ xbps.sh extract foo
 
 To not remove the build directory after successful installation:
 
-	$ pkgfs.sh -C install blah
+	$ xbps.sh -C install blah
 
 To only fetch the distfile:
 
-	$ pkgfs.sh fetch blah
+	$ xbps.sh fetch blah
 
 To only install the package, _without_ stowning it into the master directory:
 
-	$ pkgfs.sh install-destdir blob
+	$ xbps.sh install-destdir blob
 
 To list files installed by a package, note that package must be installed
 into destination directory first and you must specify package name plus
 version, i.e: vim-7.2:
 
-	$ pkgfs.sh listfiles blob-2.4
+	$ xbps.sh listfiles blob-2.4
 
 That's all for now folks. I hope you find it useful, as I do.
 
@@ -90,11 +90,11 @@ That's all for now folks. I hope you find it useful, as I do.
  PERFORMANCE
 ------------------------------------------------------------------------------
 
-pkgfs is really fast, trust me. That was one of my reasons to make my own
+xbps is really fast, trust me. That was one of my reasons to make my own
 pkgsrc/ports alike system.
 
 If you want benchmarks, here is one: building libX11 and all its dependencies
-required (not included building xstow) with pkgfs:
+required (not included building xstow) with xbps:
 
 	251.20s real   121.36s user    53.94s system
 
@@ -110,8 +110,8 @@ wrappers in pkgsrc that aren't very useful on NetBSD :-)
  HOW TO MAKE TEMPLATES
 ------------------------------------------------------------------------------
 
-A template in pkgfs is just a small text file with a few variables that are
-required to build the package. pkgfs should be easy to work on, and
+A template in xbps is just a small text file with a few variables that are
+required to build the package. xbps should be easy to work on, and
 making templates shouldn't be too hard... if you have made any pkgsrc, it
 should be trivial.
 

helper-templates/automake.sh

@@ -5,10 +5,10 @@
 
 run_automake()
 {
-	$PKGFS_MASTERDIR/bin/aclocal
-	$PKGFS_MASTERDIR/bin/libtoolize --automake
-	$PKGFS_MASTERDIR/bin/automake -a --foreign -i
-	$PKGFS_MASTERDIR/bin/autoconf
+	$XBPS_MASTERDIR/bin/aclocal
+	$XBPS_MASTERDIR/bin/libtoolize --automake
+	$XBPS_MASTERDIR/bin/automake -a --foreign -i
+	$XBPS_MASTERDIR/bin/autoconf
 }
 
 if [ -z "$automake_dir" ]; then

helper-templates/external-gettext.sh

@@ -3,10 +3,10 @@
 # use the external GNU gettext tools provided by a package.
 #
 
-local GMSGFMT_CMD="$PKGFS_MASTERDIR/bin/msgfmt"
-local MSGFMT_CMD="$PKGFS_MASTERDIR/bin/msgfmt"
-local MSGMERGE_CMD="$PKGFS_MASTERDIR/bin/msgmerge"
-local XGETTEXT_CMD="$PKGFS_MASTERDIR/bin/xgettext"
+local GMSGFMT_CMD="$XBPS_MASTERDIR/bin/msgfmt"
+local MSGFMT_CMD="$XBPS_MASTERDIR/bin/msgfmt"
+local MSGMERGE_CMD="$XBPS_MASTERDIR/bin/msgmerge"
+local XGETTEXT_CMD="$XBPS_MASTERDIR/bin/xgettext"
 
 configure_env="ac_cv_path_GMSGFMT=$GMSGFMT_CMD $configure_env"
 configure_env="ac_cv_path_MSGFMT=$MSGFMT_CMD $configure_env"

helper-templates/fontconfig-update.sh

@@ -3,7 +3,7 @@
 # and update its list of fonts.
 #
 
-if [ -x $PKGFS_MASTERDIR/bin/fc-cache ]; then
-	$PKGFS_MASTERDIR/bin/fc-cache -f
+if [ -x $XBPS_MASTERDIR/bin/fc-cache ]; then
+	$XBPS_MASTERDIR/bin/fc-cache -f
 	[ "$?" -eq 0 ] && echo "=> Updated fontconfig fonts cache."
 fi

helper-templates/gtk-update-gdkpixbufloaders.sh

@@ -3,8 +3,8 @@
 # a template requests this process.
 #
 gtk_version="2.0"
-gdk_pixbuf_query_cmd=$PKGFS_MASTERDIR/bin/gdk-pixbuf-query-loaders
-gdk_pixbuf_db=$PKGFS_SYSCONFDIR/gtk-$gtk_version/gdk-pixbuf.loaders
+gdk_pixbuf_query_cmd=$XBPS_MASTERDIR/bin/gdk-pixbuf-query-loaders
+gdk_pixbuf_db=$XBPS_SYSCONFDIR/gtk-$gtk_version/gdk-pixbuf.loaders
 
 if [ -x $gdk_pixbuf_query_cmd -a -w $gdk_pixbuf_db ]; then
 	$gdk_pixbuf_query_cmd > $gdk_pixbuf_db

helper-templates/gtk-update-icon-cache.sh

@@ -3,8 +3,8 @@
 # any template.
 #
 
-gtkupdate_iconcache_cmd=$PKGFS_MASTERDIR/bin/gtk-update-icon-cache
-iconcache_theme_dir=$PKGFS_MASTERDIR/share/icons/hicolor
+gtkupdate_iconcache_cmd=$XBPS_MASTERDIR/bin/gtk-update-icon-cache
+iconcache_theme_dir=$XBPS_MASTERDIR/share/icons/hicolor
 
 if [ -x $gtkupdate_iconcache_cmd -a -d $iconcache_theme_dir ]; then
 	$gtkupdate_iconcache_cmd -f -t $iconcache_theme_dir && \

helper-templates/gtk-update-immodules.sh

@@ -3,8 +3,8 @@
 # a template requests this process.
 #
 gtk_version="2.0"
-gtk_query_immodules_cmd=$PKGFS_MASTERDIR/bin/gtk-query-immodules-$gtk_version
-gtk_immodules_db=$PKGFS_SYSCONFDIR/gtk-$gtk_version/gtk.immodules
+gtk_query_immodules_cmd=$XBPS_MASTERDIR/bin/gtk-query-immodules-$gtk_version
+gtk_immodules_db=$XBPS_SYSCONFDIR/gtk-$gtk_version/gtk.immodules
 
 if [ -x $gtk_query_immodules_cmd -a -w $gtk_immodules_db ]; then
 	$gtk_query_immodules_cmd > $gtk_immodules_db

helper-templates/mkfontxx-rebuild.sh

@@ -6,8 +6,8 @@
 [ -z "$fonts_dir" ] && return 1
 [ ! -d "$fonts_dir" ] && $mkdir_cmd -p $fonts_dir
 
-mkfontdir_cmd=$PKGFS_MASTERDIR/bin/mkfontdir
-mkfontscale_cmd=$PKGFS_MASTERDIR/bin/mkfontscale
+mkfontdir_cmd=$XBPS_MASTERDIR/bin/mkfontdir
+mkfontscale_cmd=$XBPS_MASTERDIR/bin/mkfontscale
 
 if [ -x $mkfontdir_cmd -a -x $mkfontscale_cmd ]; then
 	save_path=$(pwd -P 2>/dev/null)

helper-templates/pango-update-modules.sh

@@ -3,8 +3,8 @@
 # has been properly installed and stowned.
 #
 
-pango_query_modules_cmd=$PKGFS_MASTERDIR/bin/pango-querymodules
-pango_query_modules_db=$PKGFS_SYSCONFDIR/pango/pango.modules
+pango_query_modules_cmd=$XBPS_MASTERDIR/bin/pango-querymodules
+pango_query_modules_db=$XBPS_SYSCONFDIR/pango/pango.modules
 
 if [ -x $pango_query_modules_cmd -a -w $pango_query_modules_db ]; then
 	$pango_query_modules_cmd > $pango_query_modules_db

helper-templates/perl-module.sh

@@ -7,7 +7,7 @@
 # 	build_style=perl_module
 #
 # Optionally if the module needs more directories to be configured other
-# than $PKGFS_BUILDDIR/$wrksrc, one can use (relative to $wrksrc):
+# than $XBPS_BUILDDIR/$wrksrc, one can use (relative to $wrksrc):
 #
 #	perl_configure_dirs=blob/bob foo/blah
 #
@@ -15,12 +15,12 @@
 # Override the paths to get desired results.
 : ${_arch:=$(uname -m)}
 : ${perl_thrmulti:=${_arch}-netbsd-thread-multi}
-: ${perl_cmd:=$PKGFS_MASTERDIR/bin/perl}
-: ${PERL_DESTDIR:=$PKGFS_MASTERDIR}
+: ${perl_cmd:=$XBPS_MASTERDIR/bin/perl}
+: ${PERL_DESTDIR:=$XBPS_MASTERDIR}
 : ${PERL_PREFIX:=$PERL_DESTDIR}
-: ${PERL_DPREFIX:=$PKGFS_DESTDIR/$pkgname-$version}
+: ${PERL_DPREFIX:=$XBPS_DESTDIR/$pkgname-$version}
 : ${PERL_VERSION:=5.10.0}
-: ${PERL_LDDLFLAGS:=--whole-archive -shared -L$PKGFS_MASTERDIR/lib}
+: ${PERL_LDDLFLAGS:=--whole-archive -shared -L$XBPS_MASTERDIR/lib}
 : ${PERL_SITELIBEXP:=$PERL_DPREFIX/lib/perl5/site_perl/$PERL_VERSION}
 : ${PERL_SITEARCHEXP:=$PERL_SITELIBEXP/$perl_thrmulti}
 : ${PERL_SITEPREFIX:=$PERL_PREFIX}

helper-templates/perl-replace-path.sh

@@ -1,6 +1,6 @@
 #
 # This helper transforms files with wrong perl path to the correct
-# one pointing at PKGFS_MASTERDIR/bin/perl.
+# one pointing at XBPS_MASTERDIR/bin/perl.
 #
 
 perl_transform_file()
@@ -11,7 +11,7 @@ perl_transform_file()
 
 	for f in ${files}; do
 		[ ! -f $f ] && continue
-		$sed_cmd -e "s|^#!.*/usr/bin/perl|#!$PKGFS_MASTERDIR/bin/perl|" \
+		$sed_cmd -e "s|^#!.*/usr/bin/perl|#!$XBPS_MASTERDIR/bin/perl|" \
 			$f > $f.in && $mv_cmd -f $f.in $f && \
 		echo "=> Transformed $(basename $f) with correct path."
 	done

helper-templates/pkg-config-transform.sh

@@ -1,6 +1,6 @@
 #
 # This helper will transform the pkg-config files with correct
-# directories pointing at PKGFS_MASTERDIR specified in the config file.
+# directories pointing at XBPS_MASTERDIR specified in the config file.
 #
 pkgconfig_transform_file()
 {
@@ -10,7 +10,7 @@ pkgconfig_transform_file()
 	[ -z "$file" ] && return 1
 
 	$sed_cmd	\
-		-e "s|^exec_prefix=$PKGFS_DESTDIR/$pkg.*$|exec_prefix=\${prefix}|" \
+		-e "s|^exec_prefix=$XBPS_DESTDIR/$pkg.*$|exec_prefix=\${prefix}|" \
 		-e "s|-L\${libdir}|-L\${libdir} -Wl,-R\${libdir}|" \
 		$file > $file.in && \
 	$mv_cmd $file.in $file

helper-templates/unzip-extraction.sh

@@ -5,7 +5,7 @@
 #
 # If unzip is already installed just return immediately.
 
-if [ ! -x "$PKGFS_MASTERDIR/bin/unzip" ]; then
+if [ ! -x "$XBPS_MASTERDIR/bin/unzip" ]; then
 	unzip_version="5.52"
 
 	# Save pkgname before installing unzip.
@@ -33,5 +33,5 @@ if [ ! -x "$PKGFS_MASTERDIR/bin/unzip" ]; then
 	unset unzip_version
 fi
 
-unzip_cmd=$PKGFS_MASTERDIR/bin/unzip
-extract_cmd="$unzip_cmd -x $dfile -d $PKGFS_BUILDDIR"
+unzip_cmd=$XBPS_MASTERDIR/bin/unzip
+extract_cmd="$unzip_cmd -x $dfile -d $XBPS_BUILDDIR"

helper-templates/update-mimedb.sh

@@ -2,10 +2,10 @@
 # This helper updates shared-mime-info's database when a template
 # requests this operation.
 #
-updatemimedb_cmd="$PKGFS_MASTERDIR/bin/update-mime-database"
-updatemimedb_dir="$PKGFS_MASTERDIR/share/mime"
+updatemimedb_cmd="$XBPS_MASTERDIR/bin/update-mime-database"
+updatemimedb_dir="$XBPS_MASTERDIR/share/mime"
 
-if [ -d "$PKGFS_MASTERDIR/share/mime" ]; then
+if [ -d "$XBPS_MASTERDIR/share/mime" ]; then
 	$updatemimedb_cmd $updatemimedb_dir >/dev/null && \
 		echo "=> Updated shared-mime-info database."
 fi

mktmpl.sh

@@ -25,7 +25,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
 #
-# Shell script to automate the creation of new templates for pkgfs.
+# Shell script to automate the creation of new templates for xbps.
 # Only writes basic stuff into the template, if you need advanced stuff
 # you'll have to do that manually.
 #
@@ -39,7 +39,7 @@
 : ${cksum_cmd:=/usr/bin/cksum -a rmd160}
 : ${sed_cmd:=/usr/bin/sed}
 : ${db_cmd:=/usr/bin/db -q}
-: ${config_file:=/usr/local/etc/pkgfs.conf}
+: ${config_file:=/usr/local/etc/xbps.conf}
 : ${chmod_cmd:=/bin/chmod}
 : ${mkdir_cmd:=/bin/mkdir}
 
@@ -48,9 +48,9 @@ user_deps=
 
 write_new_template()
 {
-	local tmpldir="$PKGFS_DISTRIBUTIONDIR/templates"
-	local depsdir="$PKGFS_DISTRIBUTIONDIR/dependencies"
-	local distdir="$PKGFS_SRCDISTDIR"
+	local tmpldir="$XBPS_DISTRIBUTIONDIR/templates"
+	local depsdir="$XBPS_DISTRIBUTIONDIR/dependencies"
+	local distdir="$XBPS_SRCDISTDIR"
 	local checksum=
 	local dfile=
 	local tmplname=
@@ -104,7 +104,7 @@ write_new_template()
 		echo "url=${url%%/$dfile}";				\
 		echo "build_style=$build_style";			\
 		if [ -n "$dep_gmake" ]; then				\
-			echo "make_cmd=\"\$PKGFS_MASTERDIR/bin/gmake\"";	\
+			echo "make_cmd=\"\$XBPS_MASTERDIR/bin/gmake\"";	\
 		fi;							\
 		if [ -n "$pcfiles" ]; then				\
 			echo "pkgconfig_override=\"$pcfiles\"";		\
@@ -232,7 +232,7 @@ read_parameters()
 }
 
 #
-# If user specified a full path to pkgfs.conf, use it. Otherwise look
+# If user specified a full path to xbps.conf, use it. Otherwise look
 # at default location, and as last resort current dir.
 #
 if [ -n "$1" ]; then
@@ -240,10 +240,10 @@ if [ -n "$1" ]; then
 fi
 
 if [ ! -f "$config_file" ]; then
-	config_file="$(pwd -P 2>/dev/null)/pkgfs.conf"
+	config_file="$(pwd -P 2>/dev/null)/xbps.conf"
 	if [ ! -f "$config_file" ]; then
 		echo "$(basename $0): cannot find configuration file"
-		echo "Please speficify it, e.g: $(basename $0) /path/to/pkgfs.conf"
+		echo "Please speficify it, e.g: $(basename $0) /path/to/xbps.conf"
 		exit 1
 	fi
 fi

templates/MesaLib.tmpl

@@ -7,8 +7,8 @@ extract_sufx=".tar.bz2"
 url=http://kent.dl.sourceforge.net/sourceforge/mesa3d
 build_style=gnu_configure
 make_build_args="MKDEP=mkdep"
-configure_args="--with-expat=$PKGFS_MASTERDIR"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+configure_args="--with-expat=$XBPS_MASTERDIR"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="dri.pc gl.pc glu.pc glw.pc"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/atk.tmpl

@@ -4,7 +4,7 @@ version=1.24.0
 extract_sufx=".tar.bz2"
 url=http://ftp.gnome.org/pub/GNOME/sources/atk/1.24
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="atk.pc"
 short_desc="Set of interfaces for accessibility"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/babl.tmpl

@@ -4,7 +4,7 @@ version=0.0.22
 extract_sufx=".tar.bz2"
 url=ftp://ftp.gtk.org/pub/babl/0.0
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="babl.pc"
 short_desc="Dynamic pixel format translation library"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/cairo.tmpl

@@ -5,7 +5,7 @@ patch_files="$pkgname-doc-public-Makefile-in.diff"
 extract_sufx=".tar.gz"
 url=http://cairographics.org/snapshots
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 configure_args="--enable-glitz --enable-pdf --enable-ps"
 pkgconfig_override="cairo.pc cairo-ft.pc cairo-glitz.pc cairo-pdf.pc
  cairo-ps.pc cairo-svg.pc cairo-xlib-xrender.pc cairo-xlib.pc"

templates/example.tmpl

@@ -1,7 +1,7 @@
-# Example template build file for pkgs.
+# Example template build file for xbps.
 #
 # Use this file to create new templates, as it contains all variables
-# that can currently be used with pkgfs.
+# that can currently be used with xbps.
 
 # Name of the package, sometimes you need a different name than
 # the one used in the source distribution file so in that case use
@@ -50,7 +50,7 @@
 
 # Make command to be used while building, it needs a full path.
 # Uncomment the following line to use GNU make.
-#make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+#make_cmd="$XBPS_MASTERDIR/bin/gmake"
 
 # List of pkg-config files to be transformed once the package has
 # been installed.
@@ -75,23 +75,7 @@
 # Third line... blah blah blah..........................................
 # Nth line... blah blah ..............................................."
 
-# Use the following vars to execute arbitrary stuff at some stage
-# while installing a package.
-#
-# There are three stages: configure, build and install; and
-# also two states when this are run: before or after.
-#
-# Please take a look at templates/perl-run-stuff-{before,after}.sh files
-# to know what to do with them.
-#
-#run_stuff_before="configure build install"
-#run_stuff_before_configure_file="example-before-configure.sh"
-#run_stuff_before_build_file="example-before-build.sh"
-#run_stuff_before_install_file="example-before-install.sh"
-#run_stuff_after="install"
-#run_stuff_after_install_file="example-after-install.sh"
-
 # Run helpers after the package has been installed and stowned.
-# Helpers are located at PKGFS_DISTRIBUTIONDIR/helper-templates.
+# Helpers are located at XBPS_DISTRIBUTIONDIR/helper-templates.
 #
 #postinstall_helpers="blah.sh"

templates/firefox.tmpl

@@ -12,10 +12,10 @@ configure_args="--enable-default-toolkit=cairo-gtk2 --disable-dbus
  --enable-svg --enable-svg-renderer=cairo --enable-system-cairo
  --enable-crypto --enable-application=browser --disable-gnomevfs
  --disable-gnomeui"
-configure_env="LIBRUNPATH=$PKGFS_MASTERDIR/lib/$pkgname"
-LDFLAGS="-L$PKGFS_DESTDIR/lib/$pkgname -Wl,-R$PKGFS_MASTERDIR/lib/$pkgname"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
-make_env="MOZILLA_PKG_NAME=$pkgname LIBRUNPATH=$PKGFS_MASTERDIR/lib/$pkgname"
+configure_env="LIBRUNPATH=$XBPS_MASTERDIR/lib/$pkgname"
+LDFLAGS="-L$XBPS_DESTDIR/lib/$pkgname -Wl,-R$XBPS_MASTERDIR/lib/$pkgname"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
+make_env="MOZILLA_PKG_NAME=$pkgname LIBRUNPATH=$XBPS_MASTERDIR/lib/$pkgname"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=50f5c23182ac8bfe1a33502fb04814a3961c5033

templates/font-adobe-100dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Adobe PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=34a3af933a71062f27d1b6b305a497e9e9f2606d
@@ -19,6 +19,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/100dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-adobe-75dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 75pi Adobe PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=348e233516806415e2e190ec4af7ea09f5d33fb9
@@ -19,6 +19,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/100dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-adobe-utopia-100dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.1
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fb6cdba17598655226b9885b47961184de327d10
@@ -15,6 +15,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/100dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-adobe-utopia-75dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.1
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0c4a7ef7fe8f5c688ceaebd1f5f6e6a2a1920813
@@ -15,6 +15,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/75dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/75dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-adobe-utopia-type1.tmpl

@@ -4,7 +4,7 @@ version=1.0.1
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Adobe Utopia Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=73cf16a10870d134526feb4db5877a193a49a4db
@@ -15,6 +15,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/Type1"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/Type1"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bh-100dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Bigelow & Holmes PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6f0a1719962bb018b5b6ce684ac6e6febf722c07
@@ -17,6 +17,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/100dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bh-75dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 75dpi Bigelow & Holmes PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3086f534f2dcdb6eedb0b7df36cb0805b3ce7304
@@ -17,6 +17,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/75dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/75dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bh-lucidatypewriter-100dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Bigelow & Holmes Lucida Typewriter PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a396ff6fa3d59ca0c8ec4b0a2ecd9b326fdcebfa
@@ -16,6 +16,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/100dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bh-lucidatypewriter-75dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="75dpi Bigelow & Holmes Lucida Typewriter PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a2fa441a655710e602ea56f64d763b43c5a47cb7
@@ -16,6 +16,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/75dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/75dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bh-ttf.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Bigelow & Holmes TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fed191717895e0cdbe7c34dbbe94a13e1b823793
@@ -17,6 +17,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/TTF"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/TTF"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bh-type1.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Bigelow & Holmes Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bb57ceadc6dfc1b00b513aa7c5a817c916f49098
@@ -17,6 +17,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/Type1"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/Type1"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bitstream-100dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ce7304b7d65d3bec9a75eafd07106858d06ced85
@@ -16,6 +16,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/100dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bitstream-75dpi.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b8218eb4bf25a5bda69a5034f8b582824b0b13f4
@@ -16,6 +16,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/75dpi"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/75dpi"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bitstream-speedo.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Speedo Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5b6a215a1e2f857fe48ea4e416260ddec92f3df7
@@ -15,6 +15,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/Speedo"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/Speedo"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-bitstream-type1.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Type1 Bitstream PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7648f71312d2b79034ee00037a79dc0568450251
@@ -15,6 +15,6 @@ long_desc="
  This is from the modular Xorg project."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/Type1"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/Type1"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-cursor-misc.tmpl

@@ -14,6 +14,6 @@ long_desc="
  many more."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/misc"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/misc"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-misc-misc.tmpl

@@ -4,7 +4,7 @@ version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/font
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard X11 \"fixed\" PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=be44e00d94afdba48002e259f460d6a39ffbb370
@@ -13,6 +13,6 @@ long_desc="
  share and enjoy. It is in PCF format."
 
 # Build fonts.dir and fonts.scale files after install.
-fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/misc"
+fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/misc"
 postinstall_helpers="mkfontxx-rebuild.sh"
 ignore_files="fonts.scale fonts.dir"

templates/font-util.tmpl

@@ -16,5 +16,5 @@ long_desc="
 
 # Transform bdftruncate.pl with correct path.
 run_stuff_before="build"
-run_stuff_before_build_file="$PKGFS_TMPLHELPDIR/perl-replace-path.sh"
+run_stuff_before_build_file="$XBPS_TMPLHELPDIR/perl-replace-path.sh"
 run_stuff_before_build_cmd="perl_transform_file $wrksrc/bdftruncate.pl"

templates/fontconfig.tmpl

@@ -5,9 +5,9 @@ patch_files="$pkgname-Makefile-fc-cache.diff"
 extract_sufx=".tar.gz"
 url=http://www.fontconfig.org/release
 build_style=gnu_configure
-configure_args="--with-add-fonts=$PKGFS_MASTERDIR/lib/X11/fonts
- --enable-docs --with-default-fonts=$PKGFS_MASTERDIR/lib/X11/fonts"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+configure_args="--with-add-fonts=$XBPS_MASTERDIR/lib/X11/fonts
+ --enable-docs --with-default-fonts=$XBPS_MASTERDIR/lib/X11/fonts"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="fontconfig.pc"
 short_desc="Library for configuring and customizing font access"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/freeglut.tmpl

@@ -6,7 +6,7 @@ extract_sufx=".tar.gz"
 url=http://surfnet.dl.sourceforge.net/sourceforge/freeglut
 build_style=gnu_configure
 configure_args="--disable-warnings"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Alternative to the OpenGL Utility Toolkit (GLUT) library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=77465647f3d65fbb5cf253eb93ac7409e0c37b14

templates/freetype2.tmpl

@@ -5,7 +5,7 @@ extract_sufx=".tar.bz2"
 distfiles="freetype-$version"
 url=http://download.savannah.gnu.org/releases/freetype
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 configure_env="GNUMAKE=$make_cmd"
 pkgconfig_override="freetype2.pc"
 short_desc="Font rendering engine and library API"

templates/gegl.tmpl

@@ -4,7 +4,7 @@ version=0.0.20
 extract_sufx=".tar.bz2"
 url=ftp://ftp.gimp.org/pub/gegl/0.0
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="gegl.pc"
 short_desc="graph based image processing framework"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/gettext-runtime.tmpl

@@ -8,7 +8,7 @@ extract_sufx=".tar.gz"
 url=http://ftp.gnu.org/pub/gnu/gettext
 build_style=gnu_configure
 configure_args="--disable-libasprintf"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 ignore_files="charset.alias"
 short_desc="Internationalized Message Handling Library (runtime tools)"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/gettext-tools.tmpl

@@ -10,9 +10,9 @@ build_style=gnu_configure
 configure_args="--disable-libasprintf --without-emacs --disable-java
  --disable-native-java --enable-threads=posix --disable-openmp
  --with-included-glib --with-included-expat --with-included-libxml2
- --with-libintl-prefix=$PKGFS_MASTERDIR"
-LDFLAGS="$PKGFS_MASTERDIR/lib/libintl.so"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+ --with-libintl-prefix=$XBPS_MASTERDIR"
+LDFLAGS="$XBPS_MASTERDIR/lib/libintl.so"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 ignore_files="charset.alias locale.alias"
 short_desc="Internationalized Message Handling Library (developer tools)"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/gimp.tmpl

@@ -5,7 +5,7 @@ extract_sufx=".tar.bz2"
 url=http://sunsite.rediris.es/mirror/gimp/v2.6
 build_style=gnu_configure
 configure_args="--disable-python"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="gimp.pc gimpthumb-2.0.pc gimpui-2.0.pc"
 short_desc="The GNU image manipulation program"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -18,7 +18,7 @@ long_desc="
 
 # This needs GNU gettext >= 0.16.
 run_stuff_before="configure"
-run_stuff_before_configure_file="$PKGFS_TMPLHELPDIR/external-gettext.sh"
+run_stuff_before_configure_file="$XBPS_TMPLHELPDIR/external-gettext.sh"
 
 # Update shared-mime-info database.
 postinstall_helpers="update-mimedb.sh"

templates/git.tmpl

@@ -5,11 +5,11 @@ patch_files="$pkgname-fix-install.diff"
 extract_sufx=".tar.bz2"
 url=http://www.kernel.org/pub/software/scm/git
 build_style=gnu_configure
-configure_env="CURLDIR=$PKGFS_MASTERDIR"
-configure_args="--with-shell=/bin/sh --with-perl=$PKGFS_MASTERDIR/bin/perl
+configure_env="CURLDIR=$XBPS_MASTERDIR"
+configure_args="--with-shell=/bin/sh --with-perl=$XBPS_MASTERDIR/bin/perl
  --with-curl --without-tcltk --with-expat"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
-make_env="CURLDIR=$PKGFS_MASTERDIR"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
+make_env="CURLDIR=$XBPS_MASTERDIR"
 short_desc="GIT Tree History Storage Tool"
 maintainer="Daniel Horecki <morr@morr.pl>"
 checksum=eb91ca256d0fbcc956f91ad02da659d9b322261d

templates/gkrellm.tmpl

@@ -5,10 +5,10 @@ patch_files="$pkgname-fix-sensors.diff"
 extract_sufx=".tar.bz2"
 url=http://members.dslextreme.com/users/billw/gkrellm
 build_style=gnu_makefile
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 make_build_target="netbsd2"
-make_install_args="INSTALLROOT=$PKGFS_DESTDIR/$pkgname-$version
- MANDIR=$PKGFS_DESTDIR/$pkgname-$version/man/man1"
+make_install_args="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version
+ MANDIR=$XBPS_DESTDIR/$pkgname-$version/man/man1"
 short_desc="GTK2 based system monitor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9

templates/glib.tmpl

@@ -4,7 +4,7 @@ version=2.18.1
 extract_sufx=".tar.bz2"
 patch_files="$pkgname-fix-statfs-netbsd.diff"
 url=http://ftp.gnome.org/pub/gnome/sources/glib/2.18
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 # Disable FAM for now and use the installed pcre package instead
 # of the supplied one.
 configure_args="--disable-fam --with-pcre=system"

templates/gtk+.tmpl

@@ -6,7 +6,7 @@ extract_sufx=".tar.bz2"
 url=http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14
 build_style=gnu_configure
 configure_args="--disable-cups"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="gail.pc gdk-2.0.pc gdk-pixbuf-2.0.pc gdk-pixbuf-xlib-2.0.pc
 gdk-x11-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gtk+-x11-2.0.pc"
 short_desc="GIMP Toolkit v2 - libraries for building X11 user interfaces"

templates/hicolor-icon-theme.tmpl

@@ -4,7 +4,7 @@ version=0.10
 extract_sufx=".tar.gz"
 url=http://icon-theme.freedesktop.org/releases
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard icon theme called hicolor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=934a935524f1554a4bd462fe203979fd7f0d5846

templates/intltool.tmpl

@@ -4,7 +4,7 @@ version=0.40.4
 extract_sufx=".tar.bz2"
 url=http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Toolbox for internationalisation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2d6bf321d83a6ac6967bad8f4439af7a14d84314

templates/irssi.tmpl

@@ -4,7 +4,7 @@ version=0.8.12
 extract_sufx=".tar.bz2"
 url=http://www.irssi.org/files
 # We need this to get some perl paths.
-. $PKGFS_TMPLHELPDIR/perl-module.sh
+. $XBPS_TMPLHELPDIR/perl-module.sh
 
 configure_args="--with-terminfo --with-proxy --without-curses
  --with-perl-lib=$PERL_SITELIBEXP"

templates/iso-codes.tmpl

@@ -5,7 +5,7 @@ patch_files="$pkgname-fix-pkgconfig.diff"
 extract_sufx=".tar.bz2"
 url=ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="iso-codes.pc"
 short_desc="List of country, language and currency names"
 maintainer="Juan RP <xtraeme@gmail.com>"

templates/libX11.tmpl

@@ -5,12 +5,12 @@ extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure
 pkgconfig_override="x11.pc"
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 configure_args="--enable-man-pages=3 --without-xcb
  --disable-malloc0returnsnull --enable-loadable-i18n
- --datarootdir=$PKGFS_DESTDIR/$pkgname-$version/share"
+ --datarootdir=$XBPS_DESTDIR/$pkgname-$version/share"
 make_install_args="
- X11_LOCALELIBDIR=$PKGFS_DESTDIR/$pkgname-$version/lib/X11/locale"
+ X11_LOCALELIBDIR=$XBPS_DESTDIR/$pkgname-$version/lib/X11/locale"
 short_desc="Base X libraries from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=78567a999640851e7daba1ab44603ec099d0b619

templates/libXft.tmpl

@@ -4,7 +4,7 @@ version=2.1.13
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure
-make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="xft.pc"
 short_desc="Library for configuring and customizing font access"
 maintainer="Juan RP <xtraeme@gmail.com>"