--- gmanedit-0.3.3.orig/po/cat-id-tbl.c +++ gmanedit-0.3.3/po/cat-id-tbl.c @@ -94,11 +94,11 @@ {"_Search", 85}, {"_Replace", 86}, {"_Close", 87}, - {"G.P.U.L. 2000 Sergio Rua", 88}, + {"G.P.U.L. 2000-2001 Sergio Rua", 88}, {"Man Pages Editor.", 89}, {"Exit from gmanedit?", 90}, {"Preferences", 91}, - {"Command to test creted man pages: ", 92}, + {"Command to test created man pages: ", 92}, {"xterm -e man ", 93}, {"Internet browser", 94}, {"netscape", 95}, --- gmanedit-0.3.3.orig/po/gmanedit.pot +++ gmanedit-0.3.3/po/gmanedit.pot @@ -1,18 +1,20 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-09-10 13:35+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-02-04 09:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Transfer-Encoding: 8bit\n" #: src/interface.c:22 msgid "_New" @@ -262,373 +264,373 @@ msgid "_Insert" msgstr "" -#: src/interface.c:538 +#: src/interface.c:537 msgid "GNOME manpages editor" msgstr "" -#: src/interface.c:944 +#: src/interface.c:943 msgid "New" msgstr "" -#: src/interface.c:945 +#: src/interface.c:944 msgid "New page" msgstr "" -#: src/interface.c:956 +#: src/interface.c:955 msgid "Open" msgstr "" -#: src/interface.c:957 +#: src/interface.c:956 msgid "Open page" msgstr "" -#: src/interface.c:968 +#: src/interface.c:967 msgid "Save" msgstr "" -#: src/interface.c:969 +#: src/interface.c:968 msgid "Save current page" msgstr "" -#: src/interface.c:987 +#: src/interface.c:986 msgid "Cut" msgstr "" -#: src/interface.c:988 +#: src/interface.c:987 msgid "Cut selected text" msgstr "" -#: src/interface.c:999 +#: src/interface.c:998 msgid "Copy" msgstr "" -#: src/interface.c:1000 +#: src/interface.c:999 msgid "Copy selected text" msgstr "" -#: src/interface.c:1011 +#: src/interface.c:1010 msgid "Paste" msgstr "" -#: src/interface.c:1012 +#: src/interface.c:1011 msgid "Paste from clipboard" msgstr "" -#: src/interface.c:1030 src/interface.c:1330 +#: src/interface.c:1029 src/interface.c:1322 msgid "Exit" msgstr "" -#: src/interface.c:1031 +#: src/interface.c:1030 msgid "Exit from gmanedit" msgstr "" -#: src/interface.c:1103 +#: src/interface.c:1102 msgid "Select file" msgstr "" -#: src/interface.c:1137 +#: src/interface.c:1134 msgid "Saving file" msgstr "" -#: src/interface.c:1188 +#: src/interface.c:1183 msgid "Search and replace" msgstr "" -#: src/interface.c:1205 +#: src/interface.c:1200 msgid "Search: " msgstr "" -#: src/interface.c:1218 src/interface.c:1240 +#: src/interface.c:1213 src/interface.c:1235 msgid "Option not yet available" msgstr "" -#: src/interface.c:1227 +#: src/interface.c:1222 msgid "Replace with: " msgstr "" -#: src/interface.c:1251 +#: src/interface.c:1246 msgid "_Search" msgstr "" -#: src/interface.c:1263 +#: src/interface.c:1257 msgid "_Replace" msgstr "" -#: src/interface.c:1275 +#: src/interface.c:1268 msgid "_Close" msgstr "" -#: src/interface.c:1310 -msgid "G.P.U.L. 2000 Sergio Rua" +#: src/interface.c:1302 +msgid "G.P.U.L. 2000-2001 Sergio Rua" msgstr "" -#: src/interface.c:1312 +#: src/interface.c:1304 msgid "Man Pages Editor." msgstr "" -#: src/interface.c:1339 +#: src/interface.c:1331 msgid "Exit from gmanedit?" msgstr "" -#: src/interface.c:1403 +#: src/interface.c:1393 msgid "Preferences" msgstr "" -#: src/interface.c:1429 -msgid "Command to test creted man pages: " +#: src/interface.c:1419 +msgid "Command to test created man pages: " msgstr "" -#: src/interface.c:1442 +#: src/interface.c:1432 msgid "xterm -e man " msgstr "" -#: src/interface.c:1451 +#: src/interface.c:1441 msgid "Internet browser" msgstr "" -#: src/interface.c:1464 src/interface.c:1477 +#: src/interface.c:1454 src/interface.c:1467 msgid "netscape" msgstr "" -#: src/interface.c:1465 +#: src/interface.c:1455 msgid "mozilla" msgstr "" -#: src/interface.c:1466 +#: src/interface.c:1456 msgid "galeon" msgstr "" -#: src/interface.c:1467 +#: src/interface.c:1457 msgid "gnome-help-browser" msgstr "" -#: src/interface.c:1476 +#: src/interface.c:1466 msgid "Select your internet browser from this list" msgstr "" -#: src/interface.c:1479 +#: src/interface.c:1469 msgid "Use gnome-help-browser" msgstr "" -#: src/interface.c:1603 +#: src/interface.c:1591 msgid "Wizard" msgstr "" -#: src/interface.c:1626 +#: src/interface.c:1614 msgid "Welcome" msgstr "" -#: src/interface.c:1627 +#: src/interface.c:1615 msgid "" "Welcome to the Gmanedit Man Pages Wizard. \n" "Follow the next steps to build a Basic Man Page." msgstr "" -#: src/interface.c:1640 +#: src/interface.c:1628 msgid "Step 1: Basic Information" msgstr "" -#: src/interface.c:1665 +#: src/interface.c:1653 msgid "Short name to the man page (example: gmanedit)" msgstr "" -#: src/interface.c:1675 +#: src/interface.c:1663 msgid "Creation date (default today)" msgstr "" -#: src/interface.c:1685 +#: src/interface.c:1673 msgid "Long man page name or title" msgstr "" -#: src/interface.c:1695 +#: src/interface.c:1683 msgid "First_Name Last_Name " msgstr "" -#: src/interface.c:1697 +#: src/interface.c:1685 msgid "Creation Date:" msgstr "" -#: src/interface.c:1707 +#: src/interface.c:1695 msgid "Man page Title:" msgstr "" -#: src/interface.c:1717 +#: src/interface.c:1705 msgid "Author:" msgstr "" -#: src/interface.c:1727 +#: src/interface.c:1715 msgid "Man page Name:" msgstr "" -#: src/interface.c:1746 +#: src/interface.c:1734 msgid "Step 2: Section number" msgstr "" -#: src/interface.c:1763 +#: src/interface.c:1751 msgid "Section 5: File format and conventions" msgstr "" -#: src/interface.c:1773 +#: src/interface.c:1761 msgid "Section number" msgstr "" -#: src/interface.c:1782 +#: src/interface.c:1770 msgid "Section 6: Games" msgstr "" -#: src/interface.c:1792 +#: src/interface.c:1780 msgid "Section 7: Macro packages and Coventions" msgstr "" -#: src/interface.c:1802 +#: src/interface.c:1790 msgid "Section 8: System management commands" msgstr "" -#: src/interface.c:1812 +#: src/interface.c:1800 msgid "Section 9: Kernel routines" msgstr "" -#: src/interface.c:1821 +#: src/interface.c:1809 msgid "Section 4: Special files" msgstr "" -#: src/interface.c:1830 +#: src/interface.c:1818 msgid "Section 3: Library calls" msgstr "" -#: src/interface.c:1839 +#: src/interface.c:1827 msgid "Section 2: System calls" msgstr "" -#: src/interface.c:1848 +#: src/interface.c:1836 msgid "Section 1: Commands" msgstr "" -#: src/interface.c:1857 +#: src/interface.c:1845 msgid "There are 9 sections for man pages. Select one:" msgstr "" -#: src/interface.c:1875 src/interface.c:1893 +#: src/interface.c:1864 src/interface.c:1882 msgid "1" msgstr "" -#: src/interface.c:1876 +#: src/interface.c:1865 msgid "2" msgstr "" -#: src/interface.c:1877 +#: src/interface.c:1866 msgid "3" msgstr "" -#: src/interface.c:1878 +#: src/interface.c:1867 msgid "4" msgstr "" -#: src/interface.c:1879 +#: src/interface.c:1868 msgid "5" msgstr "" -#: src/interface.c:1880 +#: src/interface.c:1869 msgid "6" msgstr "" -#: src/interface.c:1881 +#: src/interface.c:1870 msgid "7" msgstr "" -#: src/interface.c:1882 +#: src/interface.c:1871 msgid "8" msgstr "" -#: src/interface.c:1883 +#: src/interface.c:1872 msgid "9" msgstr "" -#: src/interface.c:1892 +#: src/interface.c:1881 msgid "Select section number" msgstr "" -#: src/interface.c:1904 +#: src/interface.c:1893 msgid "Step 3: Man Sections" msgstr "" -#: src/interface.c:1921 +#: src/interface.c:1910 msgid "What sections would you like include?" msgstr "" -#: src/interface.c:1930 +#: src/interface.c:1919 msgid "ERROR HANDLING" msgstr "" -#: src/interface.c:1939 +#: src/interface.c:1928 msgid "ENVIRONMENT" msgstr "" -#: src/interface.c:1948 +#: src/interface.c:1937 msgid "FILES" msgstr "" -#: src/interface.c:1957 +#: src/interface.c:1946 msgid "USAGE" msgstr "" -#: src/interface.c:1966 +#: src/interface.c:1955 msgid "ERRORS" msgstr "" -#: src/interface.c:1975 +#: src/interface.c:1964 msgid "SYNOPSIS" msgstr "" -#: src/interface.c:1985 +#: src/interface.c:1974 msgid "DESCRIPTION" msgstr "" -#: src/interface.c:1995 +#: src/interface.c:1984 msgid "OPTIONS" msgstr "" -#: src/interface.c:2005 +#: src/interface.c:1994 msgid "NAME" msgstr "" -#: src/interface.c:2015 +#: src/interface.c:2004 msgid "SEE ALSO" msgstr "" -#: src/interface.c:2025 +#: src/interface.c:2014 msgid "AUTHOR" msgstr "" -#: src/interface.c:2035 +#: src/interface.c:2024 msgid "RETURN VALUES" msgstr "" -#: src/interface.c:2044 +#: src/interface.c:2033 msgid "DIAGNOSTICS" msgstr "" -#: src/interface.c:2053 +#: src/interface.c:2042 msgid "SECURITY" msgstr "" -#: src/interface.c:2062 +#: src/interface.c:2051 msgid "CONFORMING TO" msgstr "" -#: src/interface.c:2071 +#: src/interface.c:2060 msgid "NOTES" msgstr "" -#: src/interface.c:2080 +#: src/interface.c:2069 msgid "BUGS" msgstr "" -#: src/interface.c:2100 +#: src/interface.c:2089 msgid "The End" msgstr "" -#: src/interface.c:2101 +#: src/interface.c:2090 msgid "" "Thank you for using me!\n" "You can now edit the man page with\n" @@ -636,23 +638,23 @@ "text." msgstr "" -#: src/callbacks.c:100 +#: src/callbacks.c:102 msgid "New File." msgstr "" -#: src/callbacks.c:117 src/callbacks.c:1099 src/callbacks.c:1114 +#: src/callbacks.c:119 src/callbacks.c:1099 src/callbacks.c:1114 msgid "Text cutted." msgstr "" -#: src/callbacks.c:132 +#: src/callbacks.c:134 msgid "Text copied." msgstr "" -#: src/callbacks.c:148 src/callbacks.c:1130 +#: src/callbacks.c:150 src/callbacks.c:1130 msgid "Text pasted." msgstr "" -#: src/callbacks.c:156 +#: src/callbacks.c:158 msgid "" ".\\\"Created with GNOME Manpages Editor\n" ".\\\"http://gmanedit.sourceforge.net\n" @@ -687,7 +689,7 @@ ".SH AUTHOR\n" msgstr "" -#: src/callbacks.c:225 +#: src/callbacks.c:227 msgid "New file." msgstr "" @@ -759,7 +761,7 @@ msgid ".SH BUGS\n" msgstr "" -#: src/callbacks.c:528 src/callbacks.c:1367 +#: src/callbacks.c:528 src/callbacks.c:1372 msgid ".SH AUTHOR\n" msgstr "" @@ -801,51 +803,51 @@ msgid "Page preview." msgstr "" -#: src/callbacks.c:944 src/callbacks.c:1406 +#: src/callbacks.c:944 src/callbacks.c:1411 msgid "January" msgstr "" -#: src/callbacks.c:944 src/callbacks.c:1406 +#: src/callbacks.c:944 src/callbacks.c:1411 msgid "February" msgstr "" -#: src/callbacks.c:944 src/callbacks.c:1406 +#: src/callbacks.c:944 src/callbacks.c:1411 msgid "Mars" msgstr "" -#: src/callbacks.c:944 src/callbacks.c:1406 +#: src/callbacks.c:944 src/callbacks.c:1411 msgid "April" msgstr "" -#: src/callbacks.c:945 src/callbacks.c:1407 +#: src/callbacks.c:945 src/callbacks.c:1412 msgid "May" msgstr "" -#: src/callbacks.c:945 src/callbacks.c:1407 +#: src/callbacks.c:945 src/callbacks.c:1412 msgid "June" msgstr "" -#: src/callbacks.c:945 src/callbacks.c:1407 +#: src/callbacks.c:945 src/callbacks.c:1412 msgid "Jule" msgstr "" -#: src/callbacks.c:945 src/callbacks.c:1407 +#: src/callbacks.c:945 src/callbacks.c:1412 msgid "August" msgstr "" -#: src/callbacks.c:946 src/callbacks.c:1408 +#: src/callbacks.c:946 src/callbacks.c:1413 msgid "September" msgstr "" -#: src/callbacks.c:946 src/callbacks.c:1408 +#: src/callbacks.c:946 src/callbacks.c:1413 msgid "October" msgstr "" -#: src/callbacks.c:946 src/callbacks.c:1408 +#: src/callbacks.c:946 src/callbacks.c:1413 msgid "November" msgstr "" -#: src/callbacks.c:946 src/callbacks.c:1408 +#: src/callbacks.c:946 src/callbacks.c:1413 msgid "December" msgstr "" @@ -857,27 +859,27 @@ msgid "Cannot get system date!" msgstr "" -#: src/callbacks.c:1164 +#: src/callbacks.c:1169 msgid "Text selected." msgstr "" -#: src/callbacks.c:1271 +#: src/callbacks.c:1276 msgid ".SH NAME\n" msgstr "" -#: src/callbacks.c:1273 +#: src/callbacks.c:1278 msgid "" " \\-program for...\n" "\n" msgstr "" -#: src/callbacks.c:1280 +#: src/callbacks.c:1285 msgid "" ".SH SYNOPSIS\n" ".B " msgstr "" -#: src/callbacks.c:1282 +#: src/callbacks.c:1287 msgid "" "\n" ".RI [ options ]\n" @@ -885,14 +887,14 @@ "\n" msgstr "" -#: src/callbacks.c:1289 +#: src/callbacks.c:1294 msgid "" ".SH DESCRIPTION\n" "This manual page explains the\n" ".B " msgstr "" -#: src/callbacks.c:1291 +#: src/callbacks.c:1296 msgid "" "\n" "program. This program...\n" @@ -900,13 +902,13 @@ "\\fB" msgstr "" -#: src/callbacks.c:1293 +#: src/callbacks.c:1298 msgid "" "\\fP is for...\n" "\n" msgstr "" -#: src/callbacks.c:1299 +#: src/callbacks.c:1304 msgid "" ".SH OPTIONS\n" ".B\n" @@ -915,86 +917,86 @@ "\n" msgstr "" -#: src/callbacks.c:1304 +#: src/callbacks.c:1309 msgid "" ".SH USAGE\n" "\n" msgstr "" -#: src/callbacks.c:1309 +#: src/callbacks.c:1314 msgid "" ".SH FILES\n" "\n" msgstr "" -#: src/callbacks.c:1314 +#: src/callbacks.c:1319 msgid "" ".SH ENVIRONMENT\n" "\n" msgstr "" -#: src/callbacks.c:1319 +#: src/callbacks.c:1324 msgid "" ".SH DIAGNOSTICS\n" "\n" msgstr "" -#: src/callbacks.c:1324 +#: src/callbacks.c:1329 msgid "" ".SH SECURITY\n" "\n" msgstr "" -#: src/callbacks.c:1334 +#: src/callbacks.c:1339 msgid "" ".SH ERROR HANDLING\n" "\n" msgstr "" -#: src/callbacks.c:1339 +#: src/callbacks.c:1344 msgid "" ".SH ERRORS\n" "\n" msgstr "" -#: src/callbacks.c:1344 +#: src/callbacks.c:1349 msgid "" ".SH CONFORMING TO\n" "\n" msgstr "" -#: src/callbacks.c:1349 +#: src/callbacks.c:1354 msgid "" ".SH NOTES\n" "\n" msgstr "" -#: src/callbacks.c:1354 +#: src/callbacks.c:1359 msgid "" ".SH BUGS\n" "\n" msgstr "" -#: src/callbacks.c:1360 +#: src/callbacks.c:1365 msgid "" ".SH SEE ALSO\n" "\n" msgstr "" #. Insert all into gmanedit -#: src/callbacks.c:1375 +#: src/callbacks.c:1380 msgid "Wizard page created" msgstr "" -#: src/callbacks.c:1443 +#: src/callbacks.c:1450 msgid "Cannot be opened this Internet Browser" msgstr "" -#: src/callbacks.c:1476 src/callbacks.c:1506 +#: src/callbacks.c:1484 src/callbacks.c:1514 msgid "Man help." msgstr "" -#: src/callbacks.c:1525 +#: src/callbacks.c:1533 msgid "File opening." msgstr "" --- gmanedit-0.3.3.orig/po/ca.po +++ gmanedit-0.3.3/po/ca.po @@ -1,17 +1,17 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. +# Catalan translation of Gmanedit. +# Copyright (C) 2000, 2002 Free Software Foundation, Inc. +# Jordi Mallach , 2000, 2002. # msgid "" msgstr "" -"Project-Id-Version: 0.3.1\n" +"Project-Id-Version: 0.3.3\n" "POT-Creation-Date: 2000-08-23 15:12+0200\n" -"PO-Revision-Date: 2000-09-09 01:16+0200\n" +"PO-Revision-Date: 2002-06-30 03:38+0200\n" "Last-Translator: Jordi Mallach \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" #: src/interface.c:22 msgid "_New" @@ -19,7 +19,7 @@ #: src/interface.c:24 msgid "New _Wizard page" -msgstr "Nova pàgina amb _Asistent" +msgstr "Nova pàgina amb _asistent" #: src/interface.c:44 msgid "_Select All" @@ -63,7 +63,7 @@ #: src/interface.c:120 msgid "Diagnostics" -msgstr "Diagnostics" +msgstr "Diagnòstics" #: src/interface.c:127 msgid "Security" @@ -75,7 +75,7 @@ #: src/interface.c:141 msgid "Bugs" -msgstr "Errates" +msgstr "Errades" #: src/interface.c:148 msgid "Author" @@ -107,75 +107,75 @@ #: src/interface.c:208 msgid "Enable" -msgstr "Habilitar" +msgstr "Habilita" #: src/interface.c:215 msgid "Disable" -msgstr "Deshabilitar" +msgstr "Deshabilita" #: src/interface.c:227 msgid "Bold" -msgstr "" +msgstr "Negreta" #: src/interface.c:234 msgid "Bold - Roman" -msgstr "" +msgstr "Negreta - Roman" #: src/interface.c:241 msgid "Italic" -msgstr "" +msgstr "Cursiva" #: src/interface.c:248 msgid "Italic - Bold" -msgstr "" +msgstr "Cursiva - Negreta" #: src/interface.c:255 msgid "Italic - Roman" -msgstr "" +msgstr "Cursiva - Roman" #: src/interface.c:262 msgid "Roman - Bold" -msgstr "" +msgstr "Roman - Negreta" #: src/interface.c:269 msgid "Roman - Italic" -msgstr "" +msgstr "Roman - Cursiva" #: src/interface.c:276 msgid "Small - Bold" -msgstr "" +msgstr "Petita - Negreta" #: src/interface.c:283 msgid "Small" -msgstr "" +msgstr "Petita" #: src/interface.c:295 msgid "New paragraph" -msgstr "Nou paragraf" +msgstr "Nou paràgraf" #: src/interface.c:302 msgid "Paragraph start" -msgstr "Inici del paragraf" +msgstr "Inici del paràgraf" #: src/interface.c:314 msgid "Margin start" -msgstr "Inici del margen" +msgstr "Inici del marge" #: src/interface.c:315 msgid "Start a margin" -msgstr "Iniciar un margen" +msgstr "Inicia un marge" #: src/interface.c:321 msgid "Margin end" -msgstr "Final del margen" +msgstr "Final del marge" #: src/interface.c:333 msgid "A HREF" -msgstr "" +msgstr "A HREF" #: src/interface.c:340 msgid "A NAME" -msgstr "" +msgstr "A NAME" #: src/interface.c:352 msgid "Default tabs" @@ -215,7 +215,7 @@ #: src/interface.c:413 msgid "Jusitify" -msgstr "Justificar" +msgstr "Justifica" #: src/interface.c:420 msgid "Filling" @@ -227,7 +227,7 @@ #: src/interface.c:434 msgid "Paragraphs" -msgstr "Paragraf" +msgstr "Paràgraf" #: src/interface.c:441 msgid "Margin" @@ -259,11 +259,11 @@ #: src/interface.c:502 msgid "_Insert" -msgstr "_Insertar" +msgstr "_Inserta" #: src/interface.c:554 msgid "GNOME manpages editor" -msgstr "Editor de manpages de GNOME" +msgstr "Editor de pàgines de manual del GNOME" #: src/interface.c:960 msgid "New" @@ -275,47 +275,47 @@ #: src/interface.c:972 msgid "Open" -msgstr "Obrir" +msgstr "Obre" #: src/interface.c:973 msgid "Open page" -msgstr "Obrir pàgina" +msgstr "Obre pàgina" #: src/interface.c:984 msgid "Save" -msgstr "Salvar" +msgstr "Desa" #: src/interface.c:985 msgid "Save current page" -msgstr "Salvar pàgina actual" +msgstr "Desa la pàgina actual" #: src/interface.c:1003 msgid "Cut" -msgstr "Tallar" +msgstr "Talla" #: src/interface.c:1004 msgid "Cut selected text" -msgstr "Tallar texte seleccionat" +msgstr "Talla el texte seleccionat" #: src/interface.c:1015 msgid "Copy" -msgstr "Copiar" +msgstr "Copia" #: src/interface.c:1016 msgid "Copy selected text" -msgstr "Copiar texte seleccionat" +msgstr "Copia el texte seleccionat" #: src/interface.c:1027 msgid "Paste" -msgstr "Pegar" +msgstr "Engantxa" #: src/interface.c:1028 msgid "Paste from clipboard" -msgstr "Pegar des del portapapers" +msgstr "Engantxa des del portapapers" #: src/interface.c:1046 src/interface.c:1349 msgid "Exit" -msgstr "Sortir" +msgstr "Surt" #: src/interface.c:1047 msgid "Exit from gmanedit" @@ -323,19 +323,19 @@ #: src/interface.c:1122 msgid "Select file" -msgstr "Sel·leccionar fitxer" +msgstr "Seleccioneu el fitxer" #: src/interface.c:1156 msgid "Saving file" -msgstr "Salvar fixter" +msgstr "S'està desant el fixter" #: src/interface.c:1207 msgid "Search and replace" -msgstr "Buscar i reemplaçar" +msgstr "Cerca i reemplaça" #: src/interface.c:1224 msgid "Search: " -msgstr "Buscar: " +msgstr "Cerca: " #: src/interface.c:1237 src/interface.c:1259 msgid "Option not yet available" @@ -343,7 +343,7 @@ #: src/interface.c:1246 msgid "Replace with: " -msgstr "Reemplaçar amb: " +msgstr "Reemplaça amb: " #: src/interface.c:1270 msgid "_Search" @@ -351,19 +351,19 @@ #: src/interface.c:1282 msgid "_Replaze" -msgstr "_Reemplaçar" +msgstr "_Reemplaça" #: src/interface.c:1294 msgid "_Close" -msgstr "_Tancar" +msgstr "_Tanca" #: src/interface.c:1329 msgid "G.P.U.L. 2000 Sergio Rua" -msgstr "" +msgstr "G.P.U.L 2000 Sergio Rua" #: src/interface.c:1331 msgid "Man Pages Editor." -msgstr "Editor de manpages" +msgstr "Editor de pàgines de manual." #: src/interface.c:1358 msgid "Exit from gmanedit?" @@ -375,11 +375,11 @@ #: src/interface.c:1448 msgid "Command to test creted man pages: " -msgstr "Comanda per a testejar les págines creades" +msgstr "Ordre per a testejar les pàgines creades" #: src/interface.c:1461 msgid "xterm -e man " -msgstr "" +msgstr "xterm -e man " #: src/interface.c:1470 msgid "Internet browser" @@ -387,27 +387,27 @@ #: src/interface.c:1483 src/interface.c:1496 msgid "netscape" -msgstr "" +msgstr "netscape" #: src/interface.c:1484 msgid "mozilla" -msgstr "" +msgstr "mozilla" #: src/interface.c:1485 msgid "galeon" -msgstr "" +msgstr "galeon" #: src/interface.c:1486 msgid "gnome-help-browser" -msgstr "" +msgstr "gnome-help-browser" #: src/interface.c:1495 msgid "Select your internet browser from this list" -msgstr "Sel·lecciona el teu navegador de la llista" +msgstr "Sel·leccioneu el vostre navegador de la llista" #: src/interface.c:1498 msgid "Use gnome-help-browser" -msgstr "Usar gnome-help-browser" +msgstr "Utilitza gnome-help-browser" #: src/interface.c:1622 msgid "Wizard" @@ -422,8 +422,8 @@ "Welcome to the Gmanedit Man Pages Wizard. \n" "Follow the next steps to build a Basic Man Page." msgstr "" -"Benvingut al asistent de pàgines de manual\n" -"de Gmanedit. Segueix els passos per a crear\n" +"Benvinguts al asistent de pàgines de manual\n" +"de Gmanedit. Seguiu els passos per a crear\n" "una pàgina de manual bàsica." #: src/interface.c:1659 @@ -484,11 +484,11 @@ #: src/interface.c:1821 msgid "Section 8: System management commands" -msgstr "Secció 8: Comandes de manejo del sistema" +msgstr "Secció 8: Ordres del maneig del sistema" #: src/interface.c:1831 msgid "Section 9: Kernel routines" -msgstr "Secció 9: Rutines del kernel" +msgstr "Secció 9: Rutines del nucli" #: src/interface.c:1840 msgid "Section 4: Special files" @@ -496,59 +496,59 @@ #: src/interface.c:1849 msgid "Section 3: Library calls" -msgstr "Secció 3: Cridades a llibreries" +msgstr "Secció 3: Cridades a biblioteques" #: src/interface.c:1858 msgid "Section 2: System calls" -msgstr "Secció 2: Cridades al sistema" +msgstr "Secció 2: Cridades del sistema" #: src/interface.c:1867 msgid "Section 1: Commands" -msgstr "Secció 1: Comandes" +msgstr "Secció 1: Ordres" #: src/interface.c:1876 msgid "There are 9 sections for man pages. Select one:" -msgstr "Hi ha 9 seccions per a les pàgines de manual. Sel·lecciona una:" +msgstr "Hi ha 9 seccions per a les pàgines de manual. Seleccioneu una:" #: src/interface.c:1894 src/interface.c:1912 msgid "1" -msgstr "" +msgstr "1" #: src/interface.c:1895 msgid "2" -msgstr "" +msgstr "2" #: src/interface.c:1896 msgid "3" -msgstr "" +msgstr "3" #: src/interface.c:1897 msgid "4" -msgstr "" +msgstr "4" #: src/interface.c:1898 msgid "5" -msgstr "" +msgstr "5" #: src/interface.c:1899 msgid "6" -msgstr "" +msgstr "6" #: src/interface.c:1900 msgid "7" -msgstr "" +msgstr "7" #: src/interface.c:1901 msgid "8" -msgstr "" +msgstr "8" #: src/interface.c:1902 msgid "9" -msgstr "" +msgstr "9" #: src/interface.c:1911 msgid "Select section number" -msgstr "Sel·leccione un nombre de secció" +msgstr "Seleccioneu un nombre de secció" #: src/interface.c:1923 msgid "Step 3: Man Sections" @@ -556,7 +556,7 @@ #: src/interface.c:1940 msgid "What sections would you like include?" -msgstr "Quines seccions vols incloure?" +msgstr "Quines seccions voleu incloure?" #: src/interface.c:1949 msgid "ERROR HANDLING" @@ -596,7 +596,7 @@ #: src/interface.c:2034 msgid "SEE ALSO" -msgstr "VEURE TAMBÉ" +msgstr "VEGEU TAMBÉ" #: src/interface.c:2044 msgid "AUTHOR" @@ -608,7 +608,7 @@ #: src/interface.c:2063 msgid "DIAGNOSTICS" -msgstr "DIAGNOSTICS" +msgstr "DIAGNÒSTICS" #: src/interface.c:2072 msgid "SECURITY" @@ -616,7 +616,7 @@ #: src/interface.c:2081 msgid "CONFORMING TO" -msgstr "CONFORM A" +msgstr "CONFORMANT A" #: src/interface.c:2090 msgid "NOTES" @@ -624,7 +624,7 @@ #: src/interface.c:2099 msgid "BUGS" -msgstr "ERRATES" +msgstr "ERRADES" #: src/interface.c:2119 msgid "The End" @@ -637,8 +637,8 @@ "gmanedit to change and complete the\n" "text." msgstr "" -"Gracies per gastar-me!\n" -"Ara pots completar la pàgina de manual amb\n" +"Gracies per utilitzar-me!\n" +"Ara podeu editar la pàgina de manual amb\n" "gmanedit per canviar i completar el text." #: src/callbacks.c:98 @@ -655,7 +655,7 @@ #: src/callbacks.c:146 src/callbacks.c:1128 msgid "Text pasted." -msgstr "Text pegat." +msgstr "Text enganxat." #: src/callbacks.c:154 msgid "" @@ -719,7 +719,7 @@ "\n" ".SH LLICÈNCIA\n" "\n" -".SH ERRATES\n" +".SH ERRADES\n" "\n" ".SH AUTOR\n" @@ -729,11 +729,11 @@ #: src/callbacks.c:375 msgid "File saved." -msgstr "Fitxer salvat." +msgstr "Fitxer desat." #: src/callbacks.c:379 msgid "File NOT saved." -msgstr "Fitxer NO salvat." +msgstr "Fitxer NO desat." #: src/callbacks.c:392 msgid "" @@ -785,11 +785,11 @@ #: src/callbacks.c:490 msgid ".SH DIAGNOSTICS\n" -msgstr ".SH DIAGNOSTICS\n" +msgstr ".SH DIAGNÒSTICS\n" #: src/callbacks.c:499 msgid ".SH SECURITY\n" -msgstr "" +msgstr ".SH SEGURETAT\n" #: src/callbacks.c:508 msgid ".SH NOTES\n" @@ -797,7 +797,7 @@ #: src/callbacks.c:517 msgid ".SH BUGS\n" -msgstr ".SH ERRORS\n" +msgstr ".SH ERRADES\n" #: src/callbacks.c:526 src/callbacks.c:1365 msgid ".SH AUTHOR\n" @@ -901,7 +901,7 @@ #: src/callbacks.c:1162 msgid "Text selected." -msgstr "Text sel·leccionat" +msgstr "Text seleccionat" #: src/callbacks.c:1269 msgid ".SH NAME\n" @@ -1030,9 +1030,7 @@ msgid "" ".SH ERRORS\n" "\n" -msgstr "" -".SH ERRORS\n" -"\n" +msgstr ".SH ERRADES\n\n" #: src/callbacks.c:1342 msgid "" @@ -1069,7 +1067,7 @@ #. Insert all into gmanedit #: src/callbacks.c:1373 msgid "Wizard page created" -msgstr "Pàgina creada amb l'asistent" +msgstr "Pàgina de l'assistent creada" #: src/callbacks.c:1441 msgid "Cannot be opened this Internet Browser" @@ -1077,11 +1075,11 @@ #: src/callbacks.c:1474 src/callbacks.c:1506 msgid "Man help." -msgstr "Ajuda de 'man'." +msgstr "Ajuda de «man»." #: src/callbacks.c:1525 msgid "File opening." -msgstr "Obertura de fitxer." +msgstr "S'està obrint el fitxer." #: src/support.c:100 src/support.c:138 #, c-format --- gmanedit-0.3.3.orig/pixmaps/gmanedit.xpm +++ gmanedit-0.3.3/pixmaps/gmanedit.xpm @@ -1,264 +1,60 @@ /* XPM */ static char * gmanedit_xpm[] = { -"32 32 229 2", -" c None", -". c #C8AF95", -"+ c #D1BAA0", -"@ c #CFB89E", -"# c #CEB79D", -"$ c #CCB39A", -"% c #CAB198", -"& c #C8AE95", -"* c #C4AA91", -"= c #C8B097", -"- c #C0A58B", -"; c #C5AC92", -"> c #CCB49B", -", c #CEB79E", -"' c #CEB69D", -") c #CDB59B", -"! c #CBB399", -"~ c #CAB197", -"{ c #C7AE94", -"] c #C7AD94", -"^ c #E6D9C2", -"/ c #CCB69D", -"( c #AF9278", -"_ c #BEA38A", -": c #CBB299", -"< c #C9B097", -"[ c #C8AF96", -"} c #C7AD93", -"| c #AF9882", -"1 c #EADDC8", -"2 c #DCC9B2", -"3 c #A18469", -"4 c #B99E82", -"5 c #DBCB5C", -"6 c #F2EC20", -"7 c #FAF80C", -"8 c #E4D848", -"9 c #CCB586", -"0 c #C7AE95", -"a c #C1A890", -"b c #EEE3D0", -"c c #D7C3AB", -"d c #BEA68D", -"e c #997C61", -"f c #CDBD48", -"g c #F5F217", -"h c #DECF56", -"i c #D8C667", -"j c #D8C666", -"k c #F1EB23", -"l c #E5D943", -"m c #A7937E", -"n c #B0967D", -"o c #9C7F64", -"p c #A08369", -"q c #B29778", -"r c #EAE22B", -"s c #DBCA5E", -"t c #E2D54B", -"u c #F0E927", -"v c #B49A81", -"w c #A3866C", -"x c #B89D83", -"y c #C8AF90", -"z c #D9C862", -"A c #C9B08E", -"B c #E0D251", -"C c #F8F511", -"D c #AB9782", -"E c #C0A992", -"F c #AC9076", -"G c #C6AC93", -"H c #E6DB40", -"I c #F2EC21", -"J c #D5C26E", -"K c #C9AF96", -"L c #CDB69D", -"M c #7F7162", -"N c #AFA08D", -"O c #C2A990", -"P c #C5AB92", -"Q c #EAE136", -"R c #E8DE44", -"S c #CFB79E", -"T c #CCB59E", -"U c #D4BEA5", -"V c #D5BFA7", -"W c #D5C0A7", -"X c #D5BFA6", -"Y c #D4BDA5", -"Z c #BFAB95", -"` c #CDB49C", -" . c #D2BBA3", -".. c #C9B6A0", -"+. c #D5C3AD", -"@. c #E6D97B", -"#. c #FCFB0B", -"$. c #DFCDB6", -"%. c #DFCCB5", -"&. c #DDCAB2", -"*. c #DCC8B0", -"=. c #DAC6AE", -"-. c #DAC5AD", -";. c #D7C3AA", -">. c #D7C1A8", -",. c #948674", -"'. c #DDCBB5", -"). c #CAB29A", -"!. c #D5C0A8", -"~. c #E5D5BE", -"{. c #E5D5BF", -"]. c #E6D6C0", -"^. c #E9DCA5", -"/. c #FAF726", -"(. c #E5D6B5", -"_. c #E3D3BC", -":. c #E1D0B9", -"<. c #E0CEB7", -"[. c #DECBB4", -"}. c #DCC9B1", -"|. c #DBC7AF", -"1. c #C9B59F", -"2. c #E9E2D3", -"3. c #F2E9D7", -"4. c #EFE4D1", -"5. c #EDE1CD", -"6. c #ECDFCB", -"7. c #EBDEC9", -"8. c #EADDC9", -"9. c #F0E88A", -"0. c #EBDEBE", -"a. c #E9DBC5", -"b. c #E6D7C1", -"c. c #E4D4BE", -"d. c #E2D1BB", -"e. c #E1CFB8", -"f. c #DFCDB5", -"g. c #DDCAB3", -"h. c #B2A18D", -"i. c #D0CDC2", -"j. c #F6F0E1", -"k. c #F3EBDA", -"l. c #F1E8D6", -"m. c #EFE5D2", -"n. c #EEE4D0", -"o. c #EEE3CF", -"p. c #EDE2CE", -"q. c #ECE1CC", -"r. c #EADCC7", -"s. c #E8DAC4", -"t. c #E5D6BF", -"u. c #E4D4BD", -"v. c #D8C5AD", -"w. c #776C5E", -"x. c #A4A39E", -"y. c #F8F5EB", -"z. c #F8F4E6", -"A. c #F6F0E0", -"B. c #F4EDDC", -"C. c #F3EBD9", -"D. c #F1E9D7", -"E. c #F1E8D5", -"F. c #FCFB10", -"G. c #F3EB8D", -"H. c #ECE0CC", -"I. c #EADEC8", -"J. c #E8DAC5", -"K. c #E2D1BA", -"L. c #D8C6B0", -"M. c #AE9F8D", -"N. c #3B3530", -"O. c #EFEEE7", -"P. c #FBF9EF", -"Q. c #F9F6EA", -"R. c #F7F3E5", -"S. c #F6F1E1", -"T. c #F5EEDE", -"U. c #F4EDDB", -"V. c #F5EE9E", -"W. c #F1E9BF", -"X. c #EDE1CC", -"Y. c #C4B6A3", -"Z. c #5F584E", -"`. c #1D1A18", -" + c #040404", -".+ c #E1E1DE", -"++ c #FDFEF8", -"@+ c #FCFCF5", -"#+ c #FAF9EF", -"$+ c #FAF7EB", -"%+ c #F7F1E2", -"&+ c #F5EEDD", -"*+ c #F0E7D4", -"=+ c #EFE5D1", -"-+ c #DFD4C1", -";+ c #BBB1A0", -">+ c #555048", -",+ c #090808", -"'+ c #020202", -")+ c #050505", -"!+ c #C3C4C2", -"~+ c #FEFFFC", -"{+ c #FEFFFB", -"]+ c #FDFDF8", -"^+ c #FCFBF2", -"/+ c #FAF7EC", -"(+ c #EAE3D2", -"_+ c #B3AD9E", -":+ c #504C45", -"<+ c #12110F", -"[+ c #010101", -"}+ c #060606", -"|+ c #FEFEFA", -"1+ c #FCFBF3", -"2+ c #F3F0E6", -"3+ c #CFCCC1", -"4+ c #8E8B82", -"5+ c #232320", -"6+ c #030303", -"7+ c #EDEEEB", -"8+ c #F6F7F4", -"9+ c #B7B7B4", -"0+ c #6D6C68", -"a+ c #242322", -"b+ c #939492", -"c+ c #C1C2C0", -"d+ c #6F706F", -"e+ c #1D1D1D", -"f+ c #070707", -" ", -" ", -" ", -" ", -" ", -" ", -" . ", -" + @ # $ % & * ", -" = - ; > , ' ) ! ~ { ] ", -" ^ / ( _ & % ! : < [ ] } | ", -" 1 2 3 4 5 6 7 7 8 9 0 0 a ", -" b c d e f g h i j k l ] ] < m ", -" n o p q r s ] ] ] t u ] ] ] 0 ", -" v w x y z } ] A B C j ] ] 0 ] D ", -" E F * G ] ] ] H I J ] K % : ' L M ", -" N O P G ] ] ] Q R S T U V W X Y Z ", -" ` ] > ...+.@.#.$.%.&.*.=.-.;.>.,. ", -" '.).!.~.{.].^./.(._.:.<.[.}.|.-.1. ", -" 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.=.h. ", -" i.j.k.l.m.n.o.p.q.6.r.s.t.u.:.$.&.v.w. ", -" x.y.z.A.B.C.D.E.F.G.H.I.J.b.u.K.L.M.N. ", -" O.P.Q.R.S.T.U.V.W.n.X.1 a.b.Y.Z.`. + ", -" .+++@+#+$+z.%+&+C.*+=+-+;+>+,+'+)+)+ ", -" !+~+{+]+^+/+z.S.T.(+_+:+<+[+ +}+ ", -" ~+~+~+|+1+2+3+4+5+[+'+6+6+ ", -" 7+~+~+8+9+0+a+[+6+)+ + ", -" b+c+d+e+'+6+ + + ", -" +)+}+f+ ", -" ", -" ", -" ", -" "}; +"32 32 25 1", +" c None", +". c #020202", +"+ c #060606", +"@ c #1E1C1C", +"# c #A69380", +"$ c #F8F416", +"% c #F6F026", +"& c #E6DA46", +"* c #4B4741", +"= c #EAE22A", +"- c #D7C75A", +"; c #EAE236", +"> c #E2D252", +", c #F2EA8C", +"' c #696962", +") c #DAC666", +"! c #F0E8D4", +"~ c #C2AB93", +"{ c #FBF9F0", +"] c #DECE56", +"^ c #DECAB3", +"/ c #CDB89E", +"( c #957E68", +"_ c #E5D6BE", +": c #D7C6B1", +" ", +" ", +" ", +" ", +" ", +" ", +" ~ ", +" ////~/~ ", +" /~~/////~~~ ", +" _~#~~~/~~/~/# ", +" _^(~)%$$&/~~~ ", +" !:~(-%])]=&~/~# ", +" #((#=-~~~&%~~~~ ", +" ~(~~)~~/>$)~~~/# ", +" ~#~~~~~&%)~//~//( ", +" #~~~/~~&&//:/://~ ", +" /~///^&$^^^^^::/# ", +" ^~)____$__^^^^::/ ", +" !!!_!!!,_!__^^^::~ ", +" ^!!!!_!!_!_____^::' ", +" ~{!{!!!!$,!!____:~* ", +" !{{{{!!,!!_!__/*@. ", +" !{{{{{{!!!!_~*+..+ ", +" :{{{{{{{!!~*@.++ ", +" {{{{{!^(@+... ", +" {{{{/'@+++. ", +" #:'@++++ ", +" ++++ ", +" ", +" ", +" ", +" "}; --- gmanedit-0.3.3.orig/src/interface.h +++ gmanedit-0.3.3/src/interface.h @@ -1,5 +1,5 @@ /* - * NON EDITES ESTE FICHEIRO - foi xerado por Glade. + * DO NOT EDIT THIS FILE - it is generated by Glade. */ GtkWidget* create_wprincipal (void); --- gmanedit-0.3.3.orig/src/callbacks.c +++ gmanedit-0.3.3/src/callbacks.c @@ -1,4 +1,6 @@ /* + * Copyright 2000-2001: Sergio Rua + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -66,7 +68,7 @@ on_wprincipal_destroy (GtkObject *object, gpointer user_data) { - gtk_main_quit(); + //gtk_main_quit(); } void @@ -74,12 +76,12 @@ gpointer user_data) { GtkWidget *main_window; - + main_window=lookup_widget(GTK_WIDGET(button),"wprincipal"); if (exit_dialog==NULL) exit_dialog=create_exit_dialog(); - + gtk_object_set_data(GTK_OBJECT(exit_dialog),MainWindowKey,button); gtk_widget_show(exit_dialog); // gtk_main_quit(); @@ -271,7 +273,7 @@ gpointer user_data) { GtkWidget *main_window; - + main_window=lookup_widget(GTK_WIDGET(menuitem),"wprincipal"); if (save_file == NULL) @@ -279,9 +281,7 @@ gtk_object_set_data(GTK_OBJECT(save_file),MainWindowKey,menuitem); - save_as(main_window); - - gtk_widget_show(save_file); + gtk_widget_show(save_file); gdk_window_raise(save_file->window); } @@ -893,7 +893,7 @@ gtk_entry_set_text(GTK_ENTRY(obj),(gchar *)datos); } -/* Third: if it use gnome-help-browser */ +/* Third: if it use yelp */ aux=ReadConfFromFile("USE_GNOME_HELP_BROWSER"); if (aux != NULL) { @@ -1405,18 +1405,20 @@ { /* Date will be inserted into the edit box to man page date */ GtkWidget *edate; - time_t *fech; - struct tm *fecha; - gchar cad[30]; - gchar *meses[]={_("January"),_("February"),_("Mars"),_("April"), + time_t *fech; + struct tm *fecha; + gchar cad[30]; + gchar *meses[]={_("January"),_("February"),_("Mars"),_("April"), _("May"),_("June"),_("Jule"),_("August"), _("September"),_("October"),_("November"),_("December")}; - - time(fech); - fecha=localtime(fech); edate=lookup_widget(GTK_WIDGET(gnomedruidpage),"mdate"); + gtk_entry_set_text(GTK_ENTRY(edate),"Month day, year"); + return(FALSE); + + time(fech); + fecha=localtime(fech); if (fecha!=NULL) { @@ -1424,7 +1426,7 @@ gtk_entry_set_text(GTK_ENTRY(edate),cad); } - return FALSE; + return FALSE; } @@ -1471,8 +1473,9 @@ p=fork(); if (p==0) - if (execlp("gnome-help-browser","gnome-help-browser","man:man(7)",NULL) == -1) + if (execlp("yelp","yelp","man:man.7",NULL) == -1) { + printf("Warning, \"yelp\" not executed\n"); exit(0); } /* Barra de estado */ @@ -1612,3 +1615,21 @@ // waitpid (pid, NULL, NULL); return(0); } + +gboolean +on_wprincipal_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + GtkWidget *main_window; + + main_window=lookup_widget(widget,"wprincipal"); + + if (exit_dialog==NULL) + exit_dialog=create_exit_dialog(); + + gtk_object_set_data(GTK_OBJECT(exit_dialog),MainWindowKey,widget); + gtk_widget_show(exit_dialog); + return TRUE; +} + --- gmanedit-0.3.3.orig/src/interface.c +++ gmanedit-0.3.3/src/interface.c @@ -1,5 +1,5 @@ /* - * NON EDITES ESTE FICHEIRO - foi xerado por Glade. + * DO NOT EDIT THIS FILE - it is generated by Glade. */ #ifdef HAVE_CONFIG_H @@ -23,9 +23,9 @@ { GNOME_APP_UI_ITEM, N_("New _Wizard page"), NULL, - on_new_wizard_page1_activate, NULL, NULL, + (gpointer) on_new_wizard_page1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - GDK_W, GDK_CONTROL_MASK, NULL + GDK_W, (GdkModifierType) GDK_CONTROL_MASK, NULL }, GNOMEUIINFO_MENU_OPEN_ITEM (on_abrir1_activate, NULL), GNOMEUIINFO_MENU_SAVE_ITEM (on_gardar1_activate, NULL), @@ -43,9 +43,9 @@ { GNOME_APP_UI_ITEM, N_("_Select All"), NULL, - on_select_all1_activate, NULL, NULL, + (gpointer) on_select_all1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - GDK_E, GDK_CONTROL_MASK, NULL + GDK_E, (GdkModifierType) GDK_CONTROL_MASK, NULL }, GNOMEUIINFO_MENU_FIND_ITEM (on_buscar_e_reemprazar1_activate, NULL), GNOMEUIINFO_END @@ -56,129 +56,129 @@ { GNOME_APP_UI_ITEM, N_("Name"), NULL, - on_nome1_activate, NULL, NULL, + (gpointer) on_nome1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Synopsis"), NULL, - on_sinopsis1_activate, NULL, NULL, + (gpointer) on_sinopsis1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Description"), NULL, - on_descripcion1_activate, NULL, NULL, + (gpointer) on_descripcion1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Options"), NULL, - on_opcions1_activate, NULL, NULL, + (gpointer) on_opcions1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Return values"), NULL, - on_valores_retornados1_activate, NULL, NULL, + (gpointer) on_valores_retornados1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Exit status"), NULL, - on_estados_de_saida1_activate, NULL, NULL, + (gpointer) on_estados_de_saida1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Usage"), NULL, - on_uso1_activate, NULL, NULL, + (gpointer) on_uso1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("File"), NULL, - on_ficheiro1_activate, NULL, NULL, + (gpointer) on_ficheiro1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Environment"), NULL, - on_entorno1_activate, NULL, NULL, + (gpointer) on_entorno1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Diagnostics"), NULL, - on_diagnostico1_activate, NULL, NULL, + (gpointer) on_diagnostico1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Security"), NULL, - on_seguridade1_activate, NULL, NULL, + (gpointer) on_seguridade1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Notes"), NULL, - on_notas1_activate, NULL, NULL, + (gpointer) on_notas1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Bugs"), NULL, - on_bugs1_activate, NULL, NULL, + (gpointer) on_bugs1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Author"), NULL, - on_autor1_activate, NULL, NULL, + (gpointer) on_autor1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Examples"), NULL, - on_exemplos1_activate, NULL, NULL, + (gpointer) on_exemplos1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("See also"), NULL, - on_ver_tamen1_activate, NULL, NULL, + (gpointer) on_ver_tamen1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Conforming to"), NULL, - on_conforme_a1_activate, NULL, NULL, + (gpointer) on_conforme_a1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_SEPARATOR, { GNOME_APP_UI_ITEM, N_("Other"), NULL, - on_otro1_activate, NULL, NULL, + (gpointer) on_otro1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -188,16 +188,16 @@ { GNOME_APP_UI_ITEM, N_("Left"), NULL, - on_xustificacion_a_esquerda1_activate, NULL, NULL, + (gpointer) on_xustificacion_a_esquerda1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - GDK_L, GDK_CONTROL_MASK, NULL + GDK_L, (GdkModifierType) GDK_CONTROL_MASK, NULL }, { GNOME_APP_UI_ITEM, N_("Both"), NULL, - on_ambas1_activate, NULL, NULL, + (gpointer) on_ambas1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -207,16 +207,16 @@ { GNOME_APP_UI_ITEM, N_("Enable"), NULL, - on_activar1_activate, NULL, NULL, + (gpointer) on_activar1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Disable"), NULL, - on_desactivar1_activate, NULL, NULL, + (gpointer) on_desactivar1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -226,65 +226,65 @@ { GNOME_APP_UI_ITEM, N_("Bold"), NULL, - on_bold1_activate, NULL, NULL, + (gpointer) on_bold1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Bold - Roman"), NULL, - on_bold_roman1_activate, NULL, NULL, + (gpointer) on_bold_roman1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Italic"), NULL, - on_italica1_activate, NULL, NULL, + (gpointer) on_italica1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Italic - Bold"), NULL, - on_italica_bold1_activate, NULL, NULL, + (gpointer) on_italica_bold1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Italic - Roman"), NULL, - on_italica_roman1_activate, NULL, NULL, + (gpointer) on_italica_roman1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Roman - Bold"), NULL, - on_roman_bold1_activate, NULL, NULL, + (gpointer) on_roman_bold1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Roman - Italic"), NULL, - on_roman_italic1_activate, NULL, NULL, + (gpointer) on_roman_italic1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Small - Bold"), NULL, - on_small_bold1_activate, NULL, NULL, + (gpointer) on_small_bold1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Small"), NULL, - on_small1_activate, NULL, NULL, + (gpointer) on_small1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -294,16 +294,16 @@ { GNOME_APP_UI_ITEM, N_("New paragraph"), NULL, - on_novo_parrafo1_activate, NULL, NULL, + (gpointer) on_novo_parrafo1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Paragraph start"), NULL, - on_comezo_parrafo1_activate, NULL, NULL, + (gpointer) on_comezo_parrafo1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -313,16 +313,16 @@ { GNOME_APP_UI_ITEM, N_("Margin start"), N_("Start a margin"), - on_comezo_marxen1_activate, NULL, NULL, + (gpointer) on_comezo_marxen1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Margin end"), NULL, - on_finaliza_marxen1_activate, NULL, NULL, + (gpointer) on_finaliza_marxen1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -332,16 +332,16 @@ { GNOME_APP_UI_ITEM, N_("A HREF"), NULL, - on_a_href1_activate, NULL, NULL, + (gpointer) on_a_href1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("A NAME"), NULL, - on_a_name1_activate, NULL, NULL, + (gpointer) on_a_name1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -351,30 +351,30 @@ { GNOME_APP_UI_ITEM, N_("Default tabs"), NULL, - on_tabulador_por_defecto1_activate, NULL, NULL, + (gpointer) on_tabulador_por_defecto1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Subheader"), N_("Like .SH"), - on_subcabeceira1_activate, NULL, NULL, + (gpointer) on_subcabeceira1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Empty lines"), NULL, - on_lineas_en_branco1_activate, NULL, NULL, + (gpointer) on_lineas_en_branco1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Comments"), NULL, - on_comments1_activate, NULL, NULL, + (gpointer) on_comments1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -384,79 +384,79 @@ { GNOME_APP_UI_ITEM, N_("Basic page"), NULL, - on_pagina_base1_activate, NULL, NULL, + (gpointer) on_pagina_base1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Title"), NULL, - on_titulo_activate, NULL, NULL, + (gpointer) on_titulo_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Date"), NULL, - on_data1_activate, NULL, NULL, + (gpointer) on_data1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Section"), NULL, seccion1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Justify"), NULL, justificacion_esquerda1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Filling"), NULL, recheo1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Font"), NULL, fonte1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Paragraphs"), NULL, parrafos1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Margin"), NULL, marxen1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Hypertext"), N_("Not available"), hypertext1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_SUBTREE, N_("Others"), NULL, outros1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_END }; @@ -466,9 +466,9 @@ { GNOME_APP_UI_ITEM, N_("Created page"), NULL, - on_paxina_creada1_activate, NULL, NULL, + (gpointer) on_paxina_creada1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_MENU_PREFERENCES_ITEM (on_opcions_programa1_activate, NULL), GNOMEUIINFO_END @@ -479,16 +479,16 @@ { GNOME_APP_UI_ITEM, N_("H_elp"), NULL, - on_help1_activate, NULL, NULL, + (gpointer) on_help1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("_Home Page"), NULL, - on_home_page1_activate, NULL, NULL, + (gpointer) on_home_page1_activate, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_MENU_ABOUT_ITEM (on_about2_activate, NULL), GNOMEUIINFO_END @@ -503,14 +503,13 @@ NULL, insertar1_menu_uiinfo, NULL, NULL, GNOME_APP_PIXMAP_NONE, NULL, - 0, 0, NULL + 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_MENU_VIEW_TREE (ver1_menu_uiinfo), GNOMEUIINFO_MENU_HELP_TREE (separator2_menu_uiinfo), GNOMEUIINFO_END }; - GtkWidget* create_wprincipal (void) { @@ -1107,12 +1106,10 @@ ok_button1 = GTK_FILE_SELECTION (fileselection)->ok_button; gtk_object_set_data (GTK_OBJECT (fileselection), "ok_button1", ok_button1); gtk_widget_show (ok_button1); - GTK_WIDGET_SET_FLAGS (ok_button1, GTK_CAN_DEFAULT); cancel_button1 = GTK_FILE_SELECTION (fileselection)->cancel_button; gtk_object_set_data (GTK_OBJECT (fileselection), "cancel_button1", cancel_button1); gtk_widget_show (cancel_button1); - GTK_WIDGET_SET_FLAGS (cancel_button1, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (fileselection), "destroy", GTK_SIGNAL_FUNC (on_fileselection_destroy), @@ -1141,12 +1138,10 @@ ok_button2 = GTK_FILE_SELECTION (save_file)->ok_button; gtk_object_set_data (GTK_OBJECT (save_file), "ok_button2", ok_button2); gtk_widget_show (ok_button2); - GTK_WIDGET_SET_FLAGS (ok_button2, GTK_CAN_DEFAULT); cancel_button2 = GTK_FILE_SELECTION (save_file)->cancel_button; gtk_object_set_data (GTK_OBJECT (save_file), "cancel_button2", cancel_button2); gtk_widget_show (cancel_button2); - GTK_WIDGET_SET_FLAGS (cancel_button2, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (save_file), "destroy", GTK_SIGNAL_FUNC (on_save_file_destroy), @@ -1250,37 +1245,34 @@ bbuscar_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (bbuscar)->child), _("_Search")); gtk_widget_add_accelerator (bbuscar, "clicked", accel_group, - bbuscar_key, GDK_MOD1_MASK, 0); + bbuscar_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_widget_ref (bbuscar); gtk_object_set_data_full (GTK_OBJECT (wbuscar), "bbuscar", bbuscar, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (bbuscar); gtk_container_add (GTK_CONTAINER (hbuttonbox1), bbuscar); - GTK_WIDGET_SET_FLAGS (bbuscar, GTK_CAN_DEFAULT); breemprazar = gtk_button_new_with_label (""); breemprazar_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (breemprazar)->child), _("_Replace")); gtk_widget_add_accelerator (breemprazar, "clicked", accel_group, - breemprazar_key, GDK_MOD1_MASK, 0); + breemprazar_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_widget_ref (breemprazar); gtk_object_set_data_full (GTK_OBJECT (wbuscar), "breemprazar", breemprazar, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (breemprazar); gtk_container_add (GTK_CONTAINER (hbuttonbox1), breemprazar); - GTK_WIDGET_SET_FLAGS (breemprazar, GTK_CAN_DEFAULT); bpechar = gtk_button_new_with_label (""); bpechar_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (bpechar)->child), _("_Close")); gtk_widget_add_accelerator (bpechar, "clicked", accel_group, - bpechar_key, GDK_MOD1_MASK, 0); + bpechar_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_widget_ref (bpechar); gtk_object_set_data_full (GTK_OBJECT (wbuscar), "bpechar", bpechar, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (bpechar); gtk_container_add (GTK_CONTAINER (hbuttonbox1), bpechar); - GTK_WIDGET_SET_FLAGS (bpechar, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (bbuscar), "clicked", GTK_SIGNAL_FUNC (on_bbuscar_clicked), @@ -1307,7 +1299,7 @@ GtkWidget *about; about = gnome_about_new ("Gmanedit", VERSION, - _("G.P.U.L. 2000 Sergio Rua"), + _("G.P.U.L. 2000-2001 Sergio Rua"), authors, _("Man Pages Editor."), NULL); @@ -1350,20 +1342,18 @@ gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area1), 8); gnome_dialog_append_button (GNOME_DIALOG (exit_dialog), GNOME_STOCK_BUTTON_YES); - bdialog_yes = g_list_last (GNOME_DIALOG (exit_dialog)->buttons)->data; + bdialog_yes = GTK_WIDGET (g_list_last (GNOME_DIALOG (exit_dialog)->buttons)->data); gtk_widget_ref (bdialog_yes); gtk_object_set_data_full (GTK_OBJECT (exit_dialog), "bdialog_yes", bdialog_yes, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (bdialog_yes); - GTK_WIDGET_SET_FLAGS (bdialog_yes, GTK_CAN_DEFAULT); gnome_dialog_append_button (GNOME_DIALOG (exit_dialog), GNOME_STOCK_BUTTON_NO); - bdialog_no = g_list_last (GNOME_DIALOG (exit_dialog)->buttons)->data; + bdialog_no = GTK_WIDGET (g_list_last (GNOME_DIALOG (exit_dialog)->buttons)->data); gtk_widget_ref (bdialog_no); gtk_object_set_data_full (GTK_OBJECT (exit_dialog), "bdialog_no", bdialog_no, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (bdialog_no); - GTK_WIDGET_SET_FLAGS (bdialog_no, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (bdialog_yes), "clicked", GTK_SIGNAL_FUNC (on_bdialog_yes_clicked), @@ -1426,7 +1416,7 @@ gtk_widget_show (hbox3); gtk_box_pack_start (GTK_BOX (vbox4), hbox3, TRUE, TRUE, 0); - label4 = gtk_label_new (_("Command to test creted man pages: ")); + label4 = gtk_label_new (_("Command to test created man pages: ")); gtk_widget_ref (label4); gtk_object_set_data_full (GTK_OBJECT (wpreferences), "label4", label4, (GtkDestroyNotify) gtk_widget_unref); @@ -1461,10 +1451,12 @@ (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (combo2); gtk_box_pack_start (GTK_BOX (hbox4), combo2, TRUE, TRUE, 0); - combo2_items = g_list_append (combo2_items, _("netscape")); - combo2_items = g_list_append (combo2_items, _("mozilla")); - combo2_items = g_list_append (combo2_items, _("galeon")); - combo2_items = g_list_append (combo2_items, _("gnome-help-browser")); + combo2_items = g_list_append (combo2_items, (gpointer) _("netscape")); + combo2_items = g_list_append (combo2_items, (gpointer) _("mozilla")); + combo2_items = g_list_append (combo2_items, (gpointer) _("galeon")); + combo2_items = g_list_append (combo2_items, (gpointer) _("yelp")); + combo2_items = g_list_append (combo2_items, (gpointer) _("konqueror")); + combo2_items = g_list_append (combo2_items, (gpointer) _("nautilus")); gtk_combo_set_popdown_strings (GTK_COMBO (combo2), combo2_items); g_list_free (combo2_items); @@ -1476,7 +1468,7 @@ gtk_tooltips_set_tip (tooltips, cbinet, _("Select your internet browser from this list"), NULL); gtk_entry_set_text (GTK_ENTRY (cbinet), _("netscape")); - chgnome_help = gtk_check_button_new_with_label (_("Use gnome-help-browser")); + chgnome_help = gtk_check_button_new_with_label (_("Use yelp")); gtk_widget_ref (chgnome_help); gtk_object_set_data_full (GTK_OBJECT (wpreferences), "chgnome_help", chgnome_help, (GtkDestroyNotify) gtk_widget_unref); @@ -1496,7 +1488,6 @@ (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (bpok); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bpok); - GTK_WIDGET_SET_FLAGS (bpok, GTK_CAN_DEFAULT); bpcancel = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL); gtk_widget_ref (bpcancel); @@ -1504,7 +1495,6 @@ (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (bpcancel); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bpcancel); - GTK_WIDGET_SET_FLAGS (bpcancel, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (chgnome_help), "toggled", GTK_SIGNAL_FUNC (on_chgnome_help_toggled), @@ -1659,7 +1649,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "mname", mname, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (mname); - gtk_fixed_put (GTK_FIXED (fixed1), mname, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), mname, 248, 24); gtk_widget_set_uposition (mname, 248, 24); gtk_widget_set_usize (mname, 158, 26); gtk_tooltips_set_tip (tooltips, mname, _("Short name to the man page (example: gmanedit)"), NULL); @@ -1669,7 +1659,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "mdate", mdate, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (mdate); - gtk_fixed_put (GTK_FIXED (fixed1), mdate, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), mdate, 248, 80); gtk_widget_set_uposition (mdate, 248, 80); gtk_widget_set_usize (mdate, 158, 26); gtk_tooltips_set_tip (tooltips, mdate, _("Creation date (default today)"), NULL); @@ -1679,7 +1669,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "mtitle", mtitle, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (mtitle); - gtk_fixed_put (GTK_FIXED (fixed1), mtitle, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), mtitle, 248, 136); gtk_widget_set_uposition (mtitle, 248, 136); gtk_widget_set_usize (mtitle, 158, 26); gtk_tooltips_set_tip (tooltips, mtitle, _("Long man page name or title"), NULL); @@ -1689,7 +1679,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "mauthor", mauthor, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (mauthor); - gtk_fixed_put (GTK_FIXED (fixed1), mauthor, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), mauthor, 248, 192); gtk_widget_set_uposition (mauthor, 248, 192); gtk_widget_set_usize (mauthor, 158, 26); gtk_tooltips_set_tip (tooltips, mauthor, _("First_Name Last_Name "), NULL); @@ -1699,7 +1689,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label14", label14, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label14); - gtk_fixed_put (GTK_FIXED (fixed1), label14, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), label14, 64, 80); gtk_widget_set_uposition (label14, 64, 80); gtk_widget_set_usize (label14, 176, 24); gtk_label_set_line_wrap (GTK_LABEL (label14), TRUE); @@ -1709,7 +1699,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label15", label15, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label15); - gtk_fixed_put (GTK_FIXED (fixed1), label15, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), label15, 64, 136); gtk_widget_set_uposition (label15, 64, 136); gtk_widget_set_usize (label15, 176, 24); gtk_label_set_line_wrap (GTK_LABEL (label15), TRUE); @@ -1719,7 +1709,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label16", label16, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label16); - gtk_fixed_put (GTK_FIXED (fixed1), label16, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), label16, 64, 192); gtk_widget_set_uposition (label16, 64, 192); gtk_widget_set_usize (label16, 120, 24); gtk_label_set_line_wrap (GTK_LABEL (label16), TRUE); @@ -1729,7 +1719,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label1", label1, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1); - gtk_fixed_put (GTK_FIXED (fixed1), label1, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed1), label1, 64, 24); gtk_widget_set_uposition (label1, 64, 24); gtk_widget_set_usize (label1, 184, 24); gtk_label_set_line_wrap (GTK_LABEL (label1), TRUE); @@ -1765,7 +1755,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label8", label8, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label8); - gtk_fixed_put (GTK_FIXED (fixed2), label8, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label8, 32, 136); gtk_widget_set_uposition (label8, 32, 136); gtk_widget_set_usize (label8, 224, 40); gtk_label_set_line_wrap (GTK_LABEL (label8), TRUE); @@ -1775,7 +1765,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label2", label2, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label2); - gtk_fixed_put (GTK_FIXED (fixed2), label2, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label2, 56, 208); gtk_widget_set_uposition (label2, 56, 208); gtk_widget_set_usize (label2, 144, 24); @@ -1784,7 +1774,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label9", label9, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label9); - gtk_fixed_put (GTK_FIXED (fixed2), label9, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label9, 264, 40); gtk_widget_set_uposition (label9, 264, 40); gtk_widget_set_usize (label9, 184, 24); gtk_label_set_line_wrap (GTK_LABEL (label9), TRUE); @@ -1794,7 +1784,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label10", label10, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label10); - gtk_fixed_put (GTK_FIXED (fixed2), label10, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label10, 264, 64); gtk_widget_set_uposition (label10, 264, 64); gtk_widget_set_usize (label10, 240, 40); gtk_label_set_line_wrap (GTK_LABEL (label10), TRUE); @@ -1804,7 +1794,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label11", label11, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label11); - gtk_fixed_put (GTK_FIXED (fixed2), label11, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label11, 264, 104); gtk_widget_set_uposition (label11, 264, 104); gtk_widget_set_usize (label11, 240, 40); gtk_label_set_line_wrap (GTK_LABEL (label11), TRUE); @@ -1814,7 +1804,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label12", label12, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label12); - gtk_fixed_put (GTK_FIXED (fixed2), label12, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label12, 264, 152); gtk_widget_set_uposition (label12, 264, 152); gtk_widget_set_usize (label12, 240, 24); @@ -1823,7 +1813,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label7", label7, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label7); - gtk_fixed_put (GTK_FIXED (fixed2), label7, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label7, 0, 112); gtk_widget_set_uposition (label7, 0, 112); gtk_widget_set_usize (label7, 232, 24); @@ -1832,7 +1822,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label6", label6, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label6); - gtk_fixed_put (GTK_FIXED (fixed2), label6, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label6, 0, 88); gtk_widget_set_uposition (label6, 0, 88); gtk_widget_set_usize (label6, 232, 24); @@ -1841,7 +1831,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label5", label5, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label5); - gtk_fixed_put (GTK_FIXED (fixed2), label5, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label5, 0, 64); gtk_widget_set_uposition (label5, 0, 64); gtk_widget_set_usize (label5, 240, 24); @@ -1850,7 +1840,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label4", label4, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label4); - gtk_fixed_put (GTK_FIXED (fixed2), label4, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label4, 0, 40); gtk_widget_set_uposition (label4, 0, 40); gtk_widget_set_usize (label4, 232, 24); @@ -1859,7 +1849,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label3", label3, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label3); - gtk_fixed_put (GTK_FIXED (fixed2), label3, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), label3, 0, 16); gtk_widget_set_uposition (label3, 0, 16); gtk_widget_set_usize (label3, 504, 16); @@ -1868,19 +1858,20 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "combo1", combo1, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (combo1); - gtk_fixed_put (GTK_FIXED (fixed2), combo1, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed2), combo1, 240, 208); gtk_widget_set_uposition (combo1, 240, 208); gtk_widget_set_usize (combo1, 175, 26); + GTK_WIDGET_SET_FLAGS (combo1, GTK_CAN_FOCUS); gtk_combo_set_value_in_list (GTK_COMBO (combo1), TRUE, FALSE); - combo1_items = g_list_append (combo1_items, _("1")); - combo1_items = g_list_append (combo1_items, _("2")); - combo1_items = g_list_append (combo1_items, _("3")); - combo1_items = g_list_append (combo1_items, _("4")); - combo1_items = g_list_append (combo1_items, _("5")); - combo1_items = g_list_append (combo1_items, _("6")); - combo1_items = g_list_append (combo1_items, _("7")); - combo1_items = g_list_append (combo1_items, _("8")); - combo1_items = g_list_append (combo1_items, _("9")); + combo1_items = g_list_append (combo1_items, (gpointer) _("1")); + combo1_items = g_list_append (combo1_items, (gpointer) _("2")); + combo1_items = g_list_append (combo1_items, (gpointer) _("3")); + combo1_items = g_list_append (combo1_items, (gpointer) _("4")); + combo1_items = g_list_append (combo1_items, (gpointer) _("5")); + combo1_items = g_list_append (combo1_items, (gpointer) _("6")); + combo1_items = g_list_append (combo1_items, (gpointer) _("7")); + combo1_items = g_list_append (combo1_items, (gpointer) _("8")); + combo1_items = g_list_append (combo1_items, (gpointer) _("9")); gtk_combo_set_popdown_strings (GTK_COMBO (combo1), combo1_items); g_list_free (combo1_items); @@ -1923,7 +1914,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "label13", label13, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label13); - gtk_fixed_put (GTK_FIXED (fixed3), label13, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), label13, 64, 16); gtk_widget_set_uposition (label13, 64, 16); gtk_widget_set_usize (label13, 344, 24); @@ -1932,7 +1923,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "cherrorh", cherrorh, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (cherrorh); - gtk_fixed_put (GTK_FIXED (fixed3), cherrorh, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), cherrorh, 16, 184); gtk_widget_set_uposition (cherrorh, 16, 184); gtk_widget_set_usize (cherrorh, 176, 24); @@ -1941,7 +1932,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chenvironment", chenvironment, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chenvironment); - gtk_fixed_put (GTK_FIXED (fixed3), chenvironment, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chenvironment, 192, 184); gtk_widget_set_uposition (chenvironment, 192, 184); gtk_widget_set_usize (chenvironment, 152, 24); @@ -1950,7 +1941,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chfiles", chfiles, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chfiles); - gtk_fixed_put (GTK_FIXED (fixed3), chfiles, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chfiles, 192, 152); gtk_widget_set_uposition (chfiles, 192, 152); gtk_widget_set_usize (chfiles, 121, 28); @@ -1959,7 +1950,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chusage", chusage, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chusage); - gtk_fixed_put (GTK_FIXED (fixed3), chusage, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chusage, 192, 120); gtk_widget_set_uposition (chusage, 192, 120); gtk_widget_set_usize (chusage, 121, 28); @@ -1968,7 +1959,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "cherrors", cherrors, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (cherrors); - gtk_fixed_put (GTK_FIXED (fixed3), cherrors, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), cherrors, 192, 56); gtk_widget_set_uposition (cherrors, 192, 56); gtk_widget_set_usize (cherrors, 121, 28); @@ -1977,7 +1968,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chsynopsis", chsynopsis, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chsynopsis); - gtk_fixed_put (GTK_FIXED (fixed3), chsynopsis, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chsynopsis, 16, 88); gtk_widget_set_uposition (chsynopsis, 16, 88); gtk_widget_set_usize (chsynopsis, 121, 28); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chsynopsis), TRUE); @@ -1987,7 +1978,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chdescription", chdescription, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chdescription); - gtk_fixed_put (GTK_FIXED (fixed3), chdescription, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chdescription, 16, 120); gtk_widget_set_uposition (chdescription, 16, 120); gtk_widget_set_usize (chdescription, 136, 24); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chdescription), TRUE); @@ -1997,7 +1988,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "choptions", choptions, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (choptions); - gtk_fixed_put (GTK_FIXED (fixed3), choptions, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), choptions, 192, 88); gtk_widget_set_uposition (choptions, 192, 88); gtk_widget_set_usize (choptions, 121, 28); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (choptions), TRUE); @@ -2007,7 +1998,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chname", chname, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chname); - gtk_fixed_put (GTK_FIXED (fixed3), chname, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chname, 16, 56); gtk_widget_set_uposition (chname, 16, 56); gtk_widget_set_usize (chname, 121, 28); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chname), TRUE); @@ -2017,7 +2008,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chseealso", chseealso, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chseealso); - gtk_fixed_put (GTK_FIXED (fixed3), chseealso, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chseealso, 112, 208); gtk_widget_set_uposition (chseealso, 112, 208); gtk_widget_set_usize (chseealso, 121, 28); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chseealso), TRUE); @@ -2027,7 +2018,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chauthor", chauthor, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chauthor); - gtk_fixed_put (GTK_FIXED (fixed3), chauthor, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chauthor, 272, 208); gtk_widget_set_uposition (chauthor, 272, 208); gtk_widget_set_usize (chauthor, 121, 28); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chauthor), TRUE); @@ -2037,7 +2028,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chreturnvalues", chreturnvalues, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chreturnvalues); - gtk_fixed_put (GTK_FIXED (fixed3), chreturnvalues, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chreturnvalues, 16, 152); gtk_widget_set_uposition (chreturnvalues, 16, 152); gtk_widget_set_usize (chreturnvalues, 160, 32); @@ -2046,7 +2037,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chdiagnostics", chdiagnostics, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chdiagnostics); - gtk_fixed_put (GTK_FIXED (fixed3), chdiagnostics, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chdiagnostics, 336, 56); gtk_widget_set_uposition (chdiagnostics, 336, 56); gtk_widget_set_usize (chdiagnostics, 144, 24); @@ -2055,7 +2046,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chsecurity", chsecurity, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chsecurity); - gtk_fixed_put (GTK_FIXED (fixed3), chsecurity, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chsecurity, 336, 88); gtk_widget_set_uposition (chsecurity, 336, 88); gtk_widget_set_usize (chsecurity, 121, 28); @@ -2064,7 +2055,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chconformingto", chconformingto, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chconformingto); - gtk_fixed_put (GTK_FIXED (fixed3), chconformingto, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chconformingto, 336, 120); gtk_widget_set_uposition (chconformingto, 336, 120); gtk_widget_set_usize (chconformingto, 168, 32); @@ -2073,7 +2064,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chnotes", chnotes, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chnotes); - gtk_fixed_put (GTK_FIXED (fixed3), chnotes, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chnotes, 336, 152); gtk_widget_set_uposition (chnotes, 336, 152); gtk_widget_set_usize (chnotes, 121, 28); @@ -2082,7 +2073,7 @@ gtk_object_set_data_full (GTK_OBJECT (wizard), "chbugs", chbugs, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (chbugs); - gtk_fixed_put (GTK_FIXED (fixed3), chbugs, -1, -1); + gtk_fixed_put (GTK_FIXED (fixed3), chbugs, 336, 184); gtk_widget_set_uposition (chbugs, 336, 184); gtk_widget_set_usize (chbugs, 121, 28); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chbugs), TRUE); @@ -2121,8 +2112,6 @@ GTK_SIGNAL_FUNC (on_dthe_end_finish), NULL); - gtk_widget_grab_focus (mname); - gtk_widget_grab_default (mname); gtk_object_set_data (GTK_OBJECT (wizard), "tooltips", tooltips); return wizard; --- gmanedit-0.3.3.orig/src/main.c +++ gmanedit-0.3.3/src/main.c @@ -1,4 +1,6 @@ /* + * Copyright 2000-2001 Sergio Rua + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or --- gmanedit-0.3.3.orig/src/support.c +++ gmanedit-0.3.3/src/support.c @@ -1,5 +1,5 @@ /* - * NON EDITES ESTE FICHEIRO - foi xerado por Glade. + * DO NOT EDIT THIS FILE - it is generated by Glade. */ #ifdef HAVE_CONFIG_H --- gmanedit-0.3.3.orig/src/support.h +++ gmanedit-0.3.3/src/support.h @@ -1,5 +1,5 @@ /* - * NON EDITES ESTE FICHEIRO - foi xerado por Glade. + * DO NOT EDIT THIS FILE - it is generated by Glade. */ #include --- gmanedit-0.3.3.orig/debian/changelog +++ gmanedit-0.3.3/debian/changelog @@ -1,5 +1,92 @@ +gmanedit (0.3.3-12.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove Recommends: on non-existent gnome-help package (closes: #240565). + + -- Steve Langasek Sun, 2 May 2004 18:07:28 -0500 + +gmanedit (0.3.3-12) unstable; urgency=low + + * Replaced gnome-help by yelp. Closes: #229248 + * Updated config.* files + + -- Sergio Rua Wed, 4 Feb 2004 09:36:22 +0000 + +gmanedit (0.3.3-11) unstable; urgency=low + + * Moved package to section gnome + * Rebuilded with the latest gnome libraries + + -- Sergio Rua Thu, 1 May 2003 10:29:47 +0100 + +gmanedit (0.3.3-10) unstable; urgency=low + + * Missing zlib on BuildDepends + + -- Sergio Rua Sat, 30 Nov 2002 12:48:31 +0000 + +gmanedit (0.3.3-9) unstable; urgency=low + + * Changed dependency from automake to automake1.4. Closes: #166385 + + -- Sergio Rua Wed, 6 Nov 2002 11:36:41 +0000 + +gmanedit (0.3.3-8) unstable; urgency=low + + * Updated Català translation + + -- Sergio Rua Sun, 30 Jun 2002 12:34:09 +0200 + +gmanedit (0.3.3-7.1) unstable; urgency=low + + * Non-Maintainer Upload, approved by Sergio. + * debian/control: + + added Build-Depends on debhelper. + + Standards-Version: 3.1.1 (we declare Build-Depends). + * debian/rules: clean up debian/ cruft as well as config.{cache,log} + in the upstream tarball (closes: #103777). + + -- Jordi Mallach Wed, 11 Jul 2001 18:55:16 +0200 + +gmanedit (0.3.3-7) unstable; urgency=low + + * Resolved minor bug: "created" was writed "creted". + + -- Sergio Rua Tue, 26 Jun 2001 16:18:54 +0200 + +gmanedit (0.3.3-6) unstable; urgency=low + + * Removed libgtk-dev from Build-Deps + + -- Sergio Rua Wed, 23 May 2001 09:23:24 +0200 + +gmanedit (0.3.3-5) unstable; urgency=low + + * Solved bug on a date function. This fuctions is now commented. + + -- Sergio Rua Tue, 22 May 2001 12:24:15 +0200 + +gmanedit (0.3.3-4) unstable; urgency=low + + * Added 'Build-Depends' entry on control file + + -- Sergio Rua Thu, 8 Feb 2001 17:47:36 +0100 + +gmanedit (0.3.3-3) unstable; urgency=low + + * Recompiled without helix dependencies + + -- Sergio Rua Wed, 10 Sep 2000 13:15:01 +0200 + +gmanedit (0.3.3-2) unstable; urgency=low + + * Deleted Debian icon because exceed maximun number of colors + + -- Sergio Rua Wed, 10 Sep 2000 13:15:01 +0200 + gmanedit (0.3.3-1) unstable; urgency=low + * New upstream release * Deleted symbolic links generated by autoconf * Changed Debian menu icon * Changed installion dir from /usr/X11R6/bin to /usr/bin --- gmanedit-0.3.3.orig/debian/control +++ gmanedit-0.3.3/debian/control @@ -1,13 +1,13 @@ Source: gmanedit -Section: editors +Section: gnome Priority: optional +Build-Depends: libgnome-dev (>=1.4.2-16), gettext (>=0.10.35), autoconf, automake1.7, debhelper, zlib1g-dev Maintainer: Sergio Rua -Standards-Version: 3.0.1 +Standards-Version: 3.1.1 Package: gmanedit Architecture: any Depends: ${shlibs:Depends} -Recommends: gnome-help (>=1.2) Description: GTK+/GNOME Man pages editor GNOME Manpages Editor is an editor for man pages that runs on X with GTK. . --- gmanedit-0.3.3.orig/debian/gmanedit.menu +++ gmanedit-0.3.3/debian/gmanedit.menu @@ -1,3 +1,3 @@ ?package(gmanedit):needs=X11 section=Apps/Editors\ - title="gmanedit" command="/usr/X11R6/bin/gmanedit"\ + title="gmanedit" command="/usr/bin/gmanedit"\ icon="/usr/share/pixmaps/gmanedit/gmanedit.xpm" --- gmanedit-0.3.3.orig/debian/rules +++ gmanedit-0.3.3/debian/rules @@ -25,6 +25,9 @@ # Add here commands to clean up after the build process. -$(MAKE) distclean -rm -f `pwd`/po/*.gmo + -rm -f debian/substvars debian/files postinst.debhelper \ + postrm.debhelper prerm.debhelper + -rm -f config.cache config.log dh_clean @@ -66,7 +69,7 @@ dh_compress dh_fixperms # You may want to make some executables suid here. - dh_suidregister +# dh_suidregister # dh_makeshlibs dh_installdeb # dh_perl --- gmanedit-0.3.3.orig/gmanedit.glade +++ gmanedit-0.3.3/gmanedit.glade @@ -1143,6 +1143,7 @@ Wed, 01 Mar 2000 01:57:29 GMT + GTK_RELIEF_NORMAL @@ -1157,6 +1158,7 @@ Wed, 01 Mar 2000 01:57:35 GMT + GTK_RELIEF_NORMAL @@ -1190,6 +1192,7 @@ Fri, 31 Mar 2000 20:07:31 GMT + GTK_RELIEF_NORMAL @@ -1204,6 +1207,7 @@ Fri, 31 Mar 2000 20:07:35 GMT + GTK_RELIEF_NORMAL @@ -1338,6 +1342,7 @@ Tue, 07 Mar 2000 13:41:24 GMT + GTK_RELIEF_NORMAL @@ -1351,6 +1356,7 @@ Tue, 07 Mar 2000 13:41:30 GMT + GTK_RELIEF_NORMAL @@ -1364,6 +1370,7 @@ Tue, 07 Mar 2000 13:41:21 GMT + GTK_RELIEF_NORMAL @@ -1373,7 +1380,7 @@ GnomeAbout about True - G.P.U.L. 2000 Sergio Rua + G.P.U.L. 2000-2001 Sergio Rua Sergio Rua <srua@gpul.org> Man Pages Editor. @@ -1512,7 +1519,7 @@ GtkLabel label4 - + GTK_JUSTIFY_CENTER False 0.5 @@ -1650,6 +1657,7 @@ Mon, 13 Mar 2000 13:30:44 GMT GNOME_STOCK_BUTTON_OK + GTK_RELIEF_NORMAL @@ -1663,6 +1671,7 @@ Mon, 13 Mar 2000 13:30:48 GMT GNOME_STOCK_BUTTON_CANCEL + GTK_RELIEF_NORMAL @@ -1750,9 +1759,7 @@ 158 26 Short name to the man page (example: gmanedit) - True True - True True True 0 @@ -2089,6 +2096,7 @@ 208 175 26 + True True False False @@ -2110,9 +2118,7 @@ GtkCombo:entry snumber Select section number - True True - True True True 0 --- gmanedit-0.3.3.orig/config.guess +++ gmanedit-0.3.3/config.guess @@ -0,0 +1,1432 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +timestamp='2004-01-05' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pegasos:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mipseb-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit 0 ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit 0 ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit 0;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit 0 ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit 0 ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit 0 ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit 0 ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 + echo mips-mips-riscos${UNAME_RELEASE} + exit 0 ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit 0 ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit 0 ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit 0 ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit 0 ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit 0 ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit 0 ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit 0 ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit 0 ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit 0 ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit 0 ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit 0 ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit 0 ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit 0 ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit 0 ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit 0 ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit 0 ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit 0 ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit 0 ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit 0 ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit 0 ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo unknown-hitachi-hiuxwe2 + exit 0 ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit 0 ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit 0 ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit 0 ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit 0 ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit 0 ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit 0 ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit 0 ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit 0 ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit 0 ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #if __GLIBC__ >= 2 + LIBC=gnu + #else + LIBC= + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + # GNU/KFreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + exit 0 ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit 0 ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit 0 ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit 0 ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit 0 ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit 0 ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit 0 ;; + i*86:*:5:[78]*) + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit 0 ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit 0 ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit 0 ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit 0 ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit 0 ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit 0 ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit 0 ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4 && exit 0 ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit 0 ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit 0 ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit 0 ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit 0 ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit 0 ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit 0 ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Darwin:*:*) + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit 0 ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit 0 ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit 0 ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit 0 ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit 0 ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit 0 ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DRAGONFLY:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} + exit 0 ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit 0 ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + c34*) + echo c34-convex-bsd + exit 0 ;; + c38*) + echo c38-convex-bsd + exit 0 ;; + c4*) + echo c4-convex-bsd + exit 0 ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- gmanedit-0.3.3.orig/config.sub +++ gmanedit-0.3.3/config.sub @@ -0,0 +1,1537 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +timestamp='2004-01-05' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32r | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | msp430 \ + | ns16k | ns32k \ + | openrisc | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32r-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ + | ymp-* \ + | z8k-*) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + crds | unos) + basic_machine=m68k-crds + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-ibm) + os=-aix + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: