Index: branches/2018Q4/editors/mg/files/reallocarray.c =================================================================== --- branches/2018Q4/editors/mg/files/reallocarray.c (revision 481099) +++ branches/2018Q4/editors/mg/files/reallocarray.c (nonexistent) @@ -1,39 +0,0 @@ -/* $OpenBSD: reallocarray.c,v 1.3 2015/09/13 08:31:47 guenther Exp $ */ -/* - * Copyright (c) 2008 Otto Moerbeek - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include -#include - -/* - * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX - * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW - */ -#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) - -void * -reallocarray(void *optr, size_t nmemb, size_t size) -{ - if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && - nmemb > 0 && SIZE_MAX / nmemb < size) { - errno = ENOMEM; - return NULL; - } - return realloc(optr, size * nmemb); -} - Property changes on: branches/2018Q4/editors/mg/files/reallocarray.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q4/editors/mg/files/extra-patch-def.h =================================================================== --- branches/2018Q4/editors/mg/files/extra-patch-def.h (revision 481099) +++ branches/2018Q4/editors/mg/files/extra-patch-def.h (nonexistent) @@ -1,11 +0,0 @@ ---- def.h.orig 2016-09-01 15:30:59 UTC -+++ def.h -@@ -328,6 +328,8 @@ struct undo_rec { - * Prototypes. - */ - -+void *reallocarray(void*, size_t, size_t); -+ - /* tty.c X */ - void ttinit(void); - void ttreinit(void); Property changes on: branches/2018Q4/editors/mg/files/extra-patch-def.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q4/editors/mg/Makefile =================================================================== --- branches/2018Q4/editors/mg/Makefile (revision 481099) +++ branches/2018Q4/editors/mg/Makefile (revision 481100) @@ -1,43 +1,26 @@ # Created by: Dima Dorfman # $FreeBSD$ PORTNAME= mg -PORTVERSION= 20180408 +PORTVERSION= 20180927 CATEGORIES= editors +MASTER_SITES= https://github.com/ibara/mg/releases/download/mg-${PORTVERSION}/ MAINTAINER= tobik@FreeBSD.org COMMENT= Small, fast Emacs-like editor LICENSE= PD USES= ncurses -USE_GITHUB= yes -GH_ACCOUNT= hboetes +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} PLIST_FILES= bin/mg man/man1/mg.1.gz -PORTDOCS= README tutorial +PORTDOCS= README-Mg README.md tutorial OPTIONS_DEFINE= DOCS - -.include - -.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1100072 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-def.h - -post-patch: - ${CP} ${FILESDIR}/reallocarray.c ${WRKSRC} - @${REINPLACE_CMD} 's| tags.c| tags.c reallocarray.c|' ${WRKSRC}/Makefile -.endif - -pre-configure: - @${REINPLACE_CMD} 's|-lcurses|-lncurses|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} 's|__dead|__dead2|' ${WRKSRC}/main.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: branches/2018Q4/editors/mg/distinfo =================================================================== --- branches/2018Q4/editors/mg/distinfo (revision 481099) +++ branches/2018Q4/editors/mg/distinfo (revision 481100) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526285944 -SHA256 (hboetes-mg-20180408_GH0.tar.gz) = 85c1d47500fd042e427b670c630c228668bcc4f532a280f9ecce3d302229bbe4 -SIZE (hboetes-mg-20180408_GH0.tar.gz) = 141988 +TIMESTAMP = 1538400869 +SHA256 (mg-20180927.tar.gz) = 99b2fd2cf9d6474153d6c5769c818dd5514c147b8a8ad660a5e114bc1ebd504d +SIZE (mg-20180927.tar.gz) = 156632 Index: branches/2018Q4/editors/mg/pkg-descr =================================================================== --- branches/2018Q4/editors/mg/pkg-descr (revision 481099) +++ branches/2018Q4/editors/mg/pkg-descr (revision 481100) @@ -1,6 +1,6 @@ Mg is a small, fast, portable, and free (public domain) Emacs-like editor maintained by the OpenBSD Project. It is intended for people who can't, or don't want to, run the real GNU Emacs, or are not familiar with the vi(1) editor. -WWW: https://github.com/hboetes/mg +WWW: https://github.com/ibara/mg Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 481099) +++ branches/2018Q4 (revision 481100) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r481035