From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 28 06:05:39 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 77FB416A54A for ; Tue, 28 Nov 2006 06:05:39 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D1DC4487F for ; Tue, 28 Nov 2006 05:40:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAS5eHsW030598 for ; Tue, 28 Nov 2006 05:40:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAS5eHda030593; Tue, 28 Nov 2006 05:40:17 GMT (envelope-from gnats) Resent-Date: Tue, 28 Nov 2006 05:40:17 GMT Resent-Message-Id: <200611280540.kAS5eHda030593@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Frank J. Laszlo" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7391816A4FF for ; Tue, 28 Nov 2006 05:30:49 +0000 (UTC) (envelope-from laszlof@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8506743DE9 for ; Tue, 28 Nov 2006 04:33:41 +0000 (GMT) (envelope-from laszlof@FreeBSD.org) Received: from freefall.freebsd.org (laszlof@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAS1E97j002914 for ; Tue, 28 Nov 2006 01:14:09 GMT (envelope-from laszlof@freefall.freebsd.org) Received: (from laszlof@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAS1E9lD002913; Tue, 28 Nov 2006 01:14:09 GMT (envelope-from laszlof) Message-Id: <200611280114.kAS1E9lD002913@freefall.freebsd.org> Date: Tue, 28 Nov 2006 01:14:09 GMT From: "Frank J. Laszlo" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105934: [PATCH]: Mk/bsd.port.mk: Add X_PLIST_FILES and X_PLIST_DIRS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Frank J. Laszlo" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Nov 2006 06:05:39 -0000 >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: