Attachment 137442 Details for Bug 182957 – file.diff

[patch] file.diff

file.diff (text/plain), 3.60 KB, created by cjr on 2013-10-14 00:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cjr

Created: 2013-10-14 00:40:00 UTC

Size: 3.60 KB

patch

obsolete

>diff -uNr /poudriere/ports/default/math/ess/Makefile tree/math/ess/Makefile
>--- /poudriere/ports/default/math/ess/Makefile	2013-10-09 23:34:23.314649309 +0200
>+++ tree/math/ess/Makefile	2013-10-14 01:31:58.050035443 +0200
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/math/ess/Makefile 327746 2013-09-20 20:55:04Z bapt $
> 
> PORTNAME=	ess
>-DISTVERSION=	13.05
>-PORTREVISION=	1
>+DISTVERSION=	13.09
>+
> CATEGORIES=	math
> MASTER_SITES=	http://ess.r-project.org/downloads/ess/
> EXTRACT_SUFX=	.tgz
>@@ -16,28 +16,34 @@
> RUN_DEPENDS=	R:${PORTSDIR}/math/R
> 
> USE_EMACS=	yes
>-USE_GMAKE=	yes
>+USES=		gmake
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDOCS}
> INFO=	ess
> .endif
> 
>+#attention, dirty hack: because 'ETCDIR =' is typed _with_ trailing
>+#space in Makefile, $STAGEDIR append fails without the additional
>+#space in the port
> post-patch: .SILENT
> 	${REINPLACE_CMD} -e "\|^PREFIX=|d" -e "\|^INSTALL=|d" \
> 		-e "\|^EMACS=|s|=.*|=${EMACS_NAME}|" \
>-		-e "\|^ETCDIR=|s|=.*|=${PREFIX}/${EMACS_LIBDIR}/etc/ess|" \
>-		-e "\|^INFODIR=|s|=.*|=${PREFIX}/${INFO_PATH}|" \
>-		-e "\|^LISPDIR=|s|=.*|=${PREFIX}/${EMACS_SITE_LISPDIR}|" \
>+		-e "\|^ETCDIR\ =|s|=.*|=${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/ess|" \
>+		-e "\|^INFODIR=|s|=.*|=${STAGEDIR}${PREFIX}/${INFO_PATH}|" \
>+		-e "\|^LISPDIR=|s|=.*|=${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}|" \
> 		${WRKSRC}/Makeconf
>+
> 	${REINPLACE_CMD} -e "\|cd doc; \$$(MAKE) \$$@|d" \
> 		${WRKSRC}/Makefile
> 	${REINPLACE_CMD} -e "s|\$$(INSTALL)|${INSTALL_DATA}|g" \
> 		${WRKSRC}/doc/Makefile ${WRKSRC}/etc/Makefile
> 	${REINPLACE_CMD} -e "s|\$$(INSTALL)|${INSTALL_SCRIPT}|g" \
> 		${WRKSRC}/lisp/Makefile
>+	${REINPLACE_CMD} -e "s|\$$(INSTALL)|${INSTALL_SCRIPT}|g" \
>+		${WRKSRC}/lisp/Makefile
>+
> 
> .if ${PORT_OPTIONS:MDOCS}
> post-build:
>@@ -47,11 +53,13 @@
> 
> post-install:
> .if ${PORT_OPTIONS:MDOCS}
>+	#reinplace necessary because make install-info is causing
>+	# append to dir.txt
>+	${REINPLACE_CMD} -e "s|-m 444 dir.txt|-m 644 dir.txt|g" \
>+		${WRKSRC}/doc/Makefile
>+
> 	@(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \
> 		${MAKE_ARGS} install-info)
> .endif
>-	@${ECHO_MSG}
>-	@${CAT} ${PKGMESSAGE}
>-	@${ECHO_MSG}
> 
> .include <bsd.port.mk>
>diff -uNr /poudriere/ports/default/math/ess/distinfo tree/math/ess/distinfo
>--- /poudriere/ports/default/math/ess/distinfo	2013-10-09 23:34:23.365650096 +0200
>+++ tree/math/ess/distinfo	2013-10-14 00:21:59.638034182 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (ess-13.05.tgz) = b339fa418105e5376bd802a03b797dfbc44558a91e9d80a2c894a9f0206af900
>-SIZE (ess-13.05.tgz) = 3417506
>+SHA256 (ess-13.09.tgz) = d0625f8ac38831a05d419435d3a6ccf852878c8aea018c3f4a9c9d6bd61e71d2
>+SIZE (ess-13.09.tgz) = 3356969
>diff -uNr /poudriere/ports/default/math/ess/pkg-plist tree/math/ess/pkg-plist
>--- /poudriere/ports/default/math/ess/pkg-plist	2013-10-09 23:34:23.281647760 +0200
>+++ tree/math/ess/pkg-plist	2013-10-14 01:19:06.121034062 +0200
>@@ -1,3 +1,5 @@
>+info/dir
>+info/ess.info
> %%EMACS_LIBDIR%%/etc/ess/ESSR.R
> %%EMACS_LIBDIR%%/etc/ess/SVN-REVISION
> %%EMACS_LIBDIR%%/etc/ess/ess-developer.R
>@@ -40,6 +42,8 @@
> %%EMACS_SITE_LISPDIR%%/ess-eldoc.elc
> %%EMACS_SITE_LISPDIR%%/ess-font-lock.el
> %%EMACS_SITE_LISPDIR%%/ess-font-lock.elc
>+%%EMACS_SITE_LISPDIR%%/ess-gretl.el
>+%%EMACS_SITE_LISPDIR%%/ess-gretl.elc
> %%EMACS_SITE_LISPDIR%%/ess-help.el
> %%EMACS_SITE_LISPDIR%%/ess-help.elc
> %%EMACS_SITE_LISPDIR%%/ess-inf.el
>@@ -130,6 +134,6 @@
> %%EMACS_SITE_LISPDIR%%/mouseme.elc
> %%EMACS_SITE_LISPDIR%%/msdos.el
> %%EMACS_SITE_LISPDIR%%/msdos.elc
>-@dirrm %%EMACS_LIBDIR%%/etc/ess/icons
>-@dirrm %%EMACS_LIBDIR%%/etc/ess
>+@dirrmtry %%EMACS_LIBDIR%%/etc/ess/icons
>+@dirrmtry %%EMACS_LIBDIR%%/etc/ess
> @dirrmtry %%EMACS_LIBDIR%%/etc

Actions: View | Diff

Attachments on bug 182957: 137442