* Numerous mini valgrind fixes.

* Addition of hacky architecture check in the _splitname function
* Removal of libfetch from the archlinux proper - it has been renamed to
  libdownload and can be found at http://phraktured.net/libdownload
* Merge of _some_ of the Frugalware makepkg change - this may still be
  incomplete
* Removal of libftp from cvs proper
* PKGBUILD manpage now says 'PKGBUILD' instead of FrugalBuild (he he)

4 files changed, 99 insertions, 191 deletions

diff --git a/doc/PKGBUILD.8 b/doc/PKGBUILD.8
index 61fc7208..024543cb 100644
--- a/doc/PKGBUILD.8
+++ b/doc/PKGBUILD.8
@@ -1,14 +1,14 @@
-.TH FrugalBuild 8 "June 13, 2006" "Frugalware Developer Manual" ""
+.TH PKGBUILD 8 "June 13, 2006" "Archlinux Developer Manual" ""
 .SH NAME
-FrugalBuild \- Frugalware package builder descriptor
+PKGBUILD \- Archlinux package builder descriptor
 .SH DESCRIPTION
-This manual page is meant to describe general rules about FrugalBuilds. If
+This manual page is meant to describe general rules about PKGBUILDs. If
 you're interested in the package builder \fBmakepkg\fP itself, then see its
 manual page, not this one.
 
 .TP
 .TP
-.SH FrugalBuild Example:
+.SH PKGBUILD Example:
 .RS
 .nf
 # Last Modified: Sun, 19 Jun 2005 15:24:32 +0000
@@ -47,13 +47,13 @@ successful builds, and this SBU value will be equal on anyone's machine.
 
 If you wish to maintain the package, write your name or nick and e-mail
 address to the third line. If you don't plan to maintain the package just wrote
-the FrugalBuild, then write Contributor instead of Maintainer, and then someone
+the PKGBUILD, then write Contributor instead of Maintainer, and then someone
 can take it and will add his/her line later. Other lines like "Modified by" are
 not allowed. Use the darcs patch comments to mention others if you wish.
 
 pkgname defines the package name. It should not contain any uppercase letters.
 The package version defines the upstream version, while the package release
-tracks the Frugalware-specific changes. pkgrel should be an integer, pkgrels
+tracks the Archlinux-specific changes. pkgrel should be an integer, pkgrels
 like 5wanda1 are reserved for security updates. There the rule is the
 following: If the original package's pkgrel was 4, then increment it once when
 you add a security patch, but then use 5wanda1, 5wanda2 and so on. This way
@@ -68,9 +68,9 @@ current one. If the dependency is runtime-only, then use rodepends(), if
 buildtime-only then use makedepends().
 
 The next line is a special Finclude commands which allows you to inherit
-any directive from a FrugalBuild scheme. They can be found in the FST,
+any directive from a PKGBUILD scheme. They can be found in the FST,
 under /source/include. The "util" scheme always included, since its
-provided functions are used by almost every FrugalBuild. Look at the
+provided functions are used by almost every PKGBUILD. Look at the
 /source/include/sourceforge.sh, it provides the url, up2date and source()
 directives, so we don't have to specify them here. After the Finclude you
 can overwrite the inherited directives, for example define a custom up2date
@@ -93,7 +93,7 @@ is to prevent compiling from wrong sources, especially when the build is
 automatic. Where it is available you can use signatures(), its goal is that
 you don't have to update it manually every time.
 
-The last line will be added automatically to the end of the FrugalBuild if the
+The last line will be added automatically to the end of the PKGBUILD if the
 build() function used your $CFLAGS or $CXXFLAGS. This is handy if you want to
 cross-compile on a faster machine for a slower architecture. Until the package
 doesn't use our $CFLAGS we can't cross-compile it, so please try to avoid
@@ -150,7 +150,7 @@ script is run right after files are removed.
 
 .RE
 To use this feature, just create a file (eg, pkgname.install) and put it in
-the same directory as the FrugalBuild script.  Then use the \fIinstall\fP directive:
+the same directory as the PKGBUILD script.  Then use the \fIinstall\fP directive:
 .RS
 .nf
 install=pkgname.install
@@ -176,7 +176,7 @@ post_upgrade()
 }
 .fi
 
