From owner-p4-projects@FreeBSD.ORG Thu Aug 25 00:52:58 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85927106566B; Thu, 25 Aug 2011 00:52:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47FD0106566C for ; Thu, 25 Aug 2011 00:52:58 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 346F68FC0C for ; Thu, 25 Aug 2011 00:52:58 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7P0qw5J070547 for ; Thu, 25 Aug 2011 00:52:58 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7P0qwQ7070544 for perforce@freebsd.org; Thu, 25 Aug 2011 00:52:58 GMT (envelope-from jceel@freebsd.org) Date: Thu, 25 Aug 2011 00:52:58 GMT Message-Id: <201108250052.p7P0qwQ7070544@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 198110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2011 00:52:58 -0000 http://p4web.freebsd.org/@@198110?ac=10 Change 198110 by jceel@jceel_cyclone on 2011/08/25 00:52:30 Cosmetic changes and fixes, added #defines instead of hadcoded values, added proper resource handling in *_attach() method, added lpe_miibus_statchg() body. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#6 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpereg.h#5 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_dmac.c#5 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_fb.c#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#5 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_intc.c#2 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_mmc.c#6 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_ohci.c#4 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#12 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#6 (text+ko) ==== @@ -43,8 +43,6 @@ #include #include -#include - #include #include #include @@ -66,6 +64,16 @@ #include "miibus_if.h" +#define DEBUG +#undef DEBUG + +#ifdef DEBUG +#define debugf(fmt, args...) do { printf("%s(): ", __func__); \ + printf(fmt,##args); } while (0) +#else +#define debugf(fmt, args...) +#endif + struct lpe_dmamap_arg { bus_addr_t lpe_dma_busaddr; }; @@ -123,6 +131,7 @@ void * lpe_intrhand; bus_space_tag_t lpe_bst; bus_space_handle_t lpe_bsh; +#define LPE_FLAG_LINK (1 << 0) uint32_t lpe_flags; struct callout lpe_tick; @@ -324,7 +333,9 @@ lpe_write_4(sc, LPE_MCMD, 0); int x = (lpe_read_4(sc, LPE_MRDD) & LPE_MRDD_DATAMASK); -// printf("mii read: phy=%d reg=%d result=0x%04x\n", phy, reg, x); + + + debugf("phy=%d reg=%d result=0x%04x\n", phy, reg, x); return (x); } @@ -334,7 +345,7 @@ struct lpe_softc *sc = device_get_softc(dev); uint32_t val; -// printf("mii write: phy=%d reg=%d data=0x%04x\n", phy, reg, data); + debugf("phy=%d reg=%d data=0x%04x\n", phy, reg, data); lpe_write_4(sc, LPE_MCMD, LPE_MCMD_WRITE); lpe_write_4(sc, LPE_MADR, @@ -358,10 +369,16 @@ lpe_miibus_statchg(device_t dev) { struct lpe_softc *sc = device_get_softc(dev); - //struct mii_data *mii = device_get_softc(sc->lpe_miibus); + struct mii_data *mii = device_get_softc(sc->lpe_miibus); lpe_lock(sc); + if ((mii->mii_media_status & IFM_ACTIVE) && + (mii->mii_media_status & IFM_AVALID)) + sc->lpe_flags |= LPE_FLAG_LINK; + else + sc->lpe_flags &= ~LPE_FLAG_LINK; + lpe_unlock(sc); } @@ -423,12 +440,10 @@ mac1 = lpe_read_4(sc, LPE_MAC1); lpe_write_4(sc, LPE_MAC1, /*mac1 |*/ LPE_MAC1_RXENABLE | LPE_MAC1_PASSALL); - /* XXX */ lpe_write_4(sc, LPE_MAC2, LPE_MAC2_CRCENABLE | LPE_MAC2_PADCRCENABLE | LPE_MAC2_FULLDUPLEX); - /* XXX */ - lpe_write_4(sc, LPE_MCFG, (((7) & 0x7) << 2)); + lpe_write_4(sc, LPE_MCFG, LPE_MCFG_CLKSEL(7)); /* Set up Rx filter */ lpe_write_4(sc, LPE_RXFILTER_CTRL, 0xffffffff); @@ -489,7 +504,7 @@ lpe_lock_assert(sc); -// device_printf(sc->lpe_dev, "lpe_start_locked()\n"); + debugf("entry"); while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { if (lpe_read_4(sc, LPE_TXDESC_PROD) == @@ -518,7 +533,6 @@ { struct lpe_txdesc *txd; struct lpe_hwdesc *hwd; - //struct lpe_hwstatus *hws; bus_dma_segment_t segs[LPE_MAXFRAGS]; int i, err, nsegs, prod; @@ -528,10 +542,7 @@ prod = sc->lpe_cdata.lpe_tx_prod; txd = &sc->lpe_cdata.lpe_tx_desc[prod]; -// device_printf(sc->lpe_dev, "lpe_encap: starting with prod=%d\n", prod); - -// device_printf(sc->lpe_dev, "lpe_encap: packet data: %16D\n", -// mtod(*m_head, const char *), " "); + debugf("lpe_encap: starting with prod=%d\n", prod); err = bus_dmamap_load_mbuf_sg(sc->lpe_cdata.lpe_tx_buf_tag, txd->lpe_txdesc_dmamap, *m_head, segs, &nsegs, BUS_DMA_NOWAIT); @@ -553,7 +564,7 @@ for (i = 0; i < nsegs; i++) { hwd = &sc->lpe_rdata.lpe_tx_ring[prod]; hwd->lhr_data = segs[i].ds_addr; - hwd->lhr_control = segs[i].ds_len - 1;// & LPE_HWDESC_SIZE_MASK; + hwd->lhr_control = segs[i].ds_len - 1; if (i == nsegs - 1) { hwd->lhr_control |= LPE_HWDESC_LASTFLAG; @@ -563,9 +574,6 @@ } LPE_INC(prod, LPE_TXDESC_NUM); - -// device_printf(sc->lpe_dev, "lpe_encap: 1 segment done @ %p, size: %ld\n", -// hwd, segs[i].ds_len); } bus_dmamap_sync(sc->lpe_cdata.lpe_tx_ring_tag, sc->lpe_cdata.lpe_tx_ring_map, @@ -618,7 +626,7 @@ struct lpe_softc *sc = (struct lpe_softc *)arg; uint32_t intstatus; -// device_printf(sc->lpe_dev, "intr(): 0x%08x\n", lpe_read_4(sc, LPE_INTSTATUS)); + debugf("status=0x%08x\n", lpe_read_4(sc, LPE_INTSTATUS)); while ((intstatus = lpe_read_4(sc, LPE_INTSTATUS))) { if (intstatus & LPE_INT_RXDONE) @@ -643,8 +651,6 @@ struct mbuf *m; int prod, cons; -// device_printf(sc->lpe_dev, "receive interrupt\n"); - for (;;) { prod = lpe_read_4(sc, LPE_RXDESC_PROD); cons = lpe_read_4(sc, LPE_RXDESC_CONS); @@ -655,11 +661,6 @@ hwd = &sc->lpe_rdata.lpe_rx_ring[cons]; hws = &sc->lpe_rdata.lpe_rx_status[cons]; -// device_printf(sc->lpe_dev, "incoming packet: idx=%d len=%d data=%16D\n", -// cons, hws->lhs_info & 0x7ff, -// mtod(rxd->lpe_rxdesc_mbuf, const char *), " "); - - m = rxd->lpe_rxdesc_mbuf; m->m_pkthdr.rcvif = ifp; m->m_data += 2; @@ -671,14 +672,14 @@ LPE_INC(cons, LPE_RXDESC_NUM); lpe_write_4(sc, LPE_RXDESC_CONS, cons); } - -// device_printf(sc->lpe_dev, "rx: prod=%d cons=%d\n", prod, cons); } static void lpe_txintr(struct lpe_softc *sc) { -/// device_printf(sc->lpe_dev, "transmit interrupt\n"); + + /* XXX add TX error handling */ + debugf("transmit interrupt\n"); } static void @@ -968,9 +969,6 @@ bus_dmamap_unload(sc->lpe_cdata.lpe_rx_buf_tag, rxd->lpe_rxdesc_dmamap); -// printf("i=%d sc=%p lpe_rx_buf_tag=%p lpe_rxdesc_dmamap=%p m=%p\n", -// n, sc, sc->lpe_cdata.lpe_rx_buf_tag, rxd->lpe_rxdesc_dmamap, m); - if (bus_dmamap_load_mbuf_sg(sc->lpe_cdata.lpe_rx_buf_tag, rxd->lpe_rxdesc_dmamap, m, segs, &nsegs, 0)) { m_freem(m); ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpereg.h#5 (text+ko) ==== @@ -61,6 +61,10 @@ #define LPE_SUPP_SPEED (1 << 8) #define LPE_TEST 0x01c #define LPE_MCFG 0x020 +#define LPE_MCFG_SCANINCR (1 << 0) +#define LPE_MCFG_SUPPREAMBLE (1 << 1) +#define LPE_MCFG_CLKSEL(_n) ((_n & 0x7) << 2) +#define LPC_MCFG_RESETMII (1 << 15) #define LPE_MCMD 0x024 #define LPE_MCMD_READ (1 << 0) #define LPE_MCMD_WRITE (0 << 0) ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_dmac.c#5 (text+ko) ==== @@ -218,7 +218,7 @@ cfg = LPC_DMAC_CH_CONFIG_ITC | LPC_DMAC_CH_CONFIG_IE | LPC_DMAC_CH_CONFIG_FLOWCNTL(ch->ldc_config->ldc_fcntl) | LPC_DMAC_CH_CONFIG_DESTP(ch->ldc_config->ldc_dst_periph) | - LPC_DMAC_CH_CONFIG_SRCP(ch->ldc_config->ldc_src_periph) | LPC_DMAC_CH_CONFIG_E; // XXX + LPC_DMAC_CH_CONFIG_SRCP(ch->ldc_config->ldc_src_periph) | LPC_DMAC_CH_CONFIG_E; lpc_dmac_write_ch_4(sc, chno, LPC_DMAC_CH_SRCADDR, src); lpc_dmac_write_ch_4(sc, chno, LPC_DMAC_CH_DSTADDR, dst); lpc_dmac_write_ch_4(sc, chno, LPC_DMAC_CH_LLI, 0); ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_fb.c#2 (text+ko) ==== @@ -429,7 +429,7 @@ lpc_fb_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int x, struct thread *td) { - /* XXX */ + return (EINVAL); } ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_gpio.c#5 (text+ko) ==== @@ -443,9 +443,8 @@ static int lpc_gpio_pin_toggle(device_t dev, uint32_t pin) { - //struct lpc_gpio_softc *sc = device_get_softc(dev); const struct lpc_gpio_pinmap *map; - uint32_t /*state,*/ flags; + uint32_t flags; map = lpc_gpio_get_pinmap(pin); ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_intc.c#2 (text+ko) ==== @@ -220,8 +220,6 @@ } -/* XXX */ - struct fdt_fixup_entry fdt_fixup_table[] = { { NULL, NULL } }; ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_mmc.c#6 (text+ko) ==== @@ -66,7 +66,7 @@ #include #define DEBUG -//#undef DEBUG +#undef DEBUG #ifdef DEBUG #define debugf(fmt, args...) do { printf("%s(): ", __func__); \ ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_ohci.c#4 (text+ko) ==== @@ -151,7 +151,7 @@ strlcpy(sc->sc_vendor, "NXP", sizeof(sc->sc_vendor)); err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL , (void *)ohci_interrupt, sc, &sc->sc_intr_hdl); + NULL, (void *)ohci_interrupt, sc, &sc->sc_intr_hdl); if (err) { sc->sc_intr_hdl = NULL; goto fail; @@ -215,7 +215,13 @@ return (0); fail: - /* XXX */ + if (sc->sc_intr_hdl) + bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intr_hdl); + if (sc->sc_irq_res) + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res); + if (sc->sc_io_res) + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_io_res); + return (ENXIO); } ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Aug 25 16:26:42 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D31D1065672; Thu, 25 Aug 2011 16:26:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 006FB1065670 for ; Thu, 25 Aug 2011 16:26:42 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E25F38FC0A for ; Thu, 25 Aug 2011 16:26:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7PGQff5061745 for ; Thu, 25 Aug 2011 16:26:41 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7PGQf40061742 for perforce@freebsd.org; Thu, 25 Aug 2011 16:26:41 GMT (envelope-from jceel@freebsd.org) Date: Thu, 25 Aug 2011 16:26:41 GMT Message-Id: <201108251626.p7PGQf40061742@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 198137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2011 16:26:42 -0000 http://p4web.freebsd.org/@@198137?ac=10 Change 198137 by jceel@jceel_cyclone on 2011/08/25 16:25:38 Enable mii_tick() call in if_lpe.c Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#7 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/if_lpe.c#7 (text+ko) ==== @@ -686,10 +686,10 @@ lpe_tick(void *arg) { struct lpe_softc *sc = (struct lpe_softc *)arg; - //struct mii_data *mii = device_get_softc(sc->lpe_miibus); + struct mii_data *mii = device_get_softc(sc->lpe_miibus); lpe_lock_assert(sc); - //mii_tick(mii); + mii_tick(mii); callout_reset(&sc->lpe_tick, hz, lpe_tick, sc); } From owner-p4-projects@FreeBSD.ORG Thu Aug 25 19:46:20 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E12E1065670; Thu, 25 Aug 2011 19:46:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C561106566B for ; Thu, 25 Aug 2011 19:46:20 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 49F538FC0A for ; Thu, 25 Aug 2011 19:46:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7PJkKkF001157 for ; Thu, 25 Aug 2011 19:46:20 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7PJkKDh001154 for perforce@freebsd.org; Thu, 25 Aug 2011 19:46:20 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 25 Aug 2011 19:46:20 GMT Message-Id: <201108251946.p7PJkKDh001154@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 198146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2011 19:46:20 -0000 http://p4web.freebsd.org/@@198146?ac=10 Change 198146 by rene@rene_acer on 2011/08/25 19:46:13 Add a disclaimer to the Dutch privacy policy stating that the English version is leading. Idea from: eadler Affected files ... .. //depot/projects/docproj_nl/www/nl/privacy.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/privacy.sgml#4 (text+ko) ==== @@ -18,6 +18,13 @@ File maintained by eadler@ --> +

