Date: Mon, 21 Feb 2005 20:38:11 +0100 (CET) From: Lars Thegler <lth@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Lars Thegler <lth@FreeBSD.org> Subject: ports/77876: Ensure uniqueness of (DOCS|EXAMPLES|DATA)DIR Message-ID: <20050221193811.9D0F73F2F@dask.thegler.dk> Resent-Message-ID: <200502211940.j1LJeDA0005281@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77876
>Category: ports
>Synopsis: Ensure uniqueness of (DOCS|EXAMPLES|DATA)DIR
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 21 19:40:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Lars Thegler
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD dask.thegler.dk 4.11-STABLE FreeBSD 4.11-STABLE #6: Thu Dec 30 14:06:09 CET 2004 root@dask.thegler.dk:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Since (DOCS|EXAMPLES|DATA)DIR are named exclusively from PORTNAME,
there is a risk of collisions in case of ports with identical
PORTNAMEs, say net/pear-SOAP and net/p5-SOAP.
>How-To-Repeat:
>Fix:
Apply something like the following patch, to include PKGNAMEPREFIX
in the naming scheme, like what is done for UNIQUENAME (or maybe
just use UNIQUENAME instead of PORTNAME for the (DOCS|EXAMPLES|DATA)DIR
naming):
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.509
diff -u -r1.509 bsd.port.mk
--- bsd.port.mk 9 Feb 2005 09:07:37 -0000 1.509
+++ bsd.port.mk 21 Feb 2005 19:10:48 -0000
@@ -833,11 +833,11 @@
# ${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/${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}
+# Default: ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
#
# Note that the install target will automatically add manpages (see
# above) and also substitute special sequences of characters (delimited
@@ -2700,9 +2700,9 @@
INFO_PATH?= info
.endif
-DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}
-EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME}
-DATADIR?= ${PREFIX}/share/${PORTNAME}
+DOCSDIR?= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR?= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+DATADIR?= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}" \
EXAMPLESDIR="${EXAMPLESDIR:S,^${PREFIX}/,,}" \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050221193811.9D0F73F2F>