-.SH FrugalBuild Directives
+.SH PKGBUILD Directives
 .TP
 .B pkgname
 The name of the package.  This has be a unix-friendly name as it will be
@@ -188,7 +188,7 @@ This is the version of the software as released from the author (eg, 2.7.1).
 
 .TP
 .B pkgrel
-This is the release number specific to Frugalware Linux packages.
+This is the release number specific to Archlinux Linux packages.
 
 .TP
 .B pkgdesc
@@ -214,7 +214,7 @@ option is still in development and may change in the future)
 .TP
 .B install
 Specifies a special install script that is to be included in the package.
-This file should reside in the same directory as the FrugalBuild, and will be
+This file should reside in the same directory as the PKGBUILD, and will be
 copied into the package by makepkg.  It does not need to be included in the
 \fIsource\fP array.  (eg, install=modutils.install)
 
@@ -227,7 +227,7 @@ manually the project's website (see above).
 .TP
 .B source \fI(array)\fP 
 The \fIsource\fP line is an array of source files required to build the
-package.  Source files must reside in the same directory as the FrugalBuild
+package.  Source files must reside in the same directory as the PKGBUILD
 file, unless they have a fully-qualified URL.  Then if the source file
 does not already exist in /var/cache/pacman/src, the file is downloaded
 by wget.
@@ -237,8 +237,8 @@ by wget.
 If this field is present, it should contain an MD5 hash for every source file
 specified in the \fIsource\fP array (in the same order).  makepkg will use
 this to verify source file integrity during subsequent builds.  To easily
-generate md5sums, first build using the FrugalBuild then run
-\fBmakepkg -G >>FrugalBuild\fP.  Then you can edit the FrugalBuild and move the
+generate md5sums, first build using the PKGBUILD then run
+\fBmakepkg -G >>PKGBUILD\fP.  Then you can edit the PKGBUILD and move the
 \fImd5sums\fP line from the bottom to an appropriate location.
 
 .TP
@@ -246,8 +246,8 @@ generate md5sums, first build using the FrugalBuild then run
 If this field is present, it should contain an SHA1 hash for every source file
 specified in the \fIsource\fP array (in the same order).  makepkg will use
 this to verify source file integrity during subsequent builds.  To easily
-generate sha1sums, first build using the FrugalBuild then run
-\fBmakepkg -g >>FrugalBuild\fP.  Then you can edit the FrugalBuild and move the
+generate sha1sums, first build using the PKGBUILD then run
+\fBmakepkg -g >>PKGBUILD\fP.  Then you can edit the PKGBUILD and move the
 \fIsha1sums\fP line from the bottom to an appropriate location.
 
 .TP
@@ -285,7 +285,7 @@ in this list should be surrounded with single quotes and contain at least the
 package name.  They can also include a version requirement of the form
 \fBname<>version\fP, where <> is one of these three comparisons: \fB>=\fP
 (greater than equal to), \fB<=\fP (less than or equal to), or \fB=\fP (equal to).
-See the FrugalBuild example above for an example of the \fIdepends\fP directive.
+See the PKGBUILD example above for an example of the \fIdepends\fP directive.
 
 .TP
 .B makedepends \fI(array)\fP
@@ -365,7 +365,7 @@ devel-core' should show you the actial list. (We try to change this list rarely
 of course.)
 
 When you start building with makepkg -R, pacman will install these packages to
-/var/chroot if necessary. This will produce a fully "clean" Frugalware system,
+/var/chroot if necessary. This will produce a fully "clean" Archlinux system,
 that consits of base packages only. This /var/chroot is fully separated from
 the host system so that this will solve the problems mentioned above.
 (Linking to a library installed from source, etc.)
@@ -380,7 +380,7 @@ installed depends() and makedepends(). This ensures us not to build from
 scratch the core chroot.
 
 This way we can prevent lots of dependency problems and it is even possible to
-build packages for a different Frugalware version. This is quite efficent when
+build packages for a different Archlinux version. This is quite efficent when
 building security updates or fixing critical bugs in the -stable tree.
 
 If the build is failed, the working directory will not be deleted, you can find
@@ -425,7 +425,7 @@ array of arrays, then quotes are the major separators and spaces are the minor o
 
 Simple example:
 .nf