Disclaimer

+ +

Dit is een vertaling van de Engelse versie. Deze + vertaling dient slechts als ondersteuning voor de Engelse versie en + kan niet als juridisch bindend worden beschouwd.

+

Privacybeleid

Het &os; Project erkent dat uw privacy en de bescherming van uw From owner-p4-projects@FreeBSD.ORG Thu Aug 25 19:52:55 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 808411065672; Thu, 25 Aug 2011 19:52:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A7FC106564A for ; Thu, 25 Aug 2011 19:52:55 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0C3538FC14 for ; Thu, 25 Aug 2011 19:52:55 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7PJqsIq002868 for ; Thu, 25 Aug 2011 19:52:54 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7PJqs2m002865 for perforce@freebsd.org; Thu, 25 Aug 2011 19:52:54 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 25 Aug 2011 19:52:54 GMT Message-Id: <201108251952.p7PJqs2m002865@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 198147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2011 19:52:55 -0000 http://p4web.freebsd.org/@@198147?ac=10 Change 198147 by rene@rene_acer on 2011/08/25 19:52:02 MFen: * articles/contributing-ports 1.5 -> 1.6 * www/nl/index.xsl 1.172 -> 1.173 * www/nl/share/sgml/header.l10n.ent 1.16 -> 1.17 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#12 edit .. //depot/projects/docproj_nl/www/nl/index.xsl#18 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#21 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ Stuur alstublieft geen &man.shar.1;-archief van de gehele port; gebruik in plaats daarvan &man.diff.1; - -r. Op deze manier kunnen committers + -ruN. Op deze manier kunnen committers veel gemakkelijker zien welke veranderingen er precies gemaakt worden. De sectie in het Porter's Handbook over ==== //depot/projects/docproj_nl/www/nl/index.xsl#18 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -88,7 +88,7 @@ &header1.meta; &header1.link; &header1.rsslink; - + '> From owner-p4-projects@FreeBSD.ORG Thu Aug 25 20:02:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2516D1065674; Thu, 25 Aug 2011 20:02:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB6B51065673 for ; Thu, 25 Aug 2011 20:02:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C733B8FC0C for ; Thu, 25 Aug 2011 20:02:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7PK2mmi004704 for ; Thu, 25 Aug 2011 20:02:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7PK2m4o004701 for perforce@freebsd.org; Thu, 25 Aug 2011 20:02:48 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 25 Aug 2011 20:02:48 GMT Message-Id: <201108252002.p7PK2m4o004701@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 198148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Aug 2011 20:02:49 -0000 http://p4web.freebsd.org/@@198148?ac=10 Change 198148 by rene@rene_acer on 2011/08/25 20:02:18 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#101 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-comparison/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#38 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#25 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#24 integrate .. //depot/projects/docproj_nl/www/en/layout/js/google.js#2 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies_contributors.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/search/web.atoz#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#114 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#101 (text+ko) ==== @@ -1,4 +1,4 @@ - + Dru Lavigne - $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.11 2010/07/31 11:12:17 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.12 2011/08/25 14:02:07 gabor Exp $ &tm-attrib.freebsd; @@ -99,7 +99,15 @@ &os; is a complete operating system (kernel and userland) with a well-respected heritage grounded in the - roots of Unix development.[1] Since both the kernel and the + roots of Unix development. + + + See also + for a brief history. + + + Since both the kernel and the provided utilities are under the control of the same release engineering team, there is less likelihood of library incompatibilities. Security vulnerabilities can also be @@ -145,7 +153,15 @@ restrictions on the distribution of GPLd code. In contrast, the BSD license places no such restrictions, which gives you the flexibility of keeping the code Open Source or closing - the code for a proprietary commercial product.[2] Having + the code for a proprietary commercial product. + + + For a fairly unbiased view of the merits of each + license, see . + + + Having stable and reliable code under the attractive BSD license means that many operating systems, such as Apple OS X are based on FreeBSD code. It also means that if you choose @@ -192,7 +208,15 @@ operating system! It supports the X Window System, the same one used in &linux; distributions to provide a desktop user interface. It also supports over 13,000 easy to install - third-party applications,[3] including KDE, Gnome, and + third-party applications, + + + Using FreeBSD's ports + collection: software installation is as easy as + pkg_add -r application_name. + + + including KDE, Gnome, and OpenOffice. Several projects are available to ease the installation of @@ -483,14 +507,30 @@ and Unix skillsets to FreeBSD administration. In-house developers have full access to all - FreeBSD code[4] for all releases going back to the original + FreeBSD code + + + In addition, all code is browsable through a + web-interface: . + + + for all releases going back to the original &os; release. Included with the code are all of the log messages which provide context to changes and bug fixes. Additionally, a developer can easily replicate any release by simply checking out the code with the desired label. In contrast, &linux; traditionally didn't follow this model, but has recently adopted a more mature development - model. [5] + model. + + + An interesting overview of the evolving Linux + development model can be found at . + + + In-house developers also have full access to FreeBSD's - - - Addenda - - - - See also - for a brief history. - - For a fairly unbiased view of the merits of each - license, see . - - Using FreeBSD's ports - collection: software installation is as easy as - pkg_add -r application_name. - - In addition, all code is browsable through a - web-interface: . - - An interesting overview of the evolving Linux - development model can be found at . - - - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#38 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1138 2011/06/10 13:03:29 bcr Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1139 2011/08/21 14:34:03 simon Exp $ 1995 @@ -2356,41 +2356,8 @@ Any SCSI drive connected to a supported controller is + supported. Most ATAPI compatible IDE CD-ROMs are supported. - - The following proprietary CD-ROM interfaces are also - supported: - - - - Mitsumi LU002 (8-bit), LU005 (16-bit) and FX001D - (16-bit 2x Speed). - - - - Sony CDU 31/33A - - - - Sound Blaster Non-SCSI CD-ROM - - - - Matsushita/Panasonic CD-ROM - - - - ATAPI compatible IDE CD-ROMs - - - - All non-SCSI cards are known to be extremely slow - compared to SCSI drives, and some ATAPI CD-ROMs may not - work. - - The official &os; CD-ROM ISO, and CD-ROMs from Daemon - News and &os; Mall, support booting directly from the - CD. @@ -2410,66 +2377,6 @@ your kernel. - - - - Does &os; support &iomegazip; drives? - - - - &os; supports SCSI and ATAPI (IDE) &iomegazip; drives - out of the box. SCSI ZIP drives can only be set to run at - SCSI target IDs 5 or 6, but if your SCSI host adapter's - BIOS supports it you can even boot from it. It is not - clear which host adapters support booting from targets - other than 0 or 1, so you will have to consult your - adapter's documentation if you would like to use this - feature. - - &os; also supports Parallel Port Zip Drives. Check - that your kernel contains the - scbus0, - da0, - ppbus0, and - vp0 drivers (the - GENERIC kernel contains everything - except vp0). With all these - drivers present, the Parallel Port drive should be available - as /dev/da0s4. Disks can be - mounted using mount /dev/da0s4 /mnt OR - (for DOS disks) mount -t msdosfs /dev/da0s4 /mnt - as appropriate. - - Also check out the FAQ on - removable drives later in this chapter, and the note on - formattingin the Administration - chapter. - - - - - - Does &os; support &jaz;, EZ and other removable - drives? - - - - They work. Most of these are SCSI devices, so they - look like SCSI disks to &os;. The IDE EZ looks like an IDE - drive. - - Make sure that any external units are powered on when - booting the system. - - To change the media while - running, check out &man.mount.8;, &man.umount.8;, and - &man.camcontrol.8; (for SCSI devices) or &man.atacontrol.8; - (for IDE devices), plus the discussion on using removable drives - later in the FAQ. - - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3073,7 +3073,7 @@ A prompt is displayed before deleting each obsolete file. You can skip the prompt and let the system remove these files automatically by using the BATCH_DELETE_OLD_FILES make-variable as - follows: + follows: &prompt.root; make -DBATCH_DELETE_OLD_FILES delete-old ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#25 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -181,7 +181,7 @@ &prompt.root; pkg_add -r firefox - This will install Firefox 5.0, + This will install Firefox 6.0, if you want to run Firefox 3.6, use instead: ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#24 (text+ko) ==== @@ -33,8 +33,7 @@ # BSDI Id: bsdi-man,v 1.2 1995/01/11 02:30:01 polk Exp # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # -# $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.261 2011/03/29 21:54:40 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.265 2011/08/21 12:35:12 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -145,26 +144,30 @@ 'CentOS Linux/i386 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9:n', }, 'CentOS Linux/i386 4.8' => { 'path' => '1:1p:2:3:3p:4:5:6:7:8:9:n:0p', }, - 'CentOS Linux/i386 5.4' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', }, - 'CentOS Linux/i386 5.5' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', }, + 'CentOS Linux/i386 5.4' => { + 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', + }, + 'CentOS Linux/i386 5.5' => { + 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', + }, - 'SuSE Linux/i386 4.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 5.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 5.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 5.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.4' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 8.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 8.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 8.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 9.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 9.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 4.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 5.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 5.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 5.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.4' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 8.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 8.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 8.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 9.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 9.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, 'SuSE Linux/i386 10.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, 'SuSE Linux/i386 10.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, 'SuSE Linux/i386 10.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, @@ -210,30 +213,41 @@ "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-6.2-RELEASE", 'FreeBSD Ports', "$manLocalDir/FreeBSD-ports", - 'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", + 'FreeBSD 9-current', +"$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", - 'FreeBSD 8.2-stable', "$manLocalDir/FreeBSD-8.2-stable/man:$manLocalDir/FreeBSD-8.2-stable/openssl/man", - 'FreeBSD 8.2-RELEASE', "$manLocalDir/FreeBSD-8.2-RELEASE/man:$manLocalDir/FreeBSD-8.2-RELEASE/openssl/man", + 'FreeBSD 8.2-stable', +"$manLocalDir/FreeBSD-8.2-stable/man:$manLocalDir/FreeBSD-8.2-stable/openssl/man", + 'FreeBSD 8.2-RELEASE', +"$manLocalDir/FreeBSD-8.2-RELEASE/man:$manLocalDir/FreeBSD-8.2-RELEASE/openssl/man", 'FreeBSD Ports 8.2-RELEASE', "$manLocalDir/FreeBSD-ports-8.2-RELEASE", - - 'FreeBSD 8.1-RELEASE', "$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-8.1-RELEASE/openssl/man", - 'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", + + 'FreeBSD 8.1-RELEASE', +"$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-8.1-RELEASE/openssl/man", + 'FreeBSD 8.0-RELEASE', +"$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", 'FreeBSD Ports 8.1-RELEASE', "$manLocalDir/FreeBSD-ports-8.1-RELEASE", 'FreeBSD Ports 8.0-RELEASE', "$manLocalDir/FreeBSD-ports-8.0-RELEASE", - 'FreeBSD 7.4-stable', "$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", - 'FreeBSD 7.4-RELEASE', "$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", + 'FreeBSD 7.4-stable', +"$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", + 'FreeBSD 7.4-RELEASE', +"$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", 'FreeBSD Ports 7.4-RELEASE', "$manLocalDir/FreeBSD-ports-7.4-RELEASE", - - 'FreeBSD 7.3-RELEASE', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", + + 'FreeBSD 7.3-RELEASE', +"$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", 'FreeBSD Ports 7.3-RELEASE', "$manLocalDir/FreeBSD-ports-7.3-RELEASE", - 'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man", - 'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", + 'FreeBSD 7.2-RELEASE', +"$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man", + 'FreeBSD 7.1-RELEASE', +"$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", 'FreeBSD Ports 7.1-RELEASE', "$manLocalDir/FreeBSD-ports-7.1-RELEASE", - 'FreeBSD 7.0-RELEASE', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", + 'FreeBSD 7.0-RELEASE', +"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", 'FreeBSD Ports 7.0-RELEASE', "$manLocalDir/FreeBSD-ports-7.0-RELEASE", 'FreeBSD 6.4-stable', "$manLocalDir/FreeBSD-6.4-stable", @@ -392,10 +406,10 @@ 'Red Hat Linux/i386 8.0', "$manLocalDir/RedHat-8.0-i386", 'Red Hat Linux/i386 9', "$manLocalDir/RedHat-9-i386", - 'CentOS Linux/i386 3.9', "$manLocalDir/CentOS-3.9", - 'CentOS Linux/i386 4.8', "$manLocalDir/CentOS-4.8", - 'CentOS Linux/i386 5.4', "$manLocalDir/CentOS-5.4", - 'CentOS Linux/i386 5.5', "$manLocalDir/CentOS-5.5", + 'CentOS Linux/i386 3.9', "$manLocalDir/CentOS-3.9", + 'CentOS Linux/i386 4.8', "$manLocalDir/CentOS-4.8", + 'CentOS Linux/i386 5.4', "$manLocalDir/CentOS-5.4", + 'CentOS Linux/i386 5.5', "$manLocalDir/CentOS-5.5", 'SuSE Linux/i386 4.3', "$manLocalDir/SuSE-4.3-i386", 'SuSE Linux/i386 5.0', "$manLocalDir/SuSE-5.0-i386", @@ -523,6 +537,17 @@ my %no_pdf_output = map { $_ => 1 } @no_pdf_output; +my %valid_arch = map { $_ => 1 } + qw/acorn26 acorn32 algor alpha amd64 amiga arc arm arm26 arm32 armish atari aviion bebox cats cesfic cobalt dreamcast evbarm evbmips evbppc evbsh3 evbsh5 hp300 hp700 hpcarm hpcmips hpcsh hppa hppa64 i386 ibmnws landisk loongson luna68k luna88k mac68k macppc mipsco mmeye mvme68k mvme88k mvmeppc netwinder news68k newsmips next68k ofppc palm pc532 pegasos playstation2 pmax pmppc powerpc prep sandpoint sbmips sgi sgimips shark socppc sparc sparc64 sun2 sun3 sun3x tahoe vax walnut wgrisc x68k zaurus/; + +my $default_arch = 'i386'; + +my %arch = ( +'FreeBSD 8.2-RELEASE' => { 'default' => 'i386', 'arch' => [qw/amd64 arm i386 powerpc sparc64/] } , +'NetBSD 5.1' => { 'arch' => [qw/acorn26 acorn32 alpha amiga arc atari cobalt dreamcast evbarm evbmips evbppc hp300 hp700 hpcarm hpcmips hpcsh i386 mac68k macppc mvme68k pmax prep sgimips sparc sparc64 sun2 sun3 vax x68k/] } , +'OpenBSD 4.7' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, +); + # delete not existing releases while ( ( $key, $val ) = each %manPath ) { my $counter = 0; @@ -611,6 +636,7 @@ # sort by characters else { + # minor number and characters # 4.1 RELEASE <=> 4.1.1 RELEASE if ( $flag && ( $a1 =~ /^\d+$/ || $b1 =~ /^\d+$/ ) ) { @@ -731,6 +757,19 @@ $format = $form{'format'}; $format = 'html' if $format !~ /^(ps|pdf|ascii|latin1)$/; + $arch = $form{'arch'} || ""; + $arch = '' if $arch eq 'none' || $arch eq 'default'; + if ( $arch =~ /^([a-zA-Z0-9]+)$/ && $valid_arch{$arch} ) { + $arch = $1; + } + elsif ($arch) { + warn "Unknown arch: '$arch', ignored\n"; + $arch = ""; + } + else { + $arch = ""; + } + # remove trailing spaces for dumb users $form{'query'} =~ s/\s+$//; $form{'query'} =~ s/^\s+//; @@ -793,7 +832,7 @@ } else { $section = ''; } - $apropos ? &apropos($query) : &man( $name, $section ); + $apropos ? &apropos($query) : &man( $name, $section, $arch ); } # --------------------- support routines ------------------------ @@ -943,7 +982,7 @@ } sub man { - local ( $name, $section ) = @_; + local ( $name, $section, $arch ) = @_; local ( $_, $title, $head, *MAN ); local ( $html_name, $html_section, $prefix ); local (@manargs); @@ -1070,6 +1109,8 @@ warn "X $command{'man'} @manargs -- x $name x\n" if $debug >= 3; + push( @manargs, ( "-m", $arch ) ) if $arch; + &proc( *MAN, $command{'man'}, @manargs, "--", $name ) || &mydie("$0: open of $command{'man'} command failed: $!\n"); if ( eof(MAN) ) { @@ -1449,9 +1490,32 @@ . qq{value="$key">$key\n}; } + print qq{\n}; + print qq{\nArchitecture\n\n}; + local ($m) = &encode_url($l); + print <
Apropos Keyword Search (all sections)