diff options
| -rw-r--r-- | sysutils/amanda-common/Makefile.common | 8 | ||||
| -rw-r--r-- | sysutils/amanda-common/options.mk | 6 | ||||
| -rw-r--r-- | sysutils/amanda-plot/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/libisoburn/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/rsnapshot/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/webmin/wbm.mk | 7 |
6 files changed, 15 insertions, 27 deletions
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 655f6b427c0..ae0faa039e2 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2014/09/25 21:47:06 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.41 2015/11/25 12:53:29 jperkin Exp $ # used by sysutils/amanda-common/Makefile # used by sysutils/amanda-client/Makefile @@ -84,7 +84,7 @@ LDFLAGS.SunOS+= -lsocket INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} -AMPERLDIR= ${PERLDIR:Q}/${PERL5_SUB_INSTALLVENDORLIB} +AMPERLDIR= ${PREFIX:Q}/${PERL5_SUB_INSTALLVENDORLIB} .include "../../sysutils/amanda-common/options.mk" @@ -116,7 +116,7 @@ post-install-extra: .if defined(PERL5_MODS) && !empty(PERL5_MODS) . for mod in ${PERL5_MODS} ${INSTALL_DATA} ${WRKSRC}/perl/${mod} \ - ${DESTDIR}${PERLDIR}/${PERL5_SUB_INSTALLVENDORLIB}/${mod} + ${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}/${mod} . endfor .endif .if defined(PERL5_LIBS) && !empty(PERL5_LIBS) @@ -124,7 +124,7 @@ post-install-extra: ${RUN}${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} \ ${WRAPPER_BINDIR}/libtool --mode=install ${INSTALL_LIB} \ ${WRKSRC}/perl/lib${lib}.la \ - ${DESTDIR}${PERLDIR}/${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${lib} + ${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${lib} . endfor .endif .if defined(MANPAGES) && !empty(MANPAGES) diff --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk index 25699ae63c8..cc2b0043945 100644 --- a/sysutils/amanda-common/options.mk +++ b/sysutils/amanda-common/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2015/02/09 18:35:12 gdt Exp $ +# $NetBSD: options.mk,v 1.12 2015/11/25 12:53:29 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.amanda # Common options. @@ -30,9 +30,7 @@ CONFIGURE_ARGS+= --with-ssh-security . if !exists(/usr/bin/ssh) DEPENDS+= openssh-[0-9]*:../../security/openssh -FIND_PREFIX:= SSHPREFIX=openssh -.include "../../mk/find-prefix.mk" -CONFIGURE_ENV+= ac_cv_path_SSH=${SSHPREFIX}/bin/ssh +CONFIGURE_ENV+= ac_cv_path_SSH=${LOCALBASE}/bin/ssh . endif .endif diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile index fb6af9aca3c..84d78526833 100644 --- a/sysutils/amanda-plot/Makefile +++ b/sysutils/amanda-plot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2015/02/09 18:35:12 gdt Exp $ +# $NetBSD: Makefile,v 1.36 2015/11/25 12:53:29 jperkin Exp $ # PKGNAME= amanda-plot-${AMANDA_VERSION} @@ -13,13 +13,10 @@ MANPAGES+= amplot.8 .include "../../sysutils/amanda-common/Makefile.common" -FIND_PREFIX:= GNUPLOT_PREFIX=gnuplot -.include "../../mk/find-prefix.mk" - CONFIGURE_ARGS+= --without-client CONFIGURE_ARGS+= --without-restore CONFIGURE_ARGS+= --without-amrecover -CONFIGURE_ENV+= GNUPLOT="${GNUPLOT_PREFIX}/bin/gnuplot" +CONFIGURE_ENV+= GNUPLOT="${LOCALBASE}/bin/gnuplot" BUILD_DIRS= amplot diff --git a/sysutils/libisoburn/Makefile b/sysutils/libisoburn/Makefile index 9e2167a4964..723bc62bb91 100644 --- a/sysutils/libisoburn/Makefile +++ b/sysutils/libisoburn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/07/19 11:13:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2015/11/25 12:53:29 jperkin Exp $ DISTNAME= libisoburn-1.3.8 #PKGNAME= ${DISTNAME:S/.pl/pl/} @@ -22,14 +22,11 @@ INFO_FILES= yes PKGCONFIG_OVERRIDE+= libisoburn-1.pc.in -FIND_PREFIX:= TCLDIR=tcl -.include "../../mk/find-prefix.mk" - SUBST_CLASSES+= fix-wish SUBST_STAGE.fix-wish= pre-configure SUBST_MESSAGE.fix-wish= Fixing tcl wish SUBST_FILES.fix-wish+= frontend/xorriso-tcltk -SUBST_SED.fix-wish+= -e 's,/usr/bin/wish,${TCLDIR}/bin/wish,' +SUBST_SED.fix-wish+= -e 's,/usr/bin/wish,${LOCALBASE}/bin/wish,' .include "../../sysutils/libisofs/buildlink3.mk" .include "../../sysutils/libburn/buildlink3.mk" diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile index 2ba5241de10..17bc060ee91 100644 --- a/sysutils/rsnapshot/Makefile +++ b/sysutils/rsnapshot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2015/06/12 10:51:17 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2015/11/25 12:53:29 jperkin Exp $ DISTNAME= rsnapshot-1.3.1 PKGREVISION= 5 @@ -24,12 +24,9 @@ DOCDIR= ${PREFIX}/share/doc/${PKGBASE} CONF_FILES+= ${EGDIR}/rsnapshot.conf.default \ ${PKG_SYSCONFDIR}/rsnapshot.conf -FIND_PREFIX:= RSYNCDIR=rsync -.include "../../mk/find-prefix.mk" - CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-perl=${PERL5:Q} -CONFIGURE_ARGS+= --with-rsync=${RSYNCDIR}/bin/rsync +CONFIGURE_ARGS+= --with-rsync=${LOCALBASE}/bin/rsync INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${DOCDIR} ${EGDIR} diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk index 2b781d31cbc..c22f5aa04cb 100644 --- a/sysutils/webmin/wbm.mk +++ b/sysutils/webmin/wbm.mk @@ -1,4 +1,4 @@ -# $NetBSD: wbm.mk,v 1.11 2012/11/02 19:02:50 shattered Exp $ +# $NetBSD: wbm.mk,v 1.12 2015/11/25 12:53:29 jperkin Exp $ # # Makefile fragment for Webmin modules # @@ -47,9 +47,8 @@ DEPENDS+= webmin>=${WBM_VERSION}:../../sysutils/webmin DEPENDS+= wbm-${m}>=${WBM_VERSION}:../../sysutils/wbm-${m} .endfor -EVAL_PREFIX+= PREFIX.webmin=webmin -WEBMIN_DIR= ${PREFIX.webmin}/share/webmin -WEBMIN_EGDIR= ${PREFIX.webmin}/share/examples/webmin +WEBMIN_DIR= ${LOCALBASE}/share/webmin +WEBMIN_EGDIR= ${LOCALBASE}/share/examples/webmin WEBMIN_VARDIR= ${VARBASE}/webmin WBM_DIR= ${PREFIX}/share/webmin WBM_EGDIR= ${PREFIX}/share/examples/webmin |