diff options
| author | seb <seb@pkgsrc.org> | 2002-10-27 19:41:53 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2002-10-27 19:41:53 +0000 |
| commit | 749cc12a27921dc879c55fbbe58750919fee305f (patch) | |
| tree | 6890c118e1e6722291547c925652cdd30b5501b4 | |
| parent | ed2eb17e4c909b451391dbd37d779065e839b768 (diff) | |
| download | pkgsrc-749cc12a27921dc879c55fbbe58750919fee305f.tar.gz | |
Use perl5/module.mk (including PERL5_LDFLAGS).
Remove Makefile.PL interactive part via patch.
| -rw-r--r-- | databases/p5-DBD-Sybase/Makefile | 23 | ||||
| -rw-r--r-- | databases/p5-DBD-Sybase/distinfo | 4 | ||||
| -rw-r--r-- | databases/p5-DBD-Sybase/patches/patch-aa | 22 |
3 files changed, 25 insertions, 24 deletions
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile index 7536fcde2b0..6473d2ed580 100644 --- a/databases/p5-DBD-Sybase/Makefile +++ b/databases/p5-DBD-Sybase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/09/20 02:51:00 grant Exp $ +# $NetBSD: Makefile,v 1.8 2002/10/27 19:41:53 seb Exp $ # DISTNAME= DBD-Sybase-0.94 @@ -14,27 +14,10 @@ COMMENT= perl DBI/DBD driver for Sybase/MS-SQL databases USE_BUILDLINK2= YES PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/DBD/Sybase/.packlist -LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.freetds}/freetds/lib +PERL5_LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.freetds}/freetds/lib MAKE_ENV+= SYBASE=${BUILDLINK_PREFIX.freetds}/freetds -.include "../../mk/bsd.prefs.mk" - -.if ${OBJECT_FMT} == "a.out" -MAKE_FLAGS+= OTHERLDFLAGS="${LDFLAGS:S/-Wl,//g}" -.else -MAKE_FLAGS+= OTHERLDFLAGS="${LDFLAGS}" -.endif - -do-configure: - @cd ${WRKSRC}; \ - ( \ - ${ECHO_MSG} "undef" ; \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "undef" ; \ - ) | ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS} - .include "../../databases/freetds/buildlink2.mk" .include "../../databases/p5-DBI/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" - +.include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-DBD-Sybase/distinfo b/databases/p5-DBD-Sybase/distinfo index a6c519ef8ba..8660862db7b 100644 --- a/databases/p5-DBD-Sybase/distinfo +++ b/databases/p5-DBD-Sybase/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/09/21 07:43:50 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/10/27 19:41:53 seb Exp $ SHA1 (DBD-Sybase-0.94.tar.gz) = e11d85b31751253a0da3ccee5336504b1edc59de Size (DBD-Sybase-0.94.tar.gz) = 98551 bytes -SHA1 (patch-aa) = 602a87a00c60fd7230463239815d91991a94efc1 +SHA1 (patch-aa) = 741edae7aaa75cf65ec00bae22692bc12f5e4c9f diff --git a/databases/p5-DBD-Sybase/patches/patch-aa b/databases/p5-DBD-Sybase/patches/patch-aa index 98e73da140c..945d4069c36 100644 --- a/databases/p5-DBD-Sybase/patches/patch-aa +++ b/databases/p5-DBD-Sybase/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2002/09/21 07:43:51 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2002/10/27 19:41:54 seb Exp $ ---- Makefile.PL.orig Tue Nov 20 13:04:06 2001 +--- Makefile.PL.orig Tue Nov 20 21:04:06 2001 +++ Makefile.PL @@ -39,9 +39,6 @@ WriteMakefile('NAME' => 'DBD::Sy 'LDDLFLAGS' => $lddlflags, @@ -12,3 +12,21 @@ $NetBSD: patch-aa,v 1.1 2002/09/21 07:43:51 jlam Exp $ ($] >= 5.005 ? (ABSTRACT => 'DBI driver for Sybase datasources', AUTHOR => 'Michael Peppler (mpeppler@peppler.org)') : ()), +@@ -197,17 +194,6 @@ sub configPwd { + $pwd{$key} = $val || "undef"; + } + close(IN); +- select(STDOUT); $| = 1; +- +- print "The DBD::Sybase module need access to a Sybase server to run the tests.\n"; +- print "To clear an entry please enter 'undef'\n"; +- print "Sybase server to use (default: $pwd{SRV}): "; +- $pwd{SRV} = getAns() || $pwd{SRV}; +- print "User ID to log in to Sybase (default: $pwd{UID}): "; +- $pwd{UID} = getAns() || $pwd{UID}; +- print "Password (default: $pwd{PWD}): "; +- $pwd{PWD} = getAns() || $pwd{PWD}; +- + open(OUT, ">PWD") || die "Can't open PWD: $!"; + print OUT <<EOF; + # This file contains optional login id, passwd and server info for the test |