Attachment 31256 Details for Bug 52168 – p5-ORBit-0.4.7.diff

[patch] p5-ORBit-0.4.7.diff

p5-ORBit-0.4.7.diff (text/plain), 6.11 KB, created by Mathieu Arnold on 2003-05-13 14:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2003-05-13 14:00:29 UTC

Size: 6.11 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/p5-ORBit/Makefile,v
>retrieving revision 1.2
>diff -u -b -w -r1.2 Makefile
>--- Makefile	2003/03/07 06:00:58	1.2
>+++ Makefile	2003/05/13 12:55:02
>@@ -6,22 +6,21 @@
> #
> 
> PORTNAME=	ORBit
>-PORTVERSION=	0.4.3
>+PORTVERSION=	0.4.7
> CATEGORIES=	devel perl5
> MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
>-MASTER_SITE_SUBDIR=	CORBA
>+MASTER_SITE_SUBDIR=	../by-authors/id/H/HR/HROGERS
> PKGNAMEPREFIX=	p5-
> DISTNAME=	CORBA-ORBit-${PORTVERSION}
> 
> MAINTAINER=	vanilla@FreeBSD.org
> COMMENT=	The perl binding for ORBit
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Error.pm:${PORTSDIR}/lang/p5-Error
>+BUILD_DEPENDS=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
> LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit
> 
> PERL_CONFIGURE=	yes
> 
>-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
> MAN3=		CORBA::ORBit.3 \
> 		CORBA::ORBit::Fixed.3 \
> 		CORBA::ORBit::LongDouble.3 \
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/devel/p5-ORBit/distinfo,v
>retrieving revision 1.1
>diff -u -b -w -r1.1 distinfo
>--- distinfo	2001/03/12 08:58:27	1.1
>+++ distinfo	2003/05/13 12:55:02
>@@ -1 +1 @@
>-MD5 (CORBA-ORBit-0.4.3.tar.gz) = 17910897d32d9bbedad745fe3fa1b94a
>+MD5 (CORBA-ORBit-0.4.7.tar.gz) = 9229c36e115c855a00de350000766b2b
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/devel/p5-ORBit/pkg-plist,v
>retrieving revision 1.1
>diff -u -b -w -r1.1 pkg-plist
>--- pkg-plist	2001/03/12 08:58:27	1.1
>+++ pkg-plist	2003/05/13 12:55:02
>@@ -1,13 +1,13 @@
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit.pm
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/Fixed.pm
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/LongDouble.pm
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/LongLong.pm
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/ULongLong.pm
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/mapping.pod
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit/.packlist
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.bs
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.so
>-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit
>-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA
>-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit
>-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA
>+%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit.pm
>+%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/Fixed.pm
>+%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/LongDouble.pm
>+%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/LongLong.pm
>+%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/ULongLong.pm
>+%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/mapping.pod
>+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/.packlist
>+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.bs
>+%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.so
>+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit
>+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit
>+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA 2>/dev/null || true
>+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/CORBA 2>/dev/null || true
>Index: files/patch-Makefile.PL
>===================================================================
>RCS file: /home/ncvs/ports/devel/p5-ORBit/files/patch-Makefile.PL,v
>retrieving revision 1.1
>diff -u -b -w -r1.1 patch-Makefile.PL
>--- files/patch-Makefile.PL	2002/10/15 12:42:06	1.1
>+++ files/patch-Makefile.PL	2003/05/13 12:55:02
>@@ -1,20 +1,17 @@
>---- Makefile.PL.orig	Wed Oct 25 15:27:13 2000
>-+++ Makefile.PL	Tue Oct 15 20:38:18 2002
>-@@ -14,9 +14,9 @@
>+--- Makefile.PL.orig	Sun Jul  7 14:24:33 2002
>++++ Makefile.PL	Tue May 13 14:40:46 2003
>+@@ -14,7 +14,7 @@
>                server.o
>  	      types.o);
>  
>--$orbit_cflags = `orbit-config --cflags client server`;
>-+chomp($orbit_cflags = `orbit-config --cflags client server`);
>- undef $orbit_cflags if $?;
>--$orbit_libs = `orbit-config --libs client server`;
>-+chomp($orbit_libs = `orbit-config --libs client server`);
>- undef $orbit_libs if $?;
>+-$orbit_version = `orbit-config --version`;
>++chomp($orbit_version = `orbit-config --version`);
>+ undef $orbit_version if $?;
>  
>- if (!defined $orbit_libs) {
>-@@ -24,6 +24,16 @@
>-     exit 1;
>- }
>+ if (!defined $orbit_version) {
>+@@ -41,6 +41,16 @@
>+ chomp($orbit_libs = `orbit-config --libs client server`);
>+ #$orbit_libs .= ' -R/opt/ORBit/lib ';
>  
> +chomp($idl_cflags = `libIDL-config --cflags`);
> +undef $idl_cflags if $?;
>@@ -29,20 +26,15 @@
>  if ($] < 5.0045) {
>      print STDERR "Using compatibility macros/routines for Perl 5.004\n";
>      push @OBJECTS,'constsub.o';
>-@@ -32,13 +42,13 @@
>- WriteMakefile(
>+@@ -50,9 +60,9 @@
>      'NAME'	=> 'CORBA::ORBit',
>      'VERSION_FROM' => 'ORBit.pm',
>+     'PREREQ_PM' => { 'Error' => 0.12 },
> -    'LIBS'	=> [$orbit_libs." -lIDL"],
> +    'LIBS'	=> ["$orbit_libs $idl_libs"],
>-     'DEFINE'	=> 
>-         ($] < 5.0045         ? '-DPERL5004_COMPAT ' : ''),
>+     'DEFINE'	=> ($] < 5.0045         ? '-DPERL5004_COMPAT ' : ''),
> -    'INC'	=> $orbit_cflags,
> +    'INC'	=> "$orbit_cflags $idl_cflags",
>-     'OBJECT'    => join(" ", @OBJECTS),
>+     'OBJECT'    => join(' ', @OBJECTS),
>+     'XSOPT'     => '-prototypes',
>  #    'XSOPT'     => '-nolinenumbers',
>--    'OPTIMIZE'  => '-g -Wall',
>-+    'OPTIMIZE'  => '-Wall',
>- #    'OPTIMIZE'  => '-O2 -Wall',
>-     'MAP_TARGET' => 'orbitperl',
>- #    'MAKEAPERL' => 1,
>Index: files/patch-demarshal.c
>===================================================================
>RCS file: patch-demarshal.c
>diff -N patch-demarshal.c
>--- files/patch-demarshal.c	Tue May 13 07:55:02 2003
>+++ /dev/null	Tue May 13 03:21:03 2003
>@@ -1,11 +0,0 @@
>---- demarshal.c.orig	Mon Oct 16 03:32:32 2000
>-+++ demarshal.c	Tue Oct 15 20:35:32 2002
>-@@ -7,7 +7,7 @@
>- #include "types.h"
>- 
>- #define RECV_BUFFER_LEFT(buf) \
>-- (((guchar *)buf->message_body + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar *)buf->cur)
>-+ (((guchar *)buf->message_body + 12 + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar *)buf->cur)
>- 
>- 
>- static CORBA_boolean

Actions: View | Diff

Attachments on bug 52168: 31256