diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:51:54 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:51:54 +0000 |
| commit | 841045c79ec12262235519192b12a861c26b9d85 (patch) | |
| tree | e30715a2de1b38f278666cde009981d2db784bc2 /misc/libreoffice | |
| parent | f31db4a625bf8a261f8b13e0d97caf0c58fa4f3e (diff) | |
| download | pkgsrc-841045c79ec12262235519192b12a861c26b9d85.tar.gz | |
Remove mk/find-prefix.mk usage from the misc 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 'misc/libreoffice')
| -rw-r--r-- | misc/libreoffice/options.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/misc/libreoffice/options.mk b/misc/libreoffice/options.mk index 6a44527dcfe..6bffbb518f5 100644 --- a/misc/libreoffice/options.mk +++ b/misc/libreoffice/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2015/11/25 12:51:54 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 @@ -18,13 +18,10 @@ PLIST_VARS+= java kde4 gtk3 USE_JAVA= yes USE_JAVA2= yes BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant -FIND_PREFIX:= ANTDIR=apache-ant -CONFIGURE_ARGS+= --with-ant-home=${ANTDIR} +CONFIGURE_ARGS+= --with-ant-home=${LOCALBASE} DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18 -FIND_PREFIX+= HSQLDB_SYSDIR=hsqldb18 -CONFIGURE_ARGS+= --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar -.include "../../mk/find-prefix.mk" +CONFIGURE_ARGS+= --with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar CONFIGURE_ARGS+= --enable-ext-wiki-publisher \ --with-java \ --with-jdk-home=${PKG_JAVA_HOME} \ |