From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 12 04:40:19 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF81D37B401 for ; Tue, 12 Aug 2003 04:40:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7E3D43F85 for ; Tue, 12 Aug 2003 04:40:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h7CBeGUp019116 for ; Tue, 12 Aug 2003 04:40:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h7CBeGZd019115; Tue, 12 Aug 2003 04:40:16 -0700 (PDT) Resent-Date: Tue, 12 Aug 2003 04:40:16 -0700 (PDT) Resent-Message-Id: <200308121140.h7CBeGZd019115@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Lev A. Serbryakov" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92CA337B401 for ; Tue, 12 Aug 2003 04:34:01 -0700 (PDT) Received: from ftp.translate.ru (ftp.translate.ru [195.131.4.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F99243F85 for ; Tue, 12 Aug 2003 04:33:59 -0700 (PDT) (envelope-from lev@ftp.translate.ru) Received: from ftp.translate.ru (localhost [127.0.0.1]) by ftp.translate.ru (8.12.9/8.12.9) with ESMTP id h7CBX27R028696 for ; Tue, 12 Aug 2003 15:33:02 +0400 (MSD) (envelope-from lev@ftp.translate.ru) Received: (from lev@localhost) by ftp.translate.ru (8.12.9/8.12.9/Submit) id h7CBWvYv028695; Tue, 12 Aug 2003 15:32:57 +0400 (MSD) (envelope-from lev) Message-Id: <200308121132.h7CBWvYv028695@ftp.translate.ru> Date: Tue, 12 Aug 2003 15:32:57 +0400 (MSD) From: "Lev A. Serbryakov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/55493: Add ability to automatically install *.info not to default path in ports. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Lev A. Serbryakov" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2003 11:40:19 -0000 >Number: 55493 >Category: ports >Synopsis: Add ability to automatically install *.info not to default path in ports. >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Aug 12 04:40:16 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Lev A. Serbryakov >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD ftp.translate.ru 4.8-STABLE FreeBSD 4.8-STABLE #0: Fri Apr 11 00:25:30 MSD 2003 lev@ftp.translate.ru:/usr/obj/usr/src/sys/FTPTR i386 >Description: New variable INFO in port's makefile allows to automatically generate all code for `pkg-plist' to process installed info files. But this code assumes, that info files are go to ${PREFIX}/info, and this is bad assumption. For example, target-specific info files of binutils, gcc, etc. could go to ${PREFIX}/${TARGET}/info. This patch adds INFO_PATH variable, whcich allows to specify path for info files inside ${PREFIX}. >How-To-Repeat: >Fix: --- bsd.port.mk.orig Tue Aug 12 15:10:54 2003 +++ bsd.port.mk Tue Aug 12 15:25:15 2003 @@ -529,6 +529,9 @@ # # INFO - A list of .info files (omitting the trailing ".info"); # only one entry per document! +# INFO_PATH - Path, where all .info files will be installed by your +# port, relative to ${PREFIX} (default: share/info if +# ${PREFIX} is equalr /usr and info otherwise). # # Default targets and their behaviors: # @@ -2321,6 +2324,12 @@ _MANPAGES:= ${_MANPAGES:S/$/.gz/} .endif +.if ${PREFIX} == /usr +INFO_PATH?= share/info +.else +INFO_PATH?= info +.endif + .if ${XFREE86_VERSION} == 3 XFREE86_HTML_MAN= no .else @@ -4269,10 +4278,10 @@ add-plist-info: # Process GNU INFO files at package install/deinstall time .for i in ${INFO} - @${ECHO_CMD} "@unexec install-info --delete %D/info/$i.info %D/info/dir" \ + @${ECHO_CMD} "@unexec install-info --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} - @${LS} ${PREFIX}/info/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST} - @${ECHO_CMD} "@exec install-info %D/info/$i.info %D/info/dir" \ + @${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST} + @${ECHO_CMD} "@exec install-info %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} .endfor >Release-Note: >Audit-Trail: >Unformatted: