From owner-freebsd-ports  Sat Jun 22  7:10:14 2002
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 794EC37B404
	for <freebsd-ports@hub.freebsd.org>; Sat, 22 Jun 2002 07:10:02 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5MEA2Y54485;
	Sat, 22 Jun 2002 07:10:02 -0700 (PDT)
	(envelope-from gnats)
Received: from mail.3wgraphics.net (mail.3wgraphics.net [194.87.91.161])
	by hub.freebsd.org (Postfix) with ESMTP id 44EAB37B403
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Jun 2002 07:04:18 -0700 (PDT)
Received: from root by mail.3wgraphics.net with local (Exim 3.36 #1)
	id 17LlUB-000JUx-00
	for FreeBSD-gnats-submit@freebsd.org; Sat, 22 Jun 2002 18:03:31 +0400
Message-Id: <E17LlUB-000JUx-00@mail.3wgraphics.net>
Date: Sat, 22 Jun 2002 18:03:31 +0400
From: skv@FreeBSD.org
Reply-To: skv@FreeBSD.org
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.2
Subject: ports/39660: add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         39660
>Category:       ports
>Synopsis:       add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 22 07:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Skvortsov
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
<Organization of PR author (multiple lines)>
>Environment:

	<Relevant environment information (multiple lines)>

>Description:

add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
to avoid collision between ports with common PORTNAME but
different PKGNAMEPREFIX.

>How-To-Repeat:

>Fix:


--- bsd.port.mk	Sat Jun 15 15:16:29 2002
+++ bsd.port.mk.new	Sat Jun 22 17:53:32 2002
@@ -483,9 +483,9 @@
 #				  %%PREFIX%% for ${PREFIX}, %%LOCALBASE%% for
 #				  ${LOCALBASE} and %%X11BASE%% for ${X11BASE}.
 # DOCSDIR		- Name of the directory to install the packages docs in
-#				  (default: ${PREFIX}/share/doc/${PORTNAME}).
+#				  (default: ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}).
 # EXAMPLESDIR		- Name of the directory to install the packages examples in
-#				  (default: ${PREFIX}/share/examples/${PORTNAME}).
+#				  (default: ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}).
 # DATADIR		- Name of the directory to install the packages shared data
 #				  in (default: ${PREFIX}/share/${PORTNAME}).
 # 
@@ -1778,8 +1778,8 @@
 LDCONFIG_RUNLIST!=	${ECHO_CMD} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!g"
 .endif
 
-DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME}
-EXAMPLESDIR?=	${PREFIX}/share/examples/${PORTNAME}
+DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR?=	${PREFIX}/share/${PORTNAME}
 
 .MAIN: all


--- bsd.ruby.mk	Sat Jun 22 17:29:11 2002
+++ bsd.ruby.mk.new	Sat Jun 22 17:42:18 2002
@@ -183,8 +183,8 @@
 RUBY_ARCHLIBDIR?=	${RUBY_LIBDIR}/${RUBY_ARCH}
 RUBY_SITELIBDIR?=	${_RUBY_SITEDIR}/${RUBY_VER}
 RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
-RUBY_DOCDIR?=		${LOCALBASE}/share/doc/${RUBY_NAME}
-RUBY_EXAMPLESDIR?=	${LOCALBASE}/share/examples/${RUBY_NAME}
+RUBY_DOCDIR?=		${LOCALBASE}/share/doc/${RUBY_PKGNAMEPREFIX}${RUBY_NAME}
+RUBY_EXAMPLESDIR?=	${LOCALBASE}/share/examples/${RUBY_PKGNAMEPREFIX}${RUBY_NAME}
 RUBY_ELISPDIR?=		${_RUBY_SYSLIBDIR}/ruby/elisp
 
 # PLIST
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message