Date: Tue, 14 Nov 2006 14:34:11 GMT From: "Frank J. Laszlo" <laszlof@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105529: [PATCH]: add WWWDIR macro to bsd.port.mk Message-ID: <200611141434.kAEEYBVZ059850@freefall.freebsd.org> Resent-Message-ID: <200611141440.kAEEe1XW060410@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105529
>Category: ports
>Synopsis: [PATCH]: add WWWDIR macro to bsd.port.mk
>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: Tue Nov 14 14:40:00 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Frank J. Laszlo
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 10 03:18:20 UTC 2005 kensmith@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386
>Description:
This patch will add a WWWDIR macro to bsd.port.mk, this is a commonly used directory
that is used in many ports to specify the location to install web files. I have tested
this patch on several www related ports with great success.
>How-To-Repeat:
>Fix:
--- bsd.port.mk-WWWDIR.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.544
diff -u -r1.544 bsd.port.mk
--- bsd.port.mk 30 Sep 2006 19:25:45 -0000 1.544
+++ bsd.port.mk 14 Nov 2006 14:20:50 -0000
@@ -916,6 +916,9 @@
# DATADIR - Name of the directory to install the packages shared data in.
# Default: ${TARGETDIR}/share/${PORTNAME}
#
+# WWWDIR - Name of the directory to install the packages www data in.
+# Default: ${TARGETDIR}/www/${PORTNAME}
+#
# DESKTOPDIR - Name of the directory to install ${DESKTOP_ENTRIES} in.
# Default: ${TARGETDIR}/share/applications
# DESKTOP_ENTRIES
@@ -1613,7 +1616,7 @@
DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}
SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \
DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
- DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}
+ WWWDIR=${WWWDIR} DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR}
PLIST_REINPLACE+= dirrmtry
PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true!
@@ -2988,10 +2991,12 @@
DOCSDIR?= ${TARGETDIR}/share/doc/${PORTNAME}
EXAMPLESDIR?= ${TARGETDIR}/share/examples/${PORTNAME}
DATADIR?= ${TARGETDIR}/share/${PORTNAME}
+WWWDIR?= ${TARGETDIR}/www/${PORTNAME}
PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${TARGETDIR}/,,}" \
EXAMPLESDIR="${EXAMPLESDIR:S,^${TARGETDIR}/,,}" \
- DATADIR="${DATADIR:S,^${TARGETDIR}/,,}"
+ DATADIR="${DATADIR:S,^${TARGETDIR}/,,}" \
+ WWWDIR="${WWWDIR:S,^${TARGETDIR}/,,}"
DESKTOPDIR?= ${TARGETDIR}/share/applications
_DESKTOPDIR_REL= ${DESKTOPDIR:S,^${TARGETDIR}/,,}/
--- bsd.port.mk-WWWDIR.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611141434.kAEEYBVZ059850>