-Add the followings to your bottom of your FrugalBuild
+Add the followings to your bottom of your PKGBUILD
 subpkgs=('foo' 'bar')
 subdescs=('desc of foo' 'desc of bar')
 subdepends=('foodep1 foodep2' 'bardep1 bardep2')
diff --git a/doc/hu/Makefile.am b/doc/hu/Makefile.am
index 27e74e45..80ebba62 100644
--- a/doc/hu/Makefile.am
+++ b/doc/hu/Makefile.am
@@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS=foreign
 
 mandir = @mandir@/hu
 man_MANS = pacman.8 makepkg.8 PKGBUILD.8
-
 $(man_MANS):
 
 EXTRA_DIST = pacman.8 makepkg.8 PKGBUILD.8
diff --git a/doc/po/hu.po b/doc/po/hu.po
index 76cc35a3..dec8ec25 100644
--- a/doc/po/hu.po
+++ b/doc/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-30  8:14-0600\n"
+"POT-Creation-Date: 2006-11-14 13:52-0600\n"
 "PO-Revision-Date: 2006-08-26 14:53+0200\n"
 "Last-Translator: Hungarian <frugalware-devel@frugalware.org>\n"
 "Language-Team: Hungarian <frugalware-devel@frugalware.org>\n"
@@ -1012,7 +1012,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: makepkg.8:30
+#: makepkg.8:30 PKGBUILD.8:11
 #, no-wrap
 msgid "PKGBUILD Example:"
 msgstr ""
@@ -1248,7 +1248,7 @@ msgid "script is run right after files are removed."
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:149
+#: makepkg.8:149 PKGBUILD.8:154
 msgid ""
 "To use this feature, just create a file (eg, pkgname.install) and put it in "
 "the same directory as the PKGBUILD script.  Then use the I<install> "
@@ -1369,7 +1369,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: makepkg.8:220
+#: makepkg.8:220 PKGBUILD.8:179
 #, no-wrap
 msgid "PKGBUILD Directives"
 msgstr ""
@@ -1522,7 +1522,7 @@ msgid "B<install>"
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:285
+#: makepkg.8:285 PKGBUILD.8:220
 msgid ""
 "Specifies a special install script that is to be included in the package.  "
 "This file should reside in the same directory as the PKGBUILD, and will be "
@@ -1537,7 +1537,7 @@ msgid "B<source >I<(array)>"
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:293
+#: makepkg.8:293 PKGBUILD.8:234
 msgid ""
 "The I<source> line is an array of source files required to build the "
 "package.  Source files must reside in the same directory as the PKGBUILD "
@@ -1600,7 +1600,7 @@ msgid "B<depends >I<(array)>"
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:325
+#: makepkg.8:325 PKGBUILD.8:289
 msgid ""
 "An array of packages that this package depends on to build and run.  "
 "Packages in this list should be surrounded with single quotes and contain at "
@@ -1938,11 +1938,11 @@ msgid ""
 "to contribute packages to the Arch Linux project."
 msgstr ""
 
-# type: SH
+# type: TH
 #: PKGBUILD.8:1
-#, fuzzy, no-wrap
-msgid "FrugalBuild"
-msgstr "FrugalBuild példa:"
+#, no-wrap
+msgid "PKGBUILD"
+msgstr ""
 
 # type: TH
 #: PKGBUILD.8:1
@@ -1952,29 +1952,23 @@ msgstr "2006. június 13."
 
 # type: TH
 #: PKGBUILD.8:1
-#, no-wrap
-msgid "Frugalware Developer Manual"
+#, fuzzy, no-wrap
+msgid "Archlinux Developer Manual"
 msgstr "Frugalware Fejlesztői Kézikönyv"
 
 # type: Plain text
 #: PKGBUILD.8:4
-msgid "FrugalBuild - Frugalware package builder descriptor"
+msgid "PKGBUILD - Archlinux package builder descriptor"
 msgstr ""
 
 # type: Plain text
 #: PKGBUILD.8:8
 msgid ""
-"This manual page is meant to describe general rules about FrugalBuilds. If "
+"This manual page is meant to describe general rules about PKGBUILDs. If "
 "you're interested in the package builder B<makepkg> itself, then see its "
 "manual page, not this one."
 msgstr ""
 
