diff options
-rw-r--r-- | shells/nologinmsg/Makefile | 19 | ||||
-rw-r--r-- | sysutils/mc/Makefile | 10 |
2 files changed, 14 insertions, 15 deletions
diff --git a/shells/nologinmsg/Makefile b/shells/nologinmsg/Makefile index 4f839ced822..c44a79d5932 100644 --- a/shells/nologinmsg/Makefile +++ b/shells/nologinmsg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/08 03:55:24 tv Exp $ +# $NetBSD: Makefile,v 1.8 2006/02/15 20:08:41 rillig Exp $ DISTNAME= nologinmsg-1.0 CATEGORIES= shells sysutils @@ -8,17 +8,16 @@ MAINTAINER= cjep@NetBSD.org #HOMEPAGE= COMMENT= More functional native binary replacement for /sbin/nologin +SUBST_CLASSES+= nlm +SUBST_STAGE.nlm= pre-configure +SUBST_FILES.nlm= nologinmsg.8 pathnames.h +SUBST_SED.nlm= -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g' + LIBS.Linux+= -lnbcompat LIBS.IRIX+= -lnbcompat -MAKE_FLAGS+= LDADD="${LIBS:Q}" - -post-patch: - ${MV} ${WRKSRC}/nologinmsg.8 ${WRKSRC}/nologinmsg.8.1 - ${SED} -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g' \ - ${WRKSRC}/nologinmsg.8.1 > ${WRKSRC}/nologinmsg.8 - ${MV} ${WRKSRC}/pathnames.h ${WRKSRC}/pathnames.h.1 - ${SED} -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g' \ - ${WRKSRC}/pathnames.h.1 > ${WRKSRC}/pathnames.h +MAKE_FLAGS+= LDADD=${LIBS:M*:Q} +MAKE_FLAGS+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} +MAKE_FLAGS+= MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} .include "../../mk/bsd.prefs.mk" # XXX: ${OPSYS} != "NetBSD" ? diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile index 71b3358f45a..66b551d7972 100644 --- a/sysutils/mc/Makefile +++ b/sysutils/mc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2006/02/05 23:10:55 joerg Exp $ +# $NetBSD: Makefile,v 1.65 2006/02/15 20:15:46 rillig Exp $ DISTNAME= mc-4.6.1 PKGREVISION= 1 @@ -23,22 +23,22 @@ PKG_SUGGESTED_OPTIONS= charset edit slang subshell vfs .include "../../mk/bsd.options.mk" .if ${OPSYS} == "Linux" -PLIST_SRC+= ${PKGDIR}/PLIST.cons.saver +PLIST_SRC+= ${PKGDIR}/PLIST.cons.saver .endif # remove dir if no extensions were installed there post-install: - @${RMDIR} ${PREFIX}/lib/mc 2>/dev/null || ${TRUE} + @${RMDIR} ${PREFIX:Q}/lib/mc 2>/dev/null || ${TRUE} # we need working e2fsprogs and gpm packages first CONFIGURE_ARGS+= --without-ext2undel CONFIGURE_ARGS+= --without-gpm-mouse -PLIST_SRC+= ${PKGDIR}/PLIST +PLIST_SRC+= ${PKGDIR}/PLIST .include "options.mk" -PLIST_SRC+= ${PKGDIR}/PLIST.end +PLIST_SRC+= ${PKGDIR}/PLIST.end .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |