head	1.11;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.5
	OPENPKG_E1_MP:1.5
	OPENPKG_E1_MP_2_STABLE:1.5.2.2
	OPENPKG_E1_FP:1.5.2.2
	OPENPKG_2_STABLE_MP:1.5
	OPENPKG_2_STABLE_20061018:1.5.2.2
	OPENPKG_2_STABLE:1.5.0.2
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.11
date	2009.07.24.15.18.16;	author rse;	state Exp;
branches;
next	1.10;
commitid	xSnGZYrHZtGBDYWt;

1.10
date	2009.03.18.20.26.28;	author rse;	state Exp;
branches;
next	1.9;
commitid	fOHoiUr2JHMqsyGt;

1.9
date	2008.08.19.21.21.36;	author rse;	state Exp;
branches;
next	1.8;
commitid	Lb2E5G6rc4tQxrft;

1.8
date	2008.07.04.12.05.23;	author rse;	state Exp;
branches;
next	1.7;
commitid	vXtAs47vKM3IWt9t;

1.7
date	2008.04.16.07.20.11;	author rse;	state Exp;
branches;
next	1.6;
commitid	0o2Eek5IiYNiUiZs;

1.6
date	2007.04.20.21.33.42;	author rse;	state Exp;
branches;
next	1.5;
commitid	CNYQ8TDSloexgRes;

1.5
date	2006.03.10.21.18.45;	author rse;	state Exp;
branches
	1.5.2.1;
next	1.4;
commitid	JFAhAqEIWTkweGor;

1.4
date	2005.12.08.19.11.29;	author rse;	state Exp;
branches;
next	1.3;
commitid	CKU5DexJQpCduQcr;

1.3
date	2005.07.03.18.19.47;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2005.05.15.17.26.00;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2005.03.23.11.09.50;	author rse;	state Exp;
branches;
next	;

1.5.2.1
date	2006.03.10.21.18.45;	author rse;	state dead;
branches;
next	1.5.2.2;
commitid	iZxwRSmmWscPXUQr;

1.5.2.2
date	2006.10.16.14.53.56;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.11
log
@upgrading package: parrot 1.3.0 -> 1.4.0
@
text
@Index: compilers/imcc/imcc.l
--- compilers/imcc/imcc.l.orig	2009-07-14 21:41:37 +0200
+++ compilers/imcc/imcc.l	2009-07-24 17:05:56 +0200
@@@@ -114,6 +114,7 @@@@
 %option reentrant
 %option never-interactive
 %option stack
+%option array
 
 LETTER          [a-zA-Z_@@]
 DIGIT           [0-9]
Index: config/auto/icu.pm
--- config/auto/icu.pm.orig	2009-06-27 21:41:40 +0200
+++ config/auto/icu.pm	2009-07-24 17:05:56 +0200
@@@@ -333,7 +333,7 @@@@
             $without = 1;
         }
         my $slash = $conf->data->get('slash');
-        $icuheaders .= "${slash}include";
+        $icuheaders .= "${slash}include/icu";
         if (! -d $icuheaders) {
             $without = 1;
         }
