diff options
| author | jlam <jlam> | 2008-03-06 16:01:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-03-06 16:01:42 +0000 |
| commit | bd2b60667a27ac58b80b481aff29ff1776da688c (patch) | |
| tree | 4cc7ff4d502daf94086d3064592117a037e71fae /databases/mysql4-client/Makefile.common | |
| parent | aa89065216afa0393a5d8142eb29605246e4c69e (diff) | |
| download | pkgsrc-bd2b60667a27ac58b80b481aff29ff1776da688c.tar.gz | |
+ Honor PKGINFODIR in mysql4-client.
+ Remove explicit naming of "-lncurses -ltermcap" as the way to get
the termcap libraries. Including termcap.buildlink3.mk (indirectly
through including readline/buildlink3.mk) will do the right thing.
+ Remove readline dependency from Makefile.common and add it into
mysql4-client/Makefile. Only the -client package needs and uses
readline. The -server package only "needs" it to placate the
configure script, but none of its installed binaries are linked
against it.
+ Add full DESTDIR support to the -client and -server packages.
Bump the PKGREVISION of mysql4-client to 3.
The PKGREVISION of mysql4-server remains unchanged since there are
no user-visible changes to the binary package.
Diffstat (limited to 'databases/mysql4-client/Makefile.common')
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index c5138530047..cf7e89bd210 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.60 2007/10/16 23:48:59 tnn Exp $ +# $NetBSD: Makefile.common,v 1.61 2008/03/06 16:01:42 jlam Exp $ DISTNAME= mysql-4.1.22 CATEGORIES= databases @@ -35,7 +35,6 @@ MYSQL_EXTRA_CHARSET?= all CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} CONFIGURE_ARGS+= --with-named-z-libs=z CONFIGURE_ARGS+= --without-libwrap -CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap" .if ${OPSYS} == "IRIX" CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H @@ -43,16 +42,13 @@ CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no" .endif -# We always use our own readline, either system- or pkgsrc-supplied. +# We always use our own readline. Note that these --without-* settings +# are confusing, but they just mean "don't use the included readline +# or libedit". +# CONFIGURE_ARGS+= --without-readline CONFIGURE_ARGS+= --without-libedit -# We need the full readline on NetBSD 1.6.x -.if !empty(MACHINE_PLATFORM:MNetBSD-1.*) -USE_BUILTIN.readline= no -.include "../../devel/readline/buildlink3.mk" -.endif - # This forces mysql.info _not_ to be rebuilt. CONFIGURE_ARGS+= --without-docs |