From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 4 14:30:23 2004 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 DCC4516A4CE for ; Sun, 4 Jan 2004 14:30:23 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAF9343D48 for ; Sun, 4 Jan 2004 14:30:20 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i04MUKFR039371 for ; Sun, 4 Jan 2004 14:30:20 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i04MUKvw039370; Sun, 4 Jan 2004 14:30:20 -0800 (PST) (envelope-from gnats) Resent-Date: Sun, 4 Jan 2004 14:30:20 -0800 (PST) Resent-Message-Id: <200401042230.i04MUKvw039370@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, Frank Laszlo Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED05016A4CE for ; Sun, 4 Jan 2004 14:26:13 -0800 (PST) Received: from mail.vonostingroup.com (ip209-154.digitalrealm.net [216.144.209.154]) by mx1.FreeBSD.org (Postfix) with SMTP id 7A29443D41 for ; Sun, 4 Jan 2004 14:26:11 -0800 (PST) (envelope-from laszlof@vonostingroup.com) Received: (qmail 33404 invoked by uid 89); 4 Jan 2004 22:35:17 -0000 Received: from unknown (HELO trinity.freematrix.us) (69.93.88.210) by ip209-154.digitalrealm.net with SMTP; 4 Jan 2004 22:35:17 -0000 Received: by trinity.freematrix.us (sSMTP sendmail emulation); Sun, 4 Jan 2004 16:27:35 -0600 Message-Id: <20040104222611.7A29443D41@mx1.FreeBSD.org> Date: Sun, 4 Jan 2004 16:27:35 -0600 From: "Frank J. Laszlo" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/60909: info docs are not installed correctly when PREFIX=/usr X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Frank Laszlo List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jan 2004 22:30:24 -0000 >Number: 60909 >Category: ports >Synopsis: info docs are not installed correctly when PREFIX=/usr >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jan 04 14:30:20 PST 2004 >Closed-Date: >Last-Modified: >Originator: Frank Laszlo >Release: FreeBSD 4.9-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD trinity.freematrix.us 4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #0: Wed Dec 3 07:48:46 CST 2003 laszlof@trinity.freematrix.us:/usr/obj/usr/src/sys/TRINITY i386 >Description: according to hier(7) info pages are supposed to go in $PREFIX/share/info. We tend to ignore this when PREFIX=/usr/local (default) and install them into /usr/local/info. But if PREFIX=/usr the info pages get installed into /usr/info (which is not correct) I have attached a patch for bsd.port.mk to fix this, it adds the variable INFOPREFIX and set it to $PREFIX/share when $PREFIX=/usr, and $PREFIX/info otherwise (for local/ installation) >How-To-Repeat: Build a port with info pages and PREFIX=/usr >Fix: --- bsd.port.mk.patch begins here --- --- bsd.port.mk.orig Sun Jan 4 12:18:33 2004 +++ bsd.port.mk Sun Jan 4 13:49:21 2004 @@ -1728,7 +1728,7 @@ MAKE_FLAGS?= -f MAKEFILE?= Makefile -MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" +MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" INFOPREFIX="${INFOPREFIX}" .if ${OSVERSION} < 500016 PTHREAD_CFLAGS= -D_THREAD_SAFE @@ -2446,8 +2446,10 @@ .if ${PREFIX} == /usr MANPREFIX?= /usr/share +INFOPREFIX?= /usr/share .else MANPREFIX?= ${PREFIX} +INFOPREFIX?= ${PREFIX} .endif .for sect in 1 2 3 4 5 6 7 8 9 @@ -4470,7 +4472,7 @@ .endfor @${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST} .if !defined(NO_MTREE) - @${ECHO_CMD} "@unexec if [ -f %D/info/dir ]; then if sed -e '1,/Menu:/d' %D/info/dir | grep -q '^[*] '; then true; else rm %D/info/dir; fi; fi" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec if [ -f %D/share/info/dir ]; then if sed -e '1,/Menu:/d' %D/share/info/dir | grep -q '^[*] '; then true; else rm %D/share/info/dir; fi; fi" >> ${TMPPLIST} .endif .if defined(INSTALLS_SHLIB) @${ECHO_CMD} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST}" >> ${TMPPLIST} @@ -4508,10 +4510,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 ${INFOPREFIX}/info/$i.info ${INFOPREFIX}/info/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} ${INFOPREFIX}/info/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST} + @${ECHO_CMD} "@exec install-info ${INFOPREFIX}/info/$i.info ${INFOPREFIX}/info/dir" \ >> ${TMPPLIST} .endfor --- bsd.port.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: