Attachment 143554 Details for Bug 187954 – Update to 3.1 & staging support

[patch] Update to 3.1 & staging support

patch-stage.txt (text/plain), 12.97 KB, created by Šimun Mikecin on 2014-06-09 07:35:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Šimun Mikecin

Created: 2014-06-09 07:35:15 UTC

Size: 12.97 KB

patch

obsolete

>diff -urN lang.orig/see/Makefile lang/see/Makefile
>--- lang.orig/see/Makefile	2014-03-10 00:45:01.905058000 +0100
>+++ lang/see/Makefile	2014-06-09 00:49:15.503266000 +0200
>@@ -2,56 +2,49 @@
> # $FreeBSD: head/lang/see/Makefile 340722 2014-01-22 17:00:46Z mat $
> 
> PORTNAME=	see
>-PORTVERSION=	2.0.1131
>-PORTREVISION=	1
>+PORTVERSION=	3.1.1424
> CATEGORIES=	lang devel
>-MASTER_SITES=	http://www.powerband.net.au/~david.leonard/ \
>-		http://freshmeat.net/redir/see/45974/url_tgz/
>+MASTER_SITES=	http://download.openpkg.org/components/cache/see/ \
>+		http://lil.fr.distfiles.macports.org/see/ \
>+		ftp://ftp7.freebsd.org/sites/distfiles.macports.org/see/ \
>+		ftp://ftp.mirrorservice.org/sites/distfiles.macports.org/see/ \
>+		ftp://kuiper.mirrorservice.org/sites/distfiles.macports.org/see/ \
>+		ftp://copernicus.mirrorservice.org/sites/distfiles.macports.org/see/ \
>+		ftp://ftp2.uk.i-scream.org/sites/distfiles.macports.org/see/ \
>+		ftp://mirror.csclub.uwaterloo.ca/MacPorts/mpdistfiles/see/
> 
> MAINTAINER=	numisemis@yahoo.com
> COMMENT=	Simple ECMAScript Engine (SEE)
> 
>-OPTIONS_DEFINE=	GC OPTIMIZED_CFLAGS SEE_DEBUG THREADS DOCS
>-OPTIONS_DEFAULT=	GC THREADS
>+LICENSE=	BSD
>+
>+OPTIONS_DEFINE=	GC SEE_DEBUG DOCS
>+OPTIONS_DEFAULT=	GC DOCS
> GC_DESC=	Use Boehm-Weiser garbage collection package
> SEE_DEBUG_DESC=	Internal SEE library debugging
> 
> CONFLICTS=	see-devel-[0-9]*
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
>-
>+USES=		pathfix perl5
> USE_LDCONFIG=	yes
>-USES=		perl5
> USE_PERL5=	build
> GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
> LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MMULTIPLE_THREADS}
>-CFLAGS+=	-DMULTIPLE_THREADS
>-.endif
>+CFLAGS+=	-O3 -fno-strict-aliasing
> 
> .if ! ${PORT_OPTIONS:MSEE_DEBUG}
> CFLAGS+=	-DNDEBUG
> .endif
> 
>-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
>-CFLAGS+=	-O3 -fomit-frame-pointer
>-.endif
>-
> .if ${PORT_OPTIONS:MGC}
>-LIB_DEPENDS+=	gc:${PORTSDIR}/devel/boehm-gc
>+LIB_DEPENDS+=	libgc.so:${PORTSDIR}/devel/boehm-gc
> .else
> CONFIGURE_ARGS+=	--without-boehm-gc
>-.if ! ${PORT_OPTIONS:MTHREADS}
>-PTHREAD_CFLAGS=
>-PTHREAD_LIBS=
>-.endif
> .endif
> 
> post-patch:
>@@ -60,9 +53,9 @@
> 
> .if ${PORT_OPTIONS:MDOCS}
> post-install:
>-	${MKDIR} ${DOCSDIR}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for f in doc/USAGE.html AUTHORS NEWS README TODO COPYING
>-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
> .endfor
> .endif
> 
>diff -urN lang.orig/see/distinfo lang/see/distinfo
>--- lang.orig/see/distinfo	2014-03-10 00:45:01.910058000 +0100
>+++ lang/see/distinfo	2014-06-09 00:44:43.745305000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (see-2.0.1131.tar.gz) = 0d398fd5f7a2e86ddbe361a80d9658bf0f0f6c11dad186953c3c064c56d12d93
>-SIZE (see-2.0.1131.tar.gz) = 948647
>+SHA256 (see-3.1.1424.tar.gz) = 04c58de4f56894f05ebb3b7c61b35e4090cd15710d42b3918f867eea50ab8f5c
>+SIZE (see-3.1.1424.tar.gz) = 1015347
>diff -urN lang.orig/see/files/patch-libsee_dtoa.c lang/see/files/patch-libsee_dtoa.c
>--- lang.orig/see/files/patch-libsee_dtoa.c	2014-03-10 00:45:01.773058000 +0100
>+++ lang/see/files/patch-libsee_dtoa.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,24 +0,0 @@
>---- libsee/dtoa.c.orig	2005-12-24 04:35:38.000000000 +0100
>-+++ libsee/dtoa.c	2008-04-07 11:30:11.529829910 +0200
>-@@ -168,6 +168,11 @@
>-  *	the result overflows to +-Infinity or underflows to 0.
>-  */
>- 
>-+#ifdef MULTIPLE_THREADS
>-+#include <pthread.h>
>-+static pthread_mutex_t mylock[2] = { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER };
>-+#endif
>-+
>- #ifndef Long
>- #define Long long
>- #endif
>-@@ -470,6 +475,9 @@
>- #ifndef MULTIPLE_THREADS
>- #define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
>- #define FREE_DTOA_LOCK(n)	/*nothing*/
>-+#else
>-+#define ACQUIRE_DTOA_LOCK(n)	pthread_mutex_lock(&mylock[n]);
>-+#define FREE_DTOA_LOCK(n)	pthread_mutex_unlock(&mylock[n]);
>- #endif
>- 
>- #define Kmax 15
>diff -urN lang.orig/see/files/patch-libsee_input__utf8.c lang/see/files/patch-libsee_input__utf8.c
>--- lang.orig/see/files/patch-libsee_input__utf8.c	2014-03-10 00:45:01.907058000 +0100
>+++ lang/see/files/patch-libsee_input__utf8.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- libsee/input_utf8.c.orig	Wed Jan 18 12:40:19 2006
>-+++ libsee/input_utf8.c	Tue Dec 12 08:48:44 2006
>-@@ -63,7 +63,7 @@
>- 
>- struct input_utf8 {
>- 	struct SEE_input	inp;
>--	const char *	s;
>-+	const unsigned char *	s;
>- };
>- 
>- static SEE_unicode_t
>-@@ -141,7 +141,7 @@
>- 	inpu->inp.inputclass = &input_utf8_class;
>- 	inpu->inp.filename = NULL;
>- 	inpu->inp.first_lineno = 1;
>--	inpu->s = s;
>-+	inpu->s = (const unsigned char *)s;
>- 	SEE_INPUT_NEXT((struct SEE_input *)inpu);	/* prime */
>- 	return (struct SEE_input *)inpu;
>- }
>diff -urN lang.orig/see/files/patch-libsee_obj__Date.c lang/see/files/patch-libsee_obj__Date.c
>--- lang.orig/see/files/patch-libsee_obj__Date.c	2014-03-10 00:45:01.909058000 +0100
>+++ lang/see/files/patch-libsee_obj__Date.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- libsee/obj_Date.c.orig	Sun May  7 06:43:55 2006
>-+++ libsee/obj_Date.c	Tue Sep  5 09:11:09 2006
>-@@ -335,7 +335,7 @@
>- 	struct SEE_interpreter *interp;
>- 	SEE_number_t t;
>- {
>--	return t + LocalTZA(interp) + DaylightSavingTA(interp, t);
>-+	return t + LocalTZA(interp) - DaylightSavingTA(interp, t);
>- }
>- 
>- /*
>diff -urN lang.orig/see/files/patch-libsee_system.c lang/see/files/patch-libsee_system.c
>--- lang.orig/see/files/patch-libsee_system.c	2014-03-10 00:45:01.904058000 +0100
>+++ lang/see/files/patch-libsee_system.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- libsee/system.c.orig	2009-12-17 14:05:43.000000000 -0800
>-+++ libsee/system.c	2009-12-17 14:07:20.000000000 -0800
>-@@ -70,6 +70,8 @@
>- #include "dprint.h"
>- #include "platform.h"
>- 
>-+typedef	void * GC_PTR;
>-+
>- /* Prototypes */
>- static unsigned int simple_random_seed(void);
>- #if HAVE_GC_MALLOC
>diff -urN lang.orig/see/pkg-plist lang/see/pkg-plist
>--- lang.orig/see/pkg-plist	2014-03-10 00:45:01.908058000 +0100
>+++ lang/see/pkg-plist	2014-06-09 00:44:43.794309000 +0200
>@@ -23,11 +23,12 @@
> lib/libsee.a
> lib/libsee.la
> lib/libsee.so
>-lib/libsee.so.1
>+lib/libsee.so.2
> lib/see/libFile.a
> lib/see/libFile.la
> lib/see/libFile.so
> lib/see/libFile.so.0
>+libdata/pkgconfig/see.pc
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
>diff -urN lang.orig/see-devel/Makefile lang/see-devel/Makefile
>--- lang.orig/see-devel/Makefile	2014-03-10 00:45:00.911058000 +0100
>+++ lang/see-devel/Makefile	1970-01-01 01:00:00.000000000 +0100
>@@ -1,67 +0,0 @@
>-# Created by: Simun Mikecin <numisemis@yahoo.com>
>-# $FreeBSD: head/lang/see-devel/Makefile 340722 2014-01-22 17:00:46Z mat $
>-
>-PORTNAME=	see
>-PORTVERSION=	3.0.1376
>-PORTREVISION=	2
>-CATEGORIES=	lang devel
>-MASTER_SITES=	http://www.evolane.com/download/mirror/etcl/ \
>-		http://www.evolane.fr/download/mirror/etcl/
>-PKGNAMESUFFIX=	-devel
>-
>-MAINTAINER=	numisemis@yahoo.com
>-COMMENT=	Simple ECMAScript Engine (SEE)
>-
>-OPTIONS_DEFINE=	GC OPTIMIZED_CFLAGS SEE_DEBUG THREADS DOCS
>-OPTIONS_DEFAULT=	GC THREADS
>-GC_DESC=	Use Boehm-Weiser garbage collection package
>-SEE_DEBUG_DESC=	Internal SEE library debugging
>-
>-CONFLICTS=	see-[0-9]*
>-
>-USES=		pathfix perl5
>-USE_LDCONFIG=	yes
>-USE_PERL5=	build
>-GNU_CONFIGURE=	yes
>-
>-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>-
>-NO_STAGE=	yes
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MMULTIPLE_THREADS}
>-CFLAGS+=	-DMULTIPLE_THREADS
>-.endif
>-
>-.if ! ${PORT_OPTIONS:MSEE_DEBUG}
>-CFLAGS+=	-DNDEBUG
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
>-CFLAGS+=	-O3 -fomit-frame-pointer
>-.endif
>-
>-.if ${PORT_OPTIONS:MGC}
>-LIB_DEPENDS+=	gc:${PORTSDIR}/devel/boehm-gc
>-.else
>-CONFIGURE_ARGS+=	--without-boehm-gc
>-.if ! ${PORT_OPTIONS:MTHREADS}
>-PTHREAD_CFLAGS=
>-PTHREAD_LIBS=
>-.endif
>-.endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e "s|PACKAGE_BUGREPORT='leonard@users|PACKAGE_BUGREPORT='leonard\\\@users|" \
>-		${WRKSRC}/configure
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-post-install:
>-	${MKDIR} ${DOCSDIR}
>-.for f in doc/USAGE.html AUTHORS NEWS README TODO COPYING
>-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
>-.endfor
>-.endif
>-
>-.include <bsd.port.mk>
>diff -urN lang.orig/see-devel/distinfo lang/see-devel/distinfo
>--- lang.orig/see-devel/distinfo	2014-03-10 00:45:00.949059000 +0100
>+++ lang/see-devel/distinfo	1970-01-01 01:00:00.000000000 +0100
>@@ -1,2 +0,0 @@
>-SHA256 (see-3.0.1376.tar.gz) = e06dc6182adc2d4abb7b23b92472c02b8a1016d58038533770de4c26988d51f7
>-SIZE (see-3.0.1376.tar.gz) = 1066852
>diff -urN lang.orig/see-devel/files/patch-libsee_dtoa.c lang/see-devel/files/patch-libsee_dtoa.c
>--- lang.orig/see-devel/files/patch-libsee_dtoa.c	2014-03-10 00:45:00.912058000 +0100
>+++ lang/see-devel/files/patch-libsee_dtoa.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,24 +0,0 @@
>---- libsee/dtoa.c.orig	2005-12-24 04:35:38.000000000 +0100
>-+++ libsee/dtoa.c	2008-04-07 11:30:11.529829910 +0200
>-@@ -168,6 +168,11 @@
>-  *	the result overflows to +-Infinity or underflows to 0.
>-  */
>- 
>-+#ifdef MULTIPLE_THREADS
>-+#include <pthread.h>
>-+static pthread_mutex_t mylock[2] = { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER };
>-+#endif
>-+
>- #ifndef Long
>- #define Long long
>- #endif
>-@@ -470,6 +475,9 @@
>- #ifndef MULTIPLE_THREADS
>- #define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
>- #define FREE_DTOA_LOCK(n)	/*nothing*/
>-+#else
>-+#define ACQUIRE_DTOA_LOCK(n)	pthread_mutex_lock(&mylock[n]);
>-+#define FREE_DTOA_LOCK(n)	pthread_mutex_unlock(&mylock[n]);
>- #endif
>- 
>- #define Kmax 15
>diff -urN lang.orig/see-devel/files/patch-libsee_parse.c lang/see-devel/files/patch-libsee_parse.c
>--- lang.orig/see-devel/files/patch-libsee_parse.c	2014-03-10 00:45:00.975058000 +0100
>+++ lang/see-devel/files/patch-libsee_parse.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,18 +0,0 @@
>---- libsee/parse.c.orig	Sun Feb 10 05:59:48 2008
>-+++ libsee/parse.c	Thu Aug 21 13:07:30 2008
>-@@ -27,7 +27,7 @@
>-  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>-  * POSSIBILITY OF SUCH DAMAGE.
>-  */
>--/* $Id: parse.c 1371 2008-02-10 04:59:09Z d $ */
>-+/* $Id: parse.c 1381 2008-03-05 07:29:31Z d $ */
>- 
>- /*
>-  * Combined parser and evaluator.
>-@@ -12317,6 +12317,7 @@
>- 		&SourceElements_nodeclass); 
>- 	ss->statements = s;
>- 	ss->functions = NULL;
>-+	ss->vars = NULL;
>- 	return (struct node *)ss;
>- }
>diff -urN lang.orig/see-devel/files/patch-libsee_value.c lang/see-devel/files/patch-libsee_value.c
>--- lang.orig/see-devel/files/patch-libsee_value.c	2014-03-10 00:45:00.647058000 +0100
>+++ lang/see-devel/files/patch-libsee_value.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,40 +0,0 @@
>---- libsee/value.c.orig	Sat Feb  9 13:54:59 2008
>-+++ libsee/value.c	Thu Aug 21 13:07:30 2008
>-@@ -27,7 +27,7 @@
>-  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>-  * POSSIBILITY OF SUCH DAMAGE.
>-  */
>--/* $Id: value.c 1370 2008-02-09 12:54:24Z d $ */
>-+/* $Id: value.c 1383 2008-07-03 13:56:11Z d $ */
>- 
>- #if HAVE_CONFIG_H
>- # include <config.h>
>-@@ -289,14 +289,17 @@
>- 		} else if (SEE_NUMBER_ISPINF(val)) {
>- 			SEE_SET_STRING(res, STR(Infinity));
>- 		} else {
>--			char *a, *endstr;
>-+			char *a0, *a, *endstr;
>- 			struct SEE_string *s;
>- 			int sign, k, n, i, exponent;
>- 			int len;
>- 
>--			a = SEE_dtoa(val->u.number, DTOA_MODE_SHORT_SW, 31, 
>-+			a0 = SEE_dtoa(val->u.number, DTOA_MODE_SHORT_SW, 31, 
>- 				&n, &sign, &endstr);
>--			k = (int)(endstr - a);
>-+			k = (int)(endstr - a0);
>-+			a = SEE_STRING_ALLOCA(interp, char, k);
>-+			memcpy(a, a0, k);
>-+			SEE_freedtoa(a0);
>- 
>- 			/* Numbers converted to strings are generally
>- 			 * small and short-lived. */
>-@@ -359,7 +362,6 @@
>- 			}
>- 			SEE_ASSERT(interp, len == s->length);
>- 			SEE_SET_STRING(res, s);
>--			SEE_freedtoa(a);
>- 		} 
>- 		break;
>- 	case SEE_STRING:
>diff -urN lang.orig/see-devel/pkg-descr lang/see-devel/pkg-descr
>--- lang.orig/see-devel/pkg-descr	2014-03-10 00:45:00.646058000 +0100
>+++ lang/see-devel/pkg-descr	1970-01-01 01:00:00.000000000 +0100
>@@ -1,3 +0,0 @@
>-Library that provides an ECMAScript (JavaScript) run-time environment.
>-
>-WWW: http://www.adaptive-enterprises.com.au/~d/software/see/
>diff -urN lang.orig/see-devel/pkg-plist lang/see-devel/pkg-plist
>--- lang.orig/see-devel/pkg-plist	2014-03-10 00:45:00.646058000 +0100
>+++ lang/see-devel/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>@@ -1,40 +0,0 @@
>-bin/libsee-config
>-bin/see-shell
>-include/see/cfunction.h
>-include/see/context.h
>-include/see/debug.h
>-include/see/error.h
>-include/see/eval.h
>-include/see/input.h
>-include/see/intern.h
>-include/see/interpreter.h
>-include/see/mem.h
>-include/see/module.h
>-include/see/native.h
>-include/see/no.h
>-include/see/object.h
>-include/see/see.h
>-include/see/string.h
>-include/see/system.h
>-include/see/try.h
>-include/see/type.h
>-include/see/value.h
>-include/see/version.h
>-lib/libsee.a
>-lib/libsee.la
>-lib/libsee.so
>-lib/libsee.so.2
>-lib/see/libFile.a
>-lib/see/libFile.la
>-lib/see/libFile.so
>-lib/see/libFile.so.0
>-libdata/pkgconfig/see.pc
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
>-%%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/USAGE.html
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm include/see
>-@dirrm lib/see

Flags:

numisemis: maintainer-approval+

Actions: View | Diff

Attachments on bug 187954: 141205 | 143554