[Midnightbsd-cvs] src: usr.sbin/sysinstall: Remove extra fields in device.c and update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 30 12:33:16 EDT 2008
Log Message:
-----------
Remove extra fields in device.c and update index.c to include new port categories added since the last release and remove some of the older tcl/tk categories.
Tags:
----
RELENG_0_2
Modified Files:
--------------
src/usr.sbin/sysinstall:
devices.c (r1.7.2.1 -> r1.7.2.2)
index.c (r1.3.2.1 -> r1.3.2.2)
-------------- next part --------------
Index: index.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/index.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -L usr.sbin/sysinstall/index.c -L usr.sbin/sysinstall/index.c -u -r1.3.2.1 -r1.3.2.2
--- usr.sbin/sysinstall/index.c
+++ usr.sbin/sysinstall/index.c
@@ -96,17 +96,20 @@
"devel", "Software development utilities and libraries.",
"dns", "Domain Name Service tools.",
"documentation", "Document preparation utilities.",
- "editors", "Common text editors.",
+ "editors", "Editors.",
"elisp", "Things related to Emacs Lisp.",
- "emulators", "Utilities for emulating other OS types.",
+ "emulators", "Utilities for emulating other operating systems.",
"finance", "Monetary, financial and related applications.",
"french", "Ported software for French countries.",
"ftp", "FTP client and server utilities.",
"games", "Various and sundry amusements.",
"german", "Ported software for Germanic countries.",
+ "geography", "Geography-related software.",
"gnome", "Components of the Gnome Desktop environment.",
+ "gnustep", "Software for the GNUstep environment.",
"graphics", "Graphics libraries and utilities.",
"haskell", "Software related to the Haskell language.",
+ "hamradio", "Software for amateur radio.",
"hebrew", "Ported software for Hebrew language.",
"hungarian", "Ported software for the Hungarian market.",
"ipv6", "IPv6 related software.",
@@ -114,51 +117,53 @@
"japanese", "Ported software for the Japanese market.",
"java", "Java language support.",
"kde", "Software for the K Desktop Environment.",
+ "kld", "Kernel loadable modules.",
"korean", "Ported software for the Korean market.",
"lang", "Computer languages.",
- "languages", "Computer languages.",
"libraries", "Software development libraries.",
"linux", "Linux programs that can be run under binary compatibility.",
+ "lisp", "Software related to the Lisp language",
"mail", "Electronic mail packages and utilities.",
"math", "Mathematical computation software.",
"mbone", "Applications and utilities for the MBONE.",
"misc", "Miscellaneous utilities.",
"multimedia", "Multimedia software.",
"net", "Networking utilities.",
+ "net-im", "Instant messaging software",
"net-mgmt", "Network Management",
+ "net-p2p", "Peer to peer network applications.",
"news", "USENET News support software.",
"numeric", "Mathematical computation software.",
"offix", "An office automation suite of sorts.",
"orphans", "Packages without a home elsewhere.",
"palm", "Software support for the Palm(tm) series.",
"parallel", "Applications dealing with parallelism in computing.",
+ "pear", "Software relatd to the Pear PHP framework.",
"perl5", "Utilities/modules for the PERL5 language.",
- "picobsd", "Ports to support PicoBSD.",
- "pilot", "Software support for the 3Com Palm Pilot(tm) series.",
"plan9", "Software from the Plan9 operating system.",
"polish", "Ported software for the Polish market.",
+ "ports-mgmt", "Utilities for managing ports and packages.",
"portuguese", "Ported software for the Portuguese market.",
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",
"programming", "Software development utilities and libraries.",
"python", "Software related to the Python language.",
"ruby", "Software related to the Ruby language.",
+ "rubygems", "Ports of RubyGems packages",
"russian", "Ported software for the Russian market.",
"science", "Scientific software.",
"scheme", "Software related to the Scheme language.",
"security", "System security software.",
"shells", "Various shells (tcsh, bash, etc).",
+ "spanish", "Ported software for the Spanish market.",
"sysutils", "Various system utilities.",
- "tcl75", "TCL v7.5 and packages that depend on it.",
- "tcl76", "TCL v7.6 and packages that depend on it.",
+ "tcl", "TCL and packages that depend on it.",
"tcl80", "TCL v8.0 and packages that depend on it.",
- "tcl81", "TCL v8.1 and packages that depend on it.",
"tcl82", "TCL v8.2 and packages that depend on it.",
"tcl83", "TCL v8.3 and packages that depend on it.",
"tcl84", "TCL v8.4 and packages that depend on it.",
"textproc", "Text processing/search utilities.",
- "tk41", "Tk4.1 and packages that depend on it.",
- "tk42", "Tk4.2 and packages that depend on it.",
+ "tk", "Tk and packages that depend on it.",
"tk80", "Tk8.0 and packages that depend on it.",
"tk81", "Tk8.1 and packages that depend on it.",
"tk82", "Tk8.2 and packages that depend on it.",
@@ -171,12 +176,14 @@
"www", "WEB utilities (browers, HTTP servers, etc).",
"x11", "X Window System based utilities.",
"x11-clocks", "X Window System based clocks.",
+ "x11-drivers", "X Window System drivers.",
"x11-fm", "X Window System based file managers.",
"x11-fonts", "X Window System fonts and font utilities.",
"x11-servers", "X Window System servers.",
"x11-themes", "X Window System themes.",
"x11-toolkits", "X Window System based development toolkits.",
"x11-wm", "X Window System window managers.",
+ "xfce", "Software related to the Xfce Desktop Environment.",
"zope", "Software related to the Zope platform.",
NULL, NULL,
};
Index: devices.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/devices.c,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -L usr.sbin/sysinstall/devices.c -L usr.sbin/sysinstall/devices.c -u -r1.7.2.1 -r1.7.2.2
--- usr.sbin/sysinstall/devices.c
+++ usr.sbin/sysinstall/devices.c
@@ -190,7 +190,7 @@
dev_t d;
int fail;
- sprintf(unit, sizeof unit, dev.name, i);
+ sprintf(unit, dev.name, i);
snprintf(try, FILENAME_MAX, "/dev/%s", unit);
if (isDebug())
msgDebug("deviceTry: attempting to open %s\n", try);
@@ -428,7 +428,7 @@
cp = device_names[i].description;
/* Serial devices get a slip and ppp device each, if supported */
newdesc = safe_malloc(strlen(cp) + 40);
- snprintf(newdesc, cp, "SLIP interface", try, j + 1);
+ sprintf(newdesc, cp, "SLIP interface", try, j + 1);
deviceRegister("sl0", newdesc, strdup(try), DEVICE_TYPE_NETWORK, TRUE, mediaInitNetwork,
NULL, mediaShutdownNetwork, NULL);
msgDebug("Add mapping for %s to sl0\n", try);
More information about the Midnightbsd-cvs
mailing list