diff options
| author | rillig <rillig@pkgsrc.org> | 2015-10-15 04:59:30 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2015-10-15 04:59:30 +0000 |
| commit | 958b386e2447efa6c4a1c6855445be59216bb9ac (patch) | |
| tree | f73ba311aa40941e7bbbc70643a03f97beb80b93 /time/xalarm | |
| parent | 23fc8cdca746896525fa4b781edfdeefe7c2450a (diff) | |
| download | pkgsrc-958b386e2447efa6c4a1c6855445be59216bb9ac.tar.gz | |
Fixed some of the pkglint warnings
Diffstat (limited to 'time/xalarm')
| -rw-r--r-- | time/xalarm/Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile index 8808e3b3605..6bd859d1d72 100644 --- a/time/xalarm/Makefile +++ b/time/xalarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/10/14 20:17:28 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2015/10/15 04:59:30 rillig Exp $ DISTNAME= xalarm-3.06 PKGREVISION= 4 @@ -10,6 +10,8 @@ COMMENT= X11 interactive alarm clock DEPENDS+= skill>=4.0:../../sysutils/skill +.include "../../mk/bsd.prefs.mk" + USE_IMAKE= yes XAW_TYPE?= 3d @@ -32,34 +34,34 @@ DEPENDS+= emacs20>=20.7:../../editors/emacs .endif .if ${OPSYS} == "NetBSD" -.if exists(/usr/games/fortune) +. if exists(/usr/games/fortune) FORTUNE= `/usr/games/fortune` -.endif +. endif MAKE_FLAGS+= EXTRA_DEFINES=-DFORKRETURNSPID_T .endif pre-configure: .if defined(XALARM_USE_YOW) # if multiple version emacs of emacs are there, take the higher one... - YOW=`${FIND} ${LOCALBASE}/libexec/emacs -name yow -print 2>/dev/null | ${SORT} -rn | ${HEAD} -1` ; \ - if ${TEST} x$${YOW} = x ; then \ - YOW=${YOW} ; \ - fi ; ${SETENV} YOW=$${YOW} \ + ${RUN}YOW=`${FIND} ${LOCALBASE}/libexec/emacs -name yow -print 2>/dev/null | ${SORT} -rn | ${HEAD} -1` ; \ + if ${TEST} "x$${YOW}" = "x" ; then \ + YOW=${YOW:Q} ; \ + fi ; ${SETENV} YOW="$${YOW}" \ ${SED} -e "s|@PRG@|\`$${YOW}\`|" \ -e 's|@XPRG@|xyow|' \ ${FILESDIR}/xprg > ${WRKSRC}/xyow .else - ${SED} -e 's|@PRG@|${YOW}|' \ + ${RUN}${SED} -e 's|@PRG@|${YOW}|' \ -e 's|@XPRG@|xyow|' \ ${FILESDIR}/xprg > ${WRKSRC}/xyow .endif - ${SED} -e 's|@PRG@|${FORTUNE}|' \ + ${RUN}${SED} -e 's|@PRG@|${FORTUNE}|' \ -e 's|@XPRG@|xfortune|' \ ${FILESDIR}/xprg > ${WRKSRC}/xfortune - ${SED} -e 's|@SKILL@|${LOCALBASE}/bin/skill|' \ + ${RUN}${SED} -e 's|@SKILL@|${LOCALBASE}/bin/skill|' \ -e 's|@GREP@|${GREP}|' \ -e 's|@KILL@|${KILL}|' ${FILESDIR}/fns.h.in > ${WRKSRC}/fns.h - ${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/ + ${RUN}${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/ .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" |