Attachment #31256 for bug #52168

View | Details | Raw Unified | Return to bug 52168
Collapse All | Expand All




#

PORTNAME=	ORBit
PORTVERSION=	0.4.7
CATEGORIES=	devel perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
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=	${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 \

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (CORBA-ORBit-0.4.3.tar.gz) = 17910897d32d9bbedad745fe3fa1b94a	1	MD5 (CORBA-ORBit-0.4.7.tar.gz) = 9229c36e115c855a00de350000766b2b




%%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




--- 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_version = `orbit-config --version`;
+chomp($orbit_version = `orbit-config --version`);
 undef $orbit_version if $?;
-$orbit_libs = `orbit-config --libs client server`;
+chomp($orbit_libs = `orbit-config --libs client server`);
 undef $orbit_libs if $?;
 
 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 $?;

 if ($] < 5.0045) {
     print STDERR "Using compatibility macros/routines for Perl 5.004\n";
     push @OBJECTS,'constsub.o';
@@ -50,9 +60,9 @@
 WriteMakefile(
     '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 ' : ''),
         ($] < 5.0045         ? '-DPERL5004_COMPAT ' : ''),
-    'INC'	=> $orbit_cflags,
+    'INC'	=> "$orbit_cflags $idl_cflags",
     'OBJECT'    => join(' ', @OBJECTS),
     'XSOPT'     => '-prototypes',
 #    'XSOPT'     => '-nolinenumbers',
-    'OPTIMIZE'  => '-g -Wall',
+    'OPTIMIZE'  => '-Wall',
 #    'OPTIMIZE'  => '-O2 -Wall',
     'MAP_TARGET' => 'orbitperl',
 #    'MAKEAPERL' => 1,

Removed Link Here

(-)files/patch-demarshal.c (-11 lines)
1	--- demarshal.c.orig Mon Oct 16 03:32:32 2000
2	+++ demarshal.c Tue Oct 15 20:35:32 2002
3	@@ -7,7 +7,7 @@
4	#include "types.h"
5
6	#define RECV_BUFFER_LEFT(buf) \
7	- (((guchar )buf->message_body + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar )buf->cur)
8	+ (((guchar )buf->message_body + 12 + GIOP_MESSAGE_BUFFER(buf)->message_header.message_size) - (guchar )buf->cur)
9
10
11	static CORBA_boolean

Return to bug 52168

Lines 6-27 Link Here

(-)Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= ORBit	8	PORTNAME= ORBit
9	PORTVERSION= 0.4.3	9	PORTVERSION= 0.4.7
10	CATEGORIES= devel perl5	10	CATEGORIES= devel perl5
11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
12	MASTER_SITE_SUBDIR= CORBA	12	MASTER_SITE_SUBDIR= ../by-authors/id/H/HR/HROGERS
13	PKGNAMEPREFIX= p5-	13	PKGNAMEPREFIX= p5-
14	DISTNAME= CORBA-ORBit-${PORTVERSION}	14	DISTNAME= CORBA-ORBit-${PORTVERSION}
15		15
16	MAINTAINER= vanilla@FreeBSD.org	16	MAINTAINER= vanilla@FreeBSD.org
17	COMMENT= The perl binding for ORBit	17	COMMENT= The perl binding for ORBit
18		18
19	BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Error.pm:${PORTSDIR}/lang/p5-Error	19	BUILD_DEPENDS= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
20	LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit	20	LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit
21		21
22	PERL_CONFIGURE= yes	22	PERL_CONFIGURE= yes
23		23
24	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
25	MAN3= CORBA::ORBit.3 \	24	MAN3= CORBA::ORBit.3 \
26	CORBA::ORBit::Fixed.3 \	25	CORBA::ORBit::Fixed.3 \
27	CORBA::ORBit::LongDouble.3 \	26	CORBA::ORBit::LongDouble.3 \

Lines 1-13 Link Here

