Date: Sat, 22 Jun 2002 18:03:31 +0400
From: skv@FreeBSD.org
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/39660: add ${PKGNAMEPREFIX} to (DOCS|EXAMPLES)DIR
Message-ID: <E17LlUB-000JUx-00@mail.3wgraphics.net>
next in thread | raw e-mail | index | archive | help
>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E17LlUB-000JUx-00>