pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases pkglint cleanup.
details: https://anonhg.NetBSD.org/pkgsrc/rev/0b7b657bc936
branches: trunk
changeset: 540091:0b7b657bc936
user: wiz <wiz%pkgsrc.org@localhost>
date: Wed Mar 26 13:27:16 2008 +0000
description:
pkglint cleanup.
diffstat:
databases/mysql4-client/Makefile | 6 ++----
databases/mysql4-client/Makefile.common | 14 ++++++++++----
databases/mysql4-server/Makefile | 4 ++--
3 files changed, 14 insertions(+), 10 deletions(-)
diffs (90 lines):
diff -r 5ae4ac078064 -r 0b7b657bc936 databases/mysql4-client/Makefile
--- a/databases/mysql4-client/Makefile Wed Mar 26 13:26:33 2008 +0000
+++ b/databases/mysql4-client/Makefile Wed Mar 26 13:27:16 2008 +0000
@@ -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-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 @@
${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 -r 5ae4ac078064 -r 0b7b657bc936 databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common Wed Mar 26 13:26:33 2008 +0000
+++ b/databases/mysql4-client/Makefile.common Wed Mar 26 13:27:16 2008 +0000
@@ -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_GROUP?= mysql
MYSQL_DATADIR?= ${VARBASE}/mysql
+BUILD_DEFS+= VARBASE
+
PKG_USERS_VARS+= MYSQL_USER
PKG_GROUPS_VARS+= MYSQL_GROUP
@@ -95,19 +99,21 @@
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"
diff -r 5ae4ac078064 -r 0b7b657bc936 databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile Wed Mar 26 13:26:33 2008 +0000
+++ b/databases/mysql4-server/Makefile Wed Mar 26 13:27:16 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/03/26 13:22:00 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/03/26 13:27:16 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
SVR4_PKGNAME= mysqs
@@ -38,7 +38,7 @@
MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \
MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
BUILD_DEFS+= MYSQL_DATADIR
-BUILD_DIRS= ${WRKSRC} ${WRKSRC}/man
+BUILD_DIRS= . man
INSTALLATION_DIRS= bin
Home |
Main Index |
Thread Index |
Old Index