Oh, I agree... I forgot to apply your patch, sorry :(
This could be ok?
Cesare
On Tue, Dec 08, 2009 at 06:49:42PM +0100, Landry Breuil wrote:
> On Tue, Dec 08, 2009 at 05:13:21PM +0000, Cesare Gargano wrote:
> > Hi!
> > This updates p5-Alien-wxWidgets to 0.47
> >
> > I replaced a 1 with a 2 in the patch,
> > I don't like their method to get our wxWidgets version ;(
>
> No, sorry, this won't work. Please keep the patch as is.
>
> There is a reason i did it that way : we want to be able to update
> wxwidgets without breaking/patching alien-wxwidgets.
>
> I don't care if you like it or not, but hardcoding so versions like this
> in patches is a sure way to break things at one moment.
>
> Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-Alien-wxWidgets/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 8 Sep 2009 21:46:17 -0000 1.2
+++ Makefile 8 Dec 2009 23:45:31 -0000
@@ -3,8 +3,7 @@
COMMENT = building, finding and using wxWidgets binaries
MODULES = cpan
-DISTNAME = Alien-wxWidgets-0.44
-PKGNAME = p5-${DISTNAME}p0
+DISTNAME = Alien-wxWidgets-0.47
CATEGORIES = devel
CPAN_AUTHOR = MBARBON
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/p5-Alien-wxWidgets/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 4 Sep 2009 16:05:55 -0000 1.1.1.1
+++ distinfo 8 Dec 2009 23:45:31 -0000
@@ -1,5 +1,5 @@
-MD5 (Alien-wxWidgets-0.44.tar.gz) = 7Ms5Uhw0aqZDSPHv8Ivl4A==
-RMD160 (Alien-wxWidgets-0.44.tar.gz) = byikhh2XH7JZor9hd/7D4RxZdF8=
-SHA1 (Alien-wxWidgets-0.44.tar.gz) = 4WNVBLEGdziPfkIigZQbc8xZxRM=
-SHA256 (Alien-wxWidgets-0.44.tar.gz) =
3LDtRuu0NUm7GBiECeRa4Xxrpe8ArjYUB1s0yF6bxMw=
-SIZE (Alien-wxWidgets-0.44.tar.gz) = 642914
+MD5 (Alien-wxWidgets-0.47.tar.gz) = mfDTjJda3JkBSNAu9zxp2w==
+RMD160 (Alien-wxWidgets-0.47.tar.gz) = Q/UA8msOowxjS0mW40n6nAXcSzE=
+SHA1 (Alien-wxWidgets-0.47.tar.gz) = 0SPeCQyH81NiygTGjNzdih7ZYTs=
+SHA256 (Alien-wxWidgets-0.47.tar.gz) =
igNLntEX4WsVSdm0DPdkYu/5ceMWirFIyrdvCZFueGs=
+SIZE (Alien-wxWidgets-0.47.tar.gz) = 647430
Index: patches/patch-Build_PL
===================================================================
RCS file: /cvs/ports/devel/p5-Alien-wxWidgets/patches/patch-Build_PL,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Build_PL
--- patches/patch-Build_PL 4 Sep 2009 16:05:55 -0000 1.1.1.1
+++ patches/patch-Build_PL 8 Dec 2009 23:45:31 -0000
@@ -1,13 +1,13 @@
-$OpenBSD: patch-Build_PL,v 1.1.1.1 2009/09/04 16:05:55 landry Exp $
---- Build.PL.orig Fri Aug 28 15:28:43 2009
-+++ Build.PL Fri Aug 28 15:30:12 2009
-@@ -97,8 +97,7 @@ EOT
+$OpenBSD$
+--- Build.PL.orig Wed Dec 9 00:32:09 2009
++++ Build.PL Wed Dec 9 00:32:57 2009
+@@ -163,8 +163,7 @@ EOT
}
}
chomp $build_prompt;
-my $build_wx = _askyn( $build, 'wxWidgets-build',
- $build_prompt, $build_wx_dflt );
+my $build_wx = 0;
+ my $wx_version;
$build->notes( 'build_wx' => $build_wx );
$build->notes( 'mk_portable' => $build->args('wxWidgets-portable') );
- if( $build_wx ) {
Index: patches/patch-inc_My_Build_Any_wx_config_Bakefile_pm
===================================================================
RCS file:
/cvs/ports/devel/p5-Alien-wxWidgets/patches/patch-inc_My_Build_Any_wx_config_Bakefile_pm,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-inc_My_Build_Any_wx_config_Bakefile_pm
--- patches/patch-inc_My_Build_Any_wx_config_Bakefile_pm 4 Sep 2009
16:05:55 -0000 1.1.1.1
+++ patches/patch-inc_My_Build_Any_wx_config_Bakefile_pm 8 Dec 2009
23:45:31 -0000
@@ -1,34 +1,18 @@
-$OpenBSD: patch-inc_My_Build_Any_wx_config_Bakefile_pm,v 1.1.1.1 2009/09/04
16:05:55 landry Exp $
-use glob() to find all matching $lib.so.*, and take the last value
---- inc/My/Build/Any_wx_config_Bakefile.pm.orig Sun Aug 9 13:13:40 2009
-+++ inc/My/Build/Any_wx_config_Bakefile.pm Fri Aug 28 15:29:47 2009
-@@ -3,7 +3,6 @@ package My::Build::Any_wx_config_Bakefile;
- use strict;
- our @ISA = qw(My::Build::Any_wx_config::Base);
- use Config;
--
- sub awx_wx_config_data {
- my $self = shift;
- return $self->{awx_data} if $self->{awx_data};
-@@ -24,7 +23,7 @@ sub awx_wx_config_data {
- my $libraries = $self->_call_wx_config( $arg );
-
- foreach my $lib ( grep { m/\-lwx/ } split ' ', $libraries ) {
-- $lib =~ m/-l(.*_(\w+)-.*)/ or die $lib;
-+ $lib =~ m/-l(.*_(\w+))/ or die $lib;
- my( $key, $name ) = ( $2, $1 );
- $key = 'base' if $key =~ m/^base[ud]{0,2}/;
- $key = 'base' if $key =~ m/^carbon|^cocoa/ && $name !~ /osx_/; # here
for Mac
-@@ -34,7 +33,11 @@ sub awx_wx_config_data {
+$OpenBSD$
+--- inc/My/Build/Any_wx_config_Bakefile.pm.orig Wed Dec 9 00:40:29 2009
++++ inc/My/Build/Any_wx_config_Bakefile.pm Wed Dec 9 00:41:51 2009
+@@ -41,7 +41,13 @@ sub awx_wx_config_data {
+ $key = 'core' if $key =~ m/^gtk2?[ud]{0,2}/
&& $self->awx_is_monolithic
&& $lib =~ m/(?:gtk2?|mac)[ud]{0,2}-/;
- my $dll = "lib${name}." . $self->awx_dlext;
--
-+ my @t = glob("${LOCALBASE}/lib/$dll.*");
-+ if ($#t >= 0) {
-+ $dll = $t[-1];
-+ $dll =~ s/.*\///g;
-+ }
+- my $dll = "lib${name}." . $self->awx_dlext . $libsuffix;
++ my $dll = "lib${name}." . $self->awx_dlext;
++
++ my @t = glob("${LOCALBASE}/lib/$dll.*");
++ if ($#t >= 0) {
++ $dll = $t[-1];
++ $dll =~ s/.*\///g;
++ }
+
$data{dlls}{$key} = { dll => $dll,
link => $lib };
- }
Index: patches/patch-inc_My_Build_Base_pm
===================================================================
RCS file:
/cvs/ports/devel/p5-Alien-wxWidgets/patches/patch-inc_My_Build_Base_pm,v
retrieving revision 1.1
diff -u -p -r1.1 patch-inc_My_Build_Base_pm
--- patches/patch-inc_My_Build_Base_pm 8 Sep 2009 21:46:17 -0000 1.1
+++ patches/patch-inc_My_Build_Base_pm 8 Dec 2009 23:45:31 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-inc_My_Build_Base_pm,v 1.1 2009/09/08 21:46:17 landry Exp $
---- inc/My/Build/Base.pm.orig Tue Sep 8 23:35:06 2009
-+++ inc/My/Build/Base.pm Tue Sep 8 23:35:41 2009
-@@ -367,12 +367,11 @@ sub awx_get_name {
+$OpenBSD$
+--- inc/My/Build/Base.pm.orig Wed Dec 9 00:41:32 2009
++++ inc/My/Build/Base.pm Wed Dec 9 00:41:38 2009
+@@ -370,12 +370,11 @@ sub awx_get_name {
my $e = sub { defined $_[0] ? ( $_[0] ) : () };
my $pv = sub { join '.', map { 0 + ( $_ || 0 ) }
( $_[0] =~ /(\d+)\.(\d{1,3})(\d{0,3})/ ) } ;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/p5-Alien-wxWidgets/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 8 Sep 2009 21:46:17 -0000 1.2
+++ pkg/PLIST 8 Dec 2009 23:45:31 -0000
@@ -1,4 +1,4 @@
-...@comment $OpenBSD: PLIST,v 1.2 2009/09/08 21:46:17 landry Exp $
+...@comment $OpenBSD$
${P5ARCH}/
${P5ARCH}/Alien/
${P5ARCH}/Alien/wxWidgets/
