diff options
author | seb <seb@pkgsrc.org> | 2002-02-18 15:14:00 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2002-02-18 15:14:00 +0000 |
commit | 66111c6d15be91debc28f649061f5ed03d48e340 (patch) | |
tree | c84409a165bd501342b10b825394cf1eb3684d02 /databases | |
parent | 0b7fe93445e5b9c2ed4f512cd83d2c904922531b (diff) | |
download | pkgsrc-66111c6d15be91debc28f649061f5ed03d48e340.tar.gz |
Introduce new framework for handling info files generation and installation.
Summary of changes:
- removal of USE_GTEXINFO
- addition of mk/texinfo.mk
- inclusion of this file in package Makefiles requiring it
- `install-info' substituted by `${INSTALL_INFO}' in PLISTs
- tuning of mk/bsd.pkg.mk:
removal of USE_GTEXINFO
INSTALL_INFO added to PLIST_SUBST
`${INSTALL_INFO}' replace `install-info' in target rules
print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info'
- a couple of new patch files added for a handful of packages
- setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it
- devel/cssc marked requiring texinfo 4.0
- a couple of packages Makefiles were tuned with respect of INFO_FILES and
makeinfo command usage
See -newly added by this commit- section 10.24 of Packages.txt for
further information.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/gdbm/Makefile | 4 | ||||
-rw-r--r-- | databases/gdbm/PLIST | 6 | ||||
-rw-r--r-- | databases/gnats/Makefile | 16 | ||||
-rw-r--r-- | databases/gnats/PLIST | 10 | ||||
-rw-r--r-- | databases/mysql-client/Makefile | 3 | ||||
-rw-r--r-- | databases/mysql-client/PLIST | 6 |
6 files changed, 25 insertions, 20 deletions
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 85122896612..0ed8bf857c3 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/06/21 02:47:27 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2002/02/18 15:14:05 seb Exp $ # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp # @@ -15,8 +15,10 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig INFO_FILES= gdbm.info +TEXINFO_OVERRIDE= YES post-extract: ${RM} -f ${WRKSRC}/gdbm.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gdbm/PLIST b/databases/gdbm/PLIST index 07c91280d83..74ad1b0fb32 100644 --- a/databases/gdbm/PLIST +++ b/databases/gdbm/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:40 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:06 seb Exp $ include/gdbm.h -@unexec install-info --delete %D/info/gdbm.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gdbm.info %D/info/dir info/gdbm.info -@exec install-info %D/info/gdbm.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gdbm.info %D/info/dir lib/libgdbm.a lib/libgdbm.la lib/libgdbm.so diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index 72df5bbd2eb..bc10a41392a 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/11 11:42:26 martti Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:06 seb Exp $ DISTNAME= gnats-3.113.1 CATEGORIES= devel @@ -27,6 +27,7 @@ CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp \ --with-release-based USE_GMAKE= yes USE_BISON= yes +TEXINFO_OVERRIDE= YES DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL @@ -53,8 +54,8 @@ CONFIGURE_ENV= SEND_PR=/dev/null INSTALL_TARGET= install-gnats install-send-pr post-build: - (cd ${WRKSRC}/gnats; ${MAKE} info) - (cd ${WRKSRC}/send-pr; ${MAKE} info) + (cd ${WRKSRC}/gnats; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info) + (cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info) pre-install: ${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} @@ -62,9 +63,10 @@ pre-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: - (cd ${WRKSRC}/gnats; ${MAKE} install-info) - (cd ${WRKSRC}/send-pr; ${MAKE} install-info) - install-info ${PREFIX}/info/gnats.info ${PREFIX}/info/dir - install-info ${PREFIX}/info/send-pr.info ${PREFIX}/info/dir + (cd ${WRKSRC}/gnats; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info) + (cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info) + ${INSTALL_INFO} ${PREFIX}/info/gnats.info ${PREFIX}/info/dir + ${INSTALL_INFO} ${PREFIX}/info/send-pr.info ${PREFIX}/info/dir +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST index d11591c6f38..c1bd6e96865 100644 --- a/databases/gnats/PLIST +++ b/databases/gnats/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:33 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:06 seb Exp $ bin/edit-pr bin/getclose bin/install-sid @@ -7,16 +7,16 @@ bin/nquery-pr bin/query-pr bin/send-pr bin/sub-type -@unexec install-info --delete %D/info/gnats.info %D/info/dir -@unexec install-info --delete %D/info/send-pr.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnats.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/send-pr.info %D/info/dir info/gnats.info info/gnats.info-1 info/gnats.info-2 info/gnats.info-3 info/gnats.info-4 info/send-pr.info -@exec install-info %D/info/gnats.info %D/info/dir -@exec install-info %D/info/send-pr.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnats.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/send-pr.info %D/info/dir libexec/gnats/at-pr libexec/gnats/check-db libexec/gnats/delete-pr diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 066584b1226..450380f3bee 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/11/02 02:57:28 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:06 seb Exp $ # .include "Makefile.common" @@ -20,4 +20,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info .include "../../devel/readline/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST index ccffad13f00..b2f9e9886a0 100644 --- a/databases/mysql-client/PLIST +++ b/databases/mysql-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/08 14:09:38 martti Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:06 seb Exp $ bin/msql2mysql bin/mysql bin/mysqlcheck @@ -39,9 +39,9 @@ include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h -@unexec install-info --delete %D/info/mysql.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec install-info %D/info/mysql.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/mysql.info %D/info/dir lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so |