diff options
author | jlam <jlam@pkgsrc.org> | 2006-03-14 01:14:26 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2006-03-14 01:14:26 +0000 |
commit | daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d (patch) | |
tree | 2d76c0a00d07e0939789aa971b834f332c4820c3 /fonts | |
parent | b1472309671a67b16cab03410ae83bb9d6007baa (diff) | |
download | pkgsrc-daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d.tar.gz |
Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.
If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts. If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:
INSTALL_SRC= ${PKGDIR}/INSTALL
DEINSTALL_SRC= # emtpy
As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts. By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).
In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework. The only public variables relating to the templates are:
INSTALL_SRC INSTALL_TEMPLATE
DEINSTALL_SRC DEINSTALL_TEMPLATE
HEADER_TEMPLATE
The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.
Diffstat (limited to 'fonts')
-rw-r--r-- | fonts/ghostscript-cidfonts/Makefile | 5 | ||||
-rw-r--r-- | fonts/ghostscript-cmaps/Makefile | 5 | ||||
-rw-r--r-- | fonts/ja-kappa20/Makefile | 4 | ||||
-rw-r--r-- | fonts/ja-shinonome/Makefile | 5 | ||||
-rw-r--r-- | fonts/vfontcap-kochi/Makefile | 5 |
5 files changed, 7 insertions, 17 deletions
diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile index c7cc7f7d0ae..cbb5e6f69eb 100644 --- a/fonts/ghostscript-cidfonts/Makefile +++ b/fonts/ghostscript-cidfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:39 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:28 jlam Exp $ DISTNAME= ghostscript-cidfonts-20000901 PKGREVISION= 2 @@ -21,8 +21,7 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_TOOLS+= gs:run -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q} FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q} diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile index 8c2ab9a3ca7..e6622759d5f 100644 --- a/fonts/ghostscript-cmaps/Makefile +++ b/fonts/ghostscript-cmaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:39 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:28 jlam Exp $ DISTNAME= ghostscript-cmaps-20020913 PKGREVISION= 2 @@ -21,8 +21,7 @@ USE_TOOLS+= gs:run NO_CONFIGURE= yes NO_BUILD= yes -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL FILES_SUBST+= ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q} FILES_SUBST+= GS_RESOURCEDIR=${GS_RESOURCEDIR:Q} diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile index fadceb0eef2..763373669ac 100644 --- a/fonts/ja-kappa20/Makefile +++ b/fonts/ja-kappa20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:09 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:28 jlam Exp $ DISTNAME= Kappa20-0.394 PKGNAME= ja-kappa20-0.394 @@ -16,8 +16,6 @@ FONTDIR= ${PREFIX}/lib/X11/fonts/local ALIAS_KAPPA= ${PREFIX}/share/examples/fonts.alias.Kappa20 USE_TOOLS+= mkfontdir -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= FONTDIR=${FONTDIR:Q} FILES_SUBST+= ALIAS_KAPPA=${ALIAS_KAPPA:Q} diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile index c29918cdd1f..ff7d6427609 100644 --- a/fonts/ja-shinonome/Makefile +++ b/fonts/ja-shinonome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:10 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 01:14:28 jlam Exp $ # DISTNAME= shinonome-0.9.10-src @@ -20,9 +20,6 @@ FONTDIR= ${PREFIX}/lib/X11/fonts/local FOUNDRY= Misc ALIAS_SHINONOME= ${PREFIX}/share/examples/fonts.alias.shinonome -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - FILES_SUBST+= FONTDIR=${FONTDIR:Q} FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME:Q} diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile index ad811f1571b..5ac997cc280 100644 --- a/fonts/vfontcap-kochi/Makefile +++ b/fonts/vfontcap-kochi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:11 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ DISTNAME= vfontcap-kochi-0.0 PKGREVISION= 2 @@ -17,9 +17,6 @@ EXTRACT_ONLY= # empty NO_CHECKSUM= YES NO_BUILD= YES -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - VFONTCAPDIR= ${PREFIX}/share/VFlib/2.24.2 FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR:Q} |