diff options
| author | rh <rh@pkgsrc.org> | 2000-05-25 08:08:30 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2000-05-25 08:08:30 +0000 |
| commit | 9f0a9daea874a34cf5e185c46ff4ff0d8c488230 (patch) | |
| tree | 87217295b119fe55cddcd0f468efad4ca22c88dd /databases | |
| parent | 06c055f6c873300c62f321388d71866c4f9b1a41 (diff) | |
| download | pkgsrc-9f0a9daea874a34cf5e185c46ff4ff0d8c488230.tar.gz | |
Make this compile again by removing outdated `patch-aa'
Make configuration non-interactive
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/p5-DBD-mysql/Makefile | 8 | ||||
| -rw-r--r-- | databases/p5-DBD-mysql/patches/patch-aa | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index c1da48c92a2..8c9ab6102c0 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/05/11 19:27:21 christos Exp $ +# $NetBSD: Makefile,v 1.6 2000/05/25 08:08:30 rh Exp $ # DISTNAME= Msql-Mysql-modules-1.2214 @@ -16,14 +16,14 @@ DEPENDS+= p5-Data-ShowTable-3.3:../../devel/p5-Data-ShowTable USE_PERL5= YES -MYSQL_HEADERDIR= ${LOCALBASE}/include/mysql -MYSQL_LIBDIR= ${LOCALBASE}/lib/mysql +MYSQL_HEADERDIR= ${PREFIX}/include/mysql +MYSQL_LIBDIR= ${PREFIX}/lib/mysql CONFIGURE_ENV+= MYSQL_HEADERDIR="${MYSQL_HEADERDIR}" CONFIGURE_ENV+= MYSQL_LIBDIR="${MYSQL_LIBDIR}" CONFIGURE_ENV+= IN_MYSQL_DISTRIBUTION=1 do-configure: - @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/perl Makefile.PL + @cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL --noprompt --mysql-install --nomsql-install --nomsql1-install --mysql-incdir=${MYSQL_HEADERDIR} --mysql-libdir=${MYSQL_LIBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/databases/p5-DBD-mysql/patches/patch-aa b/databases/p5-DBD-mysql/patches/patch-aa deleted file mode 100644 index 533077e4b25..00000000000 --- a/databases/p5-DBD-mysql/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/06/10 18:32:37 bad Exp $ - ---- Makefile.PL.orig Tue Jan 26 21:22:04 1999 -+++ Makefile.PL Thu Jun 10 19:04:20 1999 -@@ -417,7 +417,7 @@ - $cfg->{'Mysql'}->{'FINAL_LIBS'} = $final_libs; - - my(@headerfiles) = ("$headerdir/mysql.h"); -- $X{dynamic_lib} = { OTHERLDFLAGS => "-L$libdir $linkwith" }; -+ $X{dynamic_lib} = { OTHERLDFLAGS => "-R$libdir -L$libdir $linkwith" }; - $X{DEFINE} = $defines; - $X{LIBS} = $sysliblist; - $X{INC} = "-I$headerdir -I../dbd -I\$(INSTALLSITEARCH)/auto/DBI" |