Attachment 127769 Details for Bug 171621 – bsd-port-mk-maintainer-not-just-email.diff

[patch] bsd-port-mk-maintainer-not-just-email.diff

bsd-port-mk-maintainer-not-just-email.diff (text/plain), 2.92 KB, created by Chris Rees on 2012-09-13 21:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rees

Created: 2012-09-13 21:30:01 UTC

Size: 2.92 KB

patch

obsolete

>Index: bsd.gnome.mk
>===================================================================
>--- bsd.gnome.mk	(revision 304122)
>+++ bsd.gnome.mk	(working copy)
>@@ -806,7 +806,7 @@
> SUB_LIST+=		GNOME_SUBR=${GNOME_SUBR}
> .endif
> 
>-.if ${MAINTAINER}=="gnome@FreeBSD.org"
>+.if ${MAINTAINER:M*@*:C,^<([^>]*)>$,\1,}=="gnome@FreeBSD.org"
> CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http://www.freebsd.org/gnome/gnomelogalyzer.sh\", which will diagnose the problem and suggest a solution. If - and only if - the gnomelogalyzer cannot solve the problem, report the build failure to the FreeBSD GNOME team at ${MAINTAINER}, and attach (a) \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\", (b) the output of the failed make command, and (c) the gnomelogalyzer output. Also, it might be a good idea to provide an overview of all packages installed on your system (i.e. an \`ls ${PKG_DBDIR}\`). Put your attachment up on any website, copy-and-paste into http://freebsd-gnome.pastebin.com, or use send-pr(1) with the attachment. Try to avoid sending any attachments to the mailing list (${MAINTAINER}), because attachments sent to FreeBSD mailing lists are usually discarded by the mailing list software."
> .endif
> 
>Index: bsd.port.mk
>===================================================================
>--- bsd.port.mk	(revision 304122)
>+++ bsd.port.mk	(working copy)
>@@ -1181,7 +1181,7 @@
> 
> 
> # Get the default maintainer
>-MAINTAINER?=	ports@FreeBSD.org
>+MAINTAINER?=	FreeBSD Ports Mailing List <ports@FreeBSD.org>
> 
> # Get the architecture
> .if !defined(ARCH)
>@@ -2865,9 +2865,14 @@
> #  by user.
> EXTRACT_ONLY?=	${_DISTFILES}
> 
>+# Show traditional MAINTAINER, first word with @ in, stripped of surroundings
>+.for m in ${MAINTAINER:M*@*}
>+_MAINTAINER?=	${m:C,^<([^>]*)>$,\1,}
>+.endfor
>+
> .if !target(maintainer)
> maintainer:
>-	@${ECHO_CMD} "${MAINTAINER}"
>+	@${ECHO_MSG} "${_MAINTAINER}"
> .endif
> 
> .if !target(check-makefile)
>@@ -5553,7 +5558,7 @@
> describe:
> 	@(${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|"; \
> 	${ECHO_CMD} -n ${COMMENT:Q}; \
>-	${ECHO_CMD} -n "|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|"; \
>+	${ECHO_CMD} -n "|${_DESCR}|${_MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|"; \
> 	while read one two discard; do \
> 		case "$$one" in \
> 		WWW:)   case "$$two" in \
>@@ -5592,8 +5597,7 @@
> 			-e '/%%COMMENT%%/d' \
> 			-e 's|%%DESCR%%|'"$$(${ECHO_CMD} ${DESCR} | \
> 								 ${SED} -e 's|${.CURDIR}/||')"'|' \
>-			-e 's|%%EMAIL%%|'"$$(${ECHO_CMD} "${MAINTAINER}" | \
>-								 ${SED} -e 's/([^)]*)//;s/.*<//;s/>.*//')"'|g' \
>+			-e 's|%%EMAIL%%|${_MAINTAINER}|g' \
> 			-e 's|%%MAINTAINER%%|${MAINTAINER}|g' \
> 			-e 's|%%WEBSITE%%|'"$$(cd ${.CURDIR} && eval ${MAKE} pretty-print-www-site)"'|' \
> 			-e 's|%%BUILD_DEPENDS%%|'"$$(cd ${.CURDIR} && eval ${MAKE} pretty-print-build-depends-list)"'|' \

Actions: View | Diff

Attachments on bug 171621: 127769