kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkglint cleanup.

Browse source
This commit is contained in:
wiz 2008-03-26 13:27:16 +00:00
parent 1f903bb170
commit e36d39ed8b
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
databases/mysql4-client/Makefile
View file

@ -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-/} PKGNAME= ${DISTNAME:S/-/-client-/}
PKGREVISION= 3 PKGREVISION= 3
@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --without-extra-tools
CONFIGURE_ARGS+= --without-server CONFIGURE_ARGS+= --without-server
CONFIGURE_ARGS+= --enable-thread-safe-client CONFIGURE_ARGS+= --enable-thread-safe-client
UNWRAP_FILES= scripts/mysql_config UNWRAP_FILES= scripts/mysql_config
INFO_FILES= # PLIST INFO_FILES= yes
INSTALLATION_DIRS= ${PKGINFODIR} INSTALLATION_DIRS= ${PKGINFODIR}
@ -28,8 +28,6 @@ post-install:
${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
.endfor .endfor
# We need the full readline on NetBSD<2.0.
INCOMPAT_READLINE+= NetBSD-[0-1].*-*
.include "../../devel/readline/buildlink3.mk" .include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

14
databases/mysql4-client/Makefile.common
View file

@ -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 DISTNAME= mysql-4.1.22
CATEGORIES= databases CATEGORIES= databases
@ -23,6 +25,8 @@ MYSQL_USER?= mysql
MYSQL_GROUP?= mysql MYSQL_GROUP?= mysql
MYSQL_DATADIR?= ${VARBASE}/mysql MYSQL_DATADIR?= ${VARBASE}/mysql
BUILD_DEFS+= VARBASE
PKG_USERS_VARS+= MYSQL_USER PKG_USERS_VARS+= MYSQL_USER
PKG_GROUPS_VARS+= MYSQL_GROUP PKG_GROUPS_VARS+= MYSQL_GROUP
@ -95,19 +99,21 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl:run USE_TOOLS+= gmake perl:run
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
SUBST_CLASSES+= mk scripts SUBST_CLASSES+= mk
SUBST_STAGE.mk= post-extract SUBST_STAGE.mk= post-extract
SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \ SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
merge/Makefile.in mysys/Makefile.in \ merge/Makefile.in mysys/Makefile.in \
strings/Makefile.in strings/Makefile.in
SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//"
SUBST_MESSAGE.mk= Fixing Makefiles. SUBST_MESSAGE.mk= Fixing Makefiles.
SUBST_CLASSES+= scripts
SUBST_STAGE.scripts= post-extract SUBST_STAGE.scripts= post-extract
SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
scripts/mysql_secure_installation.sh \ scripts/mysql_secure_installation.sh \
support-files/mysql.server.sh support-files/mysql.server.sh
SUBST_SED.scripts= -e "s,chown,${CHOWN},g" \ SUBST_SED.scripts= -e "s,chown,${CHOWN},g"
-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" SUBST_SED.scripts+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
SUBST_MESSAGE.scripts= Fixing scripts. SUBST_MESSAGE.scripts= Fixing scripts.
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"

4
databases/mysql4-server/Makefile
View file

@ -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-/} PKGNAME= ${DISTNAME:S/-/-server-/}
SVR4_PKGNAME= mysqs SVR4_PKGNAME= mysqs
@ -38,7 +38,7 @@ FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \
MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
BUILD_DEFS+= MYSQL_DATADIR BUILD_DEFS+= MYSQL_DATADIR
BUILD_DIRS= ${WRKSRC} ${WRKSRC}/man BUILD_DIRS= . man
INSTALLATION_DIRS= bin INSTALLATION_DIRS= bin