diff options
| -rw-r--r-- | archivers/lzip/Makefile | 6 | ||||
| -rw-r--r-- | converters/convmv/Makefile | 12 | ||||
| -rw-r--r-- | databases/dbfsak/Makefile | 6 | ||||
| -rw-r--r-- | textproc/ansifilter/Makefile | 6 | ||||
| -rw-r--r-- | www/mMosaic/Makefile | 13 | ||||
| -rw-r--r-- | x11/compton/Makefile | 6 | ||||
| -rw-r--r-- | x11/elementary/Makefile | 4 | ||||
| -rw-r--r-- | x11/xfishtank/Makefile | 4 |
8 files changed, 28 insertions, 29 deletions
diff --git a/archivers/lzip/Makefile b/archivers/lzip/Makefile index 54b18842cde..d968b978e77 100644 --- a/archivers/lzip/Makefile +++ b/archivers/lzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/07/26 12:15:30 mef Exp $ +# $NetBSD: Makefile,v 1.12 2016/03/12 21:53:40 tnn Exp $ DISTNAME= lzip-1.17 CATEGORIES= archivers @@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} INFO_FILES= YES -MAKEFLAGS+= CXX=${CXX:Q} CPPFLAGS=${CPPFLAGS:Q} -MAKEFLAGS+= CXXFLAGS=${CXXFLAGS:Q} LDFLAGS=${LDFLAGS:Q} +MAKE_FLAGS+= CXX=${CXX:Q} CPPFLAGS=${CPPFLAGS:Q} +MAKE_FLAGS+= CXXFLAGS=${CXXFLAGS:Q} LDFLAGS=${LDFLAGS:Q} .include "../../mk/bsd.pkg.mk" diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile index f9adc209094..8dd337d5e8c 100644 --- a/converters/convmv/Makefile +++ b/converters/convmv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2015/06/12 10:48:31 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2016/03/12 21:53:39 tnn Exp $ DISTNAME= convmv-2.0 PKGREVISION= 1 @@ -16,11 +16,11 @@ USE_TOOLS+= pax perl:run MANCOMPRESSED= yes NO_BUILD= yes -MAKEFLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} -MAKEFLAGS+= INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q} -MAKEFLAGS+= INSTALL_SCRIPT_DIR=${INSTALL_SCRIPT_DIR:Q} -MAKEFLAGS+= INSTALL_MAN=${INSTALL_MAN:Q} -MAKEFLAGS+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} +MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} +MAKE_FLAGS+= INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q} +MAKE_FLAGS+= INSTALL_SCRIPT_DIR=${INSTALL_SCRIPT_DIR:Q} +MAKE_FLAGS+= INSTALL_MAN=${INSTALL_MAN:Q} +MAKE_FLAGS+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} REPLACE_PERL+= ${WRKSRC}/convmv REPLACE_PERL+= suite/parsable_tester.pl diff --git a/databases/dbfsak/Makefile b/databases/dbfsak/Makefile index 87512956870..151ee732dca 100644 --- a/databases/dbfsak/Makefile +++ b/databases/dbfsak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/02 20:25:18 adam Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/12 21:53:39 tnn Exp $ DISTNAME= dbfsak-4.6.src PKGNAME= ${DISTNAME:S/.src//} @@ -12,8 +12,8 @@ LICENSE= artistic NO_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -MAKEFLAGS+= CPP=${CC:Q} -MAKEFLAGS+= CFLAGS="${CFLAGS} -I. -DVERSION='\"${PKGVERSION_NOREV}\"'" +MAKE_FLAGS+= CPP=${CC:Q} +MAKE_FLAGS+= CFLAGS="${CFLAGS} -I. -DVERSION='\"${PKGVERSION_NOREV}\"'" INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/textproc/ansifilter/Makefile b/textproc/ansifilter/Makefile index 7a3225de78b..13e4d0bda99 100644 --- a/textproc/ansifilter/Makefile +++ b/textproc/ansifilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/03/12 11:49:19 tnn Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/12 21:53:39 tnn Exp $ DISTNAME= ansifilter-1.15 CATEGORIES= textproc @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3 USE_LANGUAGES= c++ MAKE_FILE= makefile -MAKEFLAGS+= PREFIX=${PREFIX:Q} -MAKEFLAGS+= man_dir=${PREFIX:Q}/${PKGMANDIR}/man1 +MAKE_FLAGS+= PREFIX=${PREFIX:Q} +MAKE_FLAGS+= man_dir=${PREFIX:Q}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile index af069dbfe0c..711e4aeea3e 100644 --- a/www/mMosaic/Makefile +++ b/www/mMosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2016/02/26 10:57:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.32 2016/03/12 21:53:39 tnn Exp $ # DISTNAME= mMosaic-3.7.2 @@ -16,12 +16,11 @@ WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2 INSTALLATION_DIRS= bin -OPSYSVARS+= MAKEFLAGS -MAKEFLAGS.DragonFly+= sysconfigflags='-DFreeBSD -DMOTIF1_2' -MAKEFLAGS.FreeBSD+= sysconfigflags='-DFreeBSD -DMOTIF1_2' -MAKEFLAGS.IRIX+= sysconfigflags='-DSVR4 -DIRIX -DMOTIF1_2' -MAKEFLAGS.Linux+= sysconfigflags='-DLINUX -Dlinux -DMOTIF1_2' -MAKEFLAGS.NetBSD+= sysconfigflags='-DNETBSD -DMOTIF1_2' +MAKE_FLAGS.DragonFly+= sysconfigflags='-DFreeBSD -DMOTIF1_2' +MAKE_FLAGS.FreeBSD+= sysconfigflags='-DFreeBSD -DMOTIF1_2' +MAKE_FLAGS.IRIX+= sysconfigflags='-DSVR4 -DIRIX -DMOTIF1_2' +MAKE_FLAGS.Linux+= sysconfigflags='-DLINUX -Dlinux -DMOTIF1_2' +MAKE_FLAGS.NetBSD+= sysconfigflags='-DNETBSD -DMOTIF1_2' BUILDLINK_TRANSFORM.Darwin+= opt:-shared:-c diff --git a/x11/compton/Makefile b/x11/compton/Makefile index 84f1dfeb870..5590dcdc0fb 100644 --- a/x11/compton/Makefile +++ b/x11/compton/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/10/07 23:21:51 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/12 21:53:39 tnn Exp $ GITHUB_PROJECT= compton GITHUB_TAG= d7f95b56b176281bfb252c54defef48c9cd1f4e1 @@ -16,8 +16,8 @@ BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc USE_TOOLS+= gmake pkg-config NO_CONFIGURE= yes BUILD_TARGET= compton docs -MAKEFLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 -MAKEFLAGS+= COMPTON_VERSION=git-${PKGVERSION_NOREV} +MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 +MAKE_FLAGS+= COMPTON_VERSION=git-${PKGVERSION_NOREV} INSTALLATION_DIRS+= share/examples/compton diff --git a/x11/elementary/Makefile b/x11/elementary/Makefile index fe18bfcc3e1..11ce9f79ad4 100644 --- a/x11/elementary/Makefile +++ b/x11/elementary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/03/05 11:27:58 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/12 21:53:39 tnn Exp $ DISTNAME= elementary-1.7.7 PKGREVISION= 5 @@ -21,7 +21,7 @@ USE_TOOLS+= gmake # override for hardcoded aclocal-1.13 in configure script CONFIGURE_ENV+= ACLOCAL='aclocal' # override for hardcoded automake-1.13 in Makefiles -MAKEFLAGS+= AUTOMAKE="automake -af" +MAKE_FLAGS+= AUTOMAKE="automake -af" PKGCONFIG_OVERRIDE= elementary diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile index 8dc39c4a85a..449a00a0014 100644 --- a/x11/xfishtank/Makefile +++ b/x11/xfishtank/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/10/29 05:07:10 asau Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/12 21:53:39 tnn Exp $ DISTNAME= xfishtank-2.2 PKGREVISION= 1 @@ -13,7 +13,7 @@ USE_IMAKE= yes NO_INSTALL_MANPAGES= yes post-patch: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKEFLAGS} clean + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} clean .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" |