new version from upstream STAGEDIR conversion Fix: patch attached I'd be grateful for comments on several issues: 1) Patching of Makefile for requires to specify "ETCDIR =" with space, which I consider dirty. Is there a better way? 2) post-install target requires to alter permissions of one file which is 444 originally, but appended to by the port, requiring 644. Is there a better way? 3) make check-orphans complains about @dirrmtry's, poudriere testport about info/dir. I do not understand why. How to do that correctly? Many thanks Patch attached with submission follows: How-To-Repeat: na
Responsible Changed From-To: freebsd-ports-bugs->antoine Take
Author: antoine Date: Tue Oct 15 19:05:24 2013 New Revision: 330430 URL: http://svnweb.freebsd.org/changeset/ports/330430 Log: - Update to 13.09 - USE_GMAKE->USES=gmake - Add missing OPTIONS_DEFINE - Convert to STAGEDIR PR: ports/182957 Submitted by: Christopher J. Ruwe (maintainer) Modified: head/math/ess/Makefile head/math/ess/distinfo head/math/ess/pkg-plist Modified: head/math/ess/Makefile ============================================================================== --- head/math/ess/Makefile Tue Oct 15 19:04:27 2013 (r330429) +++ head/math/ess/Makefile Tue Oct 15 19:05:24 2013 (r330430) @@ -2,8 +2,7 @@ # $FreeBSD$ 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,21 +15,25 @@ LICENSE= GPLv2 RUN_DEPENDS= R:${PORTSDIR}/math/R USE_EMACS= yes -USE_GMAKE= yes +USES= gmake + +OPTIONS_DEFINE= DOCS -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 @@ -50,8 +53,5 @@ post-install: @(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ ${MAKE_ARGS} install-info) .endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} .include <bsd.port.mk> Modified: head/math/ess/distinfo ============================================================================== --- head/math/ess/distinfo Tue Oct 15 19:04:27 2013 (r330429) +++ head/math/ess/distinfo Tue Oct 15 19:05:24 2013 (r330430) @@ -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 Modified: head/math/ess/pkg-plist ============================================================================== --- head/math/ess/pkg-plist Tue Oct 15 19:04:27 2013 (r330429) +++ head/math/ess/pkg-plist Tue Oct 15 19:05:24 2013 (r330430) @@ -40,6 +40,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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Port updated, thanks! 1) It is not that ugly 2) With INFO=ess, you don't need to put ess.info or dir in the plist, it is already handled 3) I usually use poudriere testport, or testport -n / bulk -t, no problem with this port with both