Ping. Ok?

On Sat, Sep 10, 2016 at 10:16:20PM +0200, Martin Natano wrote:
> Another diff I typoed, also found by rpe@. Ok?
> 
> Index: share/misc/pcvtfonts/Makefile
> ===================================================================
> RCS file: /cvs/src/share/misc/pcvtfonts/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- share/misc/pcvtfonts/Makefile     13 May 2002 15:27:58 -0000      1.6
> +++ share/misc/pcvtfonts/Makefile     8 Sep 2016 20:54:08 -0000
> @@ -16,12 +16,9 @@ FONTDIR =  ${BINDIR}/misc/pcvtfonts
>  all: $(FONTS)
>  
>  install: ${FONTS}
> -     @if [ ! -d ${DESTDIR}${FONTDIR} ]; then mkdir ${DESTDIR}${FONTDIR};fi
> -     @for i in ${FONTS}; do \
> -             echo "installing font $$i into ${DESTDIR}${FONTDIR}"; \
> -             install -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
> -             $$i ${DESTDIR}${FONTDIR}; \
> -     done
> +     ${INSTALL} -d -o root -g wheel ${DESTDIR}${FONTDIR}
> +     ${INSTALL} ${INSTALL_COPY} -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
> +         ${FONTS} ${DESTDIR}${FONTDIR}
>  
>  clean:
>       rm -f ${CLEANFILES}
> Index: share/snmp/Makefile
> ===================================================================
> RCS file: /cvs/src/share/snmp/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- share/snmp/Makefile       29 Jan 2016 03:06:00 -0000      1.4
> +++ share/snmp/Makefile       8 Sep 2016 21:02:02 -0000
> @@ -8,6 +8,7 @@ FILES+= OPENBSD-RELAYD-MIB.txt
>  all clean cleandir depend lint obj tags: _SUBDIRUSE
>  
>  realinstall:
> -     ${INSTALL} -c -m 0444 ${FILES} ${DESTDIR}${BINDIR}/snmp/mibs
> +     ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 0444 \
> +         ${FILES} ${DESTDIR}${BINDIR}/snmp/mibs
>  
>  .include <bsd.prog.mk>
> Index: share/termtypes/Makefile
> ===================================================================
> RCS file: /cvs/src/share/termtypes/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- share/termtypes/Makefile  3 Dec 2015 11:30:46 -0000       1.24
> +++ share/termtypes/Makefile  10 Sep 2016 20:11:58 -0000
> @@ -14,12 +14,14 @@ termcap: termtypes.master
>       @[ -s ${.TARGET} ] || exit 1
>  
>  realinstall:
> +     ${INSTALL} -d -o root -g wheel ${DESTDIR}${BINDIR}/terminfo
>       find terminfo -type f -exec \
>            ${INSTALL} -D ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
>            {} ${DESTDIR}${BINDIR}/{} \;
>       ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap \
>            ${DESTDIR}${BINDIR}/misc/termcap
>       ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
> +     chown -h root:wheel ${DESTDIR}/etc/termcap
>  
>  clean:
>       rm -f termcap

Reply via email to