Index: Makefile =================================================================== RCS file: /WORK/ports/REPO/ports/www/mod_accounting/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 5 Aug 2003 05:30:14 -0000 1.5 +++ Makefile 27 Aug 2003 08:35:57 -0000 @@ -20,25 +20,6 @@ MAKE_ARGS+= APXS="${APXS}" APXS?= ${LOCALBASE}/sbin/apxs -# MySQL deps hack -MYSQL323_LIBVER=10 -MYSQL40_LIBVER= 12 -MYSQL41_LIBVER= 14 - -.include - -.if defined(WITH_MYSQL_VER) -MYSQL_VER= ${WITH_MYSQL_VER} -.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL_323_LIBVER}) -MYSQL_VER= 323 -.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL40_LIBVER}) -MYSQL_VER= 40 -.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL41_LIBVER}) -MYSQL_VER= 41 -.else -MYSQL_VER= 323 -.endif - .if defined(WITHOUT_PGSQL) MAKE_ARGS+= WITHOUT_PGSQL=YES .else @@ -48,19 +29,13 @@ .if defined(WITHOUT_MYSQL) MAKE_ARGS+= WITHOUT_MYSQL=YES .else -LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client +USE_MYSQL= YES .endif DOCS= README FAQ.txt LICENSE pre-everything:: @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " WITH_MYSQL_VER=323 Enable MySQL 3.23 support (default)" - @${ECHO} " WITH_MYSQL_VER=40 Enable MySQL 4.0 support" - @${ECHO} " WITH_MYSQL_VER=41 Enable MySQL 4.1 support" - @${ECHO} "" @${ECHO} " WITHOUT_MYSQL Disable MySQL support" @${ECHO} " WITHOUT_PGSQL Disable PostgreSQL support" @${ECHO} "" @@ -76,4 +51,4 @@ .endif @${CAT} ${PKGMESSAGE} -.include +.include