Attachment 107993 Details for Bug 148808 – a.diff

[patch] a.diff

a.diff (text/plain), 1.26 KB, created by swell.k on 2010-07-21 07:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: swell.k

Created: 2010-07-21 07:30:02 UTC

Size: 1.26 KB

patch

obsolete

>Index: Mk/bsd.licenses.mk
>===================================================================
>RCS file: /a/.cvsup/ports/Mk/bsd.licenses.mk,v
>retrieving revision 1.2
>diff -u -p -r1.2 bsd.licenses.mk
>--- Mk/bsd.licenses.mk	26 May 2010 02:20:27 -0000	1.2
>+++ Mk/bsd.licenses.mk	20 Jul 2010 19:20:41 -0000
>@@ -723,11 +723,11 @@ PLIST_FILES+=	${_LICENSE_DIR_REL}/${_LIC
> PLIST_DIRS+=	${_LICENSE_DIR_REL}
> 
> .if ${_LICENSE_COMB} == "single"
>-PLIST_FILES+=	${_LICENSE_DIR_REL}/${_LICENSE_FILE:T}
>+PLIST_FILES+=	${_LICENSE_DIR_REL}/${_LICENSE}
> .else
> .	for lic in ${_LICENSE}
> .		if defined(_LICENSE_FILE_${lic})
>-PLIST_FILES+=	${_LICENSE_DIR_REL}/${_LICENSE_FILE_${lic}:T}
>+PLIST_FILES+=	${_LICENSE_DIR_REL}/${lic}
> .		endif
> .	endfor
> .endif
>@@ -737,10 +737,10 @@ install-license:
> 	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${_LICENSE_CATALOG}
> 	@${INSTALL_DATA} ${_LICENSE_REPORT_TMP} ${_LICENSE_REPORT}
> .if ${_LICENSE_COMB} == "single"
>-	@${INSTALL_DATA} ${_LICENSE_FILE} ${_LICENSE_DIR}
>+	@${INSTALL_DATA} ${_LICENSE_FILE} ${_LICENSE_DIR}/${_LICENSE}
> .else
> .	for lic in ${_LICENSE}
>-	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${_LICENSE_DIR}
>+	@${INSTALL_DATA} ${_LICENSE_FILE_${lic}} ${_LICENSE_DIR}/${lic}
> .	endfor
> .endif
> # XXX @dirrmtry entry must be here (no way to do with PLIST_* vars)

Actions: View | Diff

Attachments on bug 148808: 107993