From b2677a2cb0d685822071dbac41558e75e1bc7c6a Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 30 Aug 2003 22:51:11 +0000 Subject: Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if USE_PKGINSTALL is "YES". bsd.pkg.install.mk will no longer automatically pick up a INSTALL/DEINSTALL script in the package directory and assume that you want it for the corresponding *_EXTRA_TMPL variable. --- databases/mysql-server/Makefile | 7 +++++-- databases/postgresql-server/Makefile | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'databases') diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index f7f5f80f3c0..38c6903a30e 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2003/08/30 20:05:13 seb Exp $ +# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:14 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 4 @@ -10,9 +10,12 @@ COMMENT= MySQL, a free SQL database (server) CONFIGURE_ARGS+= --with-libwrap CONFIGURE_ARGS+= --without-berkeley-db USE_BUILDLINK2= YES -USE_PKGINSTALL= YES USE_GMAKE= YES +USE_PKGINSTALL= YES +DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL +INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL + ONLY_FOR_PLATFORM= SunOS-*-sparc Linux-*-* # on NetBSD, if native threads are not available, hardwire diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index 5b8515732ae..dfe81e41fe5 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2003/07/16 10:35:15 abs Exp $ +# $NetBSD: Makefile,v 1.33 2003/08/30 22:51:14 jlam Exp $ PKGNAME= postgresql-server-${BASE_VERS} SVR4_PKGNAME= pstgs @@ -13,6 +13,8 @@ NOT_FOR_PLATFORM= *-*-mips .include "../postgresql/Makefile.common" USE_PKGINSTALL= yes +DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL + CONFIGURE_ARGS+= --with-openssl=${SSLBASE} BUILD_DIRS= ${WRKSRC}/src/backend BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs -- cgit v1.2.3