From root@3wgraphics.net  Sat Jun 22 07:04:19 2002
Return-Path: <root@3wgraphics.net>
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
Cc: knu@freebsd.org
Subject: add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
X-Send-Pr-Version: 3.2

>Number:         39660
>Category:       ports
>Synopsis:       [patch] add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 22 07:10:01 PDT 2002
>Closed-Date:    Wed May 28 15:41:26 UTC 2014
>Last-Modified:  Wed May 28 15:41:26 UTC 2014
>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:
Responsible-Changed-From-To: freebsd-ports->portmgr 
Responsible-Changed-By: alane 
Responsible-Changed-When: Sat Jun 22 07:53:39 PDT 2002 
Responsible-Changed-Why:  
bsd.port.mk is portmgr territory; Cc: to knu@ added since this affects 
ruby as well. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39660 

From: Alan E <alane@geeksrus.net>
To: skv@FreeBSD.ORG
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/39660: add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
Date: Sat, 22 Jun 2002 10:50:22 -0400

 On Sat, Jun 22, 2002 at 06:03:31PM +0400, skv@FreeBSD.ORG wrote:
 >
 >>Number:         39660
 >>Category:       ports
 >>Synopsis:       add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
 
 I am in complete agreement with at least the bsd.port.mk part of this
 patch. I don't know enough about the ruby file to comment.
 
 Please can we get at least the bsd.port.mk part of this patch in, in
 conjuction with ports/39659?
 
 -- 
 AlanE

From: Cyrille Lefevre <cyrille.lefevre@laposte.net>
To: skv@FreeBSD.org
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/39660: add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
Date: Sun, 23 Jun 2002 02:53:08 +0200

 On Sat, Jun 22, 2002 at 06:03:31PM +0400, skv@FreeBSD.org wrote:
 > 
 > >Number:         39660
 > >Category:       ports
 > >Synopsis:       add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
 [snip]
 
 much better would be to replace PORTNAME by PKGBASE which includes
 both PKGNAMEPREFIX and PKGNAMESUFFIX. so, ports like net/isc-dhcp3
 don't have to override DOCSDIR when conflicting w/ some other port
 name (net/isc-dhcp in the present case).
 
 Cyrille.
 -- 
 Cyrille Lefevre                 mailto:cyrille.lefevre@laposte.net
State-Changed-From-To: open->suspended 
State-Changed-By: kris 
State-Changed-When: Sun Feb 23 15:14:12 PST 2003 
State-Changed-Why:  
Awaiting updated patch 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39660 

From: Kris Kennaway <kris@obsecurity.org>
To: freebsd-gnats-submit@FreeBSD.org, skv@FreeBSD.org
Cc:  
Subject: Re: ports/39660
Date: Sun, 23 Feb 2003 15:14:04 -0800

 Can someone please implement the suggestion requested by Cyrille
 Lefevre?
 
 Kris
 

From: Sergey Skvortsov <skv@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, skv@FreeBSD.org,
	Kris Kennaway <kris@FreeBSD.org>
Cc:  
Subject: Re: ports/39660: add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
Date: Tue, 25 Feb 2003 13:19:48 +0300

 This issue about PKGNAMESUFFIX already discussed:
 http://docs.freebsd.org/cgi/getmsg.cgi?fetch=2307267+0+/usr/local/www/db/text/2002/freebsd-ports/20020127.freebsd-ports
 
 I object to include PKGNAMESUFFIX because ${PKGNAMESUFFIX} is "Suffix to 
 specify compilation options".
 
 -- 
 Sergey Skvortsov
 mailto: skv@FreeBSD.org
 
State-Changed-From-To: suspended->analyzed 
State-Changed-By: kris 
State-Changed-When: Sat Jun 5 21:17:21 PDT 2004 
State-Changed-Why:  
Testing on bento for subsequent commit 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39660 
State-Changed-From-To: analyzed->suspended 
State-Changed-By: kris 
State-Changed-When: Sat Jun 5 23:48:55 PDT 2004 
State-Changed-Why:  
This patch breaks installation and packaging of the ports it affects. 
For some reason you apparently didn't test it with ports that actually 
set PKGNAMEPREFIX and DOCSDIR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39660 
State-Changed-From-To: suspended->feedback 
State-Changed-By: skv 
State-Changed-When: Tue Aug 2 09:55:44 GMT 2005 
State-Changed-Why:  
This patch is final version. It is correct for all ports using 
DOCSDIR/EXAMPLESDIR macros in pkg-plist. 

Index: bsd.port.mk 
=================================================================== 
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v 
retrieving revision 1.515 
diff -u -r1.515 bsd.port.mk 
--- bsd.port.mk	24 Jun 2005 09:18:54 -0000	1.515 
+++ bsd.port.mk	2 Aug 2005 09:52:14 -0000 
@@ -860,9 +860,9 @@ 
#				  ${LOCALBASE} and %%X11BASE%% for ${X11BASE}. 
#				  Default: %%PREFIX%%/lib 
# DOCSDIR		- Name of the directory to install the packages docs in. 
-#				  Default: ${PREFIX}/share/doc/${PORTNAME} 
+#				  Default: ${PREFIX}/share/doc/${PKGBASE} 
# EXAMPLESDIR	- Name of the directory to install the packages examples in. 
-#				  Default: ${PREFIX}/share/examples/${PORTNAME} 
+#				  Default: ${PREFIX}/share/examples/${PKGBASE} 
# DATADIR		- Name of the directory to install the packages shared data in. 
#				  Default: ${PREFIX}/share/${PORTNAME} 
# 
@@ -2780,8 +2780,8 @@ 
INFO_PATH?=	info 
.endif 

-DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME} 
-EXAMPLESDIR?=	${PREFIX}/share/examples/${PORTNAME} 
+DOCSDIR?=	${PREFIX}/share/doc/${PKGBASE} 
+EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGBASE} 
DATADIR?=	${PREFIX}/share/${PORTNAME} 

PLIST_SUB+=	DOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}"  


http://www.freebsd.org/cgi/query-pr.cgi?pr=39660 
State-Changed-From-To: feedback->open 
State-Changed-By: erwin 
State-Changed-When: Fri Dec 29 19:10:37 UTC 2006 
State-Changed-Why:  
Feedback received so set state to open. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39660 
State-Changed-From-To: open->closed 
State-Changed-By: bapt 
State-Changed-When: Wed May 28 15:41:25 UTC 2014 
State-Changed-Why:  
Fixed by using USES=uniquefiles 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39660 
>Unformatted:
