[pkgsrc/trunk]: pkgsrc/databases/php4-mysql merge back into single Makefile

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a9e2391a003
branches:  trunk
changeset: 462174:5a9e2391a003
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Sep 27 13:25:39 2003 +0000

description:
merge back into single Makefile
discussed with Thomas Klausner and Michal Pasternak

diffstat:

 databases/php4-mysql/Makefile        |  13 +++++++++++--
 databases/php4-mysql/Makefile.common |  13 -------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diffs (40 lines):

diff -r 2ee150636437 -r 5a9e2391a003 databases/php4-mysql/Makefile
--- a/databases/php4-mysql/Makefile     Sat Sep 27 13:21:37 2003 +0000
+++ b/databases/php4-mysql/Makefile     Sat Sep 27 13:25:39 2003 +0000
@@ -1,8 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2003/09/25 06:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/27 13:25:39 jdolecek Exp $
 
 MODNAME=               mysql
+CATEGORIES+=           databases
+PKGREVISION=           # empty
+COMMENT=               PHP4 extension for MySQL databases
 
-.include "../../databases/php4-mysql/Makefile.common"
 .include "../../www/php4/Makefile.module"
+
+USE_BUILDLINK2=                # defined
+
+EVAL_PREFIX+=          MYSQLDIR=mysql-client
+CONFIGURE_ARGS+=       --with-${MODNAME}=shared,${MYSQLDIR}
+LDFLAGS+=              -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql
+
 .include "../../databases/mysql-client/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2ee150636437 -r 5a9e2391a003 databases/php4-mysql/Makefile.common
--- a/databases/php4-mysql/Makefile.common      Sat Sep 27 13:21:37 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2003/09/25 06:22:11 wiz Exp $
-
-PKGMODNAME=             mysql
-CATEGORIES+=            databases
-PKGREVISION?=           # empty
-
-COMMENT?=               PHP4 extension for MySQL databases
-
-USE_BUILDLINK2?=        # defined
-
-EVAL_PREFIX+=           MYSQLDIR=mysql-client
-CONFIGURE_ARGS+=        --with-${MODNAME}=shared,${MYSQLDIR}
-LDFLAGS+=               -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql