diff options
| author | wiz <wiz@pkgsrc.org> | 2008-03-26 13:27:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2008-03-26 13:27:16 +0000 |
| commit | e36d39ed8b19be5664bbf4f49e74735c75f05f1c (patch) | |
| tree | 3bdeaf2ee883549c6179eba2064d40a3aa406da3 /databases/mysql4-client | |
| parent | 1f903bb1709803890f8aae7b8aeba8a57c00c646 (diff) | |
| download | pkgsrc-e36d39ed8b19be5664bbf4f49e74735c75f05f1c.tar.gz | |
pkglint cleanup.
Diffstat (limited to 'databases/mysql4-client')
| -rw-r--r-- | databases/mysql4-client/Makefile | 6 | ||||
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile index dea9cbcf21f..ac6461286c3 100644 --- a/databases/mysql4-client/Makefile +++ b/databases/mysql4-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2008/03/26 13:22:00 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2008/03/26 13:29:58 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} PKGREVISION= 3 @@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --without-extra-tools CONFIGURE_ARGS+= --without-server CONFIGURE_ARGS+= --enable-thread-safe-client UNWRAP_FILES= scripts/mysql_config -INFO_FILES= # PLIST +INFO_FILES= yes INSTALLATION_DIRS= ${PKGINFODIR} @@ -28,8 +28,6 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf .endfor -# We need the full readline on NetBSD<2.0. -INCOMPAT_READLINE+= NetBSD-[0-1].*-* .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index f7681558e5d..c972e5fb2cc 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,6 @@ -# $NetBSD: Makefile.common,v 1.64 2008/03/26 13:22:00 wiz Exp $ +# $NetBSD: Makefile.common,v 1.65 2008/03/26 13:29:58 wiz Exp $ +# +# used by databases/mysql4-server/Makefile DISTNAME= mysql-4.1.22 CATEGORIES= databases @@ -23,6 +25,8 @@ MYSQL_USER?= mysql MYSQL_GROUP?= mysql MYSQL_DATADIR?= ${VARBASE}/mysql +BUILD_DEFS+= VARBASE + PKG_USERS_VARS+= MYSQL_USER PKG_GROUPS_VARS+= MYSQL_GROUP @@ -95,19 +99,21 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake perl:run LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql -SUBST_CLASSES+= mk scripts +SUBST_CLASSES+= mk SUBST_STAGE.mk= post-extract SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \ merge/Makefile.in mysys/Makefile.in \ strings/Makefile.in SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" SUBST_MESSAGE.mk= Fixing Makefiles. + +SUBST_CLASSES+= scripts SUBST_STAGE.scripts= post-extract SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ scripts/mysql_secure_installation.sh \ support-files/mysql.server.sh -SUBST_SED.scripts= -e "s,chown,${CHOWN},g" \ - -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" +SUBST_SED.scripts= -e "s,chown,${CHOWN},g" +SUBST_SED.scripts+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" SUBST_MESSAGE.scripts= Fixing scripts. .include "../../devel/zlib/buildlink3.mk" |