diff options
author | cheusov <cheusov@pkgsrc.org> | 2012-03-09 18:58:19 +0000 |
---|---|---|
committer | cheusov <cheusov@pkgsrc.org> | 2012-03-09 18:58:19 +0000 |
commit | 07e7526e38150307e068bd03a62ca0c9eda30c97 (patch) | |
tree | 68ee17690c3eba597f886d55655fadd4bda74ecf /pkgtools | |
parent | e692b6e65b28ac312e767bd5242e51426fe0bc23 (diff) | |
download | pkgsrc-07e7526e38150307e068bd03a62ca0c9eda30c97.tar.gz |
clean-ups (adapted for recent mk-configure)
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/distbb/Makefile | 8 | ||||
-rw-r--r-- | pkgtools/nih/Makefile | 6 | ||||
-rw-r--r-- | pkgtools/pkg_online-client/Makefile | 6 | ||||
-rw-r--r-- | pkgtools/pkg_online-server/Makefile | 6 | ||||
-rw-r--r-- | pkgtools/pkg_summary-utils/Makefile | 8 |
5 files changed, 11 insertions, 23 deletions
diff --git a/pkgtools/distbb/Makefile b/pkgtools/distbb/Makefile index 37bb2878dc4..30d3e3e138d 100644 --- a/pkgtools/distbb/Makefile +++ b/pkgtools/distbb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/02/26 17:39:21 cheusov Exp $ +# $NetBSD: Makefile,v 1.10 2012/03/09 19:08:16 cheusov Exp $ # DISTNAME= distbb-0.44.0 @@ -41,15 +41,13 @@ DOCFILES= README NEWS TODO MAKE_FLAGS+= EGDIR=${EGDIR} -AUTO_MKDIRS= yes +INSTALLATION_DIRS= ${DOCDIR} post-install: .for f in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR} .endfor -MAKE_PROGRAM= mkcmake - -.include "../../devel/mk-configure/configure.mk" +.include "../../devel/mk-configure/mk-c.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/nih/Makefile b/pkgtools/nih/Makefile index 3ccf128d6e8..86935befa3f 100644 --- a/pkgtools/nih/Makefile +++ b/pkgtools/nih/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2011/11/22 21:03:07 cheusov Exp $ +# $NetBSD: Makefile,v 1.15 2012/03/09 19:05:31 cheusov Exp $ DISTNAME= pkgnih-0.10.0 PKGREVISION= 2 @@ -38,8 +38,6 @@ REPLACE.runawk.old= .*runawk REPLACE.runawk.new= ${PREFIX}/bin/runawk REPLACE_FILES.runawk= nih/pkg_update_plan.in nih/cmp2hr.in -MAKE_PROGRAM= mkcmake - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == NetBSD || ${OPSYS} == FreeBSD || ${OPSYS} == OpenBSD || \ @@ -56,6 +54,6 @@ MAKE_ENV+= FTP=${FTP_CMD:Q} REPLACE_SH+= nih/nih.in nih/pkg_status.in .endif -.include "../../devel/mk-configure/configure.mk" +.include "../../devel/mk-configure/mk-c.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_online-client/Makefile b/pkgtools/pkg_online-client/Makefile index 5af2dc02465..3237abfbedf 100644 --- a/pkgtools/pkg_online-client/Makefile +++ b/pkgtools/pkg_online-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/01/08 15:16:37 cheusov Exp $ +# $NetBSD: Makefile,v 1.9 2012/03/09 19:15:19 cheusov Exp $ # .include "../../pkgtools/pkg_online-server/Makefile.common" @@ -28,7 +28,5 @@ CONF_FILES= ${EGDIR}/pkg_online_client.conf \ REPLACE_SH= client/pkg_online_client client/pkg_online_find -MAKE_PROGRAM= mkcmake - -.include "../../devel/mk-configure/configure.mk" +.include "../../devel/mk-configure/mk-c.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_online-server/Makefile b/pkgtools/pkg_online-server/Makefile index c94c9b2d133..ac97a460725 100644 --- a/pkgtools/pkg_online-server/Makefile +++ b/pkgtools/pkg_online-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/10/09 10:02:45 cheusov Exp $ +# $NetBSD: Makefile,v 1.7 2012/03/09 19:15:19 cheusov Exp $ # .include "../../pkgtools/pkg_online-server/Makefile.common" @@ -24,7 +24,5 @@ MAKE_ENV+= DOCDIR=${DOCDIR} EGDIR=${EGDIR} CONF_FILES= ${EGDIR}/pkg_online_server.conf \ ${PKG_SYSCONFDIR}/pkg_online_server.conf -MAKE_PROGRAM= mkcmake - -.include "../../devel/mk-configure/configure.mk" +.include "../../devel/mk-configure/mk-c.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_summary-utils/Makefile b/pkgtools/pkg_summary-utils/Makefile index 7bfbd729984..7c5678e7411 100644 --- a/pkgtools/pkg_summary-utils/Makefile +++ b/pkgtools/pkg_summary-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/01/09 20:54:28 cheusov Exp $ +# $NetBSD: Makefile,v 1.16 2012/03/09 19:03:02 cheusov Exp $ DISTNAME= pkg_summary-utils-0.57.0 CATEGORIES= pkgtools @@ -58,9 +58,5 @@ MAKE_ENV+= PKGSRCDIR=${PKGSRCDIR} MAKE_ENV+= PKG_SUFX=${PKG_SUFX} MAKE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q} -AUTO_MKDIRS= yes - -MAKE_PROGRAM= ${PREFIX}/bin/mkcmake - -.include "../../devel/mk-configure/configure.mk" +.include "../../devel/mk-configure/mk-c.mk" .include "../../mk/bsd.pkg.mk" |