-# type: SH
-#: PKGBUILD.8:11
-#, no-wrap
-msgid "FrugalBuild Example:"
-msgstr "FrugalBuild példa:"
-
 # type: Plain text
 #: PKGBUILD.8:17
 #, no-wrap
@@ -2047,8 +2041,8 @@ msgstr ""
 msgid ""
 "If you wish to maintain the package, write your name or nick and e-mail "
 "address to the third line. If you don't plan to maintain the package just "
-"wrote the FrugalBuild, then write Contributor instead of Maintainer, and "
-"then someone can take it and will add his/her line later. Other lines like "
+"wrote the PKGBUILD, then write Contributor instead of Maintainer, and then "
+"someone can take it and will add his/her line later. Other lines like "
 "\"Modified by\" are not allowed. Use the darcs patch comments to mention "
 "others if you wish."
 msgstr ""
@@ -2058,7 +2052,7 @@ msgstr ""
 msgid ""
 "pkgname defines the package name. It should not contain any uppercase "
 "letters.  The package version defines the upstream version, while the "
-"package release tracks the Frugalware-specific changes. pkgrel should be an "
+"package release tracks the Archlinux-specific changes. pkgrel should be an "
 "integer, pkgrels like 5wanda1 are reserved for security updates. There the "
 "rule is the following: If the original package's pkgrel was 4, then "
 "increment it once when you add a security patch, but then use 5wanda1, "
@@ -2086,9 +2080,9 @@ msgstr ""
 #: PKGBUILD.8:78
 msgid ""
 "The next line is a special Finclude commands which allows you to inherit any "
-"directive from a FrugalBuild scheme. They can be found in the FST, under /"
+"directive from a PKGBUILD scheme. They can be found in the FST, under /"
 "source/include. The \"util\" scheme always included, since its provided "
-"functions are used by almost every FrugalBuild. Look at the /source/include/"
+"functions are used by almost every PKGBUILD. Look at the /source/include/"
 "sourceforge.sh, it provides the url, up2date and source()  directives, so we "
 "don't have to specify them here. After the Finclude you can overwrite the "
 "inherited directives, for example define a custom up2date if the inherited "
@@ -2128,13 +2122,13 @@ msgstr ""
 # type: Plain text
 #: PKGBUILD.8:103
 msgid ""
-"The last line will be added automatically to the end of the FrugalBuild if "
-"the build() function used your $CFLAGS or $CXXFLAGS. This is handy if you "
-"want to cross-compile on a faster machine for a slower architecture. Until "
-"the package doesn't use our $CFLAGS we can't cross-compile it, so please try "
-"to avoid creating \"unoptimized\" packages. If the package doesn't contain "
-"any architecture-dependent file, then you can add this line manually as "
-"makepkg will not detect this."
+"The last line will be added automatically to the end of the PKGBUILD if the "
+"build() function used your $CFLAGS or $CXXFLAGS. This is handy if you want "
+"to cross-compile on a faster machine for a slower architecture. Until the "
+"package doesn't use our $CFLAGS we can't cross-compile it, so please try to "
+"avoid creating \"unoptimized\" packages. If the package doesn't contain any "
+"architecture-dependent file, then you can add this line manually as makepkg "
+"will not detect this."
 msgstr ""
 
 # type: Plain text
@@ -2167,14 +2161,6 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: PKGBUILD.8:154
-msgid ""
-"To use this feature, just create a file (eg, pkgname.install) and put it in "
-"the same directory as the FrugalBuild script.  Then use the I<install> "
-"directive:"
-msgstr ""
-
-# type: Plain text
 #: PKGBUILD.8:163
 msgid ""
 "The install script does not need to be specified in the I<source> array.  If "
@@ -2209,15 +2195,9 @@ msgid ""
 "}\n"
 msgstr ""
 
-# type: SH
-#: PKGBUILD.8:179
-#, no-wrap
-msgid "FrugalBuild Directives"
-msgstr ""
-
 # type: Plain text
 #: PKGBUILD.8:192
-msgid "This is the release number specific to Frugalware Linux packages."
+msgid "This is the release number specific to Archlinux Linux packages."
 msgstr ""
 
 # type: TP
@@ -2244,15 +2224,6 @@ msgid ""
 "option is still in development and may change in the future)"
 msgstr ""
 
