Date: Tue, 28 Nov 2006 01:14:09 GMT From: "Frank J. Laszlo" <laszlof@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105934: [PATCH]: Mk/bsd.port.mk: Add X_PLIST_FILES and X_PLIST_DIRS Message-ID: <200611280114.kAS1E9lD002913@freefall.freebsd.org> Resent-Message-ID: <200611280540.kAS5eHda030593@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105934
>Category: ports
>Synopsis: [PATCH]: Mk/bsd.port.mk: Add X_PLIST_FILES and X_PLIST_DIRS
>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 28 05:40:16 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:
We are currently in progress of moving ports away from X11BASE in preparation for completely removing it from
mtree. Until Xorg is moved, some ports will be required to still install certain things (such as app-defaults)
into X11BASE. This is currently done with @cwd in the pkg-plist. This patch will add 2 knobs for the port
Makefile, X_PLIST_FILES and X_PLIST_DIRS. They do exactly what it sounds like, much like PLIST_FILES and
PLIST_DIRS, except we insert an @cwd ${X11BASE} before it. This feature should be removed once Xorg is moved out
of X11BASE. With this patch, it will allow us an easier method to moving existing ports into LOCALBASE.
>How-To-Repeat:
>Fix:
--- bsd.port.mk-XPLIST.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 28 Nov 2006 01:03:54 -0000
@@ -5417,8 +5417,23 @@
@for i in ${_TMLINKS:N${_PREFIX}*:S|^/||}; do \
${ECHO_CMD} "$$i" >> ${TMPPLIST}; \
done
- @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
.endif
+
+# XXX: X_PLIST_FILES and X_PLIST_DIRS should be removed when Xorg is moved to LOCALBASE
+
+.if defined(X_PLIST_FILES)
+ @${ECHO_CMD} '@cwd ${X11BASE}' >> ${TMPPLIST}
+ @for i in ${X_PLIST_FILES}; do \
+ ${ECHO_CMD} "$$i" >> ${TMPPLIST}; \
+ done
+.endif
+.if defined(X_PLIST_DIRS)
+ @${ECHO_CMD} '@cwd ${X11BASE}' >> ${TMPPLIST}
+ @for dir in ${X_PLIST_DIRS}; do \
+ ${ECHO_CMD} "$$dir" | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} \
+ done
+.endif
+ @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
@for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \
${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \
done
--- bsd.port.mk-XPLIST.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?200611280114.kAS1E9lD002913>