Index: config/auto/readline.pm
--- config/auto/readline.pm.orig	2009-04-28 11:55:39 +0200
+++ config/auto/readline.pm	2009-07-24 17:05:56 +0200
@@@@ -36,7 +36,8 @@@@
 sub runstep {
     my ( $self, $conf ) = @@_;
 
-    my $verbose = $conf->options->get('verbose');
+    my ($verbose, $without) = $conf->options->get('verbose', 'without-readline');
+    return 1 if ($without);
 
     my $cc     = $conf->data->get('cc');
     my $osname = $conf->data->get_p5('OSNAME');
Index: config/init/hints/freebsd.pm
--- config/init/hints/freebsd.pm.orig	2009-07-07 07:13:00 +0200
+++ config/init/hints/freebsd.pm	2009-07-24 17:09:26 +0200
@@@@ -36,7 +36,7 @@@@
         rpath => '-Wl,-R',
 
         has_dynamic_linking    => 1,
-        parrot_is_shared       => 1,
+        parrot_is_shared       => 0,
         libparrot_shared       => "libparrot$share_ext.$version",
         libparrot_shared_alias => "libparrot$share_ext",
         libparrot_soname       => "-Wl,-soname=libparrot$share_ext.$version",
Index: config/init/hints/linux.pm
--- config/init/hints/linux.pm.orig	2009-07-07 07:13:00 +0200
+++ config/init/hints/linux.pm	2009-07-24 17:09:42 +0200
@@@@ -143,7 +143,7 @@@@
         rpath          => '-Wl,-rpath=',
 
         has_dynamic_linking    => 1,
-        parrot_is_shared       => 1,
+        parrot_is_shared       => 0,
         libparrot_shared       => "libparrot$share_ext.$version",
         libparrot_shared_alias => "libparrot$share_ext",
         libparrot_soname       => "-Wl,-soname=libparrot$share_ext.$version",
Index: lib/Parrot/Configure/Options/Conf.pm
--- lib/Parrot/Configure/Options/Conf.pm.orig	2009-07-14 21:41:35 +0200
+++ lib/Parrot/Configure/Options/Conf.pm	2009-07-24 17:05:56 +0200
@@@@ -105,6 +105,7 @@@@
    --without-gettext    Build parrot without gettext support
    --without-gmp        Build parrot without GMP support
    --without-opengl     Build parrot without OpenGL support (GL/GLU/GLUT)
+   --without-readline   Build parrot without Readline support
    --without-pcre       Build parrot without pcre support
 
 ICU Options:
Index: lib/Parrot/Configure/Options/Conf/Shared.pm
--- lib/Parrot/Configure/Options/Conf/Shared.pm.orig	2009-07-14 21:41:35 +0200
+++ lib/Parrot/Configure/Options/Conf/Shared.pm	2009-07-24 17:05:56 +0200
@@@@ -74,6 +74,7 @@@@
     without-gmp
     without-icu
     without-opengl
+    without-readline
     without-pcre
     without-threads
     yacc
@


1.10
log
@modifying package: parrot-1.0.0 20090318 again
@
text
@d2 2
a3 2
--- compilers/imcc/imcc.l.orig	2009-03-08 21:32:46 +0100
+++ compilers/imcc/imcc.l	2009-03-18 21:15:47 +0100
d13 3
a15 3
--- config/auto/icu.pm.orig	2009-03-08 21:32:47 +0100
+++ config/auto/icu.pm	2009-03-18 21:15:47 +0100
@@@@ -332,7 +332,7 @@@@
d25 2
a26 2
--- config/auto/readline.pm.orig	2009-02-17 21:10:46 +0100
+++ config/auto/readline.pm	2009-03-18 21:15:47 +0100
d38 3
a40 3
--- config/init/hints/freebsd.pm.orig	2009-03-08 21:32:47 +0100
+++ config/init/hints/freebsd.pm	2009-03-18 21:15:47 +0100
@@@@ -34,7 +34,7 @@@@
d46 3
a48 3
         libparrot_shared       => 'libparrot$(SHARE_EXT).$(SOVERSION)',
         libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
         libparrot_soname       => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
d50 3
a52 3
--- config/init/hints/linux.pm.orig	2009-03-08 21:32:47 +0100
+++ config/init/hints/linux.pm	2009-03-18 21:15:47 +0100
@@@@ -141,7 +141,7 @@@@
d58 3
a60 3
         libparrot_shared       => 'libparrot$(SHARE_EXT).$(SOVERSION)',
         libparrot_shared_alias => 'libparrot$(SHARE_EXT)',
         libparrot_soname       => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
d62 3
a64 3
--- lib/Parrot/Configure/Options/Conf.pm.orig	2009-02-17 21:10:48 +0100
+++ lib/Parrot/Configure/Options/Conf.pm	2009-03-18 21:15:47 +0100
@@@@ -102,6 +102,7 @@@@
d73 3
a75 4
--- lib/Parrot/Configure/Options/Conf/Shared.pm.orig	2009-02-17 21:10:51 +0100
+++ lib/Parrot/Configure/Options/Conf/Shared.pm	2009-03-18 21:15:47 +0100
@@@@ -72,6 +72,7 @@@@
     without-gettext
d77 1
d81 1
a81 1
     without-icu
@


1.9
log
@upgrading package: parrot 0.6.2 -> 0.7.0
@
text
@d2 3
a4 3
--- compilers/imcc/imcc.l.orig	2008-08-19 15:17:14 +0200
+++ compilers/imcc/imcc.l	2008-08-19 22:08:27 +0200
@@@@ -125,6 +125,7 @@@@
d13 2
a14 2
--- config/auto/icu.pm.orig	2008-08-19 15:17:25 +0200
+++ config/auto/icu.pm	2008-08-19 22:09:59 +0200
d24 13
d38 2
a39 2
--- config/init/hints/freebsd.pm.orig	2008-08-19 15:17:23 +0200
+++ config/init/hints/freebsd.pm	2008-08-19 22:08:27 +0200
d50 3
a52 3
--- config/init/hints/linux.pm.orig	2008-08-19 15:17:23 +0200
+++ config/init/hints/linux.pm	2008-08-19 22:08:27 +0200
@@@@ -137,7 +137,7 @@@@
d61 22
@


1.8
log
@upgrading package: parrot 0.6.1 -> 0.6.2
@
text
@d2 3
a4 3
--- compilers/imcc/imcc.l.orig	2007-01-16 20:55:34 +0100
+++ compilers/imcc/imcc.l	2007-01-19 20:28:35 +0100
@@@@ -78,6 +78,7 @@@@
d13 11
a23 11
--- config/auto/icu.pm.orig	2007-01-16 20:55:44 +0100
+++ config/auto/icu.pm	2007-01-19 20:28:35 +0100
@@@@ -75,7 +75,7 @@@@
             if ( defined $icuheaders ) {
                 chomp $icuheaders;
                 $without = 1 unless -d $icuheaders;
-                $icuheaders .= "${slash}include";
+                $icuheaders .= "${slash}include/icu";
                 $without = 1 unless -d $icuheaders;
             }
 
d25 2
a26 2
--- config/init/hints/freebsd.pm.orig	2007-01-16 20:55:40 +0100
+++ config/init/hints/freebsd.pm	2007-01-19 20:29:01 +0100
d37 3
a39 3
--- config/init/hints/linux.pm.orig	2007-01-16 20:55:40 +0100
+++ config/init/hints/linux.pm	2007-01-19 20:29:13 +0100
@@@@ -80,7 +80,7 @@@@
a47 13
Index: src/packdump.c
--- src/packdump.c.orig	2008-07-04 11:46:26 +0200
+++ src/packdump.c	2008-07-04 11:47:27 +0200
@@@@ -36,8 +36,7 @@@@
         __attribute__nonnull__(3);
 
 static void pobj_flag_dump(PARROT_INTERP, ARGIN(long flags))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2);