-# type: Plain text
-#: PKGBUILD.8:220
-msgid ""
-"Specifies a special install script that is to be included in the package.  "
-"This file should reside in the same directory as the FrugalBuild, and will "
-"be copied into the package by makepkg.  It does not need to be included in "
-"the I<source> array.  (eg, install=modutils.install)"
-msgstr ""
-
 # type: TP
 #: PKGBUILD.8:221
 #, no-wrap
@@ -2268,23 +2239,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: PKGBUILD.8:234
-msgid ""
-"The I<source> line is an array of source files required to build the "
-"package.  Source files must reside in the same directory as the FrugalBuild "
-"file, unless they have a fully-qualified URL.  Then if the source file does "
-"not already exist in /var/cache/pacman/src, the file is downloaded by wget."
-msgstr ""
-
-# type: Plain text
 #: PKGBUILD.8:243
 msgid ""
 "If this field is present, it should contain an MD5 hash for every source "
 "file specified in the I<source> array (in the same order).  makepkg will use "
 "this to verify source file integrity during subsequent builds.  To easily "
-"generate md5sums, first build using the FrugalBuild then run B<makepkg -G "
-"E<gt>E<gt>FrugalBuild>.  Then you can edit the FrugalBuild and move the "
-"I<md5sums> line from the bottom to an appropriate location."
+"generate md5sums, first build using the PKGBUILD then run B<makepkg -G "
+"E<gt>E<gt>PKGBUILD>.  Then you can edit the PKGBUILD and move the I<md5sums> "
+"line from the bottom to an appropriate location."
 msgstr ""
 
 # type: TP
@@ -2299,8 +2261,8 @@ msgid ""
 "If this field is present, it should contain an SHA1 hash for every source "
 "file specified in the I<source> array (in the same order).  makepkg will use "
 "this to verify source file integrity during subsequent builds.  To easily "
-"generate sha1sums, first build using the FrugalBuild then run B<makepkg -g "
-"E<gt>E<gt>FrugalBuild>.  Then you can edit the FrugalBuild and move the "
+"generate sha1sums, first build using the PKGBUILD then run B<makepkg -g "
+"E<gt>E<gt>PKGBUILD>.  Then you can edit the PKGBUILD and move the "
 "I<sha1sums> line from the bottom to an appropriate location."
 msgstr ""
 
@@ -2337,18 +2299,6 @@ msgid ""
 "generating package databases."
 msgstr ""
 
-# type: Plain text
-#: PKGBUILD.8:289
-msgid ""
-"An array of packages that this package depends on to build and run.  "
-"Packages in this list should be surrounded with single quotes and contain at "
-"least the package name.  They can also include a version requirement of the "
-"form B<nameE<lt>E<gt>version>, where E<lt>E<gt> is one of these three "
-"comparisons: B<E<gt>=> (greater than equal to), B<E<lt>=> (less than or "
-"equal to), or B<=> (equal to).  See the FrugalBuild example above for an "
-"example of the I<depends> directive."
-msgstr ""
-
 # type: TP
 #: PKGBUILD.8:295
 #, no-wrap
@@ -2445,7 +2395,7 @@ msgstr ""
 #: PKGBUILD.8:372
 msgid ""
 "When you start building with makepkg -R, pacman will install these packages "
-"to /var/chroot if necessary. This will produce a fully \"clean\" Frugalware "
+"to /var/chroot if necessary. This will produce a fully \"clean\" Archlinux "
 "system, that consits of base packages only. This /var/chroot is fully "
 "separated from the host system so that this will solve the problems "
 "mentioned above.  (Linking to a library installed from source, etc.)"
@@ -2472,7 +2422,7 @@ msgstr ""
 #: PKGBUILD.8:385
 msgid ""
 "This way we can prevent lots of dependency problems and it is even possible "
-"to build packages for a different Frugalware version. This is quite efficent "
+"to build packages for a different Archlinux version. This is quite efficent "
 "when building security updates or fixing critical bugs in the -stable tree."
 msgstr ""
 
@@ -2559,7 +2509,7 @@ msgstr ""
 #: PKGBUILD.8:434
 #, no-wrap
 msgid ""
