From owner-svn-src-all@FreeBSD.ORG Mon Jun 22 01:11:27 2015 Return-Path: Delivered-To: svn-src-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54A4CD9C; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36757F1D; Mon, 22 Jun 2015 01:11:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LMgtBL029034; Sun, 21 Jun 2015 22:42:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LMgtqX029033; Sun, 21 Jun 2015 22:42:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506212242.t5LMgtqX029033@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 21 Jun 2015 22:42:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284685 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 01:11:27 -0000 Author: bapt Date: Sun Jun 21 22:42:55 2015 New Revision: 284685 URL: https://svnweb.freebsd.org/changeset/base/284685 Log: Simplify code to install manpages and it symlinks Use the bmake's .for multi variable loops to simplify and make the code more readable Modified: head/share/mk/bsd.man.mk Modified: head/share/mk/bsd.man.mk ============================================================================== --- head/share/mk/bsd.man.mk Sun Jun 21 22:27:52 2015 (r284684) +++ head/share/mk/bsd.man.mk Sun Jun 21 22:42:55 2015 (r284685) @@ -186,17 +186,11 @@ _maninstall: ${MAN} .endif .endfor .else - @set ${.ALLSRC:C/\.([^.]*)$/.\1 \1/}; \ - while : ; do \ - case $$# in \ - 0) break;; \ - 1) echo "warn: missing extension: $$1"; break;; \ - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done +.for _page _sect ${.ALLSRC:C/\.([^.]*)$/.\1 \1/} + @d=${DESTDIR}${MANDIR}${_sect}${MANSUBDIR}; \ + ${ECHO} ${MINSTALL} ${_page} $${d}; \ + ${MINSTALL} $${page} $${d}; +.endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) .for __page in ${MAN} ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ @@ -217,35 +211,21 @@ _maninstall: ${MAN} .endif .if !defined(NO_MLINKS) && defined(MLINKS) && !empty(MLINKS) - @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ - while : ; do \ - case $$# in \ - 0) break;; \ - [123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \ - esac; \ - name=$$1; shift; sect=$$1; shift; \ - l=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ - name=$$1; shift; sect=$$1; shift; \ - t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ - ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ - rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ - done +.for _oname _osect _dname _dsect in ${MLINKS:C/\.([^.]*)$/.\1 \1/} + @l=${DESTDIR}${MANDIR}${_osect}${MANSUBDIR}/${_oname}; \ + t=${DESTDIR}${MANDIR}${_dsect}${MANSUBDIR}/${_dname}; \ + ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ + rm -f $${t} $${t}${MCOMPRESS_EXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT} +.endfor .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ - while : ; do \ - case $$# in \ - 0) break;; \ - [123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \ - esac; \ - name=$$1; shift; sect=$$1; shift; \ - l=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \ - name=$$1; shift; sect=$$1; shift; \ - t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \ - ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ - rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ - done +.for _oname _osect _dname _dsect in ${MLINKS:C/\.([^.]*)$/.\1 \1/} + @l=${DESTDIR}${MANDIR}${_osect}${MANSUBDIR}/${_oname}; \ + t=${DESTDIR}${MANDIR}${_dsect}${MANSUBDIR}/${_dname}; \ + ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ + rm -f $${t} $${t}${MCOMPRESS_EXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT} +.endfor .endif .endif