+        __attribute__nonnull__(1);
 
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: static */
@


1.7
log
@upgrading package: parrot 0.6.0 -> 0.6.1
@
text
@d48 13
@


1.6
log
@upgrading package: parrot 0.4.7 -> 0.4.11
@
text
@d12 3
a14 3
Index: config/gen/icu.pm
--- config/gen/icu.pm.orig	2007-01-16 20:55:44 +0100
+++ config/gen/icu.pm	2007-01-19 20:28:35 +0100
@


1.5
log
@upgrading package: parrot 0.4.0 -> 0.4.2
@
text
@d2 4
a5 4
--- compilers/imcc/imcc.l.orig	2006-02-22 11:37:25 +0100
+++ compilers/imcc/imcc.l	2006-03-10 21:38:17 +0100
@@@@ -84,6 +84,7 @@@@
 
d13 4
a16 4
--- config/gen/icu.pm.orig	2006-02-19 12:53:24 +0100
+++ config/gen/icu.pm	2006-03-10 21:38:17 +0100
@@@@ -73,7 +73,7 @@@@
             if (defined $icuheaders) {
d25 4
a28 4
--- config/init/hints/freebsd.pm.orig	2006-01-15 21:52:43 +0100
+++ config/init/hints/freebsd.pm	2006-03-10 21:55:25 +0100
@@@@ -33,7 +33,7 @@@@
         rpath                   => '-Wl,-R',
d30 6
a35 6
         has_dynamic_linking     => 1,
-        parrot_is_shared        => 1,
+        parrot_is_shared        => 0,
         libparrot_shared        => 'libparrot$(SHARE_EXT).$(SOVERSION)',
         libparrot_shared_alias  => 'libparrot$(SHARE_EXT)',
         libparrot_soname        => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
d37 3
a39 3
--- config/init/hints/linux.pm.orig	2006-02-16 23:58:49 +0100
+++ config/init/hints/linux.pm	2006-03-10 21:55:20 +0100
@@@@ -62,7 +62,7 @@@@
d42 6
a47 6
         has_dynamic_linking     => 1,
-        parrot_is_shared        => 1,
+        parrot_is_shared        => 0,
         libparrot_shared        => 'libparrot$(SHARE_EXT).$(SOVERSION)',
         libparrot_shared_alias  => 'libparrot$(SHARE_EXT)',
         libparrot_soname        => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
@


1.5.2.1
log
@file parrot.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:56 +0000
@
text
@d1 47
@


1.5.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 47
Index: compilers/imcc/imcc.l
--- compilers/imcc/imcc.l.orig	2006-02-22 11:37:25 +0100
+++ compilers/imcc/imcc.l	2006-03-10 21:38:17 +0100
@@@@ -84,6 +84,7 @@@@
 
 %option never-interactive
 %option stack
+%option array
 
 LETTER          [a-zA-Z_@@]
 DIGIT           [0-9]
Index: config/gen/icu.pm
--- config/gen/icu.pm.orig	2006-02-19 12:53:24 +0100
+++ config/gen/icu.pm	2006-03-10 21:38:17 +0100
@@@@ -73,7 +73,7 @@@@
             if (defined $icuheaders) {
                 chomp $icuheaders;
                 $without = 1 unless -d $icuheaders;
-                $icuheaders .= "${slash}include";
+                $icuheaders .= "${slash}include/icu";
                 $without = 1 unless -d $icuheaders;
             }
 
Index: config/init/hints/freebsd.pm
--- config/init/hints/freebsd.pm.orig	2006-01-15 21:52:43 +0100
+++ config/init/hints/freebsd.pm	2006-03-10 21:55:25 +0100
@@@@ -33,7 +33,7 @@@@
         rpath                   => '-Wl,-R',
 
         has_dynamic_linking     => 1,
-        parrot_is_shared        => 1,
+        parrot_is_shared        => 0,
         libparrot_shared        => 'libparrot$(SHARE_EXT).$(SOVERSION)',
         libparrot_shared_alias  => 'libparrot$(SHARE_EXT)',
         libparrot_soname        => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
Index: config/init/hints/linux.pm
--- config/init/hints/linux.pm.orig	2006-02-16 23:58:49 +0100
+++ config/init/hints/linux.pm	2006-03-10 21:55:20 +0100
@@@@ -62,7 +62,7 @@@@
         rpath          => '-Wl,-rpath=',
 
         has_dynamic_linking     => 1,
-        parrot_is_shared        => 1,
+        parrot_is_shared        => 0,
         libparrot_shared        => 'libparrot$(SHARE_EXT).$(SOVERSION)',
         libparrot_shared_alias  => 'libparrot$(SHARE_EXT)',
         libparrot_soname        => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
@


1.4
log
@upgrading package: parrot 0.3.1 -> 0.4.0
@
text
@d1 4
a4 16
Index: config/gen/icu.pm
--- config/gen/icu.pm.orig	2005-12-04 11:45:25 +0100
+++ config/gen/icu.pm	2005-12-08 20:05:30 +0100
@@@@ -71,7 +71,7 @@@@
       if (defined $icuheaders) {
         chomp $icuheaders;
         $without = 1 unless -d $icuheaders;
-        $icuheaders .= "${slash}include";
+        $icuheaders .= "${slash}include/icu";
         $without = 1 unless -d $icuheaders;
       }
 
Index: imcc/imcc.l
--- imcc/imcc.l.orig	2005-11-29 18:28:35 +0100
+++ imcc/imcc.l	2005-12-08 20:05:30 +0100
@@@@ -83,6 +83,7 @@@@
d12 36
@


1.3
log
@upgrading package: parrot 0.2.1 -> 0.2.2
@
text
@d1 4
a4 4
Index: config/gen/icu.pl
--- config/gen/icu.pl.orig	2005-05-13 22:49:11 +0200
+++ config/gen/icu.pl	2005-07-03 20:13:35 +0200
@@@@ -67,7 +67,7 @@@@
a12 12
Index: config/gen/makefiles/CFLAGS.in
--- config/gen/makefiles/CFLAGS.in.orig	2005-06-15 10:00:09 +0200
+++ config/gen/makefiles/CFLAGS.in	2005-07-03 20:13:35 +0200
@@@@ -5,6 +5,8 @@@@
 #
 # Note, empty regex/options are just ignored.
 #
+ops/core_ops_switch.c -{-O2} # workaround GCC 3.4.3 optimizer problems
+ops/core_ops_cgp.c    -{-O2} # workaround GCC 3.4.3 optimizer problems
 src/spf_render.c -{-Wformat-nonliteral}   # noisy
 src/tsq.c        -{${optimize}}           # never optimize tsq.c!
 ops/core_ops_cg.c   -{${optimize}}       # takes too long
d14 3
a16 3
--- imcc/imcc.l.orig	2005-06-15 21:43:08 +0200
+++ imcc/imcc.l	2005-07-03 20:16:46 +0200
@@@@ -80,6 +80,7 @@@@
@


1.2
log
@upgrading package: parrot 0.1.2 -> 0.2.0
@
text
@d2 2
a3 2
--- config/gen/icu.pl.orig	2005-04-26 09:23:55 +0200
+++ config/gen/icu.pl	2005-05-15 19:22:35 +0200
d14 2
a15 2
--- config/gen/makefiles/CFLAGS.in.orig	2005-04-11 11:50:01 +0200
+++ config/gen/makefiles/CFLAGS.in	2005-05-15 19:20:41 +0200
d25 11
@


1.1
log
@upgrading package: parrot 0.1.1 -> 0.1.2
@
text
@d1 12
d14 2
a15 2
--- config/gen/makefiles/CFLAGS.in.orig	2004-07-08 19:22:05 +0200
+++ config/gen/makefiles/CFLAGS.in	2005-03-08 21:06:28 +0100
a24 26
Index: src/packdump.c
--- src/packdump.c.orig	2004-07-30 09:08:59 +0200
+++ src/packdump.c	2005-03-08 21:14:25 +0100
@@@@ -85,8 +85,10 @@@@
         PIO_printf(interpreter, "    [ 'PFC_STRING', {\n");
         PIO_printf(interpreter, "        FLAGS    => 0x%04lx,\n",
                    (long)PObj_get_FLAGS(self->u.string));
+#if 0
         PIO_printf(interpreter, "        REPRESENTATION => %ld,\n",
                    self->u.string->representation);
+#endif
         PIO_printf(interpreter, "        SIZE     => %ld,\n",
                    (long)self->u.string->bufused);
         /* TODO: Won't do anything reasonable for most encodings */
Index: config/gen/icu.pl
--- config/gen/icu.pl.orig	2004-10-11 12:09:26 +0200
+++ config/gen/icu.pl	2005-03-16 22:57:11 +0100
@@@@ -81,7 +81,7 @@@@
     # location of header files
     $icuheaders = `$icuconfig --prefix`;
     chomp $icuheaders;
-    $icuheaders .= "${slash}include";
+    $icuheaders .= "${slash}include/icu";
     
     # icu data dir
     $icudatadir = `$icuconfig --icudatadir`;
@