-"Add the followings to your bottom of your FrugalBuild\n"
+"Add the followings to your bottom of your PKGBUILD\n"
 "subpkgs=('foo' 'bar')\n"
 "subdescs=('desc of foo' 'desc of bar')\n"
 "subdepends=('foodep1 foodep2' 'bardep1 bardep2')\n"
@@ -2616,6 +2566,15 @@ msgid ""
 "and the Frugalware developers E<lt>frugalware-devel@frugalware.orgE<gt>\n"
 msgstr ""
 
+# type: SH
+#, fuzzy
+#~ msgid "FrugalBuild"
+#~ msgstr "FrugalBuild példa:"
+
+# type: SH
+#~ msgid "FrugalBuild Example:"
+#~ msgstr "FrugalBuild példa:"
+
 # type: TH
 #~ msgid "Frugalware User Manual"
 #~ msgstr "Frugalware Felhasználói Kézikönyv"
diff --git a/doc/po/pacman.pot b/doc/po/pacman.pot
index 77c852fa..4f003b12 100644
--- a/doc/po/pacman.pot
+++ b/doc/po/pacman.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-10-30  8:14-0600\n"
+"POT-Creation-Date: 2006-11-14 13:52-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1013,7 +1013,7 @@ msgid ""
 msgstr ""
 
 # type: SH
-#: makepkg.8:30
+#: makepkg.8:30 PKGBUILD.8:11
 #, no-wrap
 msgid "PKGBUILD Example:"
 msgstr ""
@@ -1242,7 +1242,7 @@ msgid "script is run right after files are removed."
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:149
+#: makepkg.8:149 PKGBUILD.8:154
 msgid ""
 "To use this feature, just create a file (eg, pkgname.install) and put it in "
 "the same directory as the PKGBUILD script.  Then use the I<install> "
@@ -1361,7 +1361,7 @@ msgid "This template is also available in your ABS tree (/var/abs/install.proto)
 msgstr ""
 
 # type: SH
-#: makepkg.8:220
+#: makepkg.8:220 PKGBUILD.8:179
 #, no-wrap
 msgid "PKGBUILD Directives"
 msgstr ""
@@ -1513,7 +1513,7 @@ msgid "B<install>"
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:285
+#: makepkg.8:285 PKGBUILD.8:220
 msgid ""
 "Specifies a special install script that is to be included in the package.  "
 "This file should reside in the same directory as the PKGBUILD, and will be "
@@ -1528,7 +1528,7 @@ msgid "B<source >I<(array)>"
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:293
+#: makepkg.8:293 PKGBUILD.8:234
 msgid ""
 "The I<source> line is an array of source files required to build the "
 "package.  Source files must reside in the same directory as the PKGBUILD "
@@ -1591,7 +1591,7 @@ msgid "B<depends >I<(array)>"
 msgstr ""
 
 # type: Plain text
-#: makepkg.8:325
+#: makepkg.8:325 PKGBUILD.8:289
 msgid ""
 "An array of packages that this package depends on to build and run.  "
 "Packages in this list should be surrounded with single quotes and contain at "
@@ -1932,7 +1932,7 @@ msgstr ""
 # type: TH
 #: PKGBUILD.8:1
 #, no-wrap
-msgid "FrugalBuild"
+msgid "PKGBUILD"
 msgstr ""
 
 # type: TH
@@ -1944,28 +1944,22 @@ msgstr ""
 # type: TH
 #: PKGBUILD.8:1
 #, no-wrap
-msgid "Frugalware Developer Manual"
+msgid "Archlinux Developer Manual"
 msgstr ""
 
 # type: Plain text
 #: PKGBUILD.8:4
-msgid "FrugalBuild - Frugalware package builder descriptor"
+msgid "PKGBUILD - Archlinux package builder descriptor"
 msgstr ""
 
 # type: Plain text
 #: PKGBUILD.8:8
 msgid ""
-"This manual page is meant to describe general rules about FrugalBuilds. If "
+"This manual page is meant to describe general rules about PKGBUILDs. If "
 "you're interested in the package builder B<makepkg> itself, then see its "
 "manual page, not this one."
 msgstr ""
 
-# type: SH
-#: PKGBUILD.8:11
-#, no-wrap
-msgid "FrugalBuild Example:"
-msgstr ""
-
 # type: Plain text
 #: PKGBUILD.8:17
 #, no-wrap
