patch-aa (with dragonfly config) got merged upstream. Applying the

patch with a more tolerant version of patch (like netbsd's) gives two
copies of the definitions in the same file, with who knows what
consequences. Applying the patch with a less tolerant version of patch
fails.

So, remove it, and bump PKGREVISION just in case.

3 files changed, 3 insertions, 38 deletions

diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 951d35c0e61..6757238db62 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/04/20 14:01:00 obache Exp $
+# $NetBSD: Makefile,v 1.14 2008/08/30 08:06:33 dholland Exp $
 #
 
 DISTNAME=		parrot-0.4.11
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MD/MDIEP/}
 
diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index e51994f7550..755f5aa9ef8 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/04/20 14:01:00 obache Exp $
+$NetBSD: distinfo,v 1.6 2008/08/30 08:06:33 dholland Exp $
 
 SHA1 (parrot-0.4.11.tar.gz) = 1aff85f941155d7f3758431cb1383138cf635c3a
 RMD160 (parrot-0.4.11.tar.gz) = ffec3ad25d80e60c3d977e787602e90efd7c729d
 Size (parrot-0.4.11.tar.gz) = 4113878 bytes
-SHA1 (patch-aa) = 19b64813750a1714438e2db45e0487381e401187
diff --git a/lang/parrot/patches/patch-aa b/lang/parrot/patches/patch-aa
deleted file mode 100644
index a43ccc09b1f..00000000000
--- a/lang/parrot/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/09 17:47:07 wiz Exp $
-
---- /dev/null	Fri Jan  6 20:33:00 2006
-+++ config/init/hints/dragonflybsd.pm	Fri Jan  6 20:37:08 2006
-@@ -0,0 +1,30 @@
-+# Copyright: 2005 The Perl Foundation.  All Rights Reserved.
-+
-+package init::hints::dragonflybsd;
-+
-+use strict;
-+
-+sub runstep
-+{
-+    my ($self, $conf) = @_;
-+
-+    my $libs = $conf->data->get('libs');
-+
-+    if ($libs !~ /pthread/) {
-+        $libs .= ' -pthread';
-+    }
-+
-+    $conf->data->set(
-+        libs                    => $libs,
-+        link                    => 'g++',
-+        rpath                   => '-Wl,-R',
-+
-+        has_dynamic_linking     => 1,
-+        parrot_is_shared        => 1,
-+        libparrot_shared        => 'libparrot$(SHARE_EXT).$(SOVERSION)',
-+        libparrot_shared_alias  => 'libparrot$(SHARE_EXT)',
-+        libparrot_soname        => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)',
-+    );
-+}
-+
-+1;