[pkgsrc/trunk]: pkgsrc/databases/mysql4-server Reorganize the line order to b...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/297dc5208eca
branches:  trunk
changeset: 478265:297dc5208eca
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jul 20 17:28:37 2004 +0000

description:
Reorganize the line order to bring related things together and to more
closely match the template package Makefile.  Also use BUILD_DIRS instead
of invoking make explicitly in a post-build target.

diffstat:

 databases/mysql4-server/Makefile |  57 +++++++++++++++++++--------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diffs (90 lines):

diff -r 9de5d05cb799 -r 297dc5208eca databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile  Tue Jul 20 16:53:44 2004 +0000
+++ b/databases/mysql4-server/Makefile  Tue Jul 20 17:28:37 2004 +0000
@@ -1,53 +1,37 @@
-# $NetBSD: Makefile,v 1.7 2004/06/20 18:48:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/20 17:28:37 jlam Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=          mysqs
 COMMENT=               MySQL 4, a free SQL database (server)
 
+CONFLICTS=             {mysql-server-[0-9]*,mysql3-server-[0-9]*}
+
 .include "../mysql4-client/Makefile.common"
 
+USE_BUILDLINK3=                yes
+
 CONFIGURE_ARGS+=       --with-libwrap
 CONFIGURE_ARGS+=       --with-raid
 CONFIGURE_ARGS+=       --without-berkeley-db
 CONFIGURE_ARGS+=       --without-mysqlfs
-USE_BUILDLINK3=                YES
-USE_PKGINSTALL=                YES
-
-INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
+CONFIGURE_ARGS+=       --with-mysqld-user=${MYSQL_USER}
 
-CONFLICTS=             {mysql-server-[0-9]*,mysql3-server-[0-9]*}
+PTHREAD_OPTS+=         require
+CONFIGURE_ARGS+=       --with-pthreads
 
-PTHREAD_OPTS=          require
-
-CONFIGURE_ARGS+=       --with-pthreads
+USE_PKGINSTALL=                YES
+INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
 
 PKG_USERS=             ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\\ database\\ administrator:${MYSQL_DATADIR}:${SH}
 PKG_GROUPS=            ${MYSQL_GROUP}
 RCD_SCRIPTS=           mysqld
-CONFIGURE_ARGS+=       --with-mysqld-user=${MYSQL_USER}
+MAKE_DIRS_PERMS+=      ${MYSQL_DATADIR} ${MYSQL_USER} ${MYSQL_GROUP} 0700
+
 FILES_SUBST+=          MYSQL_DATADIR=${MYSQL_DATADIR}
 MESSAGE_SUBST+=                MYSQL_DATADIR=${MYSQL_DATADIR} \
                        MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=           MYSQL_DATADIR
-MAKE_DIRS_PERMS+=      ${MYSQL_DATADIR} ${MYSQL_USER} ${MYSQL_GROUP} 0700
-
-post-configure:
-       cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
-
-post-build:
-       cd ${WRKSRC}/man && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-       cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}   \
-               ${MAKE_FLAGS} mysqld_safe mysql_install_db
-
-post-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
-       ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1
-       #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
-       PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-       ${CHOWN} -R ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_DATADIR}
+BUILD_DIRS=            ${WRKSRC} ${WRKSRC}/man
 
 .include "../../databases/mysql4-client/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
@@ -60,4 +44,19 @@
 CONFIGURE_ENV+=        ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
+post-configure:
+       cd ${WRKSRC} && ${CP} -f config.h include/my_config.h
+
+post-build:
+       cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}   \
+               ${MAKE_FLAGS} mysqld_safe mysql_install_db
+
+post-install:
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
+       ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1
+       #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
+
 .include "../../mk/bsd.pkg.mk"