diff options
| author | neel <neel@FreeBSD.org> | 2013-01-17 19:08:20 +0000 |
|---|---|---|
| committer | neel <neel@FreeBSD.org> | 2013-01-17 19:08:20 +0000 |
| commit | dde8bf641fc7c8e9541167cd7c01523973d0b569 (patch) | |
| tree | 85281efb1b510ddb4f6682a9c1b04b8baff9c888 /share/mk | |
| parent | d20dd131b5d2bbd1178a4ea9124b83aa7f9576df (diff) | |
| parent | 9b858bb6f0adb73473a948583965d4fc128312c8 (diff) | |
| download | FreeBSD-src-dde8bf641fc7c8e9541167cd7c01523973d0b569.zip FreeBSD-src-dde8bf641fc7c8e9541167cd7c01523973d0b569.tar.gz | |
IFC @ r245542
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.man.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 8602b55..f15bb77 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -62,7 +62,7 @@ MROFF_CMD?= groff -Tascii -mtty-char -man -t MCOMPRESS_CMD?= ${COMPRESS_CMD} MCOMPRESS_EXT?= ${COMPRESS_EXT} -SECTIONS= 1 1aout 2 3 4 5 6 7 8 9 +SECTIONS= 1 2 3 4 5 6 7 8 9 .SUFFIXES: ${SECTIONS:S/^/./g} # Backwards compatibility. diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 24a0f92..963ddf3 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -343,6 +343,7 @@ __DEFAULT_YES_OPTIONS = \ ZONEINFO __DEFAULT_NO_OPTIONS = \ + ARM_EABI \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ @@ -360,6 +361,7 @@ __DEFAULT_NO_OPTIONS = \ NMTREE \ NAND \ OFED \ + OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN # diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index cfa07a3..801f804 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -95,8 +95,7 @@ ${PROG}: ${OBJS} .if ${MK_MAN} != "no" && !defined(MAN) && \ !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ - !defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \ - !defined(MAN1aout) + !defined(MAN7) && !defined(MAN8) && !defined(MAN9) MAN= ${PROG}.1 MAN1= ${MAN} .endif |