(-)pkg-plist (-13 / +13 lines)
1	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit.pm	1	%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit.pm
2	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/Fixed.pm	2	%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/Fixed.pm
3	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/LongDouble.pm	3	%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/LongDouble.pm
4	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/LongLong.pm	4	%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/LongLong.pm
5	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/ULongLong.pm	5	%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/ULongLong.pm
6	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit/mapping.pod	6	%%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit/mapping.pod
7	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit/.packlist	7	%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/.packlist
8	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.bs	8	%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.bs
9	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.so	9	%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.so
10	@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA/ORBit	10	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit
11	@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/CORBA	11	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit
12	@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA/ORBit	12	@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA 2>/dev/null \|\| true
13	@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/CORBA	13	@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/CORBA 2>/dev/null \|\| true

Lines 1-20 Link Here

(-)files/patch-Makefile.PL (-23 / +15 lines)
1	--- Makefile.PL.orig Wed Oct 25 15:27:13 2000	1	--- Makefile.PL.orig Sun Jul 7 14:24:33 2002
2	+++ Makefile.PL Tue Oct 15 20:38:18 2002	2	+++ Makefile.PL Tue May 13 14:40:46 2003
3	@@ -14,9 +14,9 @@	3	@@ -14,7 +14,7 @@
4	server.o	4	server.o
5	types.o);	5	types.o);
6		6
7	-$orbit_cflags = `orbit-config --cflags client server`;	7	-$orbit_version = `orbit-config --version`;
8	+chomp($orbit_cflags = `orbit-config --cflags client server`);	8	+chomp($orbit_version = `orbit-config --version`);
9	undef $orbit_cflags if $?;	9	undef $orbit_version if $?;
10	-$orbit_libs = `orbit-config --libs client server`;
11	+chomp($orbit_libs = `orbit-config --libs client server`);
12	undef $orbit_libs if $?;
13		10
14	if (!defined $orbit_libs) {	11	if (!defined $orbit_version) {
15	@@ -24,6 +24,16 @@	12	@@ -41,6 +41,16 @@
16	exit 1;	13	chomp($orbit_libs = `orbit-config --libs client server`);
17	}	14	#$orbit_libs .= ' -R/opt/ORBit/lib ';
18		15
19	+chomp($idl_cflags = `libIDL-config --cflags`);	16	+chomp($idl_cflags = `libIDL-config --cflags`);
20	+undef $idl_cflags if $?;	17	+undef $idl_cflags if $?;
Lines 29-48 Link Here
29	if ($] < 5.0045) {	26	if ($] < 5.0045) {
30	print STDERR "Using compatibility macros/routines for Perl 5.004\n";	27	print STDERR "Using compatibility macros/routines for Perl 5.004\n";
31	push @OBJECTS,'constsub.o';	28	push @OBJECTS,'constsub.o';
32	@@ -32,13 +42,13 @@	29	@@ -50,9 +60,9 @@
33	WriteMakefile(
34	'NAME' => 'CORBA::ORBit',	30	'NAME' => 'CORBA::ORBit',
35	'VERSION_FROM' => 'ORBit.pm',	31	'VERSION_FROM' => 'ORBit.pm',
		32	'PREREQ_PM' => { 'Error' => 0.12 },
36	- 'LIBS' => [$orbit_libs." -lIDL"],	33	- 'LIBS' => [$orbit_libs." -lIDL"],
37	+ 'LIBS' => ["$orbit_libs $idl_libs"],	34	+ 'LIBS' => ["$orbit_libs $idl_libs"],
38	'DEFINE' =>	35	'DEFINE' => ($] < 5.0045 ? '-DPERL5004_COMPAT ' : ''),
39	($] < 5.0045 ? '-DPERL5004_COMPAT ' : ''),
40	- 'INC' => $orbit_cflags,	36	- 'INC' => $orbit_cflags,
41	+ 'INC' => "$orbit_cflags $idl_cflags",	37	+ 'INC' => "$orbit_cflags $idl_cflags",
42	'OBJECT' => join(" ", @OBJECTS),	38	'OBJECT' => join(' ', @OBJECTS),
		39	'XSOPT' => '-prototypes',
43	# 'XSOPT' => '-nolinenumbers',	40	# 'XSOPT' => '-nolinenumbers',
44	- 'OPTIMIZE' => '-g -Wall',
45	+ 'OPTIMIZE' => '-Wall',
46	# 'OPTIMIZE' => '-O2 -Wall',
47	'MAP_TARGET' => 'orbitperl',
48	# 'MAKEAPERL' => 1,