diff options
| author | jperkin <jperkin> | 2015-11-25 12:53:42 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-11-25 12:53:42 +0000 |
| commit | 093e9003c17ee8a64f8d4fcc02b0855e3bdcbb1d (patch) | |
| tree | aeadb9ee94a34cf79224e32c000d13b5d09199dc /textproc/xmlcatmgr | |
| parent | 0341d08cb5c37ecee986eae393687c8250e5bc2b (diff) | |
| download | pkgsrc-093e9003c17ee8a64f8d4fcc02b0855e3bdcbb1d.tar.gz | |
Remove mk/find-prefix.mk usage from the textproc category.
The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.
Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.
Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.
Diffstat (limited to 'textproc/xmlcatmgr')
| -rw-r--r-- | textproc/xmlcatmgr/buildlink3.mk | 6 | ||||
| -rw-r--r-- | textproc/xmlcatmgr/catalogs.mk | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk index 405d2819381..51b8d59901d 100644 --- a/textproc/xmlcatmgr/buildlink3.mk +++ b/textproc/xmlcatmgr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2015/11/25 12:53:42 jperkin Exp $ # # This Makefile fragment is included by packages that use xmlcatmgr. # @@ -21,9 +21,7 @@ BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr # Location of the xmlcatmgr binary program. -EVAL_PREFIX+= XMLCATMGR_PREFIX=xmlcatmgr -XMLCATMGR_PREFIX_DEFAULT= ${LOCALBASE} -XMLCATMGR= ${XMLCATMGR_PREFIX}/bin/xmlcatmgr +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr # System-wide configurable catalogs. .if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr) diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index d04f3fa43d9..1a3da181084 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.20 2013/05/10 22:33:55 riastradh Exp $ +# $NetBSD: catalogs.mk,v 1.21 2015/11/25 12:53:42 jperkin Exp $ # # This Makefile fragment is intended to be included by packages that install # catalog files or DTDs. It takes care of registering them into the right @@ -48,8 +48,8 @@ XML_ENTRIES+= nextCatalog ${PREFIX:=${c}} -- # .if !empty(SGML_ENTRIES) || !empty(XML_ENTRIES) FILES_SUBST+= XMLCATMGR=${XMLCATMGR:Q} -FILES_SUBST+= SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog" -FILES_SUBST+= XML_CATALOG="${XMLCATMGR_PREFIX}/share/xml/catalog" +FILES_SUBST+= SGML_CATALOG="${LOCALBASE}/share/sgml/catalog" +FILES_SUBST+= XML_CATALOG="${LOCALBASE}/share/xml/catalog" FILES_SUBST+= SGML_ENTRIES=${SGML_ENTRIES:Q} FILES_SUBST+= XML_ENTRIES=${XML_ENTRIES:Q} INSTALL_TEMPLATES+= ../../textproc/xmlcatmgr/files/install.tmpl |