diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/p5-DBD-InterBase/Makefile | 2 | ||||
| -rw-r--r-- | databases/p5-DBD-InterBase/distinfo | 2 | ||||
| -rw-r--r-- | databases/p5-DBD-InterBase/files/patch-Makefile.PL | 62 |
3 files changed, 29 insertions, 37 deletions
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile index d3c3441acd67..0ad2f40a16a0 100644 --- a/databases/p5-DBD-InterBase/Makefile +++ b/databases/p5-DBD-InterBase/Makefile @@ -6,7 +6,7 @@ # PORTNAME= DBD-InterBase -PORTVERSION= 0.41 +PORTVERSION= 0.42 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DBD diff --git a/databases/p5-DBD-InterBase/distinfo b/databases/p5-DBD-InterBase/distinfo index eb826f42012e..272fd2b59171 100644 --- a/databases/p5-DBD-InterBase/distinfo +++ b/databases/p5-DBD-InterBase/distinfo @@ -1 +1 @@ -MD5 (DBD-InterBase-0.41.tar.gz) = dde9cfd991cd73eae925c82a42405e07 +MD5 (DBD-InterBase-0.42.tar.gz) = ee432836596c0fff151927522295c076 diff --git a/databases/p5-DBD-InterBase/files/patch-Makefile.PL b/databases/p5-DBD-InterBase/files/patch-Makefile.PL index b093cfbcb8cc..16ffa097669d 100644 --- a/databases/p5-DBD-InterBase/files/patch-Makefile.PL +++ b/databases/p5-DBD-InterBase/files/patch-Makefile.PL @@ -1,59 +1,63 @@ ---- Makefile.PL.OOO Thu Jul 18 21:02:53 2002 -+++ Makefile.PL Thu Jul 18 21:16:22 2002 -@@ -28,6 +28,7 @@ +--- Makefile.PL.orig Sat Nov 22 06:12:11 2003 ++++ Makefile.PL Mon Dec 8 20:01:27 2003 +@@ -28,7 +28,7 @@ + use DBI::DBD; # DBD creation tools my $ib_dir_prefix; - +- +=rem # init stuff my $IB_Bin_path = ''; my $isql_name; -@@ -78,6 +79,12 @@ - @ib_bin_dirs = (qw(/usr/interbase/bin /opt/interbase/bin /usr/bin /usr/local/bin)); - @ib_inc_dirs = (qw(/usr/interbase/include /opt/interbase/include /usr/include)); +@@ -82,7 +82,12 @@ + @ib_bin_dirs = (qw(/usr/interbase/bin /opt/interbase/bin /opt/firebird/bin /usr/bin /usr/local/bin)); + @ib_inc_dirs = (qw(/usr/interbase/include /opt/interbase/include /opt/firebird/include /usr/include)); } +- +=cut +my $IB_BASE='%%IB_BASE%%'; +my $IB_Bin_path = $IB_BASE.'/bin'; +my $isql_name = 'isql'; +my $ib_lib_dir = $IB_BASE.'/lib'; +my $ib_inc = $IB_BASE.'/include'; - sub locate_dbi_arch_dir { my $dbidir = dbd_dbi_dir(); -@@ -88,6 +95,7 @@ + my @try = map { "$_/auto/DBI" } @INC; +@@ -91,7 +96,7 @@ + Carp::carp( "Multiple copies of Driver.xst found in: @xst") if @xst > 1; return $xst[0]; } - +- +=rem ################################################################################ # sub test_files - checks if at least one of the files in the list exists # Paramters: -@@ -264,6 +272,7 @@ +@@ -296,13 +301,13 @@ # prompt for InterBase bin directory - $IB_Bin_path = dir_choice("InterBase bin directory", [@ib_bin_dirs], [qw(gfix gfix.exe)]); + $IB_Bin_path = dir_choice("InterBase/Firebird bin directory", [@ib_bin_dirs], [qw(gfix gfix.exe)]); +- +=cut - unless(-x $IB_Bin_path) { -@@ -271,6 +280,7 @@ + carp "I cannot find your InterBase/Firebird installation.\nDBD::InterBase cannot build or run without InterBase.\n"; exit 1; } - +- +=rem # get InterBase version my $IBVERSION; my $GFIX_PATH = $IB_Bin_path . "/" . test_files($IB_Bin_path, [qw(gfix gfix.exe)]); -@@ -281,6 +291,7 @@ - # prompt for IB include dir - my $ib_inc = dir_choice("InterBase include directory", [@ib_inc_dirs], [qw(gds.h ibase.h)]); +@@ -312,7 +317,7 @@ + # prompt for IB include dir + my $ib_inc = dir_choice("InterBase/Firebird include directory", [@ib_inc_dirs], [qw(gds.h ibase.h)]); +- +=cut # we use a hash for the MakeMaker parameters my %MakeParams = ( -@@ -291,7 +302,7 @@ +@@ -323,14 +328,14 @@ 'CCFLAGS' => '', 'INC' => qq(-I"$ib_inc" -I"${\locate_dbi_arch_dir()}"), 'OBJECT' => "InterBase.o dbdimp.o", @@ -62,32 +66,20 @@ 'OPTIMIZE' => $Config::Config{'optimize'}, 'XSPROTOARG' => '-noprototypes', 'dist' => {COMPRESS=>'gzip -9f', SUFFIX=>'gz'}, -@@ -299,6 +310,7 @@ + 'clean' => {FILES => "*.xsi *.old t/*.old *~ t/*~ trace.txt t/trace.txt lib/DBD/InterBase/*~ lib/DBD/InterBase/*.old lib/Bundle/DBD/*~ lib/Bundle/DBD/*.old"}, 'realclean' => {FILES => "t/test.conf"}, ); - +- +=rem # the OS specific build environment setup my $os = $Config::Config{'osname'}; if ($os eq 'MSWin32') -@@ -473,6 +485,7 @@ +@@ -530,7 +535,7 @@ # create the test config file make_test_conf(); +- +=cut - # and last but not least write the makefile WriteMakefile(%MakeParams); -@@ -482,6 +495,7 @@ - return dbd_postamble(@_); - } -+=rem - package main; - - # the data used to create the database creation script -@@ -489,3 +503,4 @@ - CREATE DATABASE "__TESTDB__" user "__USER__" password "__PASS__"; - - quit; -+=cut |