Wed Mar 26 13:29:58 2008 UTC ()
pkglint cleanup.


(wiz)
diff -r1.28 -r1.29 pkgsrc/databases/mysql4-client/Makefile
diff -r1.64 -r1.65 pkgsrc/databases/mysql4-client/Makefile.common
cvs diff -r1.28 -r1.29 pkgsrc/databases/mysql4-client/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql4-client/Attic/Makefile 2008/03/26 13:22:00 1.28
+++ pkgsrc/databases/mysql4-client/Attic/Makefile 2008/03/26 13:29:58 1.29
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1# $NetBSD: Makefile,v 1.28 2008/03/26 13:22:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.29 2008/03/26 13:29:58 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 3 4PKGREVISION= 3
5SVR4_PKGNAME= mysqc 5SVR4_PKGNAME= mysqc
6COMMENT= MySQL 4, a free SQL database (client) 6COMMENT= MySQL 4, a free SQL database (client)
7 7
8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12.include "Makefile.common" 12.include "Makefile.common"
13 13
14CONFIGURE_ARGS+= --without-extra-tools 14CONFIGURE_ARGS+= --without-extra-tools
15CONFIGURE_ARGS+= --without-server 15CONFIGURE_ARGS+= --without-server
16CONFIGURE_ARGS+= --enable-thread-safe-client 16CONFIGURE_ARGS+= --enable-thread-safe-client
17UNWRAP_FILES= scripts/mysql_config 17UNWRAP_FILES= scripts/mysql_config
18INFO_FILES= # PLIST 18INFO_FILES= yes
19 19
20INSTALLATION_DIRS= ${PKGINFODIR} 20INSTALLATION_DIRS= ${PKGINFODIR}
21 21
22post-install: 22post-install:
23 ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info \ 23 ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info \
24 ${DESTDIR}${PREFIX}/${PKGINFODIR} 24 ${DESTDIR}${PREFIX}/${PKGINFODIR}
25 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/mysql 25 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/mysql
26.for f in huge large innodb-heavy-4G small medium 26.for f in huge large innodb-heavy-4G small medium
27 ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \ 27 ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
28 ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf 28 ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
29.endfor 29.endfor
30 30
31# We need the full readline on NetBSD<2.0. 
32INCOMPAT_READLINE+= NetBSD-[0-1].*-* 
33.include "../../devel/readline/buildlink3.mk" 31.include "../../devel/readline/buildlink3.mk"
34 32
35.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.64 -r1.65 pkgsrc/databases/mysql4-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql4-client/Attic/Makefile.common 2008/03/26 13:22:00 1.64
+++ pkgsrc/databases/mysql4-client/Attic/Makefile.common 2008/03/26 13:29:58 1.65
@@ -1,38 +1,42 @@ @@ -1,38 +1,42 @@
1# $NetBSD: Makefile.common,v 1.64 2008/03/26 13:22:00 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.65 2008/03/26 13:29:58 wiz Exp $
 2#
 3# used by databases/mysql4-server/Makefile
2 4
3DISTNAME= mysql-4.1.22 5DISTNAME= mysql-4.1.22
4CATEGORIES= databases 6CATEGORIES= databases
5MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-4.1/} 7MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-4.1/}
6 8
7MAINTAINER= hallmann@ahatec.de 9MAINTAINER= hallmann@ahatec.de
8HOMEPAGE= http://www.mysql.com/ 10HOMEPAGE= http://www.mysql.com/
9 11
10USE_LIBTOOL= yes 12USE_LIBTOOL= yes
11GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
12 14
13.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
14.include "options.mk" 16.include "options.mk"
15 17
16EXTRACT_USING= pax 18EXTRACT_USING= pax
17 19
18# MYSQL_USER username of the database administrator 20# MYSQL_USER username of the database administrator
19# MYSQL_GROUP group of the database administrator 21# MYSQL_GROUP group of the database administrator
20# MYSQL_DATADIR home directory of the database administrator and 22# MYSQL_DATADIR home directory of the database administrator and
21# location of the databases 23# location of the databases
22MYSQL_USER?= mysql 24MYSQL_USER?= mysql
23MYSQL_GROUP?= mysql 25MYSQL_GROUP?= mysql
24MYSQL_DATADIR?= ${VARBASE}/mysql 26MYSQL_DATADIR?= ${VARBASE}/mysql
25 27
 28BUILD_DEFS+= VARBASE
 29
26PKG_USERS_VARS+= MYSQL_USER 30PKG_USERS_VARS+= MYSQL_USER
27PKG_GROUPS_VARS+= MYSQL_GROUP 31PKG_GROUPS_VARS+= MYSQL_GROUP
28 32
29# MYSQL_CHARSET default character set 33# MYSQL_CHARSET default character set
30# MYSQL_EXTRA_CHARSET additional character set to be compiled in. 34# MYSQL_EXTRA_CHARSET additional character set to be compiled in.
31# 35#
32MYSQL_CHARSET?= latin1 36MYSQL_CHARSET?= latin1
33MYSQL_EXTRA_CHARSET?= all 37MYSQL_EXTRA_CHARSET?= all
34 38
35CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} 39CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q}
36CONFIGURE_ARGS+= --with-named-z-libs=z 40CONFIGURE_ARGS+= --with-named-z-libs=z
37CONFIGURE_ARGS+= --without-libwrap 41CONFIGURE_ARGS+= --without-libwrap
38 42
@@ -85,29 +89,31 @@ CXXFLAGS+= -DHAVE_CURSES_H @@ -85,29 +89,31 @@ CXXFLAGS+= -DHAVE_CURSES_H
85.include "../../mk/pthread.buildlink3.mk" 89.include "../../mk/pthread.buildlink3.mk"
86 90
87.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 91.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
88CFLAGS+= -DSIGNALS_DONT_BREAK_READ 92CFLAGS+= -DSIGNALS_DONT_BREAK_READ
89CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ 93CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
90CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no 94CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
91CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no 95CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
92.endif 96.endif
93 97
94USE_LANGUAGES= c c++ 98USE_LANGUAGES= c c++
95USE_TOOLS+= gmake perl:run 99USE_TOOLS+= gmake perl:run
96LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 100LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
97 101
98SUBST_CLASSES+= mk scripts 102SUBST_CLASSES+= mk
99SUBST_STAGE.mk= post-extract 103SUBST_STAGE.mk= post-extract
100SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \ 104SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
101 merge/Makefile.in mysys/Makefile.in \ 105 merge/Makefile.in mysys/Makefile.in \
102 strings/Makefile.in 106 strings/Makefile.in
103SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" 107SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//"
104SUBST_MESSAGE.mk= Fixing Makefiles. 108SUBST_MESSAGE.mk= Fixing Makefiles.
 109
 110SUBST_CLASSES+= scripts
105SUBST_STAGE.scripts= post-extract 111SUBST_STAGE.scripts= post-extract
106SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 112SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
107 scripts/mysql_secure_installation.sh \ 113 scripts/mysql_secure_installation.sh \
108 support-files/mysql.server.sh 114 support-files/mysql.server.sh
109SUBST_SED.scripts= -e "s,chown,${CHOWN},g" \ 115SUBST_SED.scripts= -e "s,chown,${CHOWN},g"
110 -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 116SUBST_SED.scripts+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
111SUBST_MESSAGE.scripts= Fixing scripts. 117SUBST_MESSAGE.scripts= Fixing scripts.
112 118
113.include "../../devel/zlib/buildlink3.mk" 119.include "../../devel/zlib/buildlink3.mk"