From owner-freebsd-ports Thu Jun 7 1:40:11 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4707E37B403 for ; Thu, 7 Jun 2001 01:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f578e1608088; Thu, 7 Jun 2001 01:40:01 -0700 (PDT) (envelope-from gnats) Received: from m08.alpha-net.ne.jp (m08.alpha-net.ne.jp [210.229.64.38]) by hub.freebsd.org (Postfix) with ESMTP id 140F937B405 for ; Thu, 7 Jun 2001 01:35:45 -0700 (PDT) (envelope-from sf@FreeBSD.org) Received: from kyoto-tc012-p42.alpha-net.ne.jp (kyoto-tc012-p42.alpha-net.ne.jp [210.237.119.170]) by m08.alpha-net.ne.jp (8.9.3/3.7W) with ESMTP id RAA11617 for ; Thu, 7 Jun 2001 17:35:32 +0900 (JST) Received: from souffle.bogus-local.net (localhost.bogus-local.net [127.0.0.1]) by kyoto-tc012-p42.alpha-net.ne.jp (Postfix) with ESMTP id 38EC69B28 for ; Thu, 7 Jun 2001 17:35:28 +0900 (JST) Message-Id: <86lmn4adrj.wl@cheerful.com> Date: Thu, 07 Jun 2001 17:35:28 +0900 From: FUJISHIMA Satsuki To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/27926: bsd.port.mk does not handle MLINKS with html manpages Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 27926 >Category: ports >Synopsis: bsd.port.mk does not handle MLINKS with html manpages >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jun 07 01:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: FUJISHIMA Satsuki >Release: FreeBSD 5.0-CURRENT i386 >Organization: N/A >Environment: System: FreeBSD souffle.bogus-local.net 5.0-CURRENT FreeBSD 5.0-CURRENT #369: Sun May 13 09:53:09 JST 2001 k5@souffle.bogus-local.net:/home/src/sys/compile/SOUFFLE i386 >Description: bsd.port.mk adds symlinks to pkg-plist automatically if MLINKS defined in port's Makefile but does not handle it with XFREE86_HTML_MAN == yes which is impiled in USE_IMAKE=yes. >How-To-Repeat: install port which installs manpages with MLINKS defined over XFree86-4. NOTE: All of ports which defines USE_IMAKE=yes does not use MLINKS for now. For example chinese/cxterm defines MAN1= cit2tit.1 cxterm.1 hzimctrl.1 tit2cit.1 but in the reality it should be MAN1= cxterm.1 hzimctrl.1 tit2cit.1 MLINKS= tit2cit.1 cit2tit.1 but you would be hit by this bug in MLINKS case. NOTE2: I don't any offend to chenese/cxterm at all. Just I found this bug when I was installing this port. >Fix: Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.367 diff -u -r1.367 bsd.port.mk --- bsd.port.mk 2001/05/23 02:46:52 1.367 +++ bsd.port.mk 2001/06/07 08:03:15 @@ -2877,6 +2884,12 @@ @echo lib/X11/doc/html/${man}.html >> ${TMPPLIST} .endfor .endfor +.if defined(MLINKS) + @${ECHO} ${MLINKS} | ${AWK} \ + '{ for (i=1; i<=NF; i++) { \ + if (i % 2 == 0) { printf "lib/X11/doc/html/%s.html\n", $$i } \ + } }' >> ${TMPPLIST} +.endif .endif .endfor @${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST} >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message