@@ -2038,8 +2032,8 @@ msgstr ""
 msgid ""
 "If you wish to maintain the package, write your name or nick and e-mail "
 "address to the third line. If you don't plan to maintain the package just "
-"wrote the FrugalBuild, then write Contributor instead of Maintainer, and "
-"then someone can take it and will add his/her line later. Other lines like "
+"wrote the PKGBUILD, then write Contributor instead of Maintainer, and then "
+"someone can take it and will add his/her line later. Other lines like "
 "\"Modified by\" are not allowed. Use the darcs patch comments to mention "
 "others if you wish."
 msgstr ""
@@ -2049,7 +2043,7 @@ msgstr ""
 msgid ""
 "pkgname defines the package name. It should not contain any uppercase "
 "letters.  The package version defines the upstream version, while the "
-"package release tracks the Frugalware-specific changes. pkgrel should be an "
+"package release tracks the Archlinux-specific changes. pkgrel should be an "
 "integer, pkgrels like 5wanda1 are reserved for security updates. There the "
 "rule is the following: If the original package's pkgrel was 4, then "
 "increment it once when you add a security patch, but then use 5wanda1, "
@@ -2077,9 +2071,9 @@ msgstr ""
 #: PKGBUILD.8:78
 msgid ""
 "The next line is a special Finclude commands which allows you to inherit any "
-"directive from a FrugalBuild scheme. They can be found in the FST, under "
+"directive from a PKGBUILD scheme. They can be found in the FST, under "
 "/source/include. The \"util\" scheme always included, since its provided "
-"functions are used by almost every FrugalBuild. Look at the "
+"functions are used by almost every PKGBUILD. Look at the "
 "/source/include/sourceforge.sh, it provides the url, up2date and source()  "
 "directives, so we don't have to specify them here. After the Finclude you "
 "can overwrite the inherited directives, for example define a custom up2date "
@@ -2119,13 +2113,13 @@ msgstr ""
 # type: Plain text
 #: PKGBUILD.8:103
 msgid ""
-"The last line will be added automatically to the end of the FrugalBuild if "
-"the build() function used your $CFLAGS or $CXXFLAGS. This is handy if you "
-"want to cross-compile on a faster machine for a slower architecture. Until "
-"the package doesn't use our $CFLAGS we can't cross-compile it, so please try "
-"to avoid creating \"unoptimized\" packages. If the package doesn't contain "
-"any architecture-dependent file, then you can add this line manually as "
-"makepkg will not detect this."
+"The last line will be added automatically to the end of the PKGBUILD if the "
+"build() function used your $CFLAGS or $CXXFLAGS. This is handy if you want "
+"to cross-compile on a faster machine for a slower architecture. Until the "
+"package doesn't use our $CFLAGS we can't cross-compile it, so please try to "
+"avoid creating \"unoptimized\" packages. If the package doesn't contain any "
+"architecture-dependent file, then you can add this line manually as makepkg "
+"will not detect this."
 msgstr ""
 
 # type: Plain text
@@ -2158,14 +2152,6 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: PKGBUILD.8:154
-msgid ""
-"To use this feature, just create a file (eg, pkgname.install) and put it in "
-"the same directory as the FrugalBuild script.  Then use the I<install> "
-"directive:"
-msgstr ""
-
-# type: Plain text
 #: PKGBUILD.8:163
 msgid ""
 "The install script does not need to be specified in the I<source> array.  If "
@@ -2199,15 +2185,9 @@ msgid ""
 "}\n"
 msgstr ""
 
-# type: SH
-#: PKGBUILD.8:179
-#, no-wrap
-msgid "FrugalBuild Directives"
-msgstr ""
-
 # type: Plain text
 #: PKGBUILD.8:192
-msgid "This is the release number specific to Frugalware Linux packages."
+msgid "This is the release number specific to Archlinux Linux packages."
 msgstr ""
 
 # type: TP
@@ -2233,15 +2213,6 @@ msgid ""
 "option is still in development and may change in the future)"
 msgstr ""
 
-# type: Plain text
-#: PKGBUILD.8:220
-msgid ""
-"Specifies a special install script that is to be included in the package.  "
-"This file should reside in the same directory as the FrugalBuild, and will "
-"be copied into the package by makepkg.  It does not need to be included in "
-"the I<source> array.  (eg, install=modutils.install)"
-msgstr ""
-
 # type: TP
 #: PKGBUILD.8:221
 #, no-wrap
