Fix the build on Perl 5.005.

While I'm here, fix two minor complaints from xsubpp and pod2man.

Reported by:	pointyhat via kris

3 files changed, 95 insertions, 5 deletions

diff --git a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile
index 99f80dd7623e..0113f2f97059 100644
--- a/audio/p5-Net-FreeDB/Makefile
+++ b/audio/p5-Net-FreeDB/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Net-FreeDB
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 PATCH_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.FreeBSD.org/~roam/ports/patches/net/
 PATCH_SITE_SUBDIR=	roam/net
-PATCHFILES=	Net-FreeDB-0.06-FreeBSD.patch
+PATCHFILES=	Net-FreeDB-0.06-FreeBSD-2.patch
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Get the CDID of an audio CD and query the FreeDB servers
@@ -29,4 +29,10 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Net::FreeDB.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+EXTRA_PATCHES+=	${FILESDIR}/perl-5005.patch
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/p5-Net-FreeDB/distinfo b/audio/p5-Net-FreeDB/distinfo
index 4bc71dffac11..27f91a5c53d6 100644
--- a/audio/p5-Net-FreeDB/distinfo
+++ b/audio/p5-Net-FreeDB/distinfo
@@ -1,4 +1,4 @@
 MD5 (Net-FreeDB-0.06.tar.gz) = e36554b1fd80860b61e00162fd0325a8
 SIZE (Net-FreeDB-0.06.tar.gz) = 17516
-MD5 (Net-FreeDB-0.06-FreeBSD.patch) = 0cec3e8a44c693b5274f919f38f83b28
-SIZE (Net-FreeDB-0.06-FreeBSD.patch) = 6925
+MD5 (Net-FreeDB-0.06-FreeBSD-2.patch) = 82cd9fa75154169b9915e302e9699fbd
+SIZE (Net-FreeDB-0.06-FreeBSD-2.patch) = 7625
diff --git a/audio/p5-Net-FreeDB/files/perl-5005.patch b/audio/p5-Net-FreeDB/files/perl-5005.patch
new file mode 100644
index 000000000000..7920e3d10eaf
--- /dev/null
+++ b/audio/p5-Net-FreeDB/files/perl-5005.patch
@@ -0,0 +1,84 @@
+diff -urN Net-FreeDB-0.06/FreeDB.pm roam/FreeDB.pm
+--- FreeDB.pm	Wed Mar 20 22:19:50 2002
++++ FreeDB.pm	Mon Oct 17 13:03:00 2005
+@@ -1,6 +1,6 @@
+ package Net::FreeDB;
+ 
+-use 5.006;
++use 5.00503;
+ use strict;
+ use warnings;
+ use IO::Socket;
+@@ -13,7 +13,9 @@
+ require DynaLoader;
+ use AutoLoader;
+ 
+-our @ISA = qw(Exporter DynaLoader Net::Cmd IO::Socket::INET);
++use vars qw/@ISA %EXPORT_TAGS @EXPORT_OK @EXPORT $VERSION $ERROR/;
++
++@ISA = qw(Exporter DynaLoader Net::Cmd IO::Socket::INET);
+ 
+ # Items to export into callers namespace by default. Note: do not export
+ # names by default without a very good reason. Use EXPORT_OK instead.
+@@ -22,22 +24,21 @@
+ # This allows declaration	use Net::FreeDB ':all';
+ # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+ # will save memory.
+-our %EXPORT_TAGS = ( 'all' => [ qw() ] );
++%EXPORT_TAGS = ( 'all' => [ qw() ] );
+ 
+-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
++@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+ 
+-our @EXPORT = qw();
++@EXPORT = qw();
+ 
+-our $VERSION = '0.06';
++$VERSION = '0.06';
+ 
+-our $ERROR;
+ sub AUTOLOAD {
+     # This AUTOLOAD is used to 'autoload' constants from the constant()
+     # XS function.  If a constant is not found then control is passed
+     # to the AUTOLOAD in AutoLoader.
+ 
+     my $constname;
+-    our $AUTOLOAD;
++    use vars qw/$AUTOLOAD/;
+     ($constname = $AUTOLOAD) =~ s/.*:://;
+     croak "& not defined" if $constname eq 'constant';
+     my $val = constant($constname, @_ ? $_[0] : 0);
+diff -urN Net-FreeDB-0.06/FreeDB.xs.linux roam/FreeDB.xs.linux
+--- FreeDB.xs.linux	Wed Mar 20 22:19:50 2002
++++ FreeDB.xs.linux	Mon Oct 17 12:09:00 2005
+@@ -36,7 +38,8 @@
+ 	RETVAL
+ 
+ char*
+-discid(char* dev)
++discid(dev)
++	char *dev;
+     INIT:
+ 		int i;
+ 		char id[30];
+@@ -54,7 +57,8 @@
+ 		RETVAL
+ 
+ SV*
+-discinfo(char* dev)
++discinfo(dev)
++	char *dev;
+     INIT:
+ 	int i;
+         char id[30];
+diff -urN Net-FreeDB-0.06/lib/discid.h roam/lib/discid.h
+--- lib/discid.h	Mon Oct 17 13:05:09 2005
++++ lib/discid.h	Mon Oct 17 12:00:02 2005
+@@ -39,6 +39,7 @@
+ 
+ #ifdef __FreeBSD__
+ #include <sys/cdio.h>
++#include <sys/fcntl.h>
+ #include "freebsd.h"
+ #endif // __FreeBSD__
+