diff --git a/README b/README index a8460ecf69e..6cda700df94 100644 --- a/README +++ b/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/. +XBPS_DESTDIR/. -Summary, to stow an already installed package (into PKGFS_DESTDIR/): +Summary, to stow an already installed package (into XBPS_DESTDIR/): - $ 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. diff --git a/helper-templates/automake.sh b/helper-templates/automake.sh index 6d237945bc1..aea35ba4238 100755 --- a/helper-templates/automake.sh +++ b/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 diff --git a/helper-templates/external-gettext.sh b/helper-templates/external-gettext.sh index e2353254cdb..1dc34a93b6a 100755 --- a/helper-templates/external-gettext.sh +++ b/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" diff --git a/helper-templates/fontconfig-update.sh b/helper-templates/fontconfig-update.sh index aa31d42a59f..7191d03ed0e 100755 --- a/helper-templates/fontconfig-update.sh +++ b/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 diff --git a/helper-templates/gtk-update-gdkpixbufloaders.sh b/helper-templates/gtk-update-gdkpixbufloaders.sh index 36fdc738905..5545b4ccdbe 100755 --- a/helper-templates/gtk-update-gdkpixbufloaders.sh +++ b/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 diff --git a/helper-templates/gtk-update-icon-cache.sh b/helper-templates/gtk-update-icon-cache.sh index 0cd47afaed2..ba421daf794 100755 --- a/helper-templates/gtk-update-icon-cache.sh +++ b/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 && \ diff --git a/helper-templates/gtk-update-immodules.sh b/helper-templates/gtk-update-immodules.sh index 0c71e53770e..900bc404e54 100755 --- a/helper-templates/gtk-update-immodules.sh +++ b/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 diff --git a/helper-templates/mkfontxx-rebuild.sh b/helper-templates/mkfontxx-rebuild.sh index f55370ea3c6..8938bdb07e2 100755 --- a/helper-templates/mkfontxx-rebuild.sh +++ b/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) diff --git a/helper-templates/pango-update-modules.sh b/helper-templates/pango-update-modules.sh index 1a4f2e2e78b..a70604ed353 100755 --- a/helper-templates/pango-update-modules.sh +++ b/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 diff --git a/helper-templates/perl-module.sh b/helper-templates/perl-module.sh index 7e39bd0bedb..2798132e7ab 100755 --- a/helper-templates/perl-module.sh +++ b/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} diff --git a/helper-templates/perl-replace-path.sh b/helper-templates/perl-replace-path.sh index aa3c6a332fb..32f0cfad979 100755 --- a/helper-templates/perl-replace-path.sh +++ b/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 diff --git a/helper-templates/pkg-config-transform.sh b/helper-templates/pkg-config-transform.sh index cddfa2bff39..46923f9c7e8 100755 --- a/helper-templates/pkg-config-transform.sh +++ b/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 diff --git a/helper-templates/unzip-extraction.sh b/helper-templates/unzip-extraction.sh index 13146d74e8f..b390fddaf55 100755 --- a/helper-templates/unzip-extraction.sh +++ b/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" diff --git a/helper-templates/update-mimedb.sh b/helper-templates/update-mimedb.sh index cebc0dda903..19ac7cbe40f 100755 --- a/helper-templates/update-mimedb.sh +++ b/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 diff --git a/mktmpl.sh b/mktmpl.sh index 786626b8448..d508edbc6bd 100755 --- a/mktmpl.sh +++ b/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 diff --git a/templates/MesaLib.tmpl b/templates/MesaLib.tmpl old mode 100755 new mode 100644 index 94d1cf02b4d..657a2af8f40 --- a/templates/MesaLib.tmpl +++ b/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 " diff --git a/templates/atk.tmpl b/templates/atk.tmpl old mode 100755 new mode 100644 index 6206b0bfba3..7ce4d5b5b7f --- a/templates/atk.tmpl +++ b/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 " diff --git a/templates/autoconf.tmpl b/templates/autoconf.tmpl old mode 100755 new mode 100644 diff --git a/templates/automake.tmpl b/templates/automake.tmpl old mode 100755 new mode 100644 diff --git a/templates/babl.tmpl b/templates/babl.tmpl old mode 100755 new mode 100644 index 7b90797e82e..669eead37fe --- a/templates/babl.tmpl +++ b/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 " diff --git a/templates/bdftopcf.tmpl b/templates/bdftopcf.tmpl old mode 100755 new mode 100644 diff --git a/templates/bigreqsproto.tmpl b/templates/bigreqsproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/cairo.tmpl b/templates/cairo.tmpl old mode 100755 new mode 100644 index 4af350a434e..b3285ba1613 --- a/templates/cairo.tmpl +++ b/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" diff --git a/templates/compositeproto.tmpl b/templates/compositeproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/curl.tmpl b/templates/curl.tmpl old mode 100755 new mode 100644 diff --git a/templates/damageproto.tmpl b/templates/damageproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/dmxproto.tmpl b/templates/dmxproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/encodings.tmpl b/templates/encodings.tmpl old mode 100755 new mode 100644 diff --git a/templates/epdfview.tmpl b/templates/epdfview.tmpl old mode 100755 new mode 100644 diff --git a/templates/evieext.tmpl b/templates/evieext.tmpl old mode 100755 new mode 100644 diff --git a/templates/example.tmpl b/templates/example.tmpl old mode 100755 new mode 100644 index f48d7f717f8..51b87b0a325 --- a/templates/example.tmpl +++ b/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" diff --git a/templates/expat.tmpl b/templates/expat.tmpl old mode 100755 new mode 100644 diff --git a/templates/firefox.tmpl b/templates/firefox.tmpl old mode 100755 new mode 100644 index 52916a839f7..b55657158e5 --- a/templates/firefox.tmpl +++ b/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 " checksum=50f5c23182ac8bfe1a33502fb04814a3961c5033 diff --git a/templates/fixesproto.tmpl b/templates/fixesproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/font-adobe-100dpi.tmpl b/templates/font-adobe-100dpi.tmpl old mode 100755 new mode 100644 index a744da9c4e0..95aab507196 --- a/templates/font-adobe-100dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-adobe-75dpi.tmpl b/templates/font-adobe-75dpi.tmpl old mode 100755 new mode 100644 index 095425cace5..22e86d6b907 --- a/templates/font-adobe-75dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-adobe-utopia-100dpi.tmpl b/templates/font-adobe-utopia-100dpi.tmpl old mode 100755 new mode 100644 index 4e228d345ef..5faebcd7539 --- a/templates/font-adobe-utopia-100dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-adobe-utopia-75dpi.tmpl b/templates/font-adobe-utopia-75dpi.tmpl old mode 100755 new mode 100644 index 092e1d726aa..357eb6cb426 --- a/templates/font-adobe-utopia-75dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-adobe-utopia-type1.tmpl b/templates/font-adobe-utopia-type1.tmpl old mode 100755 new mode 100644 index 66d8c535ef2..6f982868faf --- a/templates/font-adobe-utopia-type1.tmpl +++ b/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 " 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" diff --git a/templates/font-alias.tmpl b/templates/font-alias.tmpl old mode 100755 new mode 100644 diff --git a/templates/font-bh-100dpi.tmpl b/templates/font-bh-100dpi.tmpl old mode 100755 new mode 100644 index 91b0bda2c4f..a92388980ca --- a/templates/font-bh-100dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-bh-75dpi.tmpl b/templates/font-bh-75dpi.tmpl old mode 100755 new mode 100644 index 1a19cb9251f..2bb52d9fc57 --- a/templates/font-bh-75dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-bh-lucidatypewriter-100dpi.tmpl b/templates/font-bh-lucidatypewriter-100dpi.tmpl old mode 100755 new mode 100644 index 700dc661eb4..7ab11eb7c0c --- a/templates/font-bh-lucidatypewriter-100dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-bh-lucidatypewriter-75dpi.tmpl b/templates/font-bh-lucidatypewriter-75dpi.tmpl old mode 100755 new mode 100644 index 8d60c8c84a5..ec49b1dbeb6 --- a/templates/font-bh-lucidatypewriter-75dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-bh-ttf.tmpl b/templates/font-bh-ttf.tmpl old mode 100755 new mode 100644 index df063bcf08f..b83239d1b6a --- a/templates/font-bh-ttf.tmpl +++ b/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 " 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" diff --git a/templates/font-bh-type1.tmpl b/templates/font-bh-type1.tmpl old mode 100755 new mode 100644 index d05545d2ecf..35c7d7a62eb --- a/templates/font-bh-type1.tmpl +++ b/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 " 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" diff --git a/templates/font-bitstream-100dpi.tmpl b/templates/font-bitstream-100dpi.tmpl old mode 100755 new mode 100644 index a462435cebc..7257c4acd37 --- a/templates/font-bitstream-100dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-bitstream-75dpi.tmpl b/templates/font-bitstream-75dpi.tmpl old mode 100755 new mode 100644 index eed4c49a0d8..f79be4106f6 --- a/templates/font-bitstream-75dpi.tmpl +++ b/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 " 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" diff --git a/templates/font-bitstream-speedo.tmpl b/templates/font-bitstream-speedo.tmpl old mode 100755 new mode 100644 index 3f15573bfb8..b114e9ee01f --- a/templates/font-bitstream-speedo.tmpl +++ b/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 " 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" diff --git a/templates/font-bitstream-type1.tmpl b/templates/font-bitstream-type1.tmpl old mode 100755 new mode 100644 index e29cdfade98..b585d0dd1d3 --- a/templates/font-bitstream-type1.tmpl +++ b/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 " 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" diff --git a/templates/font-cursor-misc.tmpl b/templates/font-cursor-misc.tmpl old mode 100755 new mode 100644 index 906cfe95234..47c171e2954 --- a/templates/font-cursor-misc.tmpl +++ b/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" diff --git a/templates/font-misc-misc.tmpl b/templates/font-misc-misc.tmpl old mode 100755 new mode 100644 index 480f399a5fb..6a7b2a95cfc --- a/templates/font-misc-misc.tmpl +++ b/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 " 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" diff --git a/templates/font-util.tmpl b/templates/font-util.tmpl old mode 100755 new mode 100644 index 740fe265591..e279659e299 --- a/templates/font-util.tmpl +++ b/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" diff --git a/templates/fontcacheproto.tmpl b/templates/fontcacheproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/fontconfig.tmpl b/templates/fontconfig.tmpl old mode 100755 new mode 100644 index 7db14d4b822..f396be1367d --- a/templates/fontconfig.tmpl +++ b/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 " diff --git a/templates/fontsproto.tmpl b/templates/fontsproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/freeglut.tmpl b/templates/freeglut.tmpl old mode 100755 new mode 100644 index c4114879e0f..4c9bb7f0b76 --- a/templates/freeglut.tmpl +++ b/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 " checksum=77465647f3d65fbb5cf253eb93ac7409e0c37b14 diff --git a/templates/freetype2.tmpl b/templates/freetype2.tmpl old mode 100755 new mode 100644 index 2b07bef6020..aef5fdf446a --- a/templates/freetype2.tmpl +++ b/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" diff --git a/templates/gegl.tmpl b/templates/gegl.tmpl old mode 100755 new mode 100644 index e41df00c4bd..6d9a066f2bb --- a/templates/gegl.tmpl +++ b/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 " diff --git a/templates/gettext-runtime.tmpl b/templates/gettext-runtime.tmpl old mode 100755 new mode 100644 index c5437adf26d..9033d00c4c0 --- a/templates/gettext-runtime.tmpl +++ b/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 " diff --git a/templates/gettext-tools.tmpl b/templates/gettext-tools.tmpl old mode 100755 new mode 100644 index e1ebf137dac..038ffe69829 --- a/templates/gettext-tools.tmpl +++ b/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 " diff --git a/templates/gimp.tmpl b/templates/gimp.tmpl old mode 100755 new mode 100644 index fa6d77711ba..6f7c5adee58 --- a/templates/gimp.tmpl +++ b/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 " @@ -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" diff --git a/templates/git.tmpl b/templates/git.tmpl old mode 100755 new mode 100644 index 09fce9a9adf..1f53406f9ac --- a/templates/git.tmpl +++ b/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 " checksum=eb91ca256d0fbcc956f91ad02da659d9b322261d diff --git a/templates/gkrellm.tmpl b/templates/gkrellm.tmpl old mode 100755 new mode 100644 index 41243dede56..c5310026958 --- a/templates/gkrellm.tmpl +++ b/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 " checksum=0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9 diff --git a/templates/glib.tmpl b/templates/glib.tmpl old mode 100755 new mode 100644 index a7bd0ee7d5b..2d73d2b87fd --- a/templates/glib.tmpl +++ b/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" diff --git a/templates/glitz.tmpl b/templates/glitz.tmpl old mode 100755 new mode 100644 diff --git a/templates/glproto.tmpl b/templates/glproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/gmake.tmpl b/templates/gmake.tmpl old mode 100755 new mode 100644 diff --git a/templates/gtk+.tmpl b/templates/gtk+.tmpl old mode 100755 new mode 100644 index 2af6ab2c908..078f0793840 --- a/templates/gtk+.tmpl +++ b/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" diff --git a/templates/hicolor-icon-theme.tmpl b/templates/hicolor-icon-theme.tmpl old mode 100755 new mode 100644 index 86091f5ff3b..2d27d9e31a3 --- a/templates/hicolor-icon-theme.tmpl +++ b/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 " checksum=934a935524f1554a4bd462fe203979fd7f0d5846 diff --git a/templates/imlib2.tmpl b/templates/imlib2.tmpl old mode 100755 new mode 100644 diff --git a/templates/inputproto.tmpl b/templates/inputproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/intltool.tmpl b/templates/intltool.tmpl old mode 100755 new mode 100644 index 28da8d830cf..f34e2e289ba --- a/templates/intltool.tmpl +++ b/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 " checksum=2d6bf321d83a6ac6967bad8f4439af7a14d84314 diff --git a/templates/irssi.tmpl b/templates/irssi.tmpl old mode 100755 new mode 100644 index 1a5f998736e..1a5f350feed --- a/templates/irssi.tmpl +++ b/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" diff --git a/templates/iso-codes.tmpl b/templates/iso-codes.tmpl old mode 100755 new mode 100644 index e74a4caf3f3..e2d5dcadd0d --- a/templates/iso-codes.tmpl +++ b/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 " diff --git a/templates/jasper.tmpl b/templates/jasper.tmpl old mode 100755 new mode 100644 diff --git a/templates/jpeg.tmpl b/templates/jpeg.tmpl old mode 100755 new mode 100644 diff --git a/templates/kbproto.tmpl b/templates/kbproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/lcms.tmpl b/templates/lcms.tmpl old mode 100755 new mode 100644 diff --git a/templates/libICE.tmpl b/templates/libICE.tmpl old mode 100755 new mode 100644 diff --git a/templates/libIDL.tmpl b/templates/libIDL.tmpl old mode 100755 new mode 100644 diff --git a/templates/libSM.tmpl b/templates/libSM.tmpl old mode 100755 new mode 100644 diff --git a/templates/libX11.tmpl b/templates/libX11.tmpl old mode 100755 new mode 100644 index 6a792d57615..cb5ea104353 --- a/templates/libX11.tmpl +++ b/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 " checksum=78567a999640851e7daba1ab44603ec099d0b619 diff --git a/templates/libXau.tmpl b/templates/libXau.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXaw.tmpl b/templates/libXaw.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXcursor.tmpl b/templates/libXcursor.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXdamage.tmpl b/templates/libXdamage.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXdmcp.tmpl b/templates/libXdmcp.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXext.tmpl b/templates/libXext.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXfixes.tmpl b/templates/libXfixes.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXfont.tmpl b/templates/libXfont.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXft.tmpl b/templates/libXft.tmpl old mode 100755 new mode 100644 index a6a736a832e..176dfc14531 --- a/templates/libXft.tmpl +++ b/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 " diff --git a/templates/libXi.tmpl b/templates/libXi.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXinerama.tmpl b/templates/libXinerama.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXmu.tmpl b/templates/libXmu.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXp.tmpl b/templates/libXp.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXpm.tmpl b/templates/libXpm.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXrandr.tmpl b/templates/libXrandr.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXrender.tmpl b/templates/libXrender.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXt.tmpl b/templates/libXt.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXv.tmpl b/templates/libXv.tmpl old mode 100755 new mode 100644 index 4bd86cbc164..3eaa7cb28a1 --- a/templates/libXv.tmpl +++ b/templates/libXv.tmpl @@ -4,7 +4,7 @@ version=1.0.4 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="xv.pc" short_desc="Xv Extension library" maintainer="Juan RP " diff --git a/templates/libXvMC.tmpl b/templates/libXvMC.tmpl old mode 100755 new mode 100644 index 656175238bf..a98f339c8a1 --- a/templates/libXvMC.tmpl +++ b/templates/libXvMC.tmpl @@ -4,7 +4,7 @@ version=1.0.4 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="xvmc.pc" short_desc="XVideo Motion Compensation Library" maintainer="Juan RP " diff --git a/templates/libXxf86misc.tmpl b/templates/libXxf86misc.tmpl old mode 100755 new mode 100644 diff --git a/templates/libXxf86vm.tmpl b/templates/libXxf86vm.tmpl old mode 100755 new mode 100644 diff --git a/templates/libart.tmpl b/templates/libart.tmpl old mode 100755 new mode 100644 index 0fcf3abde75..1537953b7d1 --- a/templates/libart.tmpl +++ b/templates/libart.tmpl @@ -5,7 +5,7 @@ distfiles="libart_lgpl-$version" extract_sufx=".tar.bz2" url=http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3 build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libart-2.0.pc" short_desc="High-performance 2D graphics library" maintainer="Juan RP " diff --git a/templates/libdrm.tmpl b/templates/libdrm.tmpl old mode 100755 new mode 100644 diff --git a/templates/libexif.tmpl b/templates/libexif.tmpl old mode 100755 new mode 100644 index 593ba09e09a..3b0e20d6875 --- a/templates/libexif.tmpl +++ b/templates/libexif.tmpl @@ -5,7 +5,7 @@ extract_sufx=".tar.bz2" url=http://kent.dl.sourceforge.net/sourceforge/libexif build_style=gnu_configure configure_env="ac_cv_path_DOXYGEN=false" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libexif.pc" short_desc="EXIF file library" maintainer="Juan RP " diff --git a/templates/libfontenc.tmpl b/templates/libfontenc.tmpl old mode 100755 new mode 100644 diff --git a/templates/libgcrypt.tmpl b/templates/libgcrypt.tmpl old mode 100755 new mode 100644 index aa9068ff94c..58c4d92efd8 --- a/templates/libgcrypt.tmpl +++ b/templates/libgcrypt.tmpl @@ -4,7 +4,7 @@ version=1.4.3 extract_sufx=".tar.bz2" url=ftp://ftp.gnupg.org/gcrypt/libgcrypt build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="GNU cryptographic library" maintainer="Juan RP " checksum=5c66365e23798289fedcd9ea837cb887fa610ff4 diff --git a/templates/libgpg-error.tmpl b/templates/libgpg-error.tmpl old mode 100755 new mode 100644 index d55152b1580..8caa999e186 --- a/templates/libgpg-error.tmpl +++ b/templates/libgpg-error.tmpl @@ -4,7 +4,7 @@ version=1.6 extract_sufx=".tar.bz2" url=ftp://ftp.gnupg.org/gcrypt/libgpg-error build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Definitions of common error values for all GnuPG components" maintainer="Juan RP " checksum=5015a9e0a9c59fe5e9a45d203c324af3736c5d68 diff --git a/templates/libidn.tmpl b/templates/libidn.tmpl old mode 100755 new mode 100644 diff --git a/templates/libpciaccess-runstuff-before-configure.sh b/templates/libpciaccess-runstuff-before-configure.sh old mode 100755 new mode 100644 index 3757a50fc2d..506caf7dcd0 --- a/templates/libpciaccess-runstuff-before-configure.sh +++ b/templates/libpciaccess-runstuff-before-configure.sh @@ -1,6 +1,6 @@ # Added support for NetBSD, as specified here: # https://bugs.freedesktop.org/show_bug.cgi?id=17931 -$cp_cmd -f $PKGFS_TEMPLATESDIR/$pkgname-netbsd-pci.c \ - $PKGFS_BUILDDIR/$pkgname-$version/src/netbsd_pci.c -cd $PKGFS_BUILDDIR/$pkgname-$version && sh ./autogen.sh +$cp_cmd -f $XBPS_TEMPLATESDIR/$pkgname-netbsd-pci.c \ + $XBPS_BUILDDIR/$pkgname-$version/src/netbsd_pci.c +cd $XBPS_BUILDDIR/$pkgname-$version && sh ./autogen.sh diff --git a/templates/libpciaccess.tmpl b/templates/libpciaccess.tmpl old mode 100755 new mode 100644 index 535ced17498..1a565fd4d8c --- a/templates/libpciaccess.tmpl +++ b/templates/libpciaccess.tmpl @@ -5,7 +5,7 @@ patch_files="$pkgname-netbsd-support.diff" 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="pciaccess.pc" short_desc="PCI Access from Modular X.org" maintainer="Juan RP " diff --git a/templates/libpng-runstuff-before-build.sh b/templates/libpng-runstuff-before-build.sh old mode 100755 new mode 100644 diff --git a/templates/libpng.tmpl b/templates/libpng.tmpl old mode 100755 new mode 100644 index 41fec38534f..511f97a8213 --- a/templates/libpng.tmpl +++ b/templates/libpng.tmpl @@ -4,7 +4,7 @@ version=1.2.32 extract_sufx=".tar.bz2" url=ftp://ftp.fu-berlin.de/unix/graphics/png/src build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libpng.pc" short_desc="Library for manipulating PNG images" maintainer="Juan RP " diff --git a/templates/libtool.tmpl b/templates/libtool.tmpl old mode 100755 new mode 100644 diff --git a/templates/libungif.tmpl b/templates/libungif.tmpl old mode 100755 new mode 100644 diff --git a/templates/libwmf.tmpl b/templates/libwmf.tmpl old mode 100755 new mode 100644 index ce179d0c039..9990ad585d3 --- a/templates/libwmf.tmpl +++ b/templates/libwmf.tmpl @@ -5,11 +5,11 @@ extract_sufx=".tar.gz" url=http://kent.dl.sourceforge.net/sourceforge/wvware build_style=gnu_configure configure_args=" - --with-sysfontmap=$PKGFS_MASTERDIR/share/fonts/fontmap - --with-fontdir=$PKGFS_DESTDIR/$pkgname-$version/share/fonts - --with-gsfontmap=$PKGFS_MASTERDIR/share/ghostscript/fonts/fontmap - --with-gsfontdir=$PKGFS_DESTDIR/$pkgname-$version/share/ghostscript/fonts - --with-docdir=$PKGFS_DESTDIR/$pkgname-$version/share/doc/libwmf" + --with-sysfontmap=$XBPS_MASTERDIR/share/fonts/fontmap + --with-fontdir=$XBPS_DESTDIR/$pkgname-$version/share/fonts + --with-gsfontmap=$XBPS_MASTERDIR/share/ghostscript/fonts/fontmap + --with-gsfontdir=$XBPS_DESTDIR/$pkgname-$version/share/ghostscript/fonts + --with-docdir=$XBPS_DESTDIR/$pkgname-$version/share/doc/libwmf" short_desc="Library for reading and converting WMF (Windows Meta Files)" maintainer="Juan RP " checksum=98cd631adb5bb332d9224d04bc8a265c105435f2 diff --git a/templates/libxkbfile.tmpl b/templates/libxkbfile.tmpl old mode 100755 new mode 100644 diff --git a/templates/libxkbui.tmpl b/templates/libxkbui.tmpl old mode 100755 new mode 100644 diff --git a/templates/libxml2.tmpl b/templates/libxml2.tmpl old mode 100755 new mode 100644 index b67c07b6574..87d9a4d4080 --- a/templates/libxml2.tmpl +++ b/templates/libxml2.tmpl @@ -4,7 +4,7 @@ version=2.7.2 extract_sufx=".tar.gz" url=http://xmlsoft.org/sources build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libxml-2.0.pc" short_desc="XML parser library from the GNOME project" maintainer="Juan RP " diff --git a/templates/libxslt.tmpl b/templates/libxslt.tmpl old mode 100755 new mode 100644 index 2418ff943d6..c9fc103802d --- a/templates/libxslt.tmpl +++ b/templates/libxslt.tmpl @@ -4,7 +4,7 @@ version=1.1.24 extract_sufx=".tar.gz" url=ftp://xmlsoft.org/libxslt build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libxslt.pc libexslt.pc" short_desc="XSLT parser library from the GNOME project" maintainer="Juan RP " diff --git a/templates/m4.tmpl b/templates/m4.tmpl old mode 100755 new mode 100644 diff --git a/templates/mc.tmpl b/templates/mc.tmpl old mode 100755 new mode 100644 index c1c92a012ab..b9d0b41c410 --- a/templates/mc.tmpl +++ b/templates/mc.tmpl @@ -7,7 +7,7 @@ build_style=gnu_configure # Override datadir to get the correct directory. configure_args="--without-ext2undel --with-screen=mcslang --enable-charset --without-libiconv-prefix --without-libintl-prefix - --datadir=$PKGFS_DESTDIR/$pkgname-$version/share" + --datadir=$XBPS_DESTDIR/$pkgname-$version/share" configure_env="gt_cv_func_gnugettext_libintl=yes gt_cv_func_gnugettext1_libintl=yes gt_cv_func_gnugettext2_libintl=yes" diff --git a/templates/mkfontdir.tmpl b/templates/mkfontdir.tmpl old mode 100755 new mode 100644 diff --git a/templates/mkfontscale.tmpl b/templates/mkfontscale.tmpl old mode 100755 new mode 100644 index 560a99dee71..05cb952b1ee --- a/templates/mkfontscale.tmpl +++ b/templates/mkfontscale.tmpl @@ -4,7 +4,7 @@ version=1.0.5 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/app build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X11 Scalable Font Index Generator" maintainer="Juan RP " checksum=18423c211b516c612db8e3ea598df37b6a0cf8aa diff --git a/templates/mng-runstuff-before-configure.sh b/templates/mng-runstuff-before-configure.sh index 643cab8c178..01a9c2eb083 100644 --- a/templates/mng-runstuff-before-configure.sh +++ b/templates/mng-runstuff-before-configure.sh @@ -6,4 +6,4 @@ cd $wrksrc && \ $ln_cmd -sf makefiles/configure.in . && \ $ln_cmd -sf makefiles/Makefile.am . -. $PKGFS_TMPLHELPDIR/automake.sh +. $XBPS_TMPLHELPDIR/automake.sh diff --git a/templates/mng.tmpl b/templates/mng.tmpl old mode 100755 new mode 100644 index 7b67bedb28c..2d8bfcac6fb --- a/templates/mng.tmpl +++ b/templates/mng.tmpl @@ -5,7 +5,7 @@ distfiles="libmng-$version" extract_sufx=".tar.bz2" url=http://www.libmng.com/download build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Multiple-image Network Graphics (MNG) reference library" maintainer="Juan RP " checksum=4a8168f2f1fcfd147e367782c7a664bfe5104fc6 diff --git a/templates/pango.tmpl b/templates/pango.tmpl old mode 100755 new mode 100644 index 976e0e091ec..de8e66a14d8 --- a/templates/pango.tmpl +++ b/templates/pango.tmpl @@ -5,7 +5,7 @@ patch_files="$pkgname-docs-Makefile-in.diff" extract_sufx=".tar.bz2" url=http://ftp.gnome.org/pub/GNOME/sources/pango/1.22 build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="pango.pc pangocairo.pc pangoft2.pc pangox.pc pangoxft.pc" short_desc="Library for layout and rendering of text" maintainer="Juan RP " diff --git a/templates/pcre.tmpl b/templates/pcre.tmpl old mode 100755 new mode 100644 diff --git a/templates/pekwm.tmpl b/templates/pekwm.tmpl old mode 100755 new mode 100644 index 5b94f7eab39..edace446523 --- a/templates/pekwm.tmpl +++ b/templates/pekwm.tmpl @@ -4,7 +4,7 @@ version=0.1.7 extract_sufx=".tar.bz2" url=http://www.pekwm.org/projects/3/files build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Window manager based on aewm++" maintainer="Juan RP " checksum=77c618ddefeaad16a9b757304ca233ece9b18e3c diff --git a/templates/perl-XML-Parser.tmpl b/templates/perl-XML-Parser.tmpl old mode 100755 new mode 100644 index 3bf659d2130..dfcbf9287af --- a/templates/perl-XML-Parser.tmpl +++ b/templates/perl-XML-Parser.tmpl @@ -5,8 +5,8 @@ distfiles="XML-Parser-$version" extract_sufx=".tar.gz" url=http://cpan.perl.org/modules/by-module/XML build_style=perl_module -make_build_args="EXPATLIBPATH=$PKGFS_MASTERDIR/lib - EXPATINCPATH=$PKGFS_MASTERDIR/include" +make_build_args="EXPATLIBPATH=$XBPS_MASTERDIR/lib + EXPATINCPATH=$XBPS_MASTERDIR/include" short_desc="Perl extension interface to James Clark's XML parser, expat" maintainer="Juan RP " checksum=1c31a2398ada943efd5d2451389e163914168253 diff --git a/templates/perl-dont-hardcode-rpath.diff b/templates/perl-dont-hardcode-rpath.diff index e8edacba557..15293718a1e 100644 --- a/templates/perl-dont-hardcode-rpath.diff +++ b/templates/perl-dont-hardcode-rpath.diff @@ -1,5 +1,5 @@ Do not hardcode rpath dirs into binaries or modules that would cause -unexpected results with pkgfs. +unexpected results with xbps. --- hints/netbsd.sh.orig 2008-10-02 01:03:43.000000000 +0200 +++ hints/netbsd.sh 2008-10-02 01:04:38.000000000 +0200 diff --git a/templates/perl-runstuff-after-install.sh b/templates/perl-runstuff-after-install.sh old mode 100755 new mode 100644 index 8c652e3e00c..ffef53b47bd --- a/templates/perl-runstuff-after-install.sh +++ b/templates/perl-runstuff-after-install.sh @@ -1,11 +1,11 @@ -# Fixup Config.pm to look at PKGFS_MASTERDIR, this helps modules +# Fixup Config.pm to look at XBPS_MASTERDIR, this helps modules # to use correct dirs while building/installing them. perl_arch=$(uname -m) -perl_libdir=$PKGFS_DESTDIR/$pkgname-$version/lib/perl5 +perl_libdir=$XBPS_DESTDIR/$pkgname-$version/lib/perl5 config_pm=$perl_libdir/$version/$perl_arch-netbsd-thread-multi/Config.pm -$sed_cmd -e "s|$PKGFS_DESTDIR\/$pkgname-$version|$PKGFS_MASTERDIR|g" \ +$sed_cmd -e "s|$XBPS_DESTDIR\/$pkgname-$version|$XBPS_MASTERDIR|g" \ $config_pm > $config_pm.in $chmod_cmd 444 $config_pm.in $mv_cmd -f $config_pm.in $config_pm diff --git a/templates/perl-runstuff-before-build.sh b/templates/perl-runstuff-before-build.sh old mode 100755 new mode 100644 index 0486687dba5..1c0e1b0bbbc --- a/templates/perl-runstuff-before-build.sh +++ b/templates/perl-runstuff-before-build.sh @@ -1,6 +1,6 @@ # This fixes the definitions that the perl binary uses to look at -# PKGFS_MASTERDIR and not PKGFS_DESTDIR! +# XBPS_MASTERDIR and not XBPS_DESTDIR! -$sed_cmd -e "s|$PKGFS_DESTDIR\/$pkgname-$version|$PKGFS_MASTERDIR|g" \ +$sed_cmd -e "s|$XBPS_DESTDIR\/$pkgname-$version|$XBPS_MASTERDIR|g" \ $wrksrc/config.h > $wrksrc/config.h.in && \ $mv_cmd -f $wrksrc/config.h.in $wrksrc/config.h diff --git a/templates/perl.tmpl b/templates/perl.tmpl old mode 100755 new mode 100644 index a7c27559c6a..bf23d34d2df --- a/templates/perl.tmpl +++ b/templates/perl.tmpl @@ -5,7 +5,7 @@ patch_files="perl-dont-hardcode-rpath.diff" extract_sufx=".tar.gz" url=http://www.cpan.org/src configure_script="Configure" -configure_args="-Dusethreads -des -Dprefix=$PKGFS_DESTDIR/$pkgname-$version +configure_args="-Dusethreads -des -Dprefix=$XBPS_DESTDIR/$pkgname-$version -Ui_malloc -Uusemymalloc -Dinstallstyle=lib/perl5" build_style=configure short_desc="Practical Extraction and Report Language" diff --git a/templates/pixman.tmpl b/templates/pixman.tmpl old mode 100755 new mode 100644 diff --git a/templates/pkg-config.tmpl b/templates/pkg-config.tmpl old mode 100755 new mode 100644 index 6a5a6becdab..e6bd17dd33d --- a/templates/pkg-config.tmpl +++ b/templates/pkg-config.tmpl @@ -4,7 +4,7 @@ version=0.23 extract_sufx=".tar.gz" url=http://pkgconfig.freedesktop.org/releases build_style=gnu_configure -configure_args="--with-pc-path=$PKGFS_MASTERDIR/lib/pkgconfig" +configure_args="--with-pc-path=$XBPS_MASTERDIR/lib/pkgconfig" short_desc="System for managing library compile/link flags" maintainer="Juan RP " checksum=0aa5565430d609319917ac2c8ffeaa5e4a509489 diff --git a/templates/poppler.tmpl b/templates/poppler.tmpl old mode 100755 new mode 100644 index 9315a6c1ac8..968350a864a --- a/templates/poppler.tmpl +++ b/templates/poppler.tmpl @@ -4,7 +4,7 @@ version=0.10.0 extract_sufx=".tar.gz" url=http://poppler.freedesktop.org build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" configure_args="--enable-zlib --disable-poppler-qt --disable-poppler-qt4 --enable-libjpeg" pkgconfig_override="poppler.pc poppler-splash.pc poppler-cairo.pc diff --git a/templates/printproto.tmpl b/templates/printproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/python.tmpl b/templates/python.tmpl old mode 100755 new mode 100644 diff --git a/templates/randrproto.tmpl b/templates/randrproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/recordproto.tmpl b/templates/recordproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/renderproto.tmpl b/templates/renderproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/resourceproto.tmpl b/templates/resourceproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/ruby.tmpl b/templates/ruby.tmpl old mode 100755 new mode 100644 index 6a19bca886e..cee0f93c14a --- a/templates/ruby.tmpl +++ b/templates/ruby.tmpl @@ -6,7 +6,7 @@ url=ftp://ftp.ruby-lang.org/pub/ruby/1.8 build_style=gnu_configure # Override --exec-prefix to install it into the correct location. configure_args="--enable-pthread --enable-shared - --exec-prefix=$PKGFS_DESTDIR/$pkgname-$version" + --exec-prefix=$XBPS_DESTDIR/$pkgname-$version" short_desc="Ruby programming language" maintainer="Daniel Horecki " checksum=07bf0d6987ba111aed988093c569fb66ba54891b diff --git a/templates/scrnsaverproto.tmpl b/templates/scrnsaverproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/shared-mime-info-runstuff-before-build.sh b/templates/shared-mime-info-runstuff-before-build.sh old mode 100755 new mode 100644 index b35f632294d..4889d8c2da4 --- a/templates/shared-mime-info-runstuff-before-build.sh +++ b/templates/shared-mime-info-runstuff-before-build.sh @@ -1,5 +1,5 @@ # Replace hardcoded paths in XDG_DATA_DIRS. -$sed_cmd -e "s|/usr/local/share|$PKGFS_MASTERDIR/share|g" \ +$sed_cmd -e "s|/usr/local/share|$XBPS_MASTERDIR/share|g" \ $wrksrc/update-mime-database.c > $wrksrc/update-mime-database.c.in && \ $mv_cmd -f $wrksrc/update-mime-database.c.in $wrksrc/update-mime-database.c diff --git a/templates/shared-mime-info.tmpl b/templates/shared-mime-info.tmpl old mode 100755 new mode 100644 index e1d0bd83742..1d3baa97707 --- a/templates/shared-mime-info.tmpl +++ b/templates/shared-mime-info.tmpl @@ -6,7 +6,7 @@ extract_sufx=".tar.bz2" url=http://people.freedesktop.org/~hadess build_style=gnu_configure configure_args="--disable-update-mimedb" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="shared-mime-info.pc" short_desc="Core database of common types" maintainer="Juan RP " diff --git a/templates/sqlite.tmpl b/templates/sqlite.tmpl old mode 100755 new mode 100644 index a236b502090..5c50a36fa6d --- a/templates/sqlite.tmpl +++ b/templates/sqlite.tmpl @@ -5,7 +5,7 @@ extract_sufx=".tar.gz" url=http://sqlite.org build_style=gnu_configure configure_args="--disable-tcl --enable-load-extension --with-readline-inc=" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="sqlite3.pc" short_desc="SQL Database Engine in a C Library" maintainer="Juan RP " diff --git a/templates/sudo.tmpl b/templates/sudo.tmpl old mode 100755 new mode 100644 diff --git a/templates/sylpheed.tmpl b/templates/sylpheed.tmpl old mode 100755 new mode 100644 index 68a723f5c61..11b398d7ced --- a/templates/sylpheed.tmpl +++ b/templates/sylpheed.tmpl @@ -7,7 +7,7 @@ url=http://sylpheed.sraoss.jp/sylpheed/v2.6beta build_style=gnu_configure configure_args="--disable-compface --disable-gtkspell --disable-gpgme" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Lightweight and user-friendly e-mail client" maintainer="Juan RP " checksum=21f3204c5e9e7f8c07509fbba677f9820d847d53 diff --git a/templates/tiff.tmpl b/templates/tiff.tmpl old mode 100755 new mode 100644 diff --git a/templates/trapproto.tmpl b/templates/trapproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/unzip.tmpl b/templates/unzip.tmpl old mode 100755 new mode 100644 index b3a9c897851..372668e4f03 --- a/templates/unzip.tmpl +++ b/templates/unzip.tmpl @@ -7,7 +7,7 @@ distfiles=unzip552 extract_sufx=".tgz" url=ftp://ftp.info-zip.org/pub/infozip/src/ build_style=gnu_makefile -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" CFLAGS="-I. -DUNIX -Dunix -DUSE_UNSHRINK" make_build_args="-f unix/Makefile" make_build_target="generic_zlib unzipsfx" diff --git a/templates/util-macros.tmpl b/templates/util-macros.tmpl old mode 100755 new mode 100644 diff --git a/templates/videoproto.tmpl b/templates/videoproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/vim.tmpl b/templates/vim.tmpl old mode 100755 new mode 100644 diff --git a/templates/xauth.tmpl b/templates/xauth.tmpl old mode 100755 new mode 100644 index cf145ad3773..871d61e81c9 --- a/templates/xauth.tmpl +++ b/templates/xauth.tmpl @@ -4,7 +4,7 @@ version=1.0.3 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/app build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X authentication utility" maintainer="Juan RP " checksum=be87304d87abacc1d5fb00473807085d64b12e45 diff --git a/templates/xbitmaps.tmpl b/templates/xbitmaps.tmpl old mode 100755 new mode 100644 diff --git a/templates/xcmiscproto.tmpl b/templates/xcmiscproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xextproto.tmpl b/templates/xextproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xf86-input-joystick.tmpl b/templates/xf86-input-joystick.tmpl old mode 100755 new mode 100644 index 53fd65eb39f..8d1c6c1c726 --- a/templates/xf86-input-joystick.tmpl +++ b/templates/xf86-input-joystick.tmpl @@ -4,7 +4,7 @@ version=1.3.3 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Joystick Input driver for Modular X.org" maintainer="Juan RP " checksum=6fe62f40e7baeb31b92bae53fe73ee0140291921 diff --git a/templates/xf86-input-keyboard.tmpl b/templates/xf86-input-keyboard.tmpl old mode 100755 new mode 100644 index c1f17b1a2d4..e232da7bd5c --- a/templates/xf86-input-keyboard.tmpl +++ b/templates/xf86-input-keyboard.tmpl @@ -4,7 +4,7 @@ version=1.3.1 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg keyboard driver" maintainer="Juan RP " checksum=cccf96251364d79b434212f9ff1fcfd53359fe65 diff --git a/templates/xf86-input-mouse.tmpl b/templates/xf86-input-mouse.tmpl old mode 100755 new mode 100644 index fa09e13c9ca..1f941526490 --- a/templates/xf86-input-mouse.tmpl +++ b/templates/xf86-input-mouse.tmpl @@ -4,7 +4,7 @@ version=1.3.0 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg mouse driver" maintainer="Juan RP " checksum=a691e809e61e14e2383f1d4533b0eb454373667f diff --git a/templates/xf86-input-vmmouse.tmpl b/templates/xf86-input-vmmouse.tmpl old mode 100755 new mode 100644 index 74c05a8af87..507630b1e02 --- a/templates/xf86-input-vmmouse.tmpl +++ b/templates/xf86-input-vmmouse.tmpl @@ -4,7 +4,7 @@ version=12.5.1 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg VMware virtual mouse driver" maintainer="Juan RP " checksum=5bcd834e8e0d2577ab024bbe0058a7908cbe3a71 diff --git a/templates/xf86-video-ati.tmpl b/templates/xf86-video-ati.tmpl old mode 100755 new mode 100644 index 9ac7664972d..4754415e7f7 --- a/templates/xf86-video-ati.tmpl +++ b/templates/xf86-video-ati.tmpl @@ -5,7 +5,7 @@ extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure configure_args="--enable-dri" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg ATI Radeon video driver" maintainer="Juan RP " checksum=7c990dc8c770865d6c8a45e4861207c1dda07a13 diff --git a/templates/xf86-video-intel.tmpl b/templates/xf86-video-intel.tmpl old mode 100755 new mode 100644 index 9ac1c9098a8..14c6db17faf --- a/templates/xf86-video-intel.tmpl +++ b/templates/xf86-video-intel.tmpl @@ -5,7 +5,7 @@ extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure configure_args="--enable-dri" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg Intel video driver" maintainer="Juan RP " checksum=939bd7d3bc6f1709f312dcbcaadb2e1d0c95bc06 diff --git a/templates/xf86-video-radeonhd.tmpl b/templates/xf86-video-radeonhd.tmpl old mode 100755 new mode 100644 index f78dcd05533..0b21b3e2c8e --- a/templates/xf86-video-radeonhd.tmpl +++ b/templates/xf86-video-radeonhd.tmpl @@ -4,7 +4,7 @@ version=1.2.1 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular X.org driver for Radeon HD series" maintainer="Juan RP " checksum=f35d3a9491c5f43e94dda391a8b292aa46590a84 diff --git a/templates/xf86-video-vmware.tmpl b/templates/xf86-video-vmware.tmpl old mode 100755 new mode 100644 index 160223bd31e..2a97a9e6ca0 --- a/templates/xf86-video-vmware.tmpl +++ b/templates/xf86-video-vmware.tmpl @@ -4,7 +4,7 @@ version=10.16.4 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/driver build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg VMware virtual video driver" maintainer="Juan RP " checksum=175bf82b20697837356370a96e2bc7bcb2931fb5 diff --git a/templates/xf86bigfontproto.tmpl b/templates/xf86bigfontproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xf86dgaproto.tmpl b/templates/xf86dgaproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xf86driproto.tmpl b/templates/xf86driproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xf86miscproto.tmpl b/templates/xf86miscproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xf86vidmodeproto.tmpl b/templates/xf86vidmodeproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xineramaproto.tmpl b/templates/xineramaproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xinit.tmpl b/templates/xinit.tmpl old mode 100755 new mode 100644 index 762ff61505f..5e8b836e42a --- a/templates/xinit.tmpl +++ b/templates/xinit.tmpl @@ -4,7 +4,7 @@ version=1.1.0 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/app build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X init program" maintainer="Juan RP " checksum=d2631bd7eea0ce702b2b4d380e28365dab4fef83 diff --git a/templates/xkbcomp.tmpl b/templates/xkbcomp.tmpl old mode 100755 new mode 100644 diff --git a/templates/xkeyboard-config.tmpl b/templates/xkeyboard-config.tmpl old mode 100755 new mode 100644 index 8c340cbcef4..a7b2c5bf187 --- a/templates/xkeyboard-config.tmpl +++ b/templates/xkeyboard-config.tmpl @@ -6,7 +6,7 @@ url=http://xlibs.freedesktop.org/xkbdesc build_style=gnu_configure configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X Keyboard Configuration Database" maintainer="Juan RP " checksum=c6c655c58b25ff81df48064eb29d2e7142b2556d diff --git a/templates/xmlcatmgr-runstuff-after-install.sh b/templates/xmlcatmgr-runstuff-after-install.sh index 57458739dd0..f342897c1e1 100644 --- a/templates/xmlcatmgr-runstuff-after-install.sh +++ b/templates/xmlcatmgr-runstuff-after-install.sh @@ -5,19 +5,19 @@ echo "=> Installing XML/SGML catalogs." $chmod_cmd 644 $wrksrc/catalog.* -[ ! -d $PKGFS_SYSCONFDIR/sgml ] && $mkdir_cmd $PKGFS_SYSCONFDIR/sgml -[ ! -d $PKGFS_DESTDIR/$pkgname-$version/share/sgml ] && \ - $mkdir_cmd $PKGFS_DESTDIR/$pkgname-$version/share/sgml -[ ! -d $PKGFS_SYSCONFDIR/xml ] && $mkdir_cmd $PKGFS_SYSCONFDIR/xml -[ ! -d $PKGFS_DESTDIR/$pkgname-$version/share/xml ] && \ - $mkdir_cmd $PKGFS_DESTDIR/$pkgname-$version/share/xml -[ ! -f $PKGFS_SYSCONFDIR/sgml/catalog ] && \ - $cp_cmd $wrksrc/catalog.etc.sgml $PKGFS_SYSCONFDIR/sgml/catalog -[ ! -f $PKGFS_SYSCONFDIR/xml/catalog ] && \ - $cp_cmd $wrksrc/catalog.etc.xml $PKGFS_SYSCONFDIR/xml/catalog -[ ! -f $PKGFS_DESTDIR/$pkgname-$version/share/sgml/catalog ] && \ +[ ! -d $XBPS_SYSCONFDIR/sgml ] && $mkdir_cmd $XBPS_SYSCONFDIR/sgml +[ ! -d $XBPS_DESTDIR/$pkgname-$version/share/sgml ] && \ + $mkdir_cmd $XBPS_DESTDIR/$pkgname-$version/share/sgml +[ ! -d $XBPS_SYSCONFDIR/xml ] && $mkdir_cmd $XBPS_SYSCONFDIR/xml +[ ! -d $XBPS_DESTDIR/$pkgname-$version/share/xml ] && \ + $mkdir_cmd $XBPS_DESTDIR/$pkgname-$version/share/xml +[ ! -f $XBPS_SYSCONFDIR/sgml/catalog ] && \ + $cp_cmd $wrksrc/catalog.etc.sgml $XBPS_SYSCONFDIR/sgml/catalog +[ ! -f $XBPS_SYSCONFDIR/xml/catalog ] && \ + $cp_cmd $wrksrc/catalog.etc.xml $XBPS_SYSCONFDIR/xml/catalog +[ ! -f $XBPS_DESTDIR/$pkgname-$version/share/sgml/catalog ] && \ $cp_cmd $wrksrc/catalog.sgml \ - $PKGFS_DESTDIR/$pkgname-$version/share/sgml/catalog -[ ! -f $PKGFS_DESTDIR/$pkgname-$version/share/xml/catalog ] && \ + $XBPS_DESTDIR/$pkgname-$version/share/sgml/catalog +[ ! -f $XBPS_DESTDIR/$pkgname-$version/share/xml/catalog ] && \ $cp_cmd $wrksrc/catalog.xml \ - $PKGFS_DESTDIR/$pkgname-$version/share/xml/catalog + $XBPS_DESTDIR/$pkgname-$version/share/xml/catalog diff --git a/templates/xmlcatmgr-runstuff-before-install.sh b/templates/xmlcatmgr-runstuff-before-install.sh index e2c7208c0f4..4bbdbeee1a7 100644 --- a/templates/xmlcatmgr-runstuff-before-install.sh +++ b/templates/xmlcatmgr-runstuff-before-install.sh @@ -6,9 +6,9 @@ echo "=> Creating SGML catalogs..." $wrksrc/xmlcatmgr -sc $wrksrc/catalog.etc.sgml create $wrksrc/xmlcatmgr -sc $wrksrc/catalog.sgml create $wrksrc/xmlcatmgr -sc $wrksrc/catalog.etc.sgml add CATALOG \ - $PKGFS_MASTERDIR/share/sgml/catalog + $XBPS_MASTERDIR/share/sgml/catalog echo "=> Creating XML catalogs..." $wrksrc/xmlcatmgr -c $wrksrc/catalog.etc.xml create $wrksrc/xmlcatmgr -c $wrksrc/catalog.xml create $wrksrc/xmlcatmgr -c $wrksrc/catalog.etc.xml add nextCatalog \ - $PKGFS_MASTERDIR/share/xml/catalog + $XBPS_MASTERDIR/share/xml/catalog diff --git a/templates/xmlcatmgr.tmpl b/templates/xmlcatmgr.tmpl old mode 100755 new mode 100644 index b3ab72db0d0..cf1b8c747e8 --- a/templates/xmlcatmgr.tmpl +++ b/templates/xmlcatmgr.tmpl @@ -4,7 +4,7 @@ version=2.2 extract_sufx=".tar.gz" url=http://kent.dl.sourceforge.net/sourceforge/xmlcatmgr build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="XML and SGML catalog manager" maintainer="Juan RP " checksum=6d01a88defccd086758f78d345a2abdf4be5c970 diff --git a/templates/xorg-fonts.tmpl b/templates/xorg-fonts.tmpl old mode 100755 new mode 100644 diff --git a/templates/xorg-server.tmpl b/templates/xorg-server.tmpl old mode 100755 new mode 100644 index 7a35d3ffac4..c9369281516 --- a/templates/xorg-server.tmpl +++ b/templates/xorg-server.tmpl @@ -5,11 +5,11 @@ patch_files="$pkgname-dix-getevents-c.diff" extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/xserver build_style=gnu_configure -configure_args="--with-xkb-path=$PKGFS_MASTERDIR/share/X11/xkb - --with-xkb-output=$PKGFS_MASTERDIR/var/db/xkb --enable-install-setuid +configure_args="--with-xkb-path=$XBPS_MASTERDIR/share/X11/xkb + --with-xkb-output=$XBPS_MASTERDIR/var/db/xkb --enable-install-setuid --enable-xtrap --enable-multibuffer --enable-fontcache --enable-record" -make_cmd="$PKGFS_MASTERDIR/bin/gmake" -make_install_args="SERVER_MISC_CONFIG_PATH=$PKGFS_DESTDIR/$pkgname-$version/lib/xorg" +make_cmd="$XBPS_MASTERDIR/bin/gmake" +make_install_args="SERVER_MISC_CONFIG_PATH=$XBPS_DESTDIR/$pkgname-$version/lib/xorg" pkgconfig_override="xorg-server.pc" short_desc="Modular X11 server from modular X.org" maintainer="Juan RP " diff --git a/templates/xprop.tmpl b/templates/xprop.tmpl old mode 100755 new mode 100644 index 1e6eedd23e6..380c313b7d3 --- a/templates/xprop.tmpl +++ b/templates/xprop.tmpl @@ -4,7 +4,7 @@ version=1.0.4 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/app build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Property displayer for X" maintainer="Juan RP " checksum=8b4669af9bbcd0af9017b97fc964b3e0457a38df diff --git a/templates/xproto.tmpl b/templates/xproto.tmpl old mode 100755 new mode 100644 diff --git a/templates/xrandr.tmpl b/templates/xrandr.tmpl old mode 100755 new mode 100644 diff --git a/templates/xset.tmpl b/templates/xset.tmpl old mode 100755 new mode 100644 index 37c22133deb..7083f5a4eea --- a/templates/xset.tmpl +++ b/templates/xset.tmpl @@ -4,7 +4,7 @@ version=1.0.4 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/app build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X11 user preferences utility" maintainer="Juan RP " checksum=18abcff0456ec33e6c118eacb22ab344ab848166 diff --git a/templates/xsetroot.tmpl b/templates/xsetroot.tmpl old mode 100755 new mode 100644 index 086a53f8eb4..452b90f125b --- a/templates/xsetroot.tmpl +++ b/templates/xsetroot.tmpl @@ -4,7 +4,7 @@ version=1.0.2 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/app build_style=gnu_configure -make_cmd="$PKGFS_MASTERDIR/bin/gmake" +make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X root window parameter setting program" maintainer="Juan RP " checksum=0e51c905bf2cf2aeafceb52b41a64134a5bd7fa1 diff --git a/templates/xstow.tmpl b/templates/xstow.tmpl old mode 100755 new mode 100644 diff --git a/templates/xterm.tmpl b/templates/xterm.tmpl old mode 100755 new mode 100644 diff --git a/templates/xtrans.tmpl b/templates/xtrans.tmpl old mode 100755 new mode 100644 diff --git a/templates/zip.tmpl b/templates/zip.tmpl old mode 100755 new mode 100644 diff --git a/xbps.conf b/xbps.conf index ba574887697..b664552dacd 100644 --- a/xbps.conf +++ b/xbps.conf @@ -1,33 +1,33 @@ # -# Configuration file for pkgfs. +# Configuration file for xbps (xtraeme's build package system). # -# Global directory where the pkgfs distribution files are stored. +# Global directory where the xbps distribution files are stored. # Templates, patches, helpers and dependency files should all be # in that directory. # -PKGFS_DISTRIBUTIONDIR=$HOME/pkgfs +XBPS_DISTRIBUTIONDIR=$HOME/xbps # # Master directory: this is where all symlinks will be -# created pointing at packages installed in PKGFS_DESTDIR. +# created pointing at packages installed in XBPS_DESTDIR. # -PKGFS_MASTERDIR=$PKGFS_DISTRIBUTIONDIR/depot +XBPS_MASTERDIR=$XBPS_DISTRIBUTIONDIR/depot # # Destination directory: this is where all packages will be installed. # -PKGFS_DESTDIR=$PKGFS_DISTRIBUTIONDIR/packages +XBPS_DESTDIR=$XBPS_DISTRIBUTIONDIR/packages # # Directory where source files will be extracted to. # -PKGFS_BUILDDIR=$PKGFS_DISTRIBUTIONDIR/builddir +XBPS_BUILDDIR=$XBPS_DISTRIBUTIONDIR/builddir # # Directory where source distribution files are stored. # -PKGFS_SRCDISTDIR=$PKGFS_DISTRIBUTIONDIR/srcdistdir +XBPS_SRCDISTDIR=$XBPS_DISTRIBUTIONDIR/srcdistdir # # Directory where configuration files installed by packages will @@ -36,20 +36,20 @@ PKGFS_SRCDISTDIR=$PKGFS_DISTRIBUTIONDIR/srcdistdir # # BEWARE: the package itself may overwrite them in some cases! # -PKGFS_SYSCONFDIR=$PKGFS_MASTERDIR/etc +XBPS_SYSCONFDIR=$XBPS_MASTERDIR/etc # # Path to the xstow program. # -PKGFS_XSTOW_CMD=$PKGFS_MASTERDIR/bin/xstow +XBPS_XSTOW_CMD=$XBPS_MASTERDIR/bin/xstow # # Compilation flags for cc and c++. # -PKGFS_CFLAGS="-O2 -pipe" -PKGFS_CXXFLAGS="$PKGFS_CFLAGS" +XBPS_CFLAGS="-O2 -pipe" +XBPS_CXXFLAGS="$XBPS_CFLAGS" # # Number of jobs when running GNU or BSD make style packages. # -#PKGFS_MAKEJOBS=4 +#XBPS_MAKEJOBS=4 diff --git a/xbps.sh b/xbps.sh index 01d5cf0e8c6..87351163077 100755 --- a/xbps.sh +++ b/xbps.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# pkgfs - A simple, minimal, fast and uncomplete build package system. +# xbps - A simple, minimal, fast and uncomplete build package system. # #- # Copyright (c) 2008 Juan Romero Pardines. @@ -38,7 +38,7 @@ # Default path to configuration file, can be overriden # via the environment or command line. # -: ${PKGFS_CONFIG_FILE:=/usr/local/etc/pkgfs.conf} +: ${XBPS_CONFIG_FILE:=/usr/local/etc/xbps.conf} : ${progname:=$(basename $0)} : ${topdir:=$(/bin/pwd -P 2>/dev/null)} @@ -69,13 +69,13 @@ set_defvars() { # Directories - : ${PKGFS_TEMPLATESDIR:=$PKGFS_DISTRIBUTIONDIR/templates} - : ${PKGFS_DEPSDIR:=$PKGFS_DISTRIBUTIONDIR/dependencies} - : ${PKGFS_BUILD_DEPS_DB:=$PKGFS_DEPSDIR/build-depends.db} - : ${PKGFS_TMPLHELPDIR:=$PKGFS_DISTRIBUTIONDIR/helper-templates} - : ${PKGFS_REGPKG_DB:=$PKGFS_DESTDIR/.pkgfs-registered-pkgs.db} + : ${XBPS_TEMPLATESDIR:=$XBPS_DISTRIBUTIONDIR/templates} + : ${XBPS_DEPSDIR:=$XBPS_DISTRIBUTIONDIR/dependencies} + : ${XBPS_BUILD_DEPS_DB:=$XBPS_DEPSDIR/build-depends.db} + : ${XBPS_TMPLHELPDIR:=$XBPS_DISTRIBUTIONDIR/helper-templates} + : ${XBPS_REGPKG_DB:=$XBPS_DESTDIR/.xbps-registered-pkgs.db} - local DDIRS="PKGFS_DEPSDIR PKGFS_TEMPLATESDIR PKGFS_TMPLHELPDIR" + local DDIRS="XBPS_DEPSDIR XBPS_TEMPLATESDIR XBPS_TMPLHELPDIR" for i in ${DDIRS}; do eval val="\$$i" if [ ! -d "$val" ]; then @@ -107,7 +107,7 @@ Targets: Options: -C Do not remove build directory after successful installation. -c Path to global configuration file: - if not specified /usr/local/etc/pkgfs.conf is used. + if not specified /usr/local/etc/xbps.conf is used. _EOF exit 1 } @@ -140,27 +140,27 @@ run_file() # # This function merges two GNU info dirs into one and puts the result -# into PKGFS_MASTERDIR/share/info/dir. +# into XBPS_MASTERDIR/share/info/dir. # merge_infodir_tmpl() { local pkgname="$1" - local merge_info_cmd="$PKGFS_MASTERDIR/bin/merge-info" + local merge_info_cmd="$XBPS_MASTERDIR/bin/merge-info" - [ -z "$pkgname" -o ! -r "$PKGFS_MASTERDIR/share/info/dir" \ - -o ! -r "$PKGFS_DESTDIR/$pkgname/share/info/dir" ] && return 1 + [ -z "$pkgname" -o ! -r "$XBPS_MASTERDIR/share/info/dir" \ + -o ! -r "$XBPS_DESTDIR/$pkgname/share/info/dir" ] && return 1 - $merge_info_cmd -d $PKGFS_MASTERDIR/share/info/dir \ - $PKGFS_DESTDIR/$pkgname/share/info/dir -o \ - $PKGFS_MASTERDIR/share/info/dir.new + $merge_info_cmd -d $XBPS_MASTERDIR/share/info/dir \ + $XBPS_DESTDIR/$pkgname/share/info/dir -o \ + $XBPS_MASTERDIR/share/info/dir.new if [ $? -ne 0 ]; then echo -n "*** WARNING: there was an error merging info dir from" echo " $pkgname, aborting ***" return 1 fi - $mv_cmd -f $PKGFS_MASTERDIR/share/info/dir.new \ - $PKGFS_MASTERDIR/share/info/dir + $mv_cmd -f $XBPS_MASTERDIR/share/info/dir.new \ + $XBPS_MASTERDIR/share/info/dir } # @@ -182,7 +182,7 @@ info_tmpl() echo check_build_depends_pkg $pkgname-$version if [ $? -eq 0 ]; then - local list="$($db_cmd -V btree $PKGFS_BUILD_DEPS_DB $pkgname)" + local list="$($db_cmd -V btree $XBPS_BUILD_DEPS_DB $pkgname)" echo "This package requires the following dependencies to be built:" for i in ${list}; do echo " $i" @@ -199,9 +199,9 @@ check_config_vars() local cffound= if [ -z "$config_file_specified" ]; then - config_file_paths="$PKGFS_CONFIG_FILE ./pkgfs.conf" + config_file_paths="$XBPS_CONFIG_FILE ./xbps.conf" for f in $config_file_paths; do - [ -f $f ] && PKGFS_CONFIG_FILE=$f && \ + [ -f $f ] && XBPS_CONFIG_FILE=$f && \ cffound=yes && break done if [ -z "$cffound" ]; then @@ -211,19 +211,19 @@ check_config_vars() fi fi - run_file ${PKGFS_CONFIG_FILE} - PKGFS_CONFIG_FILE=$path_fixed + run_file ${XBPS_CONFIG_FILE} + XBPS_CONFIG_FILE=$path_fixed - if [ ! -f "$PKGFS_CONFIG_FILE" ]; then + if [ ! -f "$XBPS_CONFIG_FILE" ]; then echo -n "*** ERROR: cannot find configuration file: " - echo "'$PKGFS_CONFIG_FILE' ***" + echo "'$XBPS_CONFIG_FILE' ***" exit 1 fi - local PKGFS_VARS="PKGFS_MASTERDIR PKGFS_DESTDIR PKGFS_BUILDDIR \ - PKGFS_SRCDISTDIR PKGFS_SYSCONFDIR" + local XBPS_VARS="XBPS_MASTERDIR XBPS_DESTDIR XBPS_BUILDDIR \ + XBPS_SRCDISTDIR XBPS_SYSCONFDIR" - for f in ${PKGFS_VARS}; do + for f in ${XBPS_VARS}; do eval val="\$$f" if [ -z "$val" ]; then echo -n "**** ERROR: '$f' not set in configuration " @@ -256,8 +256,8 @@ reset_tmpl_vars() run_stuff_before_install_cmd run_stuff_after_install_cmd \ make_install_target postinstall_helpers version \ ignore_files \ - PKGFS_EXTRACT_DONE PKGFS_CONFIGURE_DONE \ - PKGFS_BUILD_DONE PKGFS_INSTALL_DONE" + XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ + XBPS_BUILD_DONE XBPS_INSTALL_DONE" for i in ${TMPL_VARS}; do eval unset "$i" @@ -273,8 +273,8 @@ setup_tmpl() { local pkg="$1" - if [ -f "$PKGFS_TEMPLATESDIR/$pkg.tmpl" ]; then - run_file $PKGFS_TEMPLATESDIR/$pkg.tmpl + if [ -f "$XBPS_TEMPLATESDIR/$pkg.tmpl" ]; then + run_file $XBPS_TEMPLATESDIR/$pkg.tmpl prepare_tmpl else echo "*** ERROR: cannot find \`$pkg´ template file ***" @@ -315,18 +315,18 @@ prepare_tmpl() exit 1 fi - dfile="$PKGFS_SRCDISTDIR/$dfile" + dfile="$XBPS_SRCDISTDIR/$dfile" case "$extract_sufx" in .tar.bz2|.tar.gz|.tgz|.tbz) - extract_cmd="$tar_cmd xfz $dfile -C $PKGFS_BUILDDIR" + extract_cmd="$tar_cmd xfz $dfile -C $XBPS_BUILDDIR" ;; .tar) - extract_cmd="$tar_cmd xf $dfile -C $PKGFS_BUILDDIR" + extract_cmd="$tar_cmd xf $dfile -C $XBPS_BUILDDIR" ;; .zip) - if [ -f "$PKGFS_TMPLHELPDIR/unzip-extraction.sh" ]; then - . $PKGFS_TMPLHELPDIR/unzip-extraction.sh + if [ -f "$XBPS_TMPLHELPDIR/unzip-extraction.sh" ]; then + . $XBPS_TMPLHELPDIR/unzip-extraction.sh unset wrksrc fi # $extract_cmd set by the helper @@ -338,27 +338,27 @@ prepare_tmpl() ;; esac - unset PKGFS_EXTRACT_DONE PKGFS_APPLYPATCHES_DONE - unset PKGFS_CONFIGURE_DONE PKGFS_BUILD_DONE PKGFS_INSTALL_DONE + unset XBPS_EXTRACT_DONE XBPS_APPLYPATCHES_DONE + unset XBPS_CONFIGURE_DONE XBPS_BUILD_DONE XBPS_INSTALL_DONE if [ -n "$wrksrc" ]; then - wrksrc=$PKGFS_BUILDDIR/$wrksrc + wrksrc=$XBPS_BUILDDIR/$wrksrc elif [ -z "$wrksrc" -a -z "$distfiles" ]; then - wrksrc=$PKGFS_BUILDDIR/$pkgname-$version + wrksrc=$XBPS_BUILDDIR/$pkgname-$version elif [ -z "$wrksrc" -a -n "$distfiles" ]; then - wrksrc=$PKGFS_BUILDDIR/$distfiles + wrksrc=$XBPS_BUILDDIR/$distfiles else echo "*** ERROR: can't guess what's the correct \$wrksrc! ***" exit 1 fi - PKGFS_EXTRACT_DONE="$wrksrc/.pkgfs_extract_done" - PKGFS_APPLYPATCHES_DONE="$wrksrc/.pkgfs_applypatches_done" - PKGFS_CONFIGURE_DONE="$wrksrc/.pkgfs_configure_done" - PKGFS_BUILD_DONE="$wrksrc/.pkgfs_build_done" - PKGFS_INSTALL_DONE="$wrksrc/.pkgfs_install_done" + XBPS_EXTRACT_DONE="$wrksrc/.xbps_extract_done" + XBPS_APPLYPATCHES_DONE="$wrksrc/.xbps_applypatches_done" + XBPS_CONFIGURE_DONE="$wrksrc/.xbps_configure_done" + XBPS_BUILD_DONE="$wrksrc/.xbps_build_done" + XBPS_INSTALL_DONE="$wrksrc/.xbps_install_done" - export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PKGFS_MASTERDIR/bin:$PKGFS_MASTERDIR/sbin" + export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin" } # @@ -379,7 +379,7 @@ extract_distfiles() # [ "$build_style" = "meta-template" ] && return 0 - echo "==> Extracting \`$pkgname-$version' into $PKGFS_BUILDDIR." + echo "==> Extracting \`$pkgname-$version' into $XBPS_BUILDDIR." $extract_cmd if [ "$?" -ne 0 ]; then @@ -389,7 +389,7 @@ extract_distfiles() fi unset extract_cmd - $touch_cmd -f $PKGFS_EXTRACT_DONE + $touch_cmd -f $XBPS_EXTRACT_DONE } # @@ -416,7 +416,7 @@ check_rmd160_cksum() fi origsum="$checksum" - dfile="$PKGFS_SRCDISTDIR/$dfile" + dfile="$XBPS_SRCDISTDIR/$dfile" filesum="$($cksum_cmd $dfile | $awk_cmd '{print $4}')" if [ "$origsum" != "$filesum" ]; then echo "*** WARNING: RMD160 checksum doesn't match for \`$dfile' ***" @@ -456,16 +456,16 @@ fetch_distfiles() for f in "$file"; do file2="$f$extract_sufx" - if [ -f "$PKGFS_SRCDISTDIR/$file2" ]; then + if [ -f "$XBPS_SRCDISTDIR/$file2" ]; then check_rmd160_cksum $f [ $? -eq 0 ] && continue fi echo "==> Fetching distfile: \`$file2'." - cd $PKGFS_SRCDISTDIR && $fetch_cmd $url/$file2 + cd $XBPS_SRCDISTDIR && $fetch_cmd $url/$file2 if [ $? -ne 0 ]; then - if [ ! -f $PKGFS_SRCDISTDIR/$file2 ]; then + if [ ! -f $XBPS_SRCDISTDIR/$file2 ]; then echo -n "*** ERROR: couldn't fetch '$file2', " echo "aborting ***" else @@ -488,25 +488,25 @@ fixup_tmpl_libtool() # we use the master directory while relinking, all will be fine # once the package is stowned. # - if [ -f "$lt_file" -a -f "$PKGFS_MASTERDIR/bin/libtool" ]; then + if [ -f "$lt_file" -a -f "$XBPS_MASTERDIR/bin/libtool" ]; then $rm_cmd -f $wrksrc/libtool $rm_cmd -f $wrksrc/ltmain.sh - $ln_cmd -s $PKGFS_MASTERDIR/bin/libtool $lt_file - $ln_cmd -s $PKGFS_MASTERDIR/share/libtool/config/ltmain.sh \ + $ln_cmd -s $XBPS_MASTERDIR/bin/libtool $lt_file + $ln_cmd -s $XBPS_MASTERDIR/share/libtool/config/ltmain.sh \ $wrksrc/ltmain.sh - elif [ -f "$PKGFS_MASTERDIR/bin/libtool" ]; then - $ln_cmd -s $PKGFS_MASTERDIR/bin/libtool $lt_file + elif [ -f "$XBPS_MASTERDIR/bin/libtool" ]; then + $ln_cmd -s $XBPS_MASTERDIR/bin/libtool $lt_file fi } set_build_vars() { - LDFLAGS="-L$PKGFS_MASTERDIR/lib -Wl,-R$PKGFS_MASTERDIR/lib $LDFLAGS" - LDFLAGS="-L$PKGFS_DESTDIR/$pkgname-$version/lib $LDFLAGS" - CFLAGS="$CFLAGS $PKGFS_CFLAGS" - CXXFLAGS="$CXXFLAGS $PKGFS_CXXFLAGS" - CPPFLAGS="-I$PKGFS_MASTERDIR/include $CPPFLAGS" - PKG_CONFIG="$PKGFS_MASTERDIR/bin/pkg-config" + LDFLAGS="-L$XBPS_MASTERDIR/lib -Wl,-R$XBPS_MASTERDIR/lib $LDFLAGS" + LDFLAGS="-L$XBPS_DESTDIR/$pkgname-$version/lib $LDFLAGS" + CFLAGS="$CFLAGS $XBPS_CFLAGS" + CXXFLAGS="$CXXFLAGS $XBPS_CXXFLAGS" + CPPFLAGS="-I$XBPS_MASTERDIR/include $CPPFLAGS" + PKG_CONFIG="$XBPS_MASTERDIR/bin/pkg-config" export LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" export CPPFLAGS="$CPPFLAGS" PKG_CONFIG="$PKG_CONFIG" @@ -530,7 +530,7 @@ apply_tmpl_patches() # if [ -n "$patch_files" ]; then for i in ${patch_files}; do - patch="$PKGFS_TEMPLATESDIR/$i" + patch="$XBPS_TEMPLATESDIR/$i" if [ ! -f "$patch" ]; then echo "*** WARNING: unexistent patch '$i' ***" continue @@ -563,7 +563,7 @@ apply_tmpl_patches() done fi - $touch_cmd -f $PKGFS_APPLYPATCHES_DONE + $touch_cmd -f $XBPS_APPLYPATCHES_DONE } # @@ -589,10 +589,10 @@ configure_src_phase() echo "=> Running \`\`configure´´ phase for \`$pkgname-$version'." # Apply patches if requested by template file - [ ! -f $PKGFS_APPLYPATCHES_DONE ] && apply_tmpl_patches + [ ! -f $XBPS_APPLYPATCHES_DONE ] && apply_tmpl_patches # Run stuff before configure. - local rbcf="$PKGFS_TEMPLATESDIR/$pkgname-runstuff-before-configure.sh" + local rbcf="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-configure.sh" [ -f $rbcf ] && . $rbcf [ -n "$run_stuff_before_configure_cmd" ] && \ ${run_stuff_before_configure_cmd} @@ -614,10 +614,10 @@ configure_src_phase() # surprises later. # ./configure \ - --prefix="$PKGFS_MASTERDIR" \ - --mandir="$PKGFS_DESTDIR/$pkgname-$version/man" \ - --infodir="$PKGFS_DESTDIR/$pkgname-$version/share/info" \ - --sysconfdir="$PKGFS_SYSCONFDIR" \ + --prefix="$XBPS_MASTERDIR" \ + --mandir="$XBPS_DESTDIR/$pkgname-$version/man" \ + --infodir="$XBPS_DESTDIR/$pkgname-$version/share/info" \ + --sysconfdir="$XBPS_SYSCONFDIR" \ ${configure_args} # @@ -635,7 +635,7 @@ configure_src_phase() # They are all handled by the helper perl-module.sh. # elif [ "$build_style" = "perl_module" ]; then - . $PKGFS_TMPLHELPDIR/perl-module.sh + . $XBPS_TMPLHELPDIR/perl-module.sh perl_module_build $pkgname # @@ -664,7 +664,7 @@ configure_src_phase() unset eval ${f%=*} done - $touch_cmd -f $PKGFS_CONFIGURE_DONE + $touch_cmd -f $XBPS_CONFIGURE_DONE } # @@ -705,13 +705,13 @@ build_src_phase() # # Run template stuff before building. # - local rbbf="$PKGFS_TEMPLATESDIR/$pkgname-runstuff-before-build.sh"a + local rbbf="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-build.sh"a [ -f $rbbf ] && . $rbbf [ -n "$run_stuff_before_build_cmd" ] && ${run_stuff_before_build_cmd} [ -z "$make_build_target" ] && make_build_target= - [ -n "$PKGFS_MAKEJOBS" ] && PKGFS_MAKEJOBS="-j$PKGFS_MAKEJOBS" + [ -n "$XBPS_MAKEJOBS" ] && XBPS_MAKEJOBS="-j$XBPS_MAKEJOBS" # Export make_env vars. for f in ${make_env}; do @@ -721,7 +721,7 @@ build_src_phase() # # Build package via make. # - ${make_cmd} ${PKGFS_MAKEJOBS} ${make_build_args} ${make_build_target} + ${make_cmd} ${XBPS_MAKEJOBS} ${make_build_args} ${make_build_target} if [ "$?" -ne 0 ]; then echo "*** ERROR building (make stage) \`$pkg' ***" exit 1 @@ -730,11 +730,11 @@ build_src_phase() # # Run template stuff before installing. # - local rbif="$PKGFS_TEMPLATESDIR/$pkgname-runstuff-before-install.sh" + local rbif="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-install.sh" [ -f $rbif ] && . $rbif [ -n "$run_stuff_before_install_cmd" ] && ${run_stuff_before_install_cmd} - $touch_cmd -f $PKGFS_BUILD_DONE + $touch_cmd -f $XBPS_BUILD_DONE } # @@ -767,7 +767,7 @@ install_src_phase() # Install package via make. # ${make_cmd} ${make_install_args} ${make_install_target} \ - prefix="$PKGFS_DESTDIR/$pkgname-$version" + prefix="$XBPS_DESTDIR/$pkgname-$version" if [ "$?" -ne 0 ]; then echo "*** ERROR instaling \`$pkgname-$version' ***" exit 1 @@ -781,7 +781,7 @@ install_src_phase() # # Run template stuff after installing. # - local raif="$PKGFS_TEMPLATESDIR/$pkgname-runstuff-after-install.sh" + local raif="$XBPS_TEMPLATESDIR/$pkgname-runstuff-after-install.sh" [ -f $raif ] && . $raif [ -n "$run_stuff_after_install_cmd" ] && ${run_stuff_after_install_cmd} @@ -789,19 +789,19 @@ install_src_phase() # Transform pkg-config files if requested by template. # for i in ${pkgconfig_override}; do - local tmpf="$PKGFS_DESTDIR/$pkgname-$version/lib/pkgconfig/$i" + local tmpf="$XBPS_DESTDIR/$pkgname-$version/lib/pkgconfig/$i" [ -f "$tmpf" ] && \ - [ -f $PKGFS_TMPLHELPDIR/pkg-config-transform.sh ] && \ - . $PKGFS_TMPLHELPDIR/pkg-config-transform.sh && \ + [ -f $XBPS_TMPLHELPDIR/pkg-config-transform.sh ] && \ + . $XBPS_TMPLHELPDIR/pkg-config-transform.sh && \ pkgconfig_transform_file $tmpf done # Unset build vars. unset_build_vars - echo "==> Installed \`$pkgname-$version' into $PKGFS_DESTDIR." + echo "==> Installed \`$pkgname-$version' into $XBPS_DESTDIR." - $touch_cmd -f $PKGFS_INSTALL_DONE + $touch_cmd -f $XBPS_INSTALL_DONE # # Remove $wrksrc if -C not specified. @@ -812,7 +812,7 @@ install_src_phase() echo "=> Removed \`$pkgname-$version' build directory." fi - cd $PKGFS_BUILDDIR + cd $XBPS_BUILDDIR } # @@ -827,14 +827,14 @@ register_pkg_handler() [ -z "$action" -o -z "$pkg" -o -z "$version" ] && return 1 if [ "$action" = "register" ]; then - $db_cmd -w btree $PKGFS_REGPKG_DB $pkg $version 2>&1 >/dev/null + $db_cmd -w btree $XBPS_REGPKG_DB $pkg $version 2>&1 >/dev/null if [ "$?" -ne 0 ]; then echo -n "*** ERROR: couldn't register \`$pkg'" echo " in db file ***" exit 1 fi elif [ "$action" = "unregister" ]; then - $db_cmd -d btree $PKGFS_REGPKG_DB $pkg 2>&1 >/dev/null + $db_cmd -d btree $XBPS_REGPKG_DB $pkg 2>&1 >/dev/null if [ "$?" -ne 0 ]; then echo -n "*** ERROR: \`$pkg' not registered " echo "in db file? ***" @@ -856,11 +856,11 @@ add_dependency_tolist() [ -z "$curpkg" ] && return 1 [ -n "$prev_pkg" ] && curpkg=$prev_pkg - for i in $($db_cmd -V btree $PKGFS_BUILD_DEPS_DB ${curpkg%-[0-9]*.*}); do + for i in $($db_cmd -V btree $XBPS_BUILD_DEPS_DB ${curpkg%-[0-9]*.*}); do # # Check if dep already installed. # - if [ -r "$PKGFS_REGPKG_DB" ]; then + if [ -r "$XBPS_REGPKG_DB" ]; then check_installed_pkg $i ${i##[aA-zZ]*-} # # If dep is already installed, put it on the @@ -955,7 +955,7 @@ install_dependencies_pkg() echo "==> Required dependencies for $(basename $pkg):" for i in ${installed_deps_list}; do - fpkg="$($db_cmd -O '-' btree $PKGFS_REGPKG_DB ${i%-[0-9]*.*})" + fpkg="$($db_cmd -O '-' btree $XBPS_REGPKG_DB ${i%-[0-9]*.*})" echo " $i: found $fpkg." done @@ -982,7 +982,7 @@ install_builddeps_required_pkg() [ -z "$pkg" ] && return 1 - for dep in $($db_cmd -V btree $PKGFS_BUILD_DEPS_DB ${pkg%-[0-9]*.*}); do + for dep in $($db_cmd -V btree $XBPS_BUILD_DEPS_DB ${pkg%-[0-9]*.*}); do check_installed_pkg $dep ${dep##[aA-zZ]*-} if [ $? -ne 0 ]; then echo "==> Installing \`$pkg´ dependency: $dep." @@ -1001,18 +1001,18 @@ check_installed_pkg() local reqver="$2" local iver= - [ -z "$pkg" -o -z "$reqver" -o ! -r $PKGFS_REGPKG_DB ] && return 1 + [ -z "$pkg" -o -z "$reqver" -o ! -r $XBPS_REGPKG_DB ] && return 1 - run_file $PKGFS_TEMPLATESDIR/${pkg%-[0-9]*.*}.tmpl + run_file $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}.tmpl reqver="$(echo $reqver | $sed_cmd 's|[[:punct:]]||g;s|[[:alpha:]]||g')" - $db_cmd -K btree $PKGFS_REGPKG_DB $pkgname 2>&1 >/dev/null + $db_cmd -K btree $XBPS_REGPKG_DB $pkgname 2>&1 >/dev/null if [ $? -eq 0 ]; then # # Package is installed, let's check the version. # - iver="$($db_cmd -V btree $PKGFS_REGPKG_DB $pkgname)" + iver="$($db_cmd -V btree $XBPS_REGPKG_DB $pkgname)" if [ -n "$iver" ]; then # # As shell only supports decimal arith expressions, @@ -1039,9 +1039,9 @@ check_build_depends_pkg() { local pkg="$1" - [ -z $pkg -o ! -r $PKGFS_BUILD_DEPS_DB ] && return 1 + [ -z $pkg -o ! -r $XBPS_BUILD_DEPS_DB ] && return 1 - $db_cmd -V btree $PKGFS_BUILD_DEPS_DB ${pkg%-[0-9]*.*} 2>&1 >/dev/null + $db_cmd -V btree $XBPS_BUILD_DEPS_DB ${pkg%-[0-9]*.*} 2>&1 >/dev/null return $? } @@ -1053,7 +1053,7 @@ install_pkg() local pkg= local curpkgn="$1" - local cur_tmpl="$PKGFS_TEMPLATESDIR/$curpkgn.tmpl" + local cur_tmpl="$XBPS_TEMPLATESDIR/$curpkgn.tmpl" if [ -z $cur_tmpl -o ! -f $cur_tmpl ]; then echo "*** ERROR: cannot find \`$cur_tmpl´ template file ***" exit 1 @@ -1098,15 +1098,15 @@ install_pkg() # fetch_distfiles - if [ ! -f "$PKGFS_EXTRACT_DONE" ]; then + if [ ! -f "$XBPS_EXTRACT_DONE" ]; then extract_distfiles fi - if [ ! -f "$PKGFS_CONFIGURE_DONE" ]; then + if [ ! -f "$XBPS_CONFIGURE_DONE" ]; then configure_src_phase fi - if [ ! -f "$PKGFS_BUILD_DONE" ]; then + if [ ! -f "$XBPS_BUILD_DONE" ]; then build_src_phase fi @@ -1132,7 +1132,7 @@ install_pkg() # install_xstow_pkg() { - [ -x "$PKGFS_XSTOW_CMD" ] && return 0 + [ -x "$XBPS_XSTOW_CMD" ] && return 0 echo "=> xstow application not found, will install it now." @@ -1140,27 +1140,27 @@ install_xstow_pkg() setup_tmpl xstow fetch_distfiles - if [ ! -f "$PKGFS_EXTRACT_DONE" ]; then + if [ ! -f "$XBPS_EXTRACT_DONE" ]; then extract_distfiles fi - if [ ! -f "$PKGFS_CONFIGURE_DONE" ]; then + if [ ! -f "$XBPS_CONFIGURE_DONE" ]; then configure_src_phase fi - if [ ! -f "$PKGFS_BUILD_DONE" ]; then + if [ ! -f "$XBPS_BUILD_DONE" ]; then build_src_phase fi install_src_phase - PKGFS_XSTOW_CMD="$PKGFS_DESTDIR/$pkgname-$version/bin/xstow" + XBPS_XSTOW_CMD="$XBPS_DESTDIR/$pkgname-$version/bin/xstow" stow_pkg $pkgname-$version # # Continue with package that called us. # - run_file $PKGFS_TEMPLATESDIR/$origin_tmpl.tmpl + run_file $XBPS_TEMPLATESDIR/$origin_tmpl.tmpl } # @@ -1168,14 +1168,14 @@ install_xstow_pkg() # list_pkgs() { - if [ ! -r "$PKGFS_REGPKG_DB" ]; then + if [ ! -r "$XBPS_REGPKG_DB" ]; then echo "=> No packages registered or missing register db file." exit 0 fi - for i in $($db_cmd -K btree $PKGFS_REGPKG_DB); do + for i in $($db_cmd -K btree $XBPS_REGPKG_DB); do # Run file to get short_desc and print something useful - run_file $PKGFS_TEMPLATESDIR/$i.tmpl + run_file $XBPS_TEMPLATESDIR/$i.tmpl echo "$i-$version $short_desc" reset_tmpl_vars done @@ -1193,13 +1193,13 @@ list_pkg_files() exit 1 fi - if [ ! -d "$PKGFS_DESTDIR/$pkg" ]; then - echo "*** ERROR: cannot find \`$pkg' in $PKGFS_DESTDIR ***" + if [ ! -d "$XBPS_DESTDIR/$pkg" ]; then + echo "*** ERROR: cannot find \`$pkg' in $XBPS_DESTDIR ***" exit 1 fi - for f in $($find_cmd $PKGFS_DESTDIR/$pkg -type f -print | sort -u); do - echo "${f##$PKGFS_DESTDIR/$pkg/}" + for f in $($find_cmd $XBPS_DESTDIR/$pkg -type f -print | sort -u); do + echo "${f##$XBPS_DESTDIR/$pkg/}" done } @@ -1215,12 +1215,12 @@ remove_pkg() exit 1 fi - if [ ! -f "$PKGFS_TEMPLATESDIR/$pkg.tmpl" ]; then + if [ ! -f "$XBPS_TEMPLATESDIR/$pkg.tmpl" ]; then echo "*** ERROR: cannot find template file ***" exit 1 fi - run_file $PKGFS_TEMPLATESDIR/$pkg.tmpl + run_file $XBPS_TEMPLATESDIR/$pkg.tmpl # # If it's a meta-template, just unregister it from the db. @@ -1232,13 +1232,13 @@ remove_pkg() return $? fi - if [ ! -d "$PKGFS_DESTDIR/$pkg-$version" ]; then - echo "*** ERROR: cannot find package on $PKGFS_DESTDIR ***" + if [ ! -d "$XBPS_DESTDIR/$pkg-$version" ]; then + echo "*** ERROR: cannot find package on $XBPS_DESTDIR ***" exit 1 fi unstow_pkg $pkg - $rm_cmd -rf $PKGFS_DESTDIR/$pkg-$version + $rm_cmd -rf $XBPS_DESTDIR/$pkg-$version return $? } @@ -1250,14 +1250,14 @@ stow_pkg() { local pkg="$1" local infodir_pkg="share/info/dir" - local infodir_master="$PKGFS_MASTERDIR/share/info/dir" + local infodir_master="$XBPS_MASTERDIR/share/info/dir" local real_xstowargs="$xstow_args" local real_xstow_ignore="$xstow_ignore_files" [ -z "$pkg" ] && return 2 if [ -n "$stow_flag" ]; then - pkg=$PKGFS_TEMPLATESDIR/$pkg.tmpl + pkg=$XBPS_TEMPLATESDIR/$pkg.tmpl run_file $pkg pkg=$pkgname-$version # @@ -1266,11 +1266,11 @@ stow_pkg() [ "$build_style" = "meta-template" ] && return 0 fi - if [ -r "$PKGFS_DESTDIR/$pkg/$infodir_pkg" ]; then + if [ -r "$XBPS_DESTDIR/$pkg/$infodir_pkg" ]; then merge_infodir_tmpl $pkg fi - if [ -r "$PKGFS_DESTDIR/$pkg/$infodir_pkg" \ + if [ -r "$XBPS_DESTDIR/$pkg/$infodir_pkg" \ -a -r "$infodir_master" ]; then xstow_args="$xstow_args -i-file-in-dir $infodir_pkg" fi @@ -1279,10 +1279,10 @@ stow_pkg() xstow_ignore_files="$xstow_ignore_files $ignore_files" fi - $PKGFS_XSTOW_CMD -ignore "${xstow_ignore_files}" ${xstow_args} \ - -pd-targets $PKGFS_MASTERDIR \ - -dir $PKGFS_DESTDIR -target $PKGFS_MASTERDIR \ - $PKGFS_DESTDIR/$pkg + $XBPS_XSTOW_CMD -ignore "${xstow_ignore_files}" ${xstow_args} \ + -pd-targets $XBPS_MASTERDIR \ + -dir $XBPS_DESTDIR -target $XBPS_MASTERDIR \ + $XBPS_DESTDIR/$pkg if [ "$?" -ne 0 ]; then echo "*** ERROR: couldn't create symlinks for \`$pkg' ***" exit 1 @@ -1296,11 +1296,11 @@ stow_pkg() # Run template postinstall helpers if requested. # if [ "$pkgname" != "${pkg%%-$version}" ]; then - run_file $PKGFS_TEMPLATESDIR/${pkg%%-$version}.tmpl + run_file $XBPS_TEMPLATESDIR/${pkg%%-$version}.tmpl fi for i in ${postinstall_helpers}; do - local pihf="$PKGFS_TMPLHELPDIR/$i" + local pihf="$XBPS_TMPLHELPDIR/$i" [ -f "$pihf" ] && . $pihf done @@ -1327,7 +1327,7 @@ unstow_pkg() exit 1 fi - run_file $PKGFS_TEMPLATESDIR/$pkg.tmpl + run_file $XBPS_TEMPLATESDIR/$pkg.tmpl # # You cannot unstow a meta-template. @@ -1338,13 +1338,13 @@ unstow_pkg() xstow_ignore_files="$xstow_ignore_files $ignore_files" fi - $PKGFS_XSTOW_CMD -dir $PKGFS_DESTDIR -target $PKGFS_MASTERDIR \ + $XBPS_XSTOW_CMD -dir $XBPS_DESTDIR -target $XBPS_MASTERDIR \ -D -i-file-in-dir share/info/dir -ignore \ - "${xstow_ignore_files}" $PKGFS_DESTDIR/$pkgname-$version + "${xstow_ignore_files}" $XBPS_DESTDIR/$pkgname-$version if [ $? -ne 0 ]; then exit 1 else - $rm_cmd -f $PKGFS_DESTDIR/$pkgname-$version/share/info/dir + $rm_cmd -f $XBPS_DESTDIR/$pkgname-$version/share/info/dir echo "==> Removed \`$pkg' symlinks from master directory." fi @@ -1367,7 +1367,7 @@ while [ "$#" -gt 0 ]; do ;; -c) config_file_specified=yes - PKGFS_CONFIG_FILE="$2" + XBPS_CONFIG_FILE="$2" shift ;; --) @@ -1397,11 +1397,11 @@ case "$target" in build) setup_tmpl $2 fetch_distfiles $2 - if [ ! -f "$PKGFS_EXTRACT_DONE" ]; then + if [ ! -f "$XBPS_EXTRACT_DONE" ]; then extract_distfiles $2 fi - if [ ! -f "$PKGFS_CONFIGURE_DONE" ]; then + if [ ! -f "$XBPS_CONFIGURE_DONE" ]; then configure_src_phase $2 fi build_src_phase $2 @@ -1409,7 +1409,7 @@ build) configure) setup_tmpl $2 fetch_distfiles $2 - if [ ! -f "$PKGFS_EXTRACT_DONE" ]; then + if [ ! -f "$XBPS_EXTRACT_DONE" ]; then extract_distfiles $2 fi configure_src_phase $2