@@ -2257,23 +2228,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: PKGBUILD.8:234
-msgid ""
-"The I<source> line is an array of source files required to build the "
-"package.  Source files must reside in the same directory as the FrugalBuild "
-"file, unless they have a fully-qualified URL.  Then if the source file does "
-"not already exist in /var/cache/pacman/src, the file is downloaded by wget."
-msgstr ""
-
-# type: Plain text
 #: PKGBUILD.8:243
 msgid ""
 "If this field is present, it should contain an MD5 hash for every source "
 "file specified in the I<source> array (in the same order).  makepkg will use "
 "this to verify source file integrity during subsequent builds.  To easily "
-"generate md5sums, first build using the FrugalBuild then run B<makepkg -G "
-"E<gt>E<gt>FrugalBuild>.  Then you can edit the FrugalBuild and move the "
-"I<md5sums> line from the bottom to an appropriate location."
+"generate md5sums, first build using the PKGBUILD then run B<makepkg -G "
+"E<gt>E<gt>PKGBUILD>.  Then you can edit the PKGBUILD and move the I<md5sums> "
+"line from the bottom to an appropriate location."
 msgstr ""
 
 # type: TP
@@ -2288,8 +2250,8 @@ msgid ""
 "If this field is present, it should contain an SHA1 hash for every source "
 "file specified in the I<source> array (in the same order).  makepkg will use "
 "this to verify source file integrity during subsequent builds.  To easily "
-"generate sha1sums, first build using the FrugalBuild then run B<makepkg -g "
-"E<gt>E<gt>FrugalBuild>.  Then you can edit the FrugalBuild and move the "
+"generate sha1sums, first build using the PKGBUILD then run B<makepkg -g "
+"E<gt>E<gt>PKGBUILD>.  Then you can edit the PKGBUILD and move the "
 "I<sha1sums> line from the bottom to an appropriate location."
 msgstr ""
 
@@ -2326,18 +2288,6 @@ msgid ""
 "generating package databases."
 msgstr ""
 
-# type: Plain text
-#: PKGBUILD.8:289
-msgid ""
-"An array of packages that this package depends on to build and run.  "
-"Packages in this list should be surrounded with single quotes and contain at "
-"least the package name.  They can also include a version requirement of the "
-"form B<nameE<lt>E<gt>version>, where E<lt>E<gt> is one of these three "
-"comparisons: B<E<gt>=> (greater than equal to), B<E<lt>=> (less than or "
-"equal to), or B<=> (equal to).  See the FrugalBuild example above for an "
-"example of the I<depends> directive."
-msgstr ""
-
 # type: TP
 #: PKGBUILD.8:295
 #, no-wrap
@@ -2437,7 +2387,7 @@ msgstr ""
 #: PKGBUILD.8:372
 msgid ""
 "When you start building with makepkg -R, pacman will install these packages "
-"to /var/chroot if necessary. This will produce a fully \"clean\" Frugalware "
+"to /var/chroot if necessary. This will produce a fully \"clean\" Archlinux "
 "system, that consits of base packages only. This /var/chroot is fully "
 "separated from the host system so that this will solve the problems "
 "mentioned above.  (Linking to a library installed from source, etc.)"
@@ -2464,7 +2414,7 @@ msgstr ""
 #: PKGBUILD.8:385
 msgid ""
 "This way we can prevent lots of dependency problems and it is even possible "
-"to build packages for a different Frugalware version. This is quite efficent "
+"to build packages for a different Archlinux version. This is quite efficent "
 "when building security updates or fixing critical bugs in the -stable tree."
 msgstr ""
 
@@ -2552,7 +2502,7 @@ msgstr ""
 #: PKGBUILD.8:434
 #, no-wrap
 msgid ""
-"Add the followings to your bottom of your FrugalBuild\n"
+"Add the followings to your bottom of your PKGBUILD\n"
 "subpkgs=('foo' 'bar')\n"
 "subdescs=('desc of foo' 'desc of bar')\n"
 "subdepends=('foodep1 foodep2' 'bardep1 bardep2')\n"