Attachment 147620 Details for Bug 193625 – devel/gmake

[patch] devel/gmake

gmake.svndif (text/plain), 7.63 KB, created by Anonymized Account on 2014-09-23 19:47:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymized Account

Created: 2014-09-23 19:47:19 UTC

Size: 7.63 KB

patch

obsolete

>Index: devel/gmake/Makefile
>===================================================================
>--- devel/gmake/Makefile	(revision 368159)
>+++ devel/gmake/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gmake
> PORTVERSION=	3.82
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	make
>@@ -22,8 +22,9 @@
> 
> USES=		makeinfo tar:bzip2
> 
>-OPTIONS_DEFINE=	NLS
>+OPTIONS_DEFINE=	DEBUG NLS WEBKIT_FIX
> OPTIONS_SUB=	yes
>+WEBKIT_FIX_DESC=	Patch argument list length for building WebKit 2.4
> 
> NLS_USES=	gettext iconv
> NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
>@@ -30,6 +31,16 @@
> 			--with-libintl-prefix=${LOCALBASE}
> NLS_CONFIGURE_ENABLE=	nls
> 
>+.include <bsd.port.options.mk>
>+
>+.if !${PORT_OPTIONS:MDEBUG}
>+INSTALL_TARGET=	install-strip
>+.endif
>+
>+.if ${PORT_OPTIONS:MWEBKIT_FIX}
>+EXTRA_PATCHES=	${FILESDIR}/extra-patch-webkit-2.4
>+.endif
>+
> CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
> 
> INFO=		make
>Index: devel/gmake/files/extra-patch-webkit-2.4
>===================================================================
>--- devel/gmake/files/extra-patch-webkit-2.4	(revision 0)
>+++ devel/gmake/files/extra-patch-webkit-2.4	(working copy)
>@@ -0,0 +1,115 @@
>+diff -u orig/configure.in configure.in
>+--- orig/configure.in	2010-07-28 07:39:50.000000000 +0200
>++++ configure.in	2012-03-21 12:34:20.000000000 +0100
>+@@ -64,7 +64,8 @@
>+ AC_HEADER_STAT
>+ AC_HEADER_TIME
>+ AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \
>+-		 memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h)
>++		 memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h \
>++		 sys/user.h linux/binfmts.h)
>+ 
>+ # Set a flag if we have an ANSI C compiler
>+ if test "$ac_cv_prog_cc_stdc" != no; then
>+Subdirectorios comunes: orig/doc y doc
>+Subdirectorios comunes: orig/glob y glob
>+diff -u orig/job.c job.c
>+--- orig/job.c	2010-07-24 10:27:50.000000000 +0200
>++++ job.c	2012-03-21 12:34:20.000000000 +0100
>+@@ -29,6 +29,11 @@
>+ 
>+ #include <string.h>
>+ 
>++#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H)
>++#include <sys/user.h>
>++#include <linux/binfmts.h>
>++#endif
>++
>+ /* Default shell to use.  */
>+ #ifdef WINDOWS32
>+ #include <windows.h>
>+@@ -2795,6 +2800,7 @@
>+     unsigned int sflags_len = strlen (shellflags);
>+     char *command_ptr = NULL; /* used for batch_mode_shell mode */
>+     char *new_line;
>++    char *args_ptr;
>+ 
>+ # ifdef __EMX__ /* is this necessary? */
>+     if (!unixy_shell)
>+@@ -2865,8 +2871,17 @@
>+ 	return new_argv;
>+       }
>+ 
>++#ifdef MAX_ARG_STRLEN
>++    static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ ";
>++#define ARG_NUMBER_DIGITS 5
>++#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4                   \
>++                  + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2))
>++#else
>++#define EVAL_LEN 0
>++#endif
>++
>+     new_line = alloca (shell_len + 1 + sflags_len + 1
>+-                             + (line_len*2) + 1);
>++                       + (line_len*2) + 1 + EVAL_LEN);
>+     ap = new_line;
>+     memcpy (ap, shell, shell_len);
>+     ap += shell_len;
>+@@ -2875,6 +2890,30 @@
>+     ap += sflags_len;
>+     *(ap++) = ' ';
>+     command_ptr = ap;
>++
>++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
>++    if (unixy_shell && line_len > MAX_ARG_STRLEN)
>++      {
>++	unsigned j;
>++	memcpy (ap, eval_line, sizeof (eval_line) - 1);
>++	ap += sizeof (eval_line) - 1;
>++	for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++)
>++	  ap += sprintf (ap, "\\$\\{%u\\}", j);
>++	*ap++ = '\\';
>++	*ap++ = '"';
>++	*ap++ = ' ';
>++	/* Copy only the first word of SHELL to $0.  */
>++	for (p = shell; *p != '\0'; ++p)
>++	  {
>++	    if (isspace ((unsigned char)*p))
>++	      break;
>++	    *ap++ = *p;
>++	  }
>++	*ap++ = ' ';
>++      }
>++#endif
>++    args_ptr = ap;
>++
>+     for (p = line; *p != '\0'; ++p)
>+       {
>+ 	if (restp != NULL && *p == '\n')
>+@@ -2922,6 +2961,14 @@
>+           }
>+ #endif
>+ 	*ap++ = *p;
>++
>++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
>++	if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2))
>++	  {
>++	    *ap++ = ' ';
>++	    args_ptr = ap;
>++	  }
>++#endif
>+       }
>+     if (ap == new_line + shell_len + sflags_len + 2)
>+       /* Line was empty.  */
>+diff -u make-3.82-orig/remake.c make-3.82/remake.c
>+--- orig/remake.c	2010-07-13 03:20:42.000000000 +0200
>++++ remake.c	2012-03-21 12:47:52.000000000 +0100
>+@@ -301,7 +301,7 @@
>+       /* Check for the case where a target has been tried and failed but
>+          the diagnostics hasn't been issued. If we need the diagnostics
>+          then we will have to continue. */
>+-      if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag))
>++      if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag) && f->command_state!=cs_not_started )
>+         {
>+           DBF (DB_VERBOSE, _("Pruning file `%s'.\n"));
>+           return f->command_state == cs_finished ? f->update_status : 0;
>
>Property changes on: devel/gmake/files/extra-patch-webkit-2.4
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/gmake/pkg-plist
>===================================================================
>--- devel/gmake/pkg-plist	(revision 368159)
>+++ devel/gmake/pkg-plist	(working copy)
>@@ -1,4 +1,5 @@
> bin/gmake
>+man/man1/gmake.1.gz
> %%NLS%%share/locale/be/LC_MESSAGES/make.mo
> %%NLS%%share/locale/da/LC_MESSAGES/make.mo
> %%NLS%%share/locale/de/LC_MESSAGES/make.mo
>@@ -23,4 +24,51 @@
> %%NLS%%share/locale/uk/LC_MESSAGES/make.mo
> %%NLS%%share/locale/vi/LC_MESSAGES/make.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
>-man/man1/gmake.1.gz
>+%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/ga/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/hr/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/be/
>+%%NLS%%@dirrmtry share/locale/da/
>+%%NLS%%@dirrmtry share/locale/de/
>+%%NLS%%@dirrmtry share/locale/es/
>+%%NLS%%@dirrmtry share/locale/fi/
>+%%NLS%%@dirrmtry share/locale/fr/
>+%%NLS%%@dirrmtry share/locale/ga/
>+%%NLS%%@dirrmtry share/locale/gl/
>+%%NLS%%@dirrmtry share/locale/he/
>+%%NLS%%@dirrmtry share/locale/hr/
>+%%NLS%%@dirrmtry share/locale/id/
>+%%NLS%%@dirrmtry share/locale/it/
>+%%NLS%%@dirrmtry share/locale/ja/
>+%%NLS%%@dirrmtry share/locale/ko/
>+%%NLS%%@dirrmtry share/locale/lt/
>+%%NLS%%@dirrmtry share/locale/nl/
>+%%NLS%%@dirrmtry share/locale/pl/
>+%%NLS%%@dirrmtry share/locale/pt_BR/
>+%%NLS%%@dirrmtry share/locale/ru/
>+%%NLS%%@dirrmtry share/locale/sv/
>+%%NLS%%@dirrmtry share/locale/tr/
>+%%NLS%%@dirrmtry share/locale/uk/
>+%%NLS%%@dirrmtry share/locale/vi/
>+%%NLS%%@dirrmtry share/locale/zh_CN/

Actions: View | Diff

Attachments on bug 193625: 147292 | 147299 | 147302 | 147615 | 147616 | 147617 | 147618 | 147620 | 147621 | 147622 | 147623 | 147726 | 147981 | 148304 | 148462 | 148852 | 148853 | 148854 | 148855 | 148856 | 148857 | 148858 | 148859 | 149838 | 149839 | 149840 | 149841