- use popt autohelp for rpm helper binaries.

CVS patchset: 4396
CVS date: 2001/01/01 23:14:47

33 files changed, 177 insertions, 170 deletions

diff --git a/popt/po/cs.po b/popt/po/cs.po
index b453b9f30..ab883d565 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vypí¹e tuto nápovìdu"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vypí¹e krátký návod k pou¾ití"
diff --git a/popt/po/da.po b/popt/po/da.po
index 348e8c2ec..9f59184b6 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hjælpemeddelelse"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
diff --git a/popt/po/de.po b/popt/po/de.po
index 92426ed88..192688a29 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/es.po b/popt/po/es.po
index 92426ed88..192688a29 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/fi.po b/popt/po/fi.po
index 92426ed88..192688a29 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/fr.po b/popt/po/fr.po
index 92426ed88..192688a29 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/gl.po b/popt/po/gl.po
index 38f28935d..a6be50c02 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilización"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index d90a9ee6e..bc2e38859 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "E súgó megjelenítése"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Rövid használati utasítás megjelenítése"
diff --git a/popt/po/id.po b/popt/po/id.po
index 92426ed88..192688a29 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/is.po b/popt/po/is.po
index 6d6d63ded..f4c93e784 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Sýna þessa hjálp"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Sýna stuttar notkunarleiðbeiningar"
diff --git a/popt/po/it.po b/popt/po/it.po
index 92426ed88..192688a29 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/ja.po b/popt/po/ja.po
index 92426ed88..192688a29 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/ko.po b/popt/po/ko.po
index 92426ed88..192688a29 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/no.po b/popt/po/no.po
index 4864b4168..25370fbf8 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 92426ed88..192688a29 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index acd8de004..502a3967b 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/pt.po b/popt/po/pt.po
index 9b10b57e3..22fc2f454 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utilização sucinta"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index 92426ed88..192688a29 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/ro.po b/popt/po/ro.po
index c721649aa..03ade3305 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,11 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
diff --git a/popt/po/ru.po b/popt/po/ru.po
index f8f053b92..782048953 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "ðÏËÁÚÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "ðÏËÁÚÁÔØ ËÒÁÔËÕÀ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index d17e68373..9081bc879 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vypísa» túto správu"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Zobrazi» struèný návod na pou¾itie"
diff --git a/popt/po/sl.po b/popt/po/sl.po
index d33261225..42e359bf5 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Prika¾i to sporoèilo s pomoèjo"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Prika¾i kratko sporoèilo o uporabi"
diff --git a/popt/po/sr.po b/popt/po/sr.po
index 92426ed88..192688a29 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/sv.po b/popt/po/sv.po
index e2f13287f..b5bf6d3ac 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Visa detta hjälpmeddelande"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Visa ett kortfattat användningsmeddelande"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index e5280342f..700abc260 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Görkem Çetin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.Þ <gorkem@gelecek.com.tr>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Bu yardým iletisini gösterir"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Kýsa bir kullaným iletisi göster"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 913a46a67..9d7f4350f 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "ðÏËÁÚÁÔÉ ÃÀ ÄÏצÄËÕ"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ"
diff --git a/popt/po/wa.po b/popt/po/wa.po
index c0c7ef51e..297f21411 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos è siervi"
diff --git a/popt/po/zh.po b/popt/po/zh.po
index 92426ed88..192688a29 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 64932fa1d..0a7948411 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "ÏÔʾÕâÌõ°ïÖúÐÅÏ¢"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "ÏÔʾ¼ò¶ÌʹÓÃÐÅÏ¢"
diff --git a/popt/popt.c b/popt/popt.c
index d67e31373..15e3eee01 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -31,7 +31,7 @@ static char * strerror(int errno) {
 #endif
 
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
-    if (con->execPath) xfree(con->execPath);
+    if (con->execPath) free((void *)con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
 }
@@ -140,11 +140,11 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 static void cleanOSE(struct optionStackEntry *os)
 {
     if (os->nextArg) {
-	xfree(os->nextArg);
+	free((void *)os->nextArg);
 	os->nextArg = NULL;
     }
     if (os->argv) {
-	xfree(os->argv);
+	free((void *)os->argv);
 	os->argv = NULL;
     }
     if (os->argb) {
@@ -175,7 +175,7 @@ void poptResetContext(poptContext con) {
 
     for (i = 0; i < con->finalArgvCount; i++) {
 	if (con->finalArgv[i]) {
-	    xfree(con->finalArgv[i]);
+	    free((void *)con->finalArgv[i]);
 	    con->finalArgv[i] = NULL;
 	}
     }
@@ -661,7 +661,7 @@ int poptGetNextOpt(poptContext con)
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (con->os->nextArg) {
-		xfree(con->os->nextArg);
+		free((void *)con->os->nextArg);
 		con->os->nextArg = NULL;
 	    }
 	    if (longArg) {
@@ -831,22 +831,22 @@ void poptFreeContext(poptContext con) {
     if (con->os->argb) free(con->os->argb);
 
     for (i = 0; i < con->numAliases; i++) {
-	if (con->aliases[i].longName) xfree(con->aliases[i].longName);
+	if (con->aliases[i].longName) free((void *)con->aliases[i].longName);
 	free(con->aliases[i].argv);
     }
 
     for (i = 0; i < con->numExecs; i++) {
-	if (con->execs[i].longName) xfree(con->execs[i].longName);
-	xfree(con->execs[i].script);
+	if (con->execs[i].longName) free((void *)con->execs[i].longName);
+	free((void *)con->execs[i].script);
     }
-    if (con->execs) xfree(con->execs);
+    if (con->execs) free((void *)con->execs);
 
     free(con->leftovers);
     free(con->finalArgv);
-    if (con->appName) xfree(con->appName);
+    if (con->appName) free((void *)con->appName);
     if (con->aliases) free(con->aliases);
-    if (con->otherHelp) xfree(con->otherHelp);
-    if (con->execPath) xfree(con->execPath);
+    if (con->otherHelp) free((void *)con->otherHelp);
+    if (con->execPath) free((void *)con->execPath);
     if (con->arg_strip) PBM_FREE(con->arg_strip);
     
     free(con);
diff --git a/popt/popt.h b/popt/popt.h
index 5bae6793b..2bb83adf0 100644
--- a/popt/popt.h
+++ b/popt/popt.h
@@ -74,25 +74,26 @@ extern "C" {
 #define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /* options can't follow args */
 
 struct poptOption {
-    /*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
+/*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argInfo;
-    /*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
+/*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
-    /*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
-    /*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
+/*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
+/*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
 };
 
 struct poptAlias {
-    /*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
+/*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argc;
-    /*@owned@*/ const char ** argv;		/* must be free()able */
+/*@owned@*/ const char ** argv;		/* must be free()able */
 };
 
 extern struct poptOption poptHelpOptions[];
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-			0, "Help options", NULL },
+			0, "Help options:", NULL },
+#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
 
 typedef struct poptContext_s * poptContext;
 #ifndef __cplusplus
diff --git a/popt/popthelp.c b/popt/popthelp.c
index 12fb484ea..25cb79141 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -14,8 +14,9 @@
 static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
 		struct poptOption * key, 
-		/*@unused@*/ const char * arg, /*@unused@*/ void * data) {
-    if (key->shortName== '?')
+		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
+{
+    if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
     else
 	poptPrintUsage(con, stdout, 0);
@@ -26,7 +27,7 @@ struct poptOption poptHelpOptions[] = {
     { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
     { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
     { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
-    { NULL, '\0', 0, NULL, 0, NULL, NULL }
+    POPT_TABLEEND
 } ;
 
 
@@ -69,25 +70,28 @@ getArgDescrip(const struct poptOption * opt, const char *translation_domain)
 
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
 			     const struct poptOption * opt,
-			     const char *translation_domain) {
+			     const char *translation_domain)
+{
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
+    const char * argDescrip = getArgDescrip(opt, translation_domain);
     int helpLength;
-    const char * ch;
-    char format[10];
     char * left;
-    const char * argDescrip = getArgDescrip(opt, translation_domain);
 
     left = malloc(maxLeftCol + 1);
     left[0] = left[maxLeftCol] = '\0';
 
     if (opt->longName && opt->shortName)
-	snprintf(left, maxLeftCol, "-%c, --%s", opt->shortName, opt->longName);
+	snprintf(left, maxLeftCol, "-%c, %s%s", opt->shortName,
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		opt->longName);
     else if (opt->shortName) 
 	snprintf(left, maxLeftCol, "-%c", opt->shortName);
     else if (opt->longName)
-	snprintf(left, maxLeftCol, "--%s", opt->longName);
+	snprintf(left, maxLeftCol, "%s%s",
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		opt->longName);
     if (!*left) return ;
     if (argDescrip) {
 	char * le = left + strlen(left);
@@ -145,6 +149,9 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 
     helpLength = strlen(help);
     while (helpLength > lineLength) {
+	const char * ch;
+	char format[10];
+
 	ch = help + lineLength - 1;
 	while (ch > help && !isspace(*ch)) ch--;
 	if (ch == help) break;		/* give up */
@@ -165,7 +172,8 @@ out:
 }
 
 static int maxArgWidth(const struct poptOption * opt,
-		       const char * translation_domain) {
+		       const char * translation_domain)
+{
     int max = 0;
     int this;
     const char * s;
@@ -175,15 +183,19 @@ static int maxArgWidth(const struct poptOption * opt,
 	    this = maxArgWidth(opt->arg, translation_domain);
 	    if (this > max) max = this;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    this = opt->shortName ? 2 : 0;
+	    this = sizeof("  ")-1;
+	    if (opt->shortName) this += sizeof("-X")-1;
+	    if (opt->shortName && opt->longName) this += sizeof(", ")-1;
 	    if (opt->longName) {
-		if (this) this += 2;
-		this += strlen(opt->longName) + 2;
+		this += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
+			? sizeof("-")-1 : sizeof("--")-1);
+		this += strlen(opt->longName);
 	    }
 
 	    s = getArgDescrip(opt, translation_domain);
 	    if (s)
-		this += strlen(s) + 1;
+		this += sizeof("=")-1 + strlen(s);
+	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) this += sizeof("[]")-1;
 	    if (this > max) max = this;
 	}
 
@@ -195,20 +207,18 @@ static int maxArgWidth(const struct poptOption * opt,
 
 static void singleTableHelp(FILE * f, const struct poptOption * table, 
 			    int left,
-			    const char *translation_domain) {
+			    const char *translation_domain)
+{
     const struct poptOption * opt;
     const char *sub_transdom;
 
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
 	    singleOptionHelp(f, left, opt, translation_domain);
-	opt++;
     }
 
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    sub_transdom = getTableTranslationDomain(opt->arg);
 	    if(!sub_transdom)
@@ -219,18 +229,18 @@ static void singleTableHelp(FILE * f, const struct poptOption * table,
 
 	    singleTableHelp(f, opt->arg, left, sub_transdom);
 	}
-	opt++;
     }
 }
 
-static int showHelpIntro(poptContext con, FILE * f) {
+static int showHelpIntro(poptContext con, FILE * f)
+{
     int len = 6;
     const char * fn;
 
     fprintf(f, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 	fn = con->optionStack->argv[0];
-	if (strchr(fn, '/')) fn = strchr(fn, '/') + 1;
+	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
 	fprintf(f, " %s", fn);
 	len += strlen(fn) + 1;
     }
@@ -238,7 +248,8 @@ static int showHelpIntro(poptContext con, FILE * f) {
     return len;
 }
 
-void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
+void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
+{
     int leftColWidth;
 
     showHelpIntro(con, f);
@@ -253,7 +264,8 @@ void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
 
 static int singleOptionUsage(FILE * f, int cursor, 
 			     const struct poptOption * opt,
-			     const char *translation_domain) {
+			     const char *translation_domain)
+{
     int len = 3;
     char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
@@ -263,7 +275,7 @@ static int singleOptionUsage(FILE * f, int cursor,
 	if (!(opt->argInfo & POPT_ARG_MASK)) 
 	    return cursor;	/* we did these already */
 	len++;
-	*shortStr = opt->shortName;
+	shortStr[0] = opt->shortName;
 	shortStr[1] = '\0';
     } else if (opt->longName) {
 	len += 1 + strlen(opt->longName);
@@ -280,36 +292,33 @@ static int singleOptionUsage(FILE * f, int cursor,
 	cursor = 7;
     } 
 
-    fprintf(f, " [-%s%s%s%s]", opt->shortName ? "" : "-", item,
-	    argDescrip ? (opt->shortName ? " " : "=") : "",
-	    argDescrip ? argDescrip : "");
+    fprintf(f, " [-%s%s%s%s]",
+	((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
+	item,
+	(argDescrip ? (opt->shortName ? " " : "=") : ""),
+	(argDescrip ? argDescrip : ""));
 
     return cursor + len + 1;
 }
 
-static int singleTableUsage(FILE * f, int cursor, const struct poptOption * table,
-		     const char *translation_domain) {
-    const struct poptOption * opt;
-    
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+static int singleTableUsage(FILE * f, int cursor,
+	const struct poptOption * opt, const char * translation_domain)
+{
+    for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
         if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN)
 	    translation_domain = (const char *)opt->arg;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) 
-	    cursor = singleTableUsage(f, cursor, opt->arg,
-				      translation_domain);
+	    cursor = singleTableUsage(f, cursor, opt->arg, translation_domain);
 	else if ((opt->longName || opt->shortName) && 
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	  cursor = singleOptionUsage(f, cursor, opt, translation_domain);
-
-	opt++;
+	    cursor = singleOptionUsage(f, cursor, opt, translation_domain);
     }
 
     return cursor;
 }
 
-static int showShortOptions(const struct poptOption * opt, FILE * f, 
-			    char * str) {
+static int showShortOptions(const struct poptOption * opt, FILE * f, char * str)
+{
     char s[300];		/* this is larger then the ascii set, so
 				   it should do just fine */
 
@@ -319,13 +328,11 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
 	str = s;
     }
 
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
 	    str[strlen(str)] = opt->shortName;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
 	    showShortOptions(opt->arg, f, str);
-
-	opt++;
     } 
 
     if (s != str || !*s)
@@ -335,7 +342,8 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
     return strlen(s) + 4;
 }
 
-void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
+void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags)
+{
     int cursor;
 
     cursor = showHelpIntro(con, f);
@@ -352,6 +360,6 @@ void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
 }
 
 void poptSetOtherOptionHelp(poptContext con, const char * text) {
-    if (con->otherHelp) xfree(con->otherHelp);
+    if (con->otherHelp) free((void *)con->otherHelp);
     con->otherHelp = xstrdup(text);
 }
diff --git a/popt/poptint.h b/popt/poptint.h
index a37a9b925..066e14312 100644
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -27,12 +27,12 @@ typedef struct {
 
 struct optionStackEntry {
     int argc;
-    /*@only@*/ const char ** argv;
-    /*@only@*/ pbm_set * argb;
+/*@only@*/ const char ** argv;
+/*@only@*/ pbm_set * argb;
     int next;
-    /*@only@*/ const char * nextArg;
-    /*@keep@*/ const char * nextCharArg;
-    /*@dependent@*/ struct poptAlias * currAlias;
+/*@only@*/ const char * nextArg;
+/*@keep@*/ const char * nextCharArg;
+/*@dependent@*/ struct poptAlias * currAlias;
     int stuffed;
 };
 
@@ -44,30 +44,28 @@ struct execEntry {
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
-    /*@dependent@*/ struct optionStackEntry * os;
-    /*@owned@*/ const char ** leftovers;
+/*@dependent@*/ struct optionStackEntry * os;
+/*@owned@*/ const char ** leftovers;
     int numLeftovers;
     int nextLeftover;
-    /*@keep@*/ const struct poptOption * options;
+/*@keep@*/ const struct poptOption * options;
     int restLeftover;
-    /*@only@*/ const char * appName;
-    /*@only@*/ struct poptAlias * aliases;
+/*@only@*/ const char * appName;
+/*@only@*/ struct poptAlias * aliases;
     int numAliases;
     int flags;
     struct execEntry * execs;
     int numExecs;
-    /*@only@*/ const char ** finalArgv;
+/*@only@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-    /*@dependent@*/ struct execEntry * doExec;
-    /*@only@*/ const char * execPath;
+/*@dependent@*/ struct execEntry * doExec;
+/*@only@*/ const char * execPath;
     int execAbsolute;
-    /*@only@*/ const char * otherHelp;
+/*@only@*/ const char * otherHelp;
     pbm_set * arg_strip;
 };
 
-#define	xfree(_a)	free((void *)_a)
-
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
@@ -82,8 +80,8 @@ struct poptContext_s {
 #define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
-#define POPT_(foo) (foo)
 #define D_(dom, str) (str)
+#define POPT_(foo) (foo)
 #endif
 
 #define N_(foo) (foo)