summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin>2015-11-25 12:50:00 +0000
committerjperkin <jperkin>2015-11-25 12:50:00 +0000
commit00219dde58f72a0e03c275c751c98eafd4d711e3 (patch)
tree40763f3de024ac7392d96ac7d7caa3fa6234eb23
parenteb462d27c8c374ddbd073a27623717fb0ada0d70 (diff)
downloadpkgsrc-00219dde58f72a0e03c275c751c98eafd4d711e3.tar.gz
Remove mk/find-prefix.mk usage from the editors 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.
-rw-r--r--editors/OmegaT/Makefile7
-rw-r--r--editors/qgoogletranslator/Makefile9
-rw-r--r--editors/xemacs-packages/Makefile4
3 files changed, 6 insertions, 14 deletions
diff --git a/editors/OmegaT/Makefile b/editors/OmegaT/Makefile
index b2179fc2047..5cf230b8f6a 100644
--- a/editors/OmegaT/Makefile
+++ b/editors/OmegaT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/08/09 17:39:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2015/11/25 12:50:00 jperkin Exp $
#
DISTNAME= OmegaT_3.5_01_Beta_Source
@@ -21,9 +21,6 @@ BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
USE_TOOLS+= pax
-FIND_PREFIX:= ANTDIR=apache-ant
-.include "../../mk/find-prefix.mk"
-
SUBST_CLASSES+= fix-omegat
SUBST_STAGE.fix-omegat= pre-configure
SUBST_MESSAGE.fix-omegat= fixing pathes
@@ -50,7 +47,7 @@ pre-patch:
do-build:
cd ${WRKSRC} \
&& env ${MAKE_ENV} \
- ${ANTDIR}/bin/ant jar release
+ ${LOCALBASE}/bin/ant jar release
do-install:
${INSTALL_DATA} ${WRKSRC}/dist/*txt \
diff --git a/editors/qgoogletranslator/Makefile b/editors/qgoogletranslator/Makefile
index 86a3b3d6b33..2347de9a37a 100644
--- a/editors/qgoogletranslator/Makefile
+++ b/editors/qgoogletranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/04/25 14:20:43 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2015/11/25 12:50:00 jperkin Exp $
#
DISTNAME= qgoogletranslator-1.2.1
@@ -19,14 +19,11 @@ USE_CMAKE= yes
LDFLAGS.DragonFly= -lX11
-FIND_PREFIX:= MPG123DIR=mpg123
-.include "../../mk/find-prefix.mk"
-
SUBST_CLASSES+= mpg123-cmd
SUBST_STAGE.mpg123-cmd= pre-configure
SUBST_FILES.mpg123-cmd= src/defines.h.in
-SUBST_SED.mpg123-cmd= -e 's,/usr/bin/mpg123,${MPG123DIR}/bin/mpg123,'
-SUBST_SED.mpg123-cmd+= -e 's,/usr/local/bin/mpg123,${MPG123DIR}/bin/mpg123,'
+SUBST_SED.mpg123-cmd= -e 's,/usr/bin/mpg123,${LOCALBASE}/bin/mpg123,'
+SUBST_SED.mpg123-cmd+= -e 's,/usr/local/bin/mpg123,${LOCALBASE}/bin/mpg123,'
.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index bad366ad72d..77390a7841a 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2015/11/11 15:02:33 hauke Exp $
+# $NetBSD: Makefile,v 1.66 2015/11/25 12:50:00 jperkin Exp $
DISTNAME= xemacs-packages
PKGNAME= xemacs-packages-1.17
@@ -170,8 +170,6 @@ REPLACE_PERL+= lisp/hyperbole/file-newer
# Do not depend on Python just for one file
CHECK_INTERPRETER_SKIP= ${XEPKGDIR}/etc/python-modes/pydoc_lisp.py
-.include "../../editors/xemacs/Makefile.pkg"
-
PRINT_PLIST_AWK+= { sub("\\.el$$", ".el$${ELSUFX}") }
.if defined(MANZ)