Index: stable/11/lib/csu/aarch64/Makefile =================================================================== --- stable/11/lib/csu/aarch64/Makefile (revision 313537) +++ stable/11/lib/csu/aarch64/Makefile (revision 313538) @@ -1,46 +1,46 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not # directly compiled to .o files. crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s .include Index: stable/11/lib/csu/amd64/Makefile =================================================================== --- stable/11/lib/csu/amd64/Makefile (revision 313537) +++ stable/11/lib/csu/amd64/Makefile (revision 313538) @@ -1,47 +1,47 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include CFLAGS+= -fno-omit-frame-pointer FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not # directly compiled to .o files. crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s .include Index: stable/11/lib/csu/arm/Makefile =================================================================== --- stable/11/lib/csu/arm/Makefile (revision 313537) +++ stable/11/lib/csu/arm/Makefile (revision 313538) @@ -1,47 +1,47 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include STATIC_CFLAGS+= -mlong-calls FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not # directly compiled to .o files. crt1.s: crt1.c ${CC} ${CFLAGS} ${STATIC_CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} ${STATIC_CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s .include Index: stable/11/lib/csu/i386/Makefile =================================================================== --- stable/11/lib/csu/i386/Makefile (revision 313537) +++ stable/11/lib/csu/i386/Makefile (revision 313538) @@ -1,57 +1,57 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o crt1.o Scrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1_c.c is not # directly compiled to .o files. gcrt1_c.s: crt1_c.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1_c.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1_c.o: gcrt1_c.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1_c.s gcrt1.o: gcrt1_c.o crt1_s.o ${LD} ${_LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o crt1_c.s: crt1_c.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1_c.c sed ${SED_FIX_NOTE} ${.TARGET} crt1_c.o: crt1_c.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1_c.s crt1.o: crt1_c.o crt1_s.o ${LD} ${_LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o ${OBJCOPY} --localize-symbol _start1 crt1.o Scrt1_c.s: crt1_c.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1_c.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1_c.o: Scrt1_c.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1_c.s Scrt1.o: Scrt1_c.o crt1_s.o ${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o ${OBJCOPY} --localize-symbol _start1 Scrt1.o .include Index: stable/11/lib/csu/mips/Makefile =================================================================== --- stable/11/lib/csu/mips/Makefile (revision 313537) +++ stable/11/lib/csu/mips/Makefile (revision 313538) @@ -1,46 +1,46 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not # directly compiled to .o files. crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s .include Index: stable/11/lib/csu/powerpc/Makefile =================================================================== --- stable/11/lib/csu/powerpc/Makefile (revision 313537) +++ stable/11/lib/csu/powerpc/Makefile (revision 313538) @@ -1,46 +1,46 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not # directly compiled to .o files. crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s .include Index: stable/11/lib/csu/powerpc64/Makefile =================================================================== --- stable/11/lib/csu/powerpc64/Makefile (revision 313537) +++ stable/11/lib/csu/powerpc64/Makefile (revision 313538) @@ -1,57 +1,57 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include \ +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include \ -mlongcall # XXX: See the log for r232932 as to why the above -mlongcall is needed. Since # clang doesn't support -mlongcall, and testing shows a clang linked with a # clang-built csu segfaults, this must currently be compiled with gcc. Once # clang supports -mlongcall, or we get a fixed ld, this can be revisited. .include .if ${COMPILER_TYPE} != "gcc" CC:= gcc COMPILER_TYPE:= gcc .endif FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not # directly compiled to .o files. crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s .include Index: stable/11/lib/csu/riscv/Makefile =================================================================== --- stable/11/lib/csu/riscv/Makefile (revision 313537) +++ stable/11/lib/csu/riscv/Makefile (revision 313538) @@ -1,46 +1,46 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not # directly compiled to .o files. crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s .include Index: stable/11/lib/csu/sparc64/Makefile =================================================================== --- stable/11/lib/csu/sparc64/Makefile (revision 313537) +++ stable/11/lib/csu/sparc64/Makefile (revision 313538) @@ -1,26 +1,27 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= Scrt1.o gcrt1.o -CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include FILES= ${OBJS} FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. .undef LIBRARIES_ONLY CLEANFILES= ${OBJS} gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} Scrt1.o: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -c -o Scrt1.o ${.ALLSRC} .include Index: stable/11/lib/libalias/libalias/Makefile =================================================================== --- stable/11/lib/libalias/libalias/Makefile (revision 313537) +++ stable/11/lib/libalias/libalias/Makefile (revision 313538) @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../sys/netinet/libalias +.PATH: ${SRCTOP}/sys/netinet/libalias PACKAGE=lib${LIB} LIB= alias SHLIBDIR?= /lib SHLIB_MAJOR= 7 MAN= libalias.3 SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h NO_WERROR= .include Index: stable/11/lib/libalias/modules/Makefile =================================================================== --- stable/11/lib/libalias/modules/Makefile (revision 313537) +++ stable/11/lib/libalias/modules/Makefile (revision 313538) @@ -1,7 +1,7 @@ # $FreeBSD$ -.include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc" +.include "${SRCTOP}/sys/modules/libalias/modules/modules.inc" SUBDIR= ${MODULES} .include Index: stable/11/lib/libalias/modules/Makefile.inc =================================================================== --- stable/11/lib/libalias/modules/Makefile.inc (revision 313537) +++ stable/11/lib/libalias/modules/Makefile.inc (revision 313538) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../sys/netinet/libalias +.PATH: ${SRCTOP}/sys/netinet/libalias SHLIBDIR?= /lib LIB?= alias_${NAME} SHLIB_NAME?=libalias_${NAME}.so WARNS?= 1 Index: stable/11/lib/libarchive/Makefile =================================================================== --- stable/11/lib/libarchive/Makefile (revision 313537) +++ stable/11/lib/libarchive/Makefile (revision 313538) @@ -1,419 +1,419 @@ # $FreeBSD$ .include PACKAGE=lib${LIB} -_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive LIB= archive LIBADD= z bz2 lzma bsdxml CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. SHLIB_MAJOR= 6 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -I${.OBJDIR} .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL LIBADD+= crypto .else LIBADD+= md .endif .if ${MK_ICONV} != "no" # TODO: This can be changed back to CFLAGS once iconv works correctly # with statically linked binaries. SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ ${MACHINE_ARCH:Msparc64*} != "" NO_WCAST_ALIGN= yes .if ${MACHINE_ARCH:M*64*} == "" CFLAGS+= -DPPMD_32BIT .endif .endif NO_WCAST_ALIGN.clang= .PATH: ${_LIBARCHIVEDIR}/libarchive # Headers to be installed in /usr/include INCS= archive.h archive_entry.h # Sources to be compiled. SRCS= archive_acl.c \ archive_check_magic.c \ archive_cmdline.c \ archive_cryptor.c \ archive_digest.c \ archive_entry.c \ archive_entry_copy_stat.c \ archive_entry_link_resolver.c \ archive_entry_sparse.c \ archive_entry_stat.c \ archive_entry_strmode.c \ archive_entry_xattr.c \ archive_getdate.c \ archive_hmac.c \ archive_match.c \ archive_options.c \ archive_pack_dev.c \ archive_pathmatch.c \ archive_ppmd7.c \ archive_random.c \ archive_rb.c \ archive_read.c \ archive_read_add_passphrase.c \ archive_read_append_filter.c \ archive_read_data_into_fd.c \ archive_read_disk_entry_from_file.c \ archive_read_disk_posix.c \ archive_read_disk_set_standard_lookup.c \ archive_read_extract.c \ archive_read_extract2.c \ archive_read_open_fd.c \ archive_read_open_file.c \ archive_read_open_filename.c \ archive_read_open_memory.c \ archive_read_set_format.c \ archive_read_set_options.c \ archive_read_support_filter_all.c \ archive_read_support_filter_bzip2.c \ archive_read_support_filter_compress.c \ archive_read_support_filter_gzip.c \ archive_read_support_filter_grzip.c \ archive_read_support_filter_lrzip.c \ archive_read_support_filter_lz4.c \ archive_read_support_filter_lzop.c \ archive_read_support_filter_none.c \ archive_read_support_filter_program.c \ archive_read_support_filter_rpm.c \ archive_read_support_filter_uu.c \ archive_read_support_filter_xz.c \ archive_read_support_format_7zip.c \ archive_read_support_format_all.c \ archive_read_support_format_ar.c \ archive_read_support_format_by_code.c \ archive_read_support_format_cab.c \ archive_read_support_format_cpio.c \ archive_read_support_format_empty.c \ archive_read_support_format_iso9660.c \ archive_read_support_format_lha.c \ archive_read_support_format_mtree.c \ archive_read_support_format_rar.c \ archive_read_support_format_raw.c \ archive_read_support_format_tar.c \ archive_read_support_format_warc.c \ archive_read_support_format_xar.c \ archive_read_support_format_zip.c \ archive_string.c \ archive_string_sprintf.c \ archive_util.c \ archive_virtual.c \ archive_write.c \ archive_write_add_filter.c \ archive_write_disk_acl.c \ archive_write_disk_set_standard_lookup.c \ archive_write_disk_posix.c \ archive_write_open_fd.c \ archive_write_open_file.c \ archive_write_open_filename.c \ archive_write_open_memory.c \ archive_write_add_filter_b64encode.c \ archive_write_add_filter_by_name.c \ archive_write_add_filter_bzip2.c \ archive_write_add_filter_compress.c \ archive_write_add_filter_grzip.c \ archive_write_add_filter_gzip.c \ archive_write_add_filter_lrzip.c \ archive_write_add_filter_lz4.c \ archive_write_add_filter_lzop.c \ archive_write_add_filter_none.c \ archive_write_add_filter_program.c \ archive_write_add_filter_uuencode.c \ archive_write_add_filter_xz.c \ archive_write_set_format.c \ archive_write_set_format_7zip.c \ archive_write_set_format_ar.c \ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ archive_write_set_format_cpio_newc.c \ archive_write_set_format_filter_by_ext.c \ archive_write_set_format_gnutar.c \ archive_write_set_format_iso9660.c \ archive_write_set_format_mtree.c \ archive_write_set_format_pax.c \ archive_write_set_format_raw.c \ archive_write_set_format_shar.c \ archive_write_set_format_ustar.c \ archive_write_set_format_v7tar.c \ archive_write_set_format_warc.c \ archive_write_set_format_xar.c \ archive_write_set_format_zip.c \ archive_write_set_passphrase.c \ archive_write_set_options.c \ filter_fork_posix.c # Man pages to be installed. MAN= archive_entry.3 \ archive_entry_acl.3 \ archive_entry_linkify.3 \ archive_entry_paths.3 \ archive_entry_perms.3 \ archive_entry_stat.3 \ archive_entry_time.3 \ archive_read.3 \ archive_read_data.3 \ archive_read_disk.3 \ archive_read_extract.3 \ archive_read_filter.3 \ archive_read_format.3 \ archive_read_free.3 \ archive_read_header.3 \ archive_read_new.3 \ archive_read_open.3 \ archive_read_set_options.3 \ archive_util.3 \ archive_write.3 \ archive_write_blocksize.3 \ archive_write_data.3 \ archive_write_disk.3 \ archive_write_filter.3 \ archive_write_finish_entry.3 \ archive_write_format.3 \ archive_write_free.3 \ archive_write_header.3 \ archive_write_new.3 \ archive_write_open.3 \ archive_write_set_options.3 \ cpio.5 \ libarchive.3 \ libarchive_changes.3 \ libarchive_internals.3 \ libarchive-formats.5 \ tar.5 # Symlink the man pages under each function name. MLINKS+= archive_entry.3 archive_entry_clear.3 MLINKS+= archive_entry.3 archive_entry_clone.3 MLINKS+= archive_entry.3 archive_entry_free.3 MLINKS+= archive_entry.3 archive_entry_new.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry_w.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_clear.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_count.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_next.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_next_w.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_reset.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_text_w.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_new.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_set_strategy.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_free.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_link.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_link_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_sourcepath.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_hardlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_pathname_w.3 MLINKS+= archive_entry_paths.3 archive_entry_set_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_set_link.3 MLINKS+= archive_entry_paths.3 archive_entry_set_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_set_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_symlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_update_symlink_utf8.3 MLINKS+= archive_entry_paths.3 archive_entry_update_hardlink_utf8.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_fflags_text.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_fflags_text_w.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_uname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_fflags.3 MLINKS+= archive_entry_perms.3 archive_entry_fflags_text.3 MLINKS+= archive_entry_perms.3 archive_entry_gid.3 MLINKS+= archive_entry_perms.3 archive_entry_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_gname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_set_fflags.3 MLINKS+= archive_entry_perms.3 archive_entry_set_gid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_perm.3 MLINKS+= archive_entry_perms.3 archive_entry_set_perm.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_strmode.3 MLINKS+= archive_entry_perms.3 archive_entry_uid.3 MLINKS+= archive_entry_perms.3 archive_entry_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_uname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_update_gname_utf8.3 MLINKS+= archive_entry_perms.3 archive_entry_update_uname_utf8.3 MLINKS+= archive_entry_stat.3 archive_entry_copy_stat.3 MLINKS+= archive_entry_stat.3 archive_entry_dev.3 MLINKS+= archive_entry_stat.3 archive_entry_dev_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_devmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_devminor.3 MLINKS+= archive_entry_stat.3 archive_entry_filetype.3 MLINKS+= archive_entry_stat.3 archive_entry_ino.3 MLINKS+= archive_entry_stat.3 archive_entry_ino64.3 MLINKS+= archive_entry_stat.3 archive_entry_ino_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_mode.3 MLINKS+= archive_entry_stat.3 archive_entry_nlink.3 MLINKS+= archive_entry_stat.3 archive_entry_rdev.3 MLINKS+= archive_entry_stat.3 archive_entry_rdevmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_rdevminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_dev.3 MLINKS+= archive_entry_stat.3 archive_entry_set_devmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_devminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_filetype.3 MLINKS+= archive_entry_stat.3 archive_entry_set_ino.3 MLINKS+= archive_entry_stat.3 archive_entry_set_ino64.3 MLINKS+= archive_entry_stat.3 archive_entry_set_mode.3 MLINKS+= archive_entry_stat.3 archive_entry_set_nlink.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdev.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdevmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdevminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_size.3 MLINKS+= archive_entry_stat.3 archive_entry_size.3 MLINKS+= archive_entry_stat.3 archive_entry_size_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_unset_size.3 MLINKS+= archive_entry_time.3 archive_entry_atime.3 MLINKS+= archive_entry_time.3 archive_entry_atime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_atime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_ctime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_ctime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_mtime.3 MLINKS+= archive_entry_time.3 archive_entry_mtime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_mtime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_set_atime.3 MLINKS+= archive_entry_time.3 archive_entry_set_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_set_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_set_mtime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_atime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_mtime.3 MLINKS+= archive_read_data.3 archive_read_data_block.3 MLINKS+= archive_read_data.3 archive_read_data_into_fd.3 MLINKS+= archive_read_data.3 archive_read_data_skip.3 MLINKS+= archive_read_header.3 archive_read_next_header.3 MLINKS+= archive_read_header.3 archive_read_next_header2.3 MLINKS+= archive_read_extract.3 archive_read_extract2.3 MLINKS+= archive_read_extract.3 archive_read_extract_set_progress_callback.3 MLINKS+= archive_read_extract.3 archive_read_extract_set_skip_file.3 MLINKS+= archive_read_open.3 archive_read_open2.3 MLINKS+= archive_read_open.3 archive_read_open_FILE.3 MLINKS+= archive_read_open.3 archive_read_open_fd.3 MLINKS+= archive_read_open.3 archive_read_open_file.3 MLINKS+= archive_read_open.3 archive_read_open_filename.3 MLINKS+= archive_read_open.3 archive_read_open_memory.3 MLINKS+= archive_read_free.3 archive_read_close.3 MLINKS+= archive_read_free.3 archive_read_finish.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_all.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_bzip2.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_compress.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_gzip.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_lzma.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_none.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_xz.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_program.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_program_signature.3 MLINKS+= archive_read_format.3 archive_read_support_format_7zip.3 MLINKS+= archive_read_format.3 archive_read_support_format_all.3 MLINKS+= archive_read_format.3 archive_read_support_format_ar.3 MLINKS+= archive_read_format.3 archive_read_support_format_by_code.3 MLINKS+= archive_read_format.3 archive_read_support_format_cab.3 MLINKS+= archive_read_format.3 archive_read_support_format_cpio.3 MLINKS+= archive_read_format.3 archive_read_support_format_empty.3 MLINKS+= archive_read_format.3 archive_read_support_format_iso9660.3 MLINKS+= archive_read_format.3 archive_read_support_format_lha.3 MLINKS+= archive_read_format.3 archive_read_support_format_mtree.3 MLINKS+= archive_read_format.3 archive_read_support_format_rar.3 MLINKS+= archive_read_format.3 archive_read_support_format_raw.3 MLINKS+= archive_read_format.3 archive_read_support_format_tar.3 MLINKS+= archive_read_format.3 archive_read_support_format_xar.3 MLINKS+= archive_read_format.3 archive_read_support_format_zip.3 MLINKS+= archive_read_disk.3 archive_read_disk_entry_from_file.3 MLINKS+= archive_read_disk.3 archive_read_disk_gname.3 MLINKS+= archive_read_disk.3 archive_read_disk_new.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_gname_lookup.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_standard_lookup.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_hybrid.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_logical.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_symlink_physical.3 MLINKS+= archive_read_disk.3 archive_read_disk_set_uname_lookup.3 MLINKS+= archive_read_disk.3 archive_read_disk_uname.3 MLINKS+= archive_read_set_options.3 archive_read_set_filter_option.3 MLINKS+= archive_read_set_options.3 archive_read_set_format_option.3 MLINKS+= archive_read_set_options.3 archive_read_set_option.3 MLINKS+= archive_util.3 archive_clear_error.3 MLINKS+= archive_util.3 archive_compression.3 MLINKS+= archive_util.3 archive_compression_name.3 MLINKS+= archive_util.3 archive_copy_error.3 MLINKS+= archive_util.3 archive_errno.3 MLINKS+= archive_util.3 archive_error_string.3 MLINKS+= archive_util.3 archive_file_count.3 MLINKS+= archive_util.3 archive_filter_code.3 MLINKS+= archive_util.3 archive_filter_count.3 MLINKS+= archive_util.3 archive_filter_name.3 MLINKS+= archive_util.3 archive_format.3 MLINKS+= archive_util.3 archive_format_name.3 MLINKS+= archive_util.3 archive_position.3 MLINKS+= archive_util.3 archive_set_error.3 MLINKS+= archive_write_blocksize.3 archive_write_get_bytes_in_last_block.3 MLINKS+= archive_write_blocksize.3 archive_write_get_bytes_per_block.3 MLINKS+= archive_write_blocksize.3 archive_write_set_bytes_in_last_block.3 MLINKS+= archive_write_blocksize.3 archive_write_set_bytes_per_block.3 MLINKS+= archive_write_disk.3 archive_write_data_block.3 MLINKS+= archive_write_disk.3 archive_write_disk_new.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_group_lookup.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_options.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_skip_file.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_standard_lookup.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_user_lookup.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_bzip2.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_compress.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_gzip.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_lzip.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_lzma.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_none.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_program.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_xz.3 MLINKS+= archive_write_format.3 archive_write_set_format_cpio.3 MLINKS+= archive_write_format.3 archive_write_set_format_pax.3 MLINKS+= archive_write_format.3 archive_write_set_format_pax_restricted.3 MLINKS+= archive_write_format.3 archive_write_set_format_shar.3 MLINKS+= archive_write_format.3 archive_write_set_format_shar_dump.3 MLINKS+= archive_write_format.3 archive_write_set_format_ustar.3 MLINKS+= archive_write_free.3 archive_write_close.3 MLINKS+= archive_write_free.3 archive_write_fail.3 MLINKS+= archive_write_free.3 archive_write_finish.3 MLINKS+= archive_write_open.3 archive_write_open_FILE.3 MLINKS+= archive_write_open.3 archive_write_open_fd.3 MLINKS+= archive_write_open.3 archive_write_open_file.3 MLINKS+= archive_write_open.3 archive_write_open_filename.3 MLINKS+= archive_write_open.3 archive_write_open_memory.3 MLINKS+= archive_write_set_options.3 archive_write_set_filter_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_format_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_option.3 MLINKS+= libarchive.3 archive.3 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libauditd/Makefile =================================================================== --- stable/11/lib/libauditd/Makefile (revision 313537) +++ stable/11/lib/libauditd/Makefile (revision 313538) @@ -1,25 +1,25 @@ # # $FreeBSD$ # PACKAGE=lib${LIB} -OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm +OPENBSMDIR= ${SRCTOP}/contrib/openbsm _LIBAUDITDDIR= ${OPENBSMDIR}/libauditd _LIBBSMDIR= ${OPENBSMDIR}/libbsm LIB= auditd .PATH: ${_LIBAUDITDDIR} SRCS= auditd_lib.c # # Must use BSM include files from within the contrib area, not the system. # CFLAGS+= -I${OPENBSMDIR} -I${_LIBBSMDIR} WARNS?= 3 MAN= .include Index: stable/11/lib/libbegemot/Makefile =================================================================== --- stable/11/lib/libbegemot/Makefile (revision 313537) +++ stable/11/lib/libbegemot/Makefile (revision 313538) @@ -1,27 +1,27 @@ # $FreeBSD$ -LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot +LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot PACKAGE=lib${LIB} .PATH: ${LIBBEGEMOT_DIR} LIB= begemot SHLIB_MAJOR= 4 SHLIBDIR?= /lib CFLAGS+= -DUSE_SELECT -DQUADFMT='"ll"' SRCS= rpoll.c INCS= rpoll.h MAN= rpoll.3 CLEANFILES= rpoll.3 rpoll.3: rpoll.man cat ${.ALLSRC} > ${.TARGET} MLINKS= rpoll.3 poll_register.3 \ rpoll.3 poll_unregister.3 \ rpoll.3 poll_start_timer.3 \ rpoll.3 poll_stop_timer.3 \ rpoll.3 poll_dispatch.3 .include Index: stable/11/lib/libblocksruntime/Makefile =================================================================== --- stable/11/lib/libblocksruntime/Makefile (revision 313537) +++ stable/11/lib/libblocksruntime/Makefile (revision 313538) @@ -1,14 +1,14 @@ # $FreeBSD$ PACKAGE=lib${LIB:tl} LIB= BlocksRuntime SHLIB_MAJOR=0 CFLAGS+=-I${.CURDIR} WARNS?= 2 -.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/BlocksRuntime +.PATH: ${SRCTOP}/contrib/compiler-rt/lib/BlocksRuntime INCS= Block.h Block_private.h SRCS= data.c runtime.c .include Index: stable/11/lib/libbluetooth/Makefile =================================================================== --- stable/11/lib/libbluetooth/Makefile (revision 313537) +++ stable/11/lib/libbluetooth/Makefile (revision 313538) @@ -1,54 +1,54 @@ # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $ # $FreeBSD$ PACKAGE= lib${LIB} LIB= bluetooth MAN= bluetooth.3 WARNS?= 2 -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys SHLIB_MAJOR= 4 SRCS= bluetooth.c dev.c hci.c INCS= bluetooth.h MLINKS+= bluetooth.3 bt_gethostbyname.3 MLINKS+= bluetooth.3 bt_gethostbyaddr.3 MLINKS+= bluetooth.3 bt_gethostent.3 MLINKS+= bluetooth.3 bt_sethostent.3 MLINKS+= bluetooth.3 bt_endhostent.3 MLINKS+= bluetooth.3 bt_getprotobyname.3 MLINKS+= bluetooth.3 bt_getprotobynumber.3 MLINKS+= bluetooth.3 bt_getprotoent.3 MLINKS+= bluetooth.3 bt_setprotoent.3 MLINKS+= bluetooth.3 bt_endprotoent.3 MLINKS+= bluetooth.3 bt_ntoa.3 MLINKS+= bluetooth.3 bt_aton.3 MLINKS+= bluetooth.3 bt_devaddr.3 MLINKS+= bluetooth.3 bt_devname.3 MLINKS+= bluetooth.3 bt_devinfo.3 MLINKS+= bluetooth.3 bt_devenum.3 MLINKS+= bluetooth.3 bt_devopen.3 MLINKS+= bluetooth.3 bt_devclose.3 MLINKS+= bluetooth.3 bt_devsend.3 MLINKS+= bluetooth.3 bt_devreq.3 MLINKS+= bluetooth.3 bt_devfilter.3 MLINKS+= bluetooth.3 bt_devfilter_pkt_set.3 MLINKS+= bluetooth.3 bt_devfilter_pkt_clr.3 MLINKS+= bluetooth.3 bt_devfilter_pkt_tst.3 MLINKS+= bluetooth.3 bt_devfilter_evt_set.3 MLINKS+= bluetooth.3 bt_devfilter_evt_clr.3 MLINKS+= bluetooth.3 bt_devfilter_evt_tst.3 MLINKS+= bluetooth.3 bt_devinquiry.3 MLINKS+= bluetooth.3 bdaddr_same.3 MLINKS+= bluetooth.3 bdaddr_any.3 MLINKS+= bluetooth.3 bdaddr_copy.3 .include Index: stable/11/lib/libbsm/Makefile =================================================================== --- stable/11/lib/libbsm/Makefile (revision 313537) +++ stable/11/lib/libbsm/Makefile (revision 313538) @@ -1,182 +1,182 @@ # # $FreeBSD$ # PACKAGE= lib${LIB} -OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm +OPENBSMDIR= ${SRCTOP}/contrib/openbsm _LIBBSMDIR= ${OPENBSMDIR}/libbsm LIB= bsm SHLIB_MAJOR= 3 .PATH: ${_LIBBSMDIR} .PATH: ${OPENBSMDIR}/bsm .PATH: ${OPENBSMDIR}/man SRCS= bsm_audit.c \ bsm_class.c \ bsm_control.c \ bsm_domain.c \ bsm_errno.c \ bsm_event.c \ bsm_fcntl.c \ bsm_flags.c \ bsm_io.c \ bsm_mask.c \ bsm_notify.c \ bsm_socket_type.c \ bsm_token.c \ bsm_user.c \ bsm_wrappers.c # # Must use BSM include files from within the contrib area, not the system. # CFLAGS+= -I${OPENBSMDIR} -I${_LIBBSMDIR} WARNS?= 1 INCS= audit_uevents.h libbsm.h INCSDIR= ${INCLUDEDIR}/bsm MAN= libbsm.3 \ au_class.3 \ au_control.3 \ au_domain.3 \ au_errno.3 \ au_event.3 \ au_fcntl_cmd.3 \ au_free_token.3 \ au_io.3 \ au_mask.3 \ au_notify.3 \ au_open.3 \ au_socket_type.3 \ au_token.3 \ au_user.3 \ audit_submit.3 # # It seems like maybe some of these should be installed separately, since # they're not all libbsm parts. # MAN+= audit.2 \ audit.log.5 \ audit_class.5 \ audit_control.5 \ audit_event.5 \ audit_user.5 \ audit_warn.5 \ auditctl.2 \ auditon.2 \ getaudit.2 \ getauid.2 \ setaudit.2 \ setauid.2 MLINKS= libbsm.3 bsm.3 \ au_class.3 getauclassent.3 \ au_class.3 getauclassent_r.3 \ au_class.3 getauclassnam.3 \ au_class.3 getauclassnam_3.3 \ au_class.3 setauclass.3 \ au_class.3 endauclass.3 \ au_control.3 setac.3 \ au_control.3 endac.3 \ au_control.3 getacdir.3 \ au_control.3 getacmin.3 \ au_control.3 getacfilesz.3 \ au_control.3 getacflg.3 \ au_control.3 getacna.3 \ au_control.3 getacpol.3 \ au_control.3 au_poltostr.3 \ au_control.3 au_strtopol.3 \ au_domain.3 au_bsm_to_domain.3 \ au_domain.3 au_domain_to_bsm.3 \ au_errno.3 au_bsm_to_errno.3 \ au_errno.3 au_errno_to_bsm.3 \ au_errno.3 au_strerror.3 \ au_event.3 setauevent.3 \ au_event.3 endauevent.3 \ au_event.3 getauevent.3 \ au_event.3 getauevent_r.3 \ au_event.3 getauevnam.3 \ au_event.3 getauevnam_r.3 \ au_event.3 getauevnum.3 \ au_event.3 getauevnum_r.3 \ au_event.3 getauevnonam.3 \ au_event.3 getauevnonam_r.3 \ au_fcntl_cmd.3 au_bsm_to_fcntl_cmd.3 \ au_fcntl_cmd.3 au_fcntl_cmd_t_bsm.3 \ au_io.3 au_fetch_tok.3 \ au_io.3 au_print_tok.3 \ au_io.3 au_read_rec.3 \ au_mask.3 au_preselect.3 \ au_mask.3 getauditflagsbin.3 \ au_mask.3 getauditflagschar.3 \ au_notify.3 au_get_state.3 \ au_notify.3 au_notify_initialize.3 \ au_notify.3 au_notify_terminate.3 \ au_open.3 au_close.3 \ au_open.3 au_close_buffer.3 \ au_open.3 au_close_token.3 \ au_open.3 au_write.3 \ au_socket_type.3 au_bsm_to_socket_type.3 \ au_socket_type.3 au_socket_type_to_bsm.3 \ au_token.3 au_to_arg32.3 \ au_token.3 au_to_arg64.3 \ au_token.3 au_to_arg.3 \ au_token.3 au_to_attr64.3 \ au_token.3 au_to_data.3 \ au_token.3 au_to_exit.3 \ au_token.3 au_to_groups.3 \ au_token.3 au_to_newgroups.3 \ au_token.3 au_to_in_addr.3 \ au_token.3 au_to_in_addr_ex.3 \ au_token.3 au_to_ip.3 \ au_token.3 au_to_ipc.3 \ au_token.3 au_to_ipc_perm.3 \ au_token.3 au_to_iport.3 \ au_token.3 au_to_opaque.3 \ au_token.3 au_to_file.3 \ au_token.3 au_to_text.3 \ au_token.3 au_to_path.3 \ au_token.3 au_to_process32.3 \ au_token.3 au_to_process64.3 \ au_token.3 au_to_process.3 \ au_token.3 au_to_process32_ex.3 \ au_token.3 au_to_process64_ex.3 \ au_token.3 au_to_process_ex.3 \ au_token.3 au_to_return32.3 \ au_token.3 au_to_return64.3 \ au_token.3 au_to_return.3 \ au_token.3 au_to_seq.3 \ au_token.3 au_to_sock_inet32.3 \ au_token.3 au_to_sock_inet128.3 \ au_token.3 au_to_sock_inet.3 \ au_token.3 au_to_subject32.3 \ au_token.3 au_to_subject64.3 \ au_token.3 au_to_subject.3 \ au_token.3 au_to_subject32_ex.3 \ au_token.3 au_to_subject64_ex.3 \ au_token.3 au_to_subject_ex.3 \ au_token.3 au_to_me.3 \ au_token.3 au_to_exec_args.3 \ au_token.3 au_to_exec_env.3 \ au_token.3 au_to_header.3 \ au_token.3 au_to_header32.3 \ au_token.3 au_to_header64.3 \ au_token.3 au_to_trailer.3 \ au_token.3 au_to_zonename.3 \ au_user.3 setauuser.3 \ au_user.3 endauuser.3 \ au_user.3 getauuserent.3 \ au_user.3 getauuserent_r.3 \ au_user.3 getauusernam.3 \ au_user.3 getauusernam_R.3 \ au_user.3 au_user_mask.3 \ au_user.3 getfauditflags.3 \ getaudit.2 getaudit_addr.2 \ setaudit.2 setaudit_addr.2 .include Index: stable/11/lib/libbsnmp/libbsnmp/Makefile =================================================================== --- stable/11/lib/libbsnmp/libbsnmp/Makefile (revision 313537) +++ stable/11/lib/libbsnmp/libbsnmp/Makefile (revision 313538) @@ -1,119 +1,119 @@ # $FreeBSD$ # # Author: Harti Brandt .include -CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib +CONTRIB= ${SRCTOP}/contrib/bsnmp/lib .PATH: ${CONTRIB} LIB= bsnmp SHLIB_MAJOR= 6 LD_FATAL_WARNINGS= no CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"' .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO LIBADD= crypto .endif SRCS= asn1.c snmp.c snmpagent.c snmpclient.c snmpcrypto.c support.c INCS= asn1.h snmp.h snmpagent.h snmpclient.h MAN= asn1.3 bsnmpagent.3 bsnmpclient.3 bsnmplib.3 MLINKS+= asn1.3 asn_append_oid.3 MLINKS+= asn1.3 asn_commit_header.3 MLINKS+= asn1.3 asn_compare_oid.3 MLINKS+= asn1.3 asn_get_counter64_raw.3 MLINKS+= asn1.3 asn_get_header.3 MLINKS+= asn1.3 asn_get_integer.3 MLINKS+= asn1.3 asn_get_integer_raw.3 MLINKS+= asn1.3 asn_get_ipaddress.3 MLINKS+= asn1.3 asn_get_ipaddress_raw.3 MLINKS+= asn1.3 asn_get_null.3 MLINKS+= asn1.3 asn_get_null_raw.3 MLINKS+= asn1.3 asn_get_objid.3 MLINKS+= asn1.3 asn_get_objid_raw.3 MLINKS+= asn1.3 asn_get_octetstring.3 MLINKS+= asn1.3 asn_get_octetstring_raw.3 MLINKS+= asn1.3 asn_get_sequence.3 MLINKS+= asn1.3 asn_get_timeticks.3 MLINKS+= asn1.3 asn_get_uint32_raw.3 MLINKS+= asn1.3 asn_is_suboid.3 MLINKS+= asn1.3 asn_oid2str.3 MLINKS+= asn1.3 asn_oid2str_r.3 MLINKS+= asn1.3 asn_put_counter64.3 MLINKS+= asn1.3 asn_put_exception.3 MLINKS+= asn1.3 asn_put_header.3 MLINKS+= asn1.3 asn_put_integer.3 MLINKS+= asn1.3 asn_put_ipaddress.3 MLINKS+= asn1.3 asn_put_null.3 MLINKS+= asn1.3 asn_put_objid.3 MLINKS+= asn1.3 asn_put_octetstring.3 MLINKS+= asn1.3 asn_put_temp_header.3 MLINKS+= asn1.3 asn_put_timeticks.3 MLINKS+= asn1.3 asn_put_uint32.3 MLINKS+= asn1.3 asn_skip.3 MLINKS+= asn1.3 asn_slice_oid.3 MLINKS+= bsnmpagent.3 snmp_debug.3 MLINKS+= bsnmpagent.3 snmp_dep_commit.3 MLINKS+= bsnmpagent.3 snmp_dep_finish.3 MLINKS+= bsnmpagent.3 snmp_dep_lookup.3 MLINKS+= bsnmpagent.3 snmp_dep_rollback.3 MLINKS+= bsnmpagent.3 snmp_depop_t.3 MLINKS+= bsnmpagent.3 snmp_get.3 MLINKS+= bsnmpagent.3 snmp_getbulk.3 MLINKS+= bsnmpagent.3 snmp_getnext.3 MLINKS+= bsnmpagent.3 snmp_init_context.3 MLINKS+= bsnmpagent.3 snmp_make_errresp.3 MLINKS+= bsnmpagent.3 snmp_op_t.3 MLINKS+= bsnmpagent.3 snmp_set.3 MLINKS+= bsnmpagent.3 snmp_trace.3 MLINKS+= bsnmpagent.3 tree.3 MLINKS+= bsnmpagent.3 tree_size.3 MLINKS+= bsnmpclient.3 snmp_add_binding.3 MLINKS+= bsnmpclient.3 snmp_client.3 MLINKS+= bsnmpclient.3 snmp_client_init.3 MLINKS+= bsnmpclient.3 snmp_client_set_host.3 MLINKS+= bsnmpclient.3 snmp_client_set_port.3 MLINKS+= bsnmpclient.3 snmp_close.3 MLINKS+= bsnmpclient.3 snmp_dialog.3 MLINKS+= bsnmpclient.3 snmp_discover_engine.3 MLINKS+= bsnmpclient.3 snmp_oid_append.3 MLINKS+= bsnmpclient.3 snmp_open.3 MLINKS+= bsnmpclient.3 snmp_parse_server.3 MLINKS+= bsnmpclient.3 snmp_pdu_check.3 MLINKS+= bsnmpclient.3 snmp_pdu_create.3 MLINKS+= bsnmpclient.3 snmp_pdu_send.3 MLINKS+= bsnmpclient.3 snmp_receive.3 MLINKS+= bsnmpclient.3 snmp_send_cb_f.3 MLINKS+= bsnmpclient.3 snmp_table_cb_f.3 MLINKS+= bsnmpclient.3 snmp_table_fetch.3 MLINKS+= bsnmpclient.3 snmp_table_fetch_async.3 MLINKS+= bsnmpclient.3 snmp_timeout_cb_f.3 MLINKS+= bsnmpclient.3 snmp_timeout_start_f.3 MLINKS+= bsnmpclient.3 snmp_timeout_stop_f.3 MLINKS+= bsnmplib.3 TRUTH_GET.3 MLINKS+= bsnmplib.3 TRUTH_MK.3 MLINKS+= bsnmplib.3 TRUTH_OK.3 MLINKS+= bsnmplib.3 snmp_calc_keychange.3 MLINKS+= bsnmplib.3 snmp_get_local_keys.3 MLINKS+= bsnmplib.3 snmp_passwd_to_keys.3 MLINKS+= bsnmplib.3 snmp_pdu_decode.3 MLINKS+= bsnmplib.3 snmp_pdu_decode_header.3 MLINKS+= bsnmplib.3 snmp_pdu_decode_scoped.3 MLINKS+= bsnmplib.3 snmp_pdu_decode_secmode.3 MLINKS+= bsnmplib.3 snmp_pdu_dump.3 MLINKS+= bsnmplib.3 snmp_pdu_encode.3 MLINKS+= bsnmplib.3 snmp_pdu_free.3 MLINKS+= bsnmplib.3 snmp_pdu_init_secparams.3 MLINKS+= bsnmplib.3 snmp_value_copy.3 MLINKS+= bsnmplib.3 snmp_value_free.3 MLINKS+= bsnmplib.3 snmp_value_parse.3 .include Index: stable/11/lib/libbz2/Makefile =================================================================== --- stable/11/lib/libbz2/Makefile (revision 313537) +++ stable/11/lib/libbz2/Makefile (revision 313538) @@ -1,16 +1,16 @@ # $FreeBSD$ PACKAGE= lib${LIB} -BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} LIB= bz2 SHLIB_MAJOR= 4 SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \ huffman.c randtable.c INCS= bzlib.h CFLAGS+= -I${BZ2DIR} WARNS?= 3 .include Index: stable/11/lib/libc++/Makefile =================================================================== --- stable/11/lib/libc++/Makefile (revision 313537) +++ stable/11/lib/libc++/Makefile (revision 313538) @@ -1,255 +1,255 @@ # $FreeBSD$ .include PACKAGE= clibs -_LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt -HDRDIR= ${.CURDIR}/../../contrib/libc++/include -SRCDIR= ${.CURDIR}/../../contrib/libc++/src +_LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt +HDRDIR= ${SRCTOP}/contrib/libc++/include +SRCDIR= ${SRCTOP}/contrib/libc++/src CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR} .if ${MACHINE_CPUARCH} == "arm" STATIC_CXXFLAGS+= -mlong-calls .endif .PATH: ${SRCDIR} LIB= c++ SHLIB_MAJOR= 1 SHLIB_LDSCRIPT= libc++.ldscript SRCS+= algorithm.cpp\ any.cpp\ bind.cpp\ chrono.cpp\ condition_variable.cpp\ debug.cpp\ exception.cpp\ future.cpp\ hash.cpp\ ios.cpp\ iostream.cpp\ locale.cpp\ memory.cpp\ mutex.cpp\ new.cpp\ optional.cpp\ random.cpp\ regex.cpp\ shared_mutex.cpp\ stdexcept.cpp\ string.cpp\ strstream.cpp\ system_error.cpp\ thread.cpp\ typeinfo.cpp\ utility.cpp\ valarray.cpp CXXRT_SRCS+= libelftc_dem_gnu3.c\ terminate.cc\ dynamic_cast.cc\ memory.cc\ auxhelper.cc\ exception.cc\ stdexcept.cc\ typeinfo.cc\ guard.cc .for _S in ${CXXRT_SRCS} CLEANFILES+= cxxrt_${_S} STATICOBJS+= cxxrt_${_S:R}.o cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .endfor WARNS= 0 CFLAGS+= -isystem ${HDRDIR} -isystem ${_LIBCXXRTDIR} -nostdinc++ -nostdlib -DLIBCXXRT .if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++11 .endif LIBADD+= cxxrt INCSGROUPS= STD EXP EXT STD_HEADERS= __bit_reference\ __bsd_locale_defaults.h\ __bsd_locale_fallbacks.h\ __config\ __debug\ __functional_03\ __functional_base\ __functional_base_03\ __hash_table\ __locale\ __mutex_base\ __nullptr\ __refstring\ __split_buffer\ __sso_allocator\ __std_stream\ __threading_support\ __tree\ __tuple\ __undef___deallocate\ __undef_min_max\ algorithm\ array\ atomic\ bitset\ cassert\ ccomplex\ cctype\ cerrno\ cfenv\ cfloat\ chrono\ cinttypes\ ciso646\ climits\ clocale\ cmath\ codecvt\ complex\ complex.h\ condition_variable\ csetjmp\ csignal\ cstdarg\ cstdbool\ cstddef\ cstdint\ cstdio\ cstdlib\ cstring\ ctgmath\ ctime\ ctype.h\ cwchar\ cwctype\ deque\ errno.h\ exception\ float.h\ forward_list\ fstream\ functional\ future\ initializer_list\ inttypes.h\ iomanip\ ios\ iosfwd\ iostream\ istream\ iterator\ limits\ list\ locale\ map\ math.h\ memory\ mutex\ new\ numeric\ ostream\ queue\ random\ ratio\ regex\ scoped_allocator\ set\ setjmp.h\ shared_mutex\ sstream\ stack\ stdbool.h\ stddef.h\ stdexcept\ stdio.h\ stdlib.h\ streambuf\ string\ string.h\ strstream\ system_error\ tgmath.h\ thread\ tuple\ type_traits\ typeindex\ typeinfo\ unordered_map\ unordered_set\ utility\ valarray\ vector\ wchar.h\ wctype.h RT_HEADERS= cxxabi.h\ unwind.h\ unwind-arm.h\ unwind-itanium.h .for hdr in ${STD_HEADERS} STD+= ${HDRDIR}/${hdr} INCSLINKS+= ../${hdr} ${CXXINCLUDEDIR}/tr1/${hdr} .endfor .for hdr in ${RT_HEADERS} STD+= ${_LIBCXXRTDIR}/${hdr} .endfor STDDIR= ${CXXINCLUDEDIR} EXP_HEADERS= __config\ __memory\ algorithm\ any\ chrono\ deque\ dynarray\ filesystem\ forward_list\ functional\ iterator\ list\ map\ memory_resource\ optional\ propagate_const\ ratio\ regex\ set\ string\ string_view\ system_error\ tuple\ type_traits\ unordered_map\ unordered_set\ utility\ vector .for hdr in ${EXP_HEADERS} EXP+= ${HDRDIR}/experimental/${hdr} .endfor EXPDIR= ${CXXINCLUDEDIR}/experimental EXT_HEADERS= __hash\ hash_map\ hash_set .for hdr in ${EXT_HEADERS} EXT+= ${HDRDIR}/ext/${hdr} .endfor EXTDIR= ${CXXINCLUDEDIR}/ext .if ${MK_GNUCXX} == "no" && ${COMPILER_TYPE} == "gcc" CLEANFILES+= libstdc++.so libstdc++.a afterinstall: ${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.so \ ${.OBJDIR}/libstdc++.so ${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.a \ ${.OBJDIR}/libstdc++.a .endif .include Index: stable/11/lib/libc_nonshared/Makefile =================================================================== --- stable/11/lib/libc_nonshared/Makefile (revision 313537) +++ stable/11/lib/libc_nonshared/Makefile (revision 313538) @@ -1,28 +1,28 @@ # $FreeBSD$ # We're actually creating a libc_noshared.a that is PIC along side libc.so.* # It is used exclusively with libc.so.* - there is no need for any other # compile modes. # bsd.lib.mk doesn't have an easy way to express that. MK_PROFILE?=no .include -NO_PIC= +NO_PIC= # -fpic on some platforms, -fPIC on others. CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden LIB= c_nonshared LIBC_NONSHARED_SRCS= # So that an empty .a file doesn't cause errors. SRCS= __stub.c .if ${MK_ICONV} == "yes" -.PATH: ${.CURDIR}/../libc/iconv +.PATH: ${SRCTOP}/lib/libc/iconv .include "Makefile.iconv" -CFLAGS+=-I${.CURDIR}/../libc/iconv +CFLAGS+=-I${SRCTOP}/lib/libc/iconv .endif SRCS+= ${LIBC_NONSHARED_SRCS} .include Index: stable/11/lib/libcam/Makefile =================================================================== --- stable/11/lib/libcam/Makefile (revision 313537) +++ stable/11/lib/libcam/Makefile (revision 313538) @@ -1,47 +1,46 @@ # $FreeBSD$ PACKAGE= lib${LIB} LIB= cam SHLIBDIR?= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ ata_all.c smp_all.c INCS= camlib.h LIBADD= sbuf MAN= cam.3 cam_cdbparse.3 WARNS?= 2 MLINKS+= cam.3 cam_open_device.3 \ cam.3 cam_open_spec_device.3 \ cam.3 cam_open_btl.3 \ cam.3 cam_open_pass.3 \ cam.3 cam_close_device.3 \ cam.3 cam_close_spec_device.3 \ cam.3 cam_getccb.3 \ cam.3 cam_send_ccb.3 \ cam.3 cam_freeccb.3 \ cam.3 cam_path_string.3 \ cam.3 cam_device_dup.3 \ cam.3 cam_device_copy.3 \ cam.3 cam_get_device.3 \ cam_cdbparse.3 csio_build.3 \ cam_cdbparse.3 csio_build_visit.3 \ cam_cdbparse.3 csio_decode.3 \ cam_cdbparse.3 csio_decode_visit.3 \ cam_cdbparse.3 buff_decode.3 \ cam_cdbparse.3 buff_decode_visit.3 \ cam_cdbparse.3 csio_encode.3 \ cam_cdbparse.3 csio_encode_visit.3 \ cam_cdbparse.3 buff_encode_visit.3 -.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam/ata \ - ${.CURDIR}/../../sys/cam +.PATH: ${SRCTOP}/sys/cam/scsi ${SRCTOP}/sys/cam/ata \ + ${SRCTOP}/sys/cam -SDIR= ${.CURDIR}/../../sys -CFLAGS+= -I${.CURDIR} -I${SDIR} +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys SHLIB_MAJOR= 7 .include Index: stable/11/lib/libcom_err/Makefile =================================================================== --- stable/11/lib/libcom_err/Makefile (revision 313537) +++ stable/11/lib/libcom_err/Makefile (revision 313538) @@ -1,16 +1,16 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= com_err SRCS= com_err.c error.c INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h MAN= com_err.3 -COM_ERRDIR= ${.CURDIR}/../../contrib/com_err +COM_ERRDIR= ${SRCTOP}/contrib/com_err CFLAGS+= -I${COM_ERRDIR} LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${COM_ERRDIR}/version-script.map .include .PATH: ${COM_ERRDIR} Index: stable/11/lib/libcompat/Makefile =================================================================== --- stable/11/lib/libcompat/Makefile (revision 313537) +++ stable/11/lib/libcompat/Makefile (revision 313538) @@ -1,30 +1,30 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PACKAGE=lib${LIB} LIB= compat -CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale +CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale NO_PIC= WARNS?= 0 .PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4 # compat 4.1 sources SRCS+= ftime.c MAN+= 4.1/ftime.3 # compat 4.3 sources SRCS+= re_comp.c rexec.c MAN+= 4.3/re_comp.3 4.3/rexec.3 MLINKS+=re_comp.3 re_exec.3 # compat 4.4 sources SRCS+= cuserid.c MAN+= 4.4/cuserid.3 .include Index: stable/11/lib/libcrypt/Makefile =================================================================== --- stable/11/lib/libcrypt/Makefile (revision 313537) +++ stable/11/lib/libcrypt/Makefile (revision 313538) @@ -1,50 +1,50 @@ # # $FreeBSD$ # PACKAGE=lib${LIB} SHLIBDIR?= /lib .include SHLIB_MAJOR= 5 LIB= crypt -.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2 +.PATH: ${SRCTOP}/lib/libmd ${SRCTOP}/sys/crypto/sha2 SRCS= crypt.c misc.c \ crypt-md5.c md5c.c \ crypt-nthash.c md4c.c \ crypt-sha256.c sha256c.c \ crypt-sha512.c sha512c.c MAN= crypt.3 MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3 -CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \ - -I${.CURDIR}/../../sys/crypto/sha2 +CFLAGS+= -I${SRCTOP}/lib/libmd -I${SRCTOP}/lib/libutil \ + -I${SRCTOP}/sys/crypto/sha2 # Pull in the strong crypto, if it is present. -.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no" -.PATH: ${.CURDIR}/../../secure/lib/libcrypt +.if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no" +.PATH: ${SRCTOP}/secure/lib/libcrypt SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH .endif .for sym in MD4Init MD4Final MD4Update MD4Pad \ MD5Init MD5Final MD5Update MD5Pad \ SHA256_Init SHA256_Final SHA256_Update \ SHA512_224_Init SHA512_224_Final SHA512_224_Update \ SHA512_256_Init SHA512_256_Final SHA512_256_Update \ SHA384_Init SHA384_Final SHA384_Update \ SHA512_Init SHA512_Final SHA512_Update CFLAGS+= -D${sym}=__${sym} .endfor WARNS?= 2 PRECIOUSLIB= .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include .include Index: stable/11/lib/libcxxrt/Makefile =================================================================== --- stable/11/lib/libcxxrt/Makefile (revision 313537) +++ stable/11/lib/libcxxrt/Makefile (revision 313538) @@ -1,30 +1,30 @@ # $FreeBSD$ PACKAGE= clibs -SRCDIR= ${.CURDIR}/../../contrib/libcxxrt +SRCDIR= ${SRCTOP}/contrib/libcxxrt SHLIB_MAJOR= 1 SHLIBDIR?= /lib .PATH: ${SRCDIR} LIB= cxxrt SRCS+= libelftc_dem_gnu3.c\ terminate.cc\ dynamic_cast.cc\ memory.cc\ auxhelper.cc\ exception.cc\ stdexcept.cc\ typeinfo.cc\ guard.cc WARNS= 0 CFLAGS+= -isystem ${SRCDIR} -nostdinc++ .if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++11 .endif VERSION_MAP= ${.CURDIR}/Version.map .include Index: stable/11/lib/libdevdctl/tests/Makefile =================================================================== --- stable/11/lib/libdevdctl/tests/Makefile (revision 313537) +++ stable/11/lib/libdevdctl/tests/Makefile (revision 313538) @@ -1,21 +1,21 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/lib/libdevdctl -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR:H} PLAIN_TESTS_CXX= libdevdctl_unittest SRCS.libdevdctl_unittest+= event_factory.cc \ libdevdctl_unittest.cc \ event.cc exception.cc \ guid.cc CFLAGS.libdevdctl_unittest+= -I ${LOCALBASE}/include -D_THREAD_SAFE -pthread DPADD.libdevdctl_unittest+= ${LIBDEVDCTL} LDADD.libdevdctl_unittest+= -L ${LOCALBASE}/lib -D_THREAD_SAFE -pthread -lgtest -lgtest_main # Googletest options LOCALBASE?= /usr/local WARNS?= 3 .include Index: stable/11/lib/libdwarf/Makefile =================================================================== --- stable/11/lib/libdwarf/Makefile (revision 313537) +++ stable/11/lib/libdwarf/Makefile (revision 313538) @@ -1,359 +1,359 @@ # $FreeBSD$ .include PACKAGE=lib${LIB} ELFTCDIR=${SRCTOP}/contrib/elftoolchain SRCDIR= ${ELFTCDIR}/libdwarf .PATH: ${SRCDIR} LIB= dwarf SRCS= \ dwarf_abbrev.c \ dwarf_arange.c \ dwarf_attr.c \ dwarf_attrval.c \ dwarf_cu.c \ dwarf_dealloc.c \ dwarf_die.c \ dwarf_dump.c \ dwarf_errmsg.c \ dwarf_finish.c \ dwarf_form.c \ dwarf_frame.c \ dwarf_funcs.c \ dwarf_init.c \ dwarf_lineno.c \ dwarf_loclist.c \ dwarf_macinfo.c \ dwarf_pro_arange.c \ dwarf_pro_attr.c \ dwarf_pro_die.c \ dwarf_pro_expr.c \ dwarf_pro_finish.c \ dwarf_pro_frame.c \ dwarf_pro_funcs.c \ dwarf_pro_init.c \ dwarf_pro_lineno.c \ dwarf_pro_macinfo.c \ dwarf_pro_pubnames.c \ dwarf_pro_reloc.c \ dwarf_pro_sections.c \ dwarf_pro_types.c \ dwarf_pro_vars.c \ dwarf_pro_weaks.c \ dwarf_pubnames.c \ dwarf_pubtypes.c \ dwarf_ranges.c \ dwarf_reloc.c \ dwarf_sections.c \ dwarf_seterror.c \ dwarf_str.c \ dwarf_types.c \ dwarf_vars.c \ dwarf_weaks.c \ libdwarf.c \ libdwarf_abbrev.c \ libdwarf_arange.c \ libdwarf_attr.c \ libdwarf_die.c \ libdwarf_error.c \ libdwarf_elf_access.c \ libdwarf_elf_init.c \ libdwarf_frame.c \ libdwarf_info.c \ libdwarf_init.c \ libdwarf_lineno.c \ libdwarf_loc.c \ libdwarf_loclist.c \ libdwarf_macinfo.c \ libdwarf_nametbl.c \ libdwarf_ranges.c \ libdwarf_reloc.c \ libdwarf_rw.c \ libdwarf_sections.c \ libdwarf_str.c INCS= dwarf.h libdwarf.h # This same hack is in lib/libelf/Makefile and usr.bin/readelf/Makefile # We need to link against the correct version of these files. One # solution is to include ../../sys in the include path. This causes # problems when a header file in sys depends on a file in another # part of the tree, e.g. a machine dependent header. # SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h GENSRCS= dwarf_pubnames.c dwarf_pubtypes.c dwarf_weaks.c \ dwarf_funcs.c dwarf_vars.c dwarf_types.c \ dwarf_pro_pubnames.c dwarf_pro_weaks.c \ dwarf_pro_funcs.c dwarf_pro_types.c \ dwarf_pro_vars.c CLEANFILES= ${GENSRCS} CLEANDIRS= sys CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common -I${ELFTCDIR}/libelf -sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA +sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA mkdir -p ${.OBJDIR}/sys ln -sf ${.ALLSRC} ${.TARGET} LIBADD+= elf SHLIB_MAJOR= 4 MAN= dwarf.3 \ dwarf_add_arange.3 \ dwarf_add_AT_comp_dir.3 \ dwarf_add_AT_const_value_string.3 \ dwarf_add_AT_dataref.3 \ dwarf_add_AT_flag.3 \ dwarf_add_AT_location_expr.3 \ dwarf_add_AT_name.3 \ dwarf_add_AT_producer.3 \ dwarf_add_AT_ref_address.3 \ dwarf_add_AT_reference.3 \ dwarf_add_AT_signed_const.3 \ dwarf_add_AT_string.3 \ dwarf_add_AT_targ_address.3 \ dwarf_add_die_to_debug.3 \ dwarf_add_directory_decl.3 \ dwarf_add_expr_addr.3 \ dwarf_add_expr_gen.3 \ dwarf_add_fde_inst.3 \ dwarf_add_file_decl.3 \ dwarf_add_frame_cie.3 \ dwarf_add_frame_fde.3 \ dwarf_add_funcname.3 \ dwarf_add_line_entry.3 \ dwarf_add_pubname.3 \ dwarf_add_typename.3 \ dwarf_add_varname.3 \ dwarf_add_weakname.3 \ dwarf_attr.3 \ dwarf_attrlist.3 \ dwarf_attroffset.3 \ dwarf_attrval_signed.3 \ dwarf_child.3 \ dwarf_dealloc.3 \ dwarf_def_macro.3 \ dwarf_die_abbrev_code.3 \ dwarf_die_link.3 \ dwarf_diename.3 \ dwarf_dieoffset.3 \ dwarf_end_macro_file.3 \ dwarf_errmsg.3 \ dwarf_errno.3 \ dwarf_expand_frame_instructions.3 \ dwarf_expr_current_offset.3 \ dwarf_expr_into_block.3 \ dwarf_fde_cfa_offset.3 \ dwarf_find_macro_value_start.3 \ dwarf_finish.3 \ dwarf_formaddr.3 \ dwarf_formblock.3 \ dwarf_formexprloc.3 \ dwarf_formflag.3 \ dwarf_formref.3 \ dwarf_formsig8.3 \ dwarf_formstring.3 \ dwarf_formudata.3 \ dwarf_get_abbrev.3 \ dwarf_get_abbrev_children_flag.3 \ dwarf_get_abbrev_code.3 \ dwarf_get_abbrev_entry.3 \ dwarf_get_abbrev_tag.3 \ dwarf_get_address_size.3 \ dwarf_get_arange.3 \ dwarf_get_arange_info.3 \ dwarf_get_aranges.3 \ dwarf_get_AT_name.3 \ dwarf_get_cie_index.3 \ dwarf_get_cie_info.3 \ dwarf_get_cie_of_fde.3 \ dwarf_get_cu_die_offset.3 \ dwarf_get_die_infotypes_flag.3 \ dwarf_get_elf.3 \ dwarf_get_fde_at_pc.3 \ dwarf_get_fde_info_for_all_regs.3 \ dwarf_get_fde_info_for_all_regs3.3 \ dwarf_get_fde_info_for_cfa_reg3.3 \ dwarf_get_fde_info_for_reg.3 \ dwarf_get_fde_info_for_reg3.3 \ dwarf_get_fde_instr_bytes.3 \ dwarf_get_fde_list.3 \ dwarf_get_fde_n.3 \ dwarf_get_fde_range.3 \ dwarf_get_form_class.3 \ dwarf_get_funcs.3 \ dwarf_get_globals.3 \ dwarf_get_loclist_entry.3 \ dwarf_get_macro_details.3 \ dwarf_get_pubtypes.3 \ dwarf_get_ranges.3 \ dwarf_get_relocation_info.3 \ dwarf_get_relocation_info_count.3 \ dwarf_get_section_bytes.3 \ dwarf_get_section_max_offsets.3 \ dwarf_get_str.3 \ dwarf_get_types.3 \ dwarf_get_vars.3 \ dwarf_get_weaks.3 \ dwarf_hasattr.3 \ dwarf_hasform.3 \ dwarf_highpc.3 \ dwarf_init.3 \ dwarf_lineno.3 \ dwarf_lne_end_sequence.3 \ dwarf_lne_set_address.3 \ dwarf_loclist.3 \ dwarf_loclist_from_expr.3 \ dwarf_new_die.3 \ dwarf_new_expr.3 \ dwarf_new_fde.3 \ dwarf_next_cu_header.3 \ dwarf_next_types_section.3 \ dwarf_object_init.3 \ dwarf_producer_init.3 \ dwarf_producer_set_isa.3 \ dwarf_reset_section_bytes.3 \ dwarf_seterrarg.3 \ dwarf_set_frame_cfa_value.3 \ dwarf_set_reloc_application.3 \ dwarf_srcfiles.3 \ dwarf_srclines.3 \ dwarf_start_macro_file.3 \ dwarf_tag.3 \ dwarf_transform_to_disk_form.3 \ dwarf_undef_macro.3 \ dwarf_vendor_ext.3 \ dwarf_whatattr.3 MLINKS+= \ dwarf_add_AT_const_value_string.3 dwarf_add_AT_const_value_signedint.3 \ dwarf_add_AT_const_value_string.3 dwarf_add_AT_const_value_unsignedint.3 \ dwarf_add_AT_signed_const.3 dwarf_add_AT_unsigned_const.3 \ dwarf_add_AT_targ_address.3 dwarf_add_AT_targ_address_b.3 \ dwarf_add_arange.3 dwarf_add_arange_b.3 \ dwarf_add_expr_addr.3 dwarf_add_expr_addr_b.3 \ dwarf_add_frame_fde.3 dwarf_add_frame_fde_b.3 \ dwarf_attrval_signed.3 dwarf_attrval_flag.3 \ dwarf_attrval_signed.3 dwarf_attrval_string.3 \ dwarf_attrval_signed.3 dwarf_attrval_unsigned.3 \ dwarf_child.3 dwarf_offdie.3 \ dwarf_child.3 dwarf_offdie_b.3 \ dwarf_child.3 dwarf_siblingof.3 \ dwarf_child.3 dwarf_siblingof_b.3 \ dwarf_dealloc.3 dwarf_fde_cie_list_dealloc.3 \ dwarf_dealloc.3 dwarf_funcs_dealloc.3 \ dwarf_dealloc.3 dwarf_globals_dealloc.3 \ dwarf_dealloc.3 dwarf_pubtypes_dealloc.3 \ dwarf_dealloc.3 dwarf_types_dealloc.3 \ dwarf_dealloc.3 dwarf_vars_dealloc.3 \ dwarf_dealloc.3 dwarf_weaks_dealloc.3 \ dwarf_dealloc.3 dwarf_ranges_dealloc.3 \ dwarf_dealloc.3 dwarf_srclines_dealloc.3 \ dwarf_init.3 dwarf_elf_init.3 \ dwarf_dieoffset.3 dwarf_die_CU_offset.3 \ dwarf_dieoffset.3 dwarf_die_CU_offset_range.3 \ dwarf_dieoffset.3 dwarf_get_cu_die_offset_given_cu_header_offset.3 \ dwarf_dieoffset.3 dwarf_get_cu_die_offset_given_cu_header_offset_b.3 \ dwarf_finish.3 dwarf_object_finish.3 \ dwarf_formref.3 dwarf_global_formref.3 \ dwarf_formudata.3 dwarf_formsdata.3 \ dwarf_get_AT_name.3 dwarf_get_ACCESS_name.3 \ dwarf_get_AT_name.3 dwarf_get_ATE_name.3 \ dwarf_get_AT_name.3 dwarf_get_CC_name.3 \ dwarf_get_AT_name.3 dwarf_get_CFA_name.3 \ dwarf_get_AT_name.3 dwarf_get_CHILDREN_name.3 \ dwarf_get_AT_name.3 dwarf_get_DS_name.3 \ dwarf_get_AT_name.3 dwarf_get_DSC_name.3 \ dwarf_get_AT_name.3 dwarf_get_EH_name.3 \ dwarf_get_AT_name.3 dwarf_get_END_name.3 \ dwarf_get_AT_name.3 dwarf_get_FORM_name.3 \ dwarf_get_AT_name.3 dwarf_get_ID_name.3 \ dwarf_get_AT_name.3 dwarf_get_INL_name.3 \ dwarf_get_AT_name.3 dwarf_get_LANG_name.3 \ dwarf_get_AT_name.3 dwarf_get_LNE_name.3 \ dwarf_get_AT_name.3 dwarf_get_LNS_name.3 \ dwarf_get_AT_name.3 dwarf_get_MACINFO_name.3 \ dwarf_get_AT_name.3 dwarf_get_OP_name.3 \ dwarf_get_AT_name.3 dwarf_get_ORD_name.3 \ dwarf_get_AT_name.3 dwarf_get_TAG_name.3 \ dwarf_get_AT_name.3 dwarf_get_VIRTUALITY_name.3 \ dwarf_get_AT_name.3 dwarf_get_VIS_name.3 \ dwarf_get_cu_die_offset.3 dwarf_get_arange_cu_header_offset.3 \ dwarf_get_fde_list.3 dwarf_get_fde_list_eh.3 \ dwarf_get_funcs.3 dwarf_func_die_offset.3 \ dwarf_get_funcs.3 dwarf_func_cu_offset.3 \ dwarf_get_funcs.3 dwarf_func_name_offsets.3 \ dwarf_get_funcs.3 dwarf_funcname.3 \ dwarf_get_globals.3 dwarf_global_die_offset.3 \ dwarf_get_globals.3 dwarf_global_cu_offset.3 \ dwarf_get_globals.3 dwarf_global_name_offsets.3 \ dwarf_get_globals.3 dwarf_globname.3 \ dwarf_get_pubtypes.3 dwarf_pubtype_die_offset.3 \ dwarf_get_pubtypes.3 dwarf_pubtype_cu_offset.3 \ dwarf_get_pubtypes.3 dwarf_pubtype_name_offsets.3 \ dwarf_get_pubtypes.3 dwarf_pubtypename.3 \ dwarf_get_ranges.3 dwarf_get_ranges_a.3 \ dwarf_get_section_max_offsets.3 dwarf_get_section_max_offsets_b.3 \ dwarf_get_types.3 dwarf_type_die_offset.3 \ dwarf_get_types.3 dwarf_type_cu_offset.3 \ dwarf_get_types.3 dwarf_type_name_offsets.3 \ dwarf_get_types.3 dwarf_typename.3 \ dwarf_get_vars.3 dwarf_var_die_offset.3 \ dwarf_get_vars.3 dwarf_var_cu_offset.3 \ dwarf_get_vars.3 dwarf_var_name_offsets.3 \ dwarf_get_vars.3 dwarf_varname.3 \ dwarf_get_weaks.3 dwarf_weak_die_offset.3 \ dwarf_get_weaks.3 dwarf_weak_cu_offset.3 \ dwarf_get_weaks.3 dwarf_weak_name_offsets.3 \ dwarf_get_weaks.3 dwarf_weakname.3 \ dwarf_hasform.3 dwarf_whatform.3 \ dwarf_hasform.3 dwarf_whatform_direct.3 \ dwarf_highpc.3 dwarf_arrayorder.3 \ dwarf_highpc.3 dwarf_bitoffset.3 \ dwarf_highpc.3 dwarf_bitsize.3 \ dwarf_highpc.3 dwarf_bytesize.3 \ dwarf_highpc.3 dwarf_highpc_b.3 \ dwarf_highpc.3 dwarf_lowpc.3 \ dwarf_highpc.3 dwarf_srclang.3 \ dwarf_lineno.3 dwarf_lineaddr.3 \ dwarf_lineno.3 dwarf_linebeginstatement.3 \ dwarf_lineno.3 dwarf_lineblock.3 \ dwarf_lineno.3 dwarf_lineendsequence.3 \ dwarf_lineno.3 dwarf_lineoff.3 \ dwarf_lineno.3 dwarf_linesrc.3 \ dwarf_lineno.3 dwarf_line_srcfileno.3 \ dwarf_loclist.3 dwarf_loclist_n.3 \ dwarf_loclist_from_expr.3 dwarf_loclist_from_expr_a.3 \ dwarf_loclist_from_expr.3 dwarf_loclist_from_expr_b.3 \ dwarf_next_cu_header.3 dwarf_next_cu_header_b.3 \ dwarf_next_cu_header.3 dwarf_next_cu_header_c.3 \ dwarf_producer_init.3 dwarf_producer_init_b.3 \ dwarf_seterrarg.3 dwarf_seterrhand.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_rule_initial_value.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_rule_table_size.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_same_value.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_undefined_value.3 dwarf_pubnames.c: dwarf_nametbl.m4 dwarf_pubnames.m4 dwarf_pubtypes.c: dwarf_nametbl.m4 dwarf_pubtypes.m4 dwarf_weaks.c: dwarf_nametbl.m4 dwarf_weaks.m4 dwarf_funcs.c: dwarf_nametbl.m4 dwarf_funcs.m4 dwarf_vars.c: dwarf_nametbl.m4 dwarf_vars.m4 dwarf_types.c: dwarf_nametbl.m4 dwarf_types.m4 dwarf_pro_pubnames.c: dwarf_pro_nametbl.m4 dwarf_pro_pubnames.m4 dwarf_pro_weaks.c: dwarf_pro_nametbl.m4 dwarf_pro_weaks.m4 dwarf_pro_funcs.c: dwarf_pro_nametbl.m4 dwarf_pro_funcs.m4 dwarf_pro_types.c: dwarf_pro_nametbl.m4 dwarf_pro_types.m4 dwarf_pro_vars.c: dwarf_pro_nametbl.m4 dwarf_pro_vars.m4 .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .m4 .c .m4.c: m4 -D SRCDIR=${SRCDIR} ${M4FLAGS} ${.IMPSRC} > ${.TARGET} Index: stable/11/lib/libelf/Makefile =================================================================== --- stable/11/lib/libelf/Makefile (revision 313537) +++ stable/11/lib/libelf/Makefile (revision 313538) @@ -1,192 +1,192 @@ # $FreeBSD$ PACKAGE=lib${LIB} SHLIBDIR?= /lib .include ELFTCDIR=${SRCTOP}/contrib/elftoolchain SRCDIR= ${ELFTCDIR}/libelf .PATH: ${SRCDIR} LIB= elf SRCS= elf.c \ elf_begin.c \ elf_cntl.c \ elf_end.c elf_errmsg.c elf_errno.c \ elf_data.c \ elf_fill.c \ elf_flag.c \ elf_getarhdr.c \ elf_getarsym.c \ elf_getbase.c \ elf_getident.c \ elf_hash.c \ elf_kind.c \ elf_memory.c \ elf_next.c \ elf_open.c \ elf_rand.c \ elf_rawfile.c \ elf_phnum.c \ elf_shnum.c \ elf_shstrndx.c \ elf_scn.c \ elf_strptr.c \ elf_update.c \ elf_version.c \ gelf_cap.c \ gelf_checksum.c \ gelf_dyn.c \ gelf_ehdr.c \ gelf_getclass.c \ gelf_fsize.c \ gelf_move.c \ gelf_phdr.c \ gelf_rel.c \ gelf_rela.c \ gelf_shdr.c \ gelf_sym.c \ gelf_syminfo.c \ gelf_symshndx.c \ gelf_xlate.c \ libelf_align.c \ libelf_allocate.c \ libelf_ar.c \ libelf_ar_util.c \ libelf_checksum.c \ libelf_data.c \ libelf_ehdr.c \ libelf_extended.c \ libelf_memory.c \ libelf_open.c \ libelf_phdr.c \ libelf_shdr.c \ libelf_xlate.c \ ${GENSRCS} INCS= libelf.h gelf.h # This same hack is in lib/libdwarf/Makefile and usr.bin/readelf/Makefile # We need to link against the correct version of these files. One # solution is to include ../../sys in the include path. This causes # problems when a header file in sys depends on a file in another # part of the tree, e.g. a machine dependent header. # SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h GENSRCS= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES= ${GENSRCS} CLEANDIRS= sys CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common -sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} .NOMETA +sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA mkdir -p ${.OBJDIR}/sys ln -sf ${.ALLSRC} ${.TARGET} SHLIB_MAJOR= 2 MAN= elf.3 \ elf_begin.3 \ elf_cntl.3 \ elf_end.3 \ elf_errmsg.3 \ elf_fill.3 \ elf_flagdata.3 \ elf_getarhdr.3 \ elf_getarsym.3 \ elf_getbase.3 \ elf_getdata.3 \ elf_getident.3 \ elf_getscn.3 \ elf_getphdrnum.3 \ elf_getphnum.3 \ elf_getshdrnum.3 \ elf_getshnum.3 \ elf_getshdrstrndx.3 \ elf_getshstrndx.3 \ elf_hash.3 \ elf_kind.3 \ elf_memory.3 \ elf_next.3 \ elf_open.3 \ elf_rawfile.3 \ elf_rand.3 \ elf_strptr.3 \ elf_update.3 \ elf_version.3 \ gelf.3 \ gelf_checksum.3 \ gelf_fsize.3 \ gelf_getcap.3 \ gelf_getclass.3 \ gelf_getdyn.3 \ gelf_getehdr.3 \ gelf_getmove.3 \ gelf_getphdr.3 \ gelf_getrel.3 \ gelf_getrela.3 \ gelf_getshdr.3 \ gelf_getsym.3 \ gelf_getsyminfo.3 \ gelf_getsymshndx.3 \ gelf_newehdr.3 \ gelf_newphdr.3 \ gelf_update_ehdr.3 \ gelf_xlatetof.3 MLINKS+= \ elf_errmsg.3 elf_errno.3 \ elf_flagdata.3 elf_flagarhdr.3 \ elf_flagdata.3 elf_flagehdr.3 \ elf_flagdata.3 elf_flagelf.3 \ elf_flagdata.3 elf_flagphdr.3 \ elf_flagdata.3 elf_flagscn.3 \ elf_flagdata.3 elf_flagshdr.3 \ elf_getdata.3 elf_newdata.3 \ elf_getdata.3 elf_rawdata.3 \ elf_getscn.3 elf_ndxscn.3 \ elf_getscn.3 elf_newscn.3 \ elf_getscn.3 elf_nextscn.3 \ elf_getshstrndx.3 elf_setshstrndx.3 \ elf_open.3 elf_openmemory.3 \ gelf_getcap.3 gelf_update_cap.3 \ gelf_getdyn.3 gelf_update_dyn.3 \ gelf_getmove.3 gelf_update_move.3 \ gelf_getrel.3 gelf_update_rel.3 \ gelf_getrela.3 gelf_update_rela.3 \ gelf_getsym.3 gelf_update_sym.3 \ gelf_getsyminfo.3 gelf_update_syminfo.3 \ gelf_getsymshndx.3 gelf_update_symshndx.3 \ gelf_update_ehdr.3 gelf_update_phdr.3 \ gelf_update_ehdr.3 gelf_update_shdr.3 \ gelf_xlatetof.3 gelf_xlatetom.3 .for E in 32 64 MLINKS+= \ gelf_checksum.3 elf${E}_checksum.3 \ gelf_fsize.3 elf${E}_fsize.3 \ gelf_getehdr.3 elf${E}_getehdr.3 \ gelf_getphdr.3 elf${E}_getphdr.3 \ gelf_getshdr.3 elf${E}_getshdr.3 \ gelf_newehdr.3 elf${E}_newehdr.3 \ gelf_newphdr.3 elf${E}_newphdr.3 \ gelf_xlatetof.3 elf${E}_xlatetof.3 \ gelf_xlatetof.3 elf${E}_xlatetom.3 .endfor VERSION_MAP= ${SRCDIR}/Version.map libelf_convert.c: elf_types.m4 libelf_convert.m4 libelf_fsize.c: elf_types.m4 libelf_fsize.m4 libelf_msize.c: elf_types.m4 libelf_msize.m4 .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .m4 .c .m4.c: m4 -D SRCDIR=${SRCDIR} ${M4FLAGS} ${.IMPSRC} > ${.TARGET} Index: stable/11/lib/libevent/Makefile =================================================================== --- stable/11/lib/libevent/Makefile (revision 313537) +++ stable/11/lib/libevent/Makefile (revision 313538) @@ -1,31 +1,31 @@ # $FreeBSD$ PACKAGE=lib${LIB} -.PATH: ${.CURDIR}/../../contrib/pf/libevent +.PATH: ${SRCTOP}/contrib/pf/libevent .include LIB= event SHLIB_MAJOR= 1 PRIVATELIB= SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c HDRS= event.h CFLAGS+= -I${.CURDIR} \ -DHAVE_CLOCK_GETTIME \ -DHAVE_FCNTL_H \ -DHAVE_POLL \ -DHAVE_SELECT \ -DHAVE_SETFD \ -DHAVE_STDARG_H \ -DHAVE_SYS_IOCTL_H \ -DHAVE_SYS_TIME_H \ -DHAVE_UNISTD_H \ -DHAVE_VASPRINTF \ -DHAVE_WORKING_KQUEUE \ -DVERSION='"1.3b"' WARNS?= 2 .include Index: stable/11/lib/libexecinfo/Makefile =================================================================== --- stable/11/lib/libexecinfo/Makefile (revision 313537) +++ stable/11/lib/libexecinfo/Makefile (revision 313538) @@ -1,23 +1,23 @@ # $FreeBSD$ PACKAGE=lib${LIB} -LIBEXECINFO= ${.CURDIR}/../../contrib/libexecinfo +LIBEXECINFO= ${SRCTOP}/contrib/libexecinfo LIB= execinfo SHLIB_MAJOR= 1 .PATH: ${LIBEXECINFO} INCS= execinfo.h SRCS= backtrace.c symtab.c unwind.c LIBADD= elf MAN= backtrace.3 MLINKS+= backtrace.3 backtrace_symbols.3 MLINKS+= backtrace.3 backtrace_symbols_fmt.3 MLINKS+= backtrace.3 backtrace_symbols_fd.3 MLINKS+= backtrace.3 backtrace_symbols_fd_fmt.3 .include Index: stable/11/lib/libexpat/Makefile =================================================================== --- stable/11/lib/libexpat/Makefile (revision 313537) +++ stable/11/lib/libexpat/Makefile (revision 313538) @@ -1,34 +1,34 @@ # $FreeBSD$ PACKAGE=lib${LIB} -EXPAT= ${.CURDIR}/../../contrib/expat +EXPAT= ${SRCTOP}/contrib/expat LIB= bsdxml SHLIBDIR?= /lib SHLIB_MAJOR= 4 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h bsdxml_external.h MAN= libbsdxml.3 .PATH: ${EXPAT}/lib CFLAGS+= -I${.CURDIR} -DHAVE_EXPAT_CONFIG_H CLEANFILES= bsdxml.h bsdxml_external.h WARNS?= 2 # OK, so it is not entirely unadulterated: we amend the COPYING to # point people to the right place, get rid of some VMS stuff and use # FreeBSD-style include guards. We also want to point it at the new # bsdxml_external.h rather than the old expat_external.h file. bsdxml.h: expat.h unifdef -U__VMS < ${.ALLSRC} | \ sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \ -e 's/COPYING/src\/contrib\/expat\/COPYING/' \ -e 's/expat_external/bsdxml_external/' \ > ${.TARGET} bsdxml_external.h: expat_external.h ${CP} ${.ALLSRC} ${.TARGET} .include Index: stable/11/lib/libgssapi/Makefile =================================================================== --- stable/11/lib/libgssapi/Makefile (revision 313537) +++ stable/11/lib/libgssapi/Makefile (revision 313538) @@ -1,109 +1,109 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= gssapi SHLIB_MAJOR= 10 -VERSION_DEF= ${.CURDIR}/../libc/Versions.def +VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map SRCS= SRCS+= gss_accept_sec_context.c SRCS+= gss_acquire_cred.c SRCS+= gss_add_cred.c SRCS+= gss_add_oid_set_member.c SRCS+= gss_buffer_set.c SRCS+= gss_canonicalize_name.c SRCS+= gss_compare_name.c SRCS+= gss_context_time.c SRCS+= gss_create_empty_oid_set.c SRCS+= gss_decapsulate_token.c SRCS+= gss_delete_sec_context.c SRCS+= gss_display_name.c SRCS+= gss_display_status.c SRCS+= gss_duplicate_name.c SRCS+= gss_duplicate_oid.c SRCS+= gss_encapsulate_token.c SRCS+= gss_export_name.c SRCS+= gss_export_sec_context.c SRCS+= gss_get_mic.c SRCS+= gss_import_name.c SRCS+= gss_import_sec_context.c SRCS+= gss_indicate_mechs.c SRCS+= gss_init_sec_context.c SRCS+= gss_inquire_context.c SRCS+= gss_inquire_cred.c SRCS+= gss_inquire_cred_by_mech.c SRCS+= gss_inquire_cred_by_oid.c SRCS+= gss_inquire_mechs_for_name.c SRCS+= gss_inquire_names_for_mech.c SRCS+= gss_inquire_sec_context_by_oid.c SRCS+= gss_mech_switch.c SRCS+= gss_names.c SRCS+= gss_oid_to_str.c SRCS+= gss_pname_to_uid.c SRCS+= gss_process_context_token.c SRCS+= gss_pseudo_random.c SRCS+= gss_release_buffer.c SRCS+= gss_release_cred.c SRCS+= gss_release_name.c SRCS+= gss_release_oid.c SRCS+= gss_release_oid_set.c SRCS+= gss_seal.c SRCS+= gss_set_cred_option.c SRCS+= gss_set_sec_context_option.c SRCS+= gss_sign.c SRCS+= gss_test_oid_set_member.c SRCS+= gss_unseal.c SRCS+= gss_unwrap.c SRCS+= gss_utils.c SRCS+= gss_verify.c SRCS+= gss_verify_mic.c SRCS+= gss_wrap.c SRCS+= gss_wrap_size_limit.c MAN= MAN+= gssapi.3 MAN+= gss_accept_sec_context.3 MAN+= gss_acquire_cred.3 MAN+= gss_add_cred.3 MAN+= gss_add_oid_set_member.3 MAN+= gss_canonicalize_name.3 MAN+= gss_compare_name.3 MAN+= gss_context_time.3 MAN+= gss_create_empty_oid_set.3 MAN+= gss_delete_sec_context.3 MAN+= gss_display_name.3 MAN+= gss_display_status.3 MAN+= gss_duplicate_name.3 MAN+= gss_export_name.3 MAN+= gss_export_sec_context.3 MAN+= gss_get_mic.3 MAN+= gss_import_name.3 MAN+= gss_import_sec_context.3 MAN+= gss_indicate_mechs.3 MAN+= gss_init_sec_context.3 MAN+= gss_inquire_context.3 MAN+= gss_inquire_cred.3 MAN+= gss_inquire_cred_by_mech.3 MAN+= gss_inquire_mechs_for_name.3 MAN+= gss_inquire_names_for_mech.3 MAN+= gss_process_context_token.3 MAN+= gss_release_buffer.3 MAN+= gss_release_cred.3 MAN+= gss_release_name.3 MAN+= gss_release_oid_set.3 MAN+= gss_test_oid_set_member.3 MAN+= gss_unwrap.3 MAN+= gss_verify_mic.3 MAN+= gss_wrap.3 MAN+= gss_wrap_size_limit.3 MAN+= mech.5 MLINKS= MLINKS+= gss_get_mic.3 gss_sign.3 MLINKS+= gss_unwrap.3 gss_unseal.3 MLINKS+= gss_verify_mic.3 gss_verify.3 MLINKS+= gss_wrap.3 gss_seal.3 MLINKS+= mech.5 qop.5 .include Index: stable/11/lib/libiconv_modules/Makefile.inc =================================================================== --- stable/11/lib/libiconv_modules/Makefile.inc (revision 313537) +++ stable/11/lib/libiconv_modules/Makefile.inc (revision 313538) @@ -1,17 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../libc/iconv +.PATH: ${SRCTOP}/lib/libc/iconv SHLIB_MAJOR= 4 WARNS?= 6 -CFLAGS+= -I${.CURDIR}/../../libc/iconv +CFLAGS+= -I${SRCTOP}/lib/libc/iconv CFLAGS+= -Dbool=_Bool .if !defined(COMPAT_32BIT) SHLIBDIR= /usr/lib/i18n .else SHLIBDIR= /usr/lib32/i18n .endif LIBDIR= ${SHLIBDIR} MK_PROFILE= no Index: stable/11/lib/libiconv_modules/mapper_parallel/Makefile =================================================================== --- stable/11/lib/libiconv_modules/mapper_parallel/Makefile (revision 313537) +++ stable/11/lib/libiconv_modules/mapper_parallel/Makefile (revision 313538) @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../mapper_serial +.PATH: ${.CURDIR:H}/mapper_serial SHLIB= mapper_parallel SRCS+= citrus_mapper_serial.c CFLAGS.gcc+= --param max-inline-insns-single=32 .include Index: stable/11/lib/libkiconv/Makefile =================================================================== --- stable/11/lib/libkiconv/Makefile (revision 313537) +++ stable/11/lib/libkiconv/Makefile (revision 313538) @@ -1,28 +1,28 @@ # $FreeBSD$ SHLIBDIR?= /lib .include PACKAGE=lib${LIB} LIB= kiconv SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c SRCS+= quirks.c SHLIB_MAJOR= 4 MAN= kiconv.3 MLINKS+= kiconv.3 kiconv_add_xlat16_cspair.3 \ kiconv.3 kiconv_add_xlat16_cspairs.3 \ kiconv.3 kiconv_add_xlat16_table.3 -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS+= -I${SRCTOP}/sys WARNS?= 1 .if ${MK_ICONV} == "no" CFLAGS+= -DICONV_DLOPEN .endif .include Index: stable/11/lib/libldns/Makefile =================================================================== --- stable/11/lib/libldns/Makefile (revision 313537) +++ stable/11/lib/libldns/Makefile (revision 313538) @@ -1,26 +1,26 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR = ${.CURDIR}/../../contrib/ldns +LDNSDIR = ${SRCTOP}/contrib/ldns PACKAGE=lib${LIB} .PATH: ${LDNSDIR} ${LDNSDIR}/compat LIB= ldns PRIVATELIB= true CFLAGS+= -I${LDNSDIR} SRCS= buffer.c dane.c dname.c dnssec.c dnssec_sign.c dnssec_verify.c \ dnssec_zone.c duration.c error.c higher.c host2str.c host2wire.c \ keys.c net.c packet.c parse.c radix.c rbtree.c rdata.c resolver.c \ rr.c rr_functions.c sha1.c sha2.c str2host.c tsig.c update.c util.c \ wire2host.c zone.c SRCS+= b64_ntop.c b64_pton.c LIBADD= crypto WARNS ?= 3 .include Index: stable/11/lib/liblzma/Makefile =================================================================== --- stable/11/lib/liblzma/Makefile (revision 313537) +++ stable/11/lib/liblzma/Makefile (revision 313538) @@ -1,171 +1,171 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= lzma -LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma +LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma -.PATH: ${LZMADIR}/../common +.PATH: ${LZMADIR:H}/common SRCS+= tuklib_physmem.c tuklib_cpucores.c .PATH: ${LZMADIR}/api/lzma MAININCS= ../lzma.h MAININCSDIR= ${INCLUDEDIR} LZMAINCS+= base.h \ bcj.h \ block.h \ check.h \ container.h \ delta.h \ filter.h \ hardware.h \ index.h \ index_hash.h \ lzma12.h \ stream_flags.h \ version.h \ vli.h LZMAINCSDIR= ${INCLUDEDIR}/lzma INCSGROUPS= MAININCS LZMAINCS .PATH: ${LZMADIR}/common SRCS+= common.c \ block_util.c \ easy_preset.c \ filter_common.c \ hardware_physmem.c \ hardware_cputhreads.c \ index.c \ stream_flags_common.c \ vli_size.c \ alone_encoder.c \ block_buffer_encoder.c \ block_encoder.c \ block_header_encoder.c \ easy_buffer_encoder.c \ easy_encoder.c \ easy_encoder_memusage.c \ filter_buffer_encoder.c \ filter_encoder.c \ filter_flags_encoder.c \ index_encoder.c \ stream_buffer_encoder.c \ stream_encoder.c \ stream_flags_encoder.c \ vli_encoder.c \ alone_decoder.c \ auto_decoder.c \ block_buffer_decoder.c \ block_decoder.c \ block_header_decoder.c \ easy_decoder_memusage.c \ filter_buffer_decoder.c \ filter_decoder.c \ filter_flags_decoder.c \ index_decoder.c \ index_hash.c \ stream_buffer_decoder.c \ stream_decoder.c \ stream_flags_decoder.c \ stream_encoder_mt.c \ vli_decoder.c \ outqueue.c .PATH: ${LZMADIR}/check SRCS+= check.c \ crc32_table.c \ crc64_table.c \ sha256.c .if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386" SRCS+= crc32_x86.S \ crc64_x86.S ACFLAGS+= -Wa,--noexecstack .else SRCS+= crc32_fast.c \ crc64_fast.c .endif .PATH: ${LZMADIR}/lz SRCS+= lz_encoder.c \ lz_encoder_mf.c \ lz_decoder.c .PATH: ${LZMADIR}/lzma SRCS+= lzma_encoder.c \ lzma_encoder_presets.c \ lzma_encoder_optimum_fast.c \ lzma_encoder_optimum_normal.c \ fastpos_table.c \ lzma_decoder.c \ lzma2_encoder.c \ lzma2_decoder.c .PATH: ${LZMADIR}/rangecoder SRCS+= price_table.c .PATH: ${LZMADIR}/delta SRCS+= delta_common.c \ delta_encoder.c \ delta_decoder.c .PATH: ${LZMADIR}/simple SRCS+= simple_coder.c \ simple_encoder.c \ simple_decoder.c \ x86.c \ powerpc.c \ ia64.c \ arm.c \ armthumb.c \ sparc.c .PATH: ${LZMADIR} VERSION_MAJOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MAJOR" {print $$3 } ' \ ${LZMADIR}/api/lzma/version.h VERSION_MINOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MINOR" {print $$3 } ' \ ${LZMADIR}/api/lzma/version.h VERSION_PATCH!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_PATCH" {print $$3 } ' \ ${LZMADIR}/api/lzma/version.h WARNS?= 3 CFLAGS+= -DHAVE_CONFIG_H \ -DTUKLIB_SYMBOL_PREFIX=lzma_ \ -I${.CURDIR} \ -I${LZMADIR}/api \ -I${LZMADIR}/common \ -I${LZMADIR}/check \ -I${LZMADIR}/lz \ -I${LZMADIR}/rangecoder \ -I${LZMADIR}/lzma \ -I${LZMADIR}/delta \ -I${LZMADIR}/simple \ - -I${LZMADIR}/../common + -I${LZMADIR:H}/common LIBADD+= pthread VERSION_DEF= ${.CURDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map CFLAGS+= -DSYMBOL_VERSIONING CLEANFILES+= liblzma.pc FILES= liblzma.pc FILESDIR= ${LIBDATADIR}/pkgconfig liblzma.pc: liblzma.pc.in sed -e 's,@prefix@,/usr,g ; \ s,@exec_prefix@,/usr,g ; \ s,@libdir@,/usr/lib,g ; \ s,@includedir@,/usr/include,g ; \ s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \ s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \ s,@PTHREAD_CFLAGS@,,g ; \ s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET} .include Index: stable/11/lib/libmagic/Makefile =================================================================== --- stable/11/lib/libmagic/Makefile (revision 313537) +++ stable/11/lib/libmagic/Makefile (revision 313538) @@ -1,63 +1,63 @@ # $FreeBSD$ # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009 PACKAGE=lib${LIB} -CONTRDIR= ${.CURDIR}/../../contrib/file +CONTRDIR= ${SRCTOP}/contrib/file .PATH: ${CONTRDIR}/src .PATH: ${CONTRDIR}/doc LIB= magic SHLIB_MAJOR= 4 LIBADD= z MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ der.c encoding.c fsmagic.c funcs.c \ is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c INCS= magic.h MAGICPATH?= /usr/share/misc CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${CONTRDIR}/src WARNS?= 3 CLEANFILES+= magic magic.mgc FILES= magic magic.mgc FILESDIR= ${MAGICPATH} MAGFILES= ${CONTRDIR}/magic/Header \ ${CONTRDIR}/magic/Localstuff \ ${CONTRDIR}/magic/Magdir/[a-z]* magic: ${MAGFILES} cat ${.ALLSRC:O} > ${.TARGET} magic.mgc: mkmagic magic ${BTOOLSPATH:U.}/mkmagic magic CLEANFILES+= mkmagic build-tools: mkmagic mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META} ${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} \ ${LDADD} FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h CLEANFILES+= ${MAN} .for mp in ${MAN} ${mp}: ${mp:C/[0-9]/man/} sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \ -e 's/__VERSION__/${FILEVER}/g' \ -e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET} .endfor CLEANFILES+= ${INCS} .for inc in ${INCS} ${inc}: ${inc}.in sed -e 's,X.YY,${FILEVER:S,",,g:S,.,,g},g' ${.ALLSRC} > ${.TARGET} .endfor .include Index: stable/11/lib/libmd/Makefile =================================================================== --- stable/11/lib/libmd/Makefile (revision 313537) +++ stable/11/lib/libmd/Makefile (revision 313538) @@ -1,385 +1,385 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= md SHLIB_MAJOR= 6 SHLIBDIR?= /lib SRCS= md4c.c md5c.c md4hl.c md5hl.c \ rmd160c.c rmd160hl.c \ sha0c.c sha0hl.c sha1c.c sha1hl.c \ sha256c.c sha256hl.c \ sha384hl.c \ sha512c.c sha512hl.c sha512thl.c \ skein.c skein_block.c \ skein256hl.c skein512hl.c skein1024hl.c INCS= md4.h md5.h ripemd.h sha.h sha256.h sha384.h sha512.h sha512t.h \ skein.h skein_port.h skein_freebsd.h skein_iv.h WARNS?= 0 MAN+= md4.3 md5.3 ripemd.3 sha.3 sha256.3 sha512.3 skein.3 MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3 MLINKS+=md4.3 MD4End.3 md4.3 MD4File.3 md4.3 MD4FileChunk.3 MLINKS+=md4.3 MD4Data.3 MLINKS+=md5.3 MD5Init.3 md5.3 MD5Update.3 md5.3 MD5Final.3 MLINKS+=md5.3 MD5End.3 md5.3 MD5File.3 md5.3 MD5FileChunk.3 MLINKS+=md5.3 MD5Data.3 MLINKS+=ripemd.3 RIPEMD160_Init.3 ripemd.3 RIPEMD160_Update.3 MLINKS+=ripemd.3 RIPEMD160_Final.3 ripemd.3 RIPEMD160_Data.3 MLINKS+=ripemd.3 RIPEMD160_End.3 ripemd.3 RIPEMD160_File.3 MLINKS+=ripemd.3 RIPEMD160_FileChunk.3 MLINKS+=sha.3 SHA_Init.3 sha.3 SHA_Update.3 sha.3 SHA_Final.3 MLINKS+=sha.3 SHA_End.3 sha.3 SHA_File.3 sha.3 SHA_FileChunk.3 MLINKS+=sha.3 SHA_Data.3 MLINKS+=sha.3 SHA1_Init.3 sha.3 SHA1_Update.3 sha.3 SHA1_Final.3 MLINKS+=sha.3 SHA1_End.3 sha.3 SHA1_File.3 sha.3 SHA1_FileChunk.3 MLINKS+=sha.3 SHA1_Data.3 MLINKS+=sha256.3 SHA256_Init.3 sha256.3 SHA256_Update.3 MLINKS+=sha256.3 SHA256_Final.3 sha256.3 SHA256_End.3 MLINKS+=sha256.3 SHA256_File.3 sha256.3 SHA256_FileChunk.3 MLINKS+=sha256.3 SHA256_Data.3 MLINKS+=sha512.3 SHA384_Init.3 sha512.3 SHA384_Update.3 MLINKS+=sha512.3 SHA384_Final.3 sha512.3 SHA384_End.3 MLINKS+=sha512.3 SHA384_File.3 sha512.3 SHA384_FileChunk.3 MLINKS+=sha512.3 SHA384_Data.3 sha512.3 sha384.3 MLINKS+=sha512.3 SHA512_Init.3 sha512.3 SHA512_Update.3 MLINKS+=sha512.3 SHA512_Final.3 sha512.3 SHA512_End.3 MLINKS+=sha512.3 SHA512_File.3 sha512.3 SHA512_FileChunk.3 MLINKS+=sha512.3 SHA512_Data.3 MLINKS+=sha512.3 SHA512_256_Init.3 sha512.3 SHA512_256_Update.3 MLINKS+=sha512.3 SHA512_256_Final.3 sha512.3 SHA512_256_End.3 MLINKS+=sha512.3 SHA512_256_File.3 sha512.3 SHA512_256_FileChunk.3 MLINKS+=sha512.3 SHA512_256_Data.3 MLINKS+=skein.3 SKEIN256_Init.3 skein.3 SKEIN256_Update.3 MLINKS+=skein.3 SKEIN256_Final.3 skein.3 SKEIN256_End.3 MLINKS+=skein.3 SKEIN256_File.3 skein.3 SKEIN256_FileChunk.3 MLINKS+=skein.3 SKEIN256_Data.3 skein.3 skein256.3 MLINKS+=skein.3 SKEIN512_Init.3 skein.3 SKEIN512_Update.3 MLINKS+=skein.3 SKEIN512_Final.3 skein.3 SKEIN512_End.3 MLINKS+=skein.3 SKEIN512_File.3 skein.3 SKEIN512_FileChunk.3 MLINKS+=skein.3 SKEIN512_Data.3 skein.3 skein512.3 MLINKS+=skein.3 SKEIN1024_Init.3 skein.3 SKEIN1024_Update.3 MLINKS+=skein.3 SKEIN1024_Final.3 skein.3 SKEIN1024_End.3 MLINKS+=skein.3 SKEIN1024_File.3 skein.3 SKEIN1024_FileChunk.3 MLINKS+=skein.3 SKEIN1024_Data.3 skein.3 skein1024.3 CLEANFILES+= md[245]hl.c md[245].ref md[245].3 mddriver \ rmd160.ref rmd160hl.c rmddriver \ sha0.ref sha0hl.c sha1.ref sha1hl.c shadriver \ sha256.ref sha256hl.c sha384hl.c sha384.ref \ sha512.ref sha512hl.c sha512t256.ref sha512thl.c \ skein256hl.c skein512hl.c skein1024hl.c \ skein256.ref skein512.ref skein1024.ref \ skeindriver # Define WEAK_REFS to provide weak aliases for libmd symbols # # Note that the same sources are also used internally by libcrypt, # in which case: # * macros are used to rename symbols to libcrypt internal names # * no weak aliases are generated -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys/crypto/sha2 -CFLAGS+= -I${.CURDIR}/../../sys/crypto/skein +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/crypto/sha2 +CFLAGS+= -I${SRCTOP}/sys/crypto/skein CFLAGS+= -DWEAK_REFS -.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2 -.PATH: ${.CURDIR}/../../sys/crypto/skein ${.CURDIR}/../../sys/crypto/skein/${MACHINE_ARCH} +.PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2 +.PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} .if exists(${MACHINE_ARCH}/sha.S) SRCS+= sha.S CFLAGS+= -DSHA1_ASM .endif .if exists(${MACHINE_ARCH}/rmd160.S) SRCS+= rmd160.S CFLAGS+= -DRMD160_ASM .endif .if exists(${MACHINE_ARCH}/skein_block_asm.s) SRCS+= skein_block_asm.s CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 .endif .if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || exists(${MACHINE_ARCH}/skein_block_asm.s) ACFLAGS+= -DELF -Wa,--noexecstack .endif md4hl.c: mdXhl.c (echo '#define LENGTH 16'; \ sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' ${.ALLSRC}) > ${.TARGET} md5hl.c: mdXhl.c (echo '#define LENGTH 16'; \ sed -e 's/mdX/md5/g' -e 's/MDX/MD5/g' ${.ALLSRC}) > ${.TARGET} sha0hl.c: mdXhl.c (echo '#define LENGTH 20'; \ sed -e 's/mdX/sha/g' -e 's/MDX/SHA_/g' -e 's/SHA__/SHA_/g' \ ${.ALLSRC}) > ${.TARGET} sha1hl.c: mdXhl.c (echo '#define LENGTH 20'; \ sed -e 's/mdX/sha/g' -e 's/MDX/SHA1_/g' -e 's/SHA1__/SHA1_/g' \ ${.ALLSRC}) > ${.TARGET} sha256hl.c: mdXhl.c (echo '#define LENGTH 32'; \ sed -e 's/mdX/sha256/g' -e 's/MDX/SHA256_/g' \ -e 's/SHA256__/SHA256_/g' \ ${.ALLSRC}) > ${.TARGET} sha384hl.c: mdXhl.c (echo '#define LENGTH 48'; \ sed -e 's/mdX/sha384/g' -e 's/MDX/SHA384_/g' \ -e 's/SHA384__/SHA384_/g' \ ${.ALLSRC}) > ${.TARGET} sha512hl.c: mdXhl.c (echo '#define LENGTH 64'; \ sed -e 's/mdX/sha512/g' -e 's/MDX/SHA512_/g' \ -e 's/SHA512__/SHA512_/g' \ ${.ALLSRC}) > ${.TARGET} sha512thl.c: mdXhl.c (echo '#define LENGTH 32'; \ sed -e 's/mdX/sha512t/g' -e 's/MDX/SHA512_256_/g' \ -e 's/SHA512_256__/SHA512_256_/g' \ -e 's/SHA512_256_CTX/SHA512_CTX/g' \ ${.ALLSRC}) > ${.TARGET} rmd160hl.c: mdXhl.c (echo '#define LENGTH 20'; \ sed -e 's/mdX/ripemd/g' -e 's/MDX/RIPEMD160_/g' \ -e 's/RIPEMD160__/RIPEMD160_/g' \ ${.ALLSRC}) > ${.TARGET} skein256hl.c: mdXhl.c (echo '#define LENGTH 32'; \ sed -e 's/mdX/skein/g' -e 's/MDX/SKEIN256_/g' \ -e 's/SKEIN256__/SKEIN256_/g' \ ${.ALLSRC}) > ${.TARGET} skein512hl.c: mdXhl.c (echo '#define LENGTH 64'; \ sed -e 's/mdX/skein/g' -e 's/MDX/SKEIN512_/g' \ -e 's/SKEIN512__/SKEIN512_/g' \ ${.ALLSRC}) > ${.TARGET} skein1024hl.c: mdXhl.c (echo '#define LENGTH 128'; \ sed -e 's/mdX/skein/g' -e 's/MDX/SKEIN1024_/g' \ -e 's/SKEIN1024__/SKEIN1024_/g' \ ${.ALLSRC}) > ${.TARGET} .for i in 2 4 5 md${i}.3: ${.CURDIR}/mdX.3 sed -e "s/mdX/md${i}/g" -e "s/MDX/MD${i}/g" ${.ALLSRC} > ${.TARGET} cat ${.CURDIR}/md${i}.copyright >> ${.TARGET} .endfor md4.ref: echo 'MD4 test suite:' > ${.TARGET} @echo 'MD4 ("") = 31d6cfe0d16ae931b73c59d7e0c089c0' >> ${.TARGET} @echo 'MD4 ("a") = bde52cb31de33e46245e05fbdbd6fb24' >> ${.TARGET} @echo 'MD4 ("abc") = a448017aaf21d8525fc10ae87aa6729d' >> ${.TARGET} @echo 'MD4 ("message digest") = d9130a8164549fe818874806e1c7014b' >> ${.TARGET} @echo 'MD4 ("abcdefghijklmnopqrstuvwxyz") = d79e1c308aa5bbcdeea8ed63df412da9' >> ${.TARGET} @echo 'MD4 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ '043f8582f241db351ce627e153e7f0e4' >> ${.TARGET} @echo 'MD4 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ 'e33b4ddc9c38f2199c3e7b164fcc0536' >> ${.TARGET} md5.ref: echo 'MD5 test suite:' > ${.TARGET} @echo 'MD5 ("") = d41d8cd98f00b204e9800998ecf8427e' >> ${.TARGET} @echo 'MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661' >> ${.TARGET} @echo 'MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72' >> ${.TARGET} @echo 'MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0' >> ${.TARGET} @echo 'MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b' >> ${.TARGET} @echo 'MD5 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") = d174ab98d277d9f5a5611c2c9f419d9f' >> ${.TARGET} @echo 'MD5 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") = 57edf4a22be3c955ac49da2e2107b67a' >> ${.TARGET} sha0.ref: echo 'SHA-0 test suite:' > ${.TARGET} @echo 'SHA-0 ("") = f96cea198ad1dd5617ac084a3d92c6107708c0ef' >> ${.TARGET} @echo 'SHA-0 ("abc") = 0164b8a914cd2a5e74c4f7ff082c4d97f1edf880' >> ${.TARGET} @echo 'SHA-0 ("message digest") =' \ 'c1b0f222d150ebb9aa36a40cafdc8bcbed830b14' >> ${.TARGET} @echo 'SHA-0 ("abcdefghijklmnopqrstuvwxyz") =' \ 'b40ce07a430cfd3c033039b9fe9afec95dc1bdcd' >> ${.TARGET} @echo 'SHA-0 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ '79e966f7a3a990df33e40e3d7f8f18d2caebadfa' >> ${.TARGET} @echo 'SHA-0 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '4aa29d14d171522ece47bee8957e35a41f3e9cff' >> ${.TARGET} sha1.ref: echo 'SHA-1 test suite:' > ${.TARGET} @echo 'SHA-1 ("") = da39a3ee5e6b4b0d3255bfef95601890afd80709' >> ${.TARGET} @echo 'SHA-1 ("abc") = a9993e364706816aba3e25717850c26c9cd0d89d' >> ${.TARGET} @echo 'SHA-1 ("message digest") =' \ 'c12252ceda8be8994d5fa0290a47231c1d16aae3' >> ${.TARGET} @echo 'SHA-1 ("abcdefghijklmnopqrstuvwxyz") =' \ '32d10c7b8cf96570ca04ce37f2a19d84240d3a89' >> ${.TARGET} @echo 'SHA-1 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ '761c457bf73b14d27e9e9265c46f4b4dda11f940' >> ${.TARGET} @echo 'SHA-1 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '50abf5706a150990a08b2c5ea40fa0e585554732' >> ${.TARGET} sha256.ref: echo 'SHA-256 test suite:' > ${.TARGET} @echo 'SHA-256 ("") = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' >> ${.TARGET} @echo 'SHA-256 ("abc") =' \ 'ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad' >> ${.TARGET} @echo 'SHA-256 ("message digest") =' \ 'f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650' >> ${.TARGET} @echo 'SHA-256 ("abcdefghijklmnopqrstuvwxyz") =' \ '71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73' >> ${.TARGET} @echo 'SHA-256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ 'db4bfcbd4da0cd85a60c3c37d3fbd8805c77f15fc6b1fdfe614ee0a7c8fdb4c0' >> ${.TARGET} @echo 'SHA-256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ 'f371bc4a311f2b009eef952dd83ca80e2b60026c8e935592d0f9c308453c813e' >> ${.TARGET} sha384.ref: echo 'SHA-384 test suite:' > ${.TARGET} @echo 'SHA-384 ("") =' \ '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b' >> ${.TARGET} @echo 'SHA-384 ("abc") =' \ 'cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7' >> ${.TARGET} @echo 'SHA-384 ("message digest") =' \ '473ed35167ec1f5d8e550368a3db39be54639f828868e9454c239fc8b52e3c61dbd0d8b4de1390c256dcbb5d5fd99cd5' >> ${.TARGET} @echo 'SHA-384 ("abcdefghijklmnopqrstuvwxyz") =' \ 'feb67349df3db6f5924815d6c3dc133f091809213731fe5c7b5f4999e463479ff2877f5f2936fa63bb43784b12f3ebb4' >> ${.TARGET} @echo 'SHA-384 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ '1761336e3f7cbfe51deb137f026f89e01a448e3b1fafa64039c1464ee8732f11a5341a6f41e0c202294736ed64db1a84' >> ${.TARGET} @echo 'SHA-384 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ 'b12932b0627d1c060942f5447764155655bd4da0c9afa6dd9b9ef53129af1b8fb0195996d2de9ca0df9d821ffee67026' >> ${.TARGET} sha512.ref: echo 'SHA-512 test suite:' > ${.TARGET} @echo 'SHA-512 ("") =' \ 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e' >> ${.TARGET} @echo 'SHA-512 ("abc") =' \ 'ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f' >> ${.TARGET} @echo 'SHA-512 ("message digest") =' \ '107dbf389d9e9f71a3a95f6c055b9251bc5268c2be16d6c13492ea45b0199f3309e16455ab1e96118e8a905d5597b72038ddb372a89826046de66687bb420e7c' >> ${.TARGET} @echo 'SHA-512 ("abcdefghijklmnopqrstuvwxyz") =' \ '4dbff86cc2ca1bae1e16468a05cb9881c97f1753bce3619034898faa1aabe429955a1bf8ec483d7421fe3c1646613a59ed5441fb0f321389f77f48a879c7b1f1' >> ${.TARGET} @echo 'SHA-512 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ '1e07be23c26a86ea37ea810c8ec7809352515a970e9253c26f536cfc7a9996c45c8370583e0a78fa4a90041d71a4ceab7423f19c71b9d5a3e01249f0bebd5894' >> ${.TARGET} @echo 'SHA-512 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '72ec1ef1124a45b047e8b7c75a932195135bb61de24ec0d1914042246e0aec3a2354e093d76f3048b456764346900cb130d2a4fd5dd16abb5e30bcb850dee843' >> ${.TARGET} sha512t256.ref: echo 'SHA-512256 test suite:' > ${.TARGET} @echo 'SHA-512256 ("") =' \ 'c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a' >> ${.TARGET} @echo 'SHA-512256 ("abc") =' \ '53048e2681941ef99b2e29b76b4c7dabe4c2d0c634fc6d46e0e2f13107e7af23' >> ${.TARGET} @echo 'SHA-512256 ("message digest") =' \ '0cf471fd17ed69d990daf3433c89b16d63dec1bb9cb42a6094604ee5d7b4e9fb' >> ${.TARGET} @echo 'SHA-512256 ("abcdefghijklmnopqrstuvwxyz") =' \ 'fc3189443f9c268f626aea08a756abe7b726b05f701cb08222312ccfd6710a26' >> ${.TARGET} @echo 'SHA-512256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ 'cdf1cc0effe26ecc0c13758f7b4a48e000615df241284185c39eb05d355bb9c8' >> ${.TARGET} @echo 'SHA-512256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '2c9fdbc0c90bdd87612ee8455474f9044850241dc105b1e8b94b8ddf5fac9148' >> ${.TARGET} rmd160.ref: echo 'RIPEMD160 test suite:' > ${.TARGET} @echo 'RIPEMD160 ("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31' >> ${.TARGET} @echo 'RIPEMD160 ("abc") = 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc' >> ${.TARGET} @echo 'RIPEMD160 ("message digest") =' \ '5d0689ef49d2fae572b881b123a85ffa21595f36' >> ${.TARGET} @echo 'RIPEMD160 ("abcdefghijklmnopqrstuvwxyz") =' \ 'f71c27109c692c1b56bbdceb5b9d2865b3708dbc' >> ${.TARGET} @echo 'RIPEMD160 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ 'b0e20b6e3116640286ed3a87a5713079b21f5189' >> ${.TARGET} @echo 'RIPEMD160 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '9b752e45573d4b39f4dbd3323cab82bf63326bfb' >> ${.TARGET} skein256.ref: echo 'SKEIN256 test suite:' > ${.TARGET} @echo 'SKEIN256 ("") = c8877087da56e072870daa843f176e9453115929094c3a40c463a196c29bf7ba' >> ${.TARGET} @echo 'SKEIN256 ("abc") = 258bdec343b9fde1639221a5ae0144a96e552e5288753c5fec76c05fc2fc1870' >> ${.TARGET} @echo 'SKEIN256 ("message digest") =' \ '4d2ce0062b5eb3a4db95bc1117dd8aa014f6cd50fdc8e64f31f7d41f9231e488' >> ${.TARGET} @echo 'SKEIN256 ("abcdefghijklmnopqrstuvwxyz") =' \ '46d8440685461b00e3ddb891b2ecc6855287d2bd8834a95fb1c1708b00ea5e82' >> ${.TARGET} @echo 'SKEIN256 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ '7c5eb606389556b33d34eb2536459528dc0af97adbcd0ce273aeb650f598d4b2' >> ${.TARGET} @echo 'SKEIN256 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '4def7a7e5464a140ae9c3a80279fbebce4bd00f9faad819ab7e001512f67a10d' >> ${.TARGET} skein512.ref: echo 'SKEIN512 test suite:' > ${.TARGET} @echo 'SKEIN512 ("") =' \ 'bc5b4c50925519c290cc634277ae3d6257212395cba733bbad37a4af0fa06af41fca7903d06564fea7a2d3730dbdb80c1f85562dfcc070334ea4d1d9e72cba7a' >> ${.TARGET} @echo 'SKEIN512 ("abc") =' \ '8f5dd9ec798152668e35129496b029a960c9a9b88662f7f9482f110b31f9f93893ecfb25c009baad9e46737197d5630379816a886aa05526d3a70df272d96e75' >> ${.TARGET} @echo 'SKEIN512 ("message digest") =' \ '15b73c158ffb875fed4d72801ded0794c720b121c0c78edf45f900937e6933d9e21a3a984206933d504b5dbb2368000411477ee1b204c986068df77886542fcc' >> ${.TARGET} @echo 'SKEIN512 ("abcdefghijklmnopqrstuvwxyz") =' \ '23793ad900ef12f9165c8080da6fdfd2c8354a2929b8aadf83aa82a3c6470342f57cf8c035ec0d97429b626c4d94f28632c8f5134fd367dca5cf293d2ec13f8c' >> ${.TARGET} @echo 'SKEIN512 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ '0c6bed927e022f5ddcf81877d42e5f75798a9f8fd3ede3d83baac0a2f364b082e036c11af35fe478745459dd8f5c0b73efe3c56ba5bb2009208d5a29cc6e469c' >> ${.TARGET} @echo 'SKEIN512 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ '2ca9fcffb3456f297d1b5f407014ecb856f0baac8eb540f534b1f187196f21e88f31103128c2f03fcc9857d7a58eb66f9525e2302d88833ee069295537a434ce' >> ${.TARGET} skein1024.ref: echo 'SKEIN1024 test suite:' > ${.TARGET} @echo 'SKEIN1024 ("") =' \ '0fff9563bb3279289227ac77d319b6fff8d7e9f09da1247b72a0a265cd6d2a62645ad547ed8193db48cff847c06494a03f55666d3b47eb4c20456c9373c86297d630d5578ebd34cb40991578f9f52b18003efa35d3da6553ff35db91b81ab890bec1b189b7f52cb2a783ebb7d823d725b0b4a71f6824e88f68f982eefc6d19c6' >> ${.TARGET} @echo 'SKEIN1024 ("abc") =' \ '35a599a0f91abcdb4cb73c19b8cb8d947742d82c309137a7caed29e8e0a2ca7a9ff9a90c34c1908cc7e7fd99bb15032fb86e76df21b72628399b5f7c3cc209d7bb31c99cd4e19465622a049afbb87c03b5ce3888d17e6e667279ec0aa9b3e2712624c01b5f5bbe1a564220bdcf6990af0c2539019f313fdd7406cca3892a1f1f' >> ${.TARGET} @echo 'SKEIN1024 ("message digest") =' \ 'ea891f5268acd0fac97467fc1aa89d1ce8681a9992a42540e53babee861483110c2d16f49e73bac27653ff173003e40cfb08516cd34262e6af95a5d8645c9c1abb3e813604d508b8511b30f9a5c1b352aa0791c7d2f27b2706dccea54bc7de6555b5202351751c3299f97c09cf89c40f67187e2521c0fad82b30edbb224f0458' >> ${.TARGET} @echo 'SKEIN1024 ("abcdefghijklmnopqrstuvwxyz") =' \ 'f23d95c2a25fbcd0e797cd058fec39d3c52d2b5afd7a9af1df934e63257d1d3dcf3246e7329c0f1104c1e51e3d22e300507b0c3b9f985bb1f645ef49835080536becf83788e17fed09c9982ba65c3cb7ffe6a5f745b911c506962adf226e435c42f6f6bc08d288f9c810e807e3216ef444f3db22744441deefa4900982a1371f' >> ${.TARGET} @echo 'SKEIN1024 ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") =' \ 'cf3889e8a8d11bfd3938055d7d061437962bc5eac8ae83b1b71c94be201b8cf657fdbfc38674997a008c0c903f56a23feb3ae30e012377f1cfa080a9ca7fe8b96138662653fb3335c7d06595bf8baf65e215307532094cfdfa056bd8052ab792a3944a2adaa47b30335b8badb8fe9eb94fe329cdca04e58bbc530f0af709f469' >> ${.TARGET} @echo 'SKEIN1024 ("12345678901234567890123456789012345678901234567890123456789012345678901234567890") =' \ 'cf21a613620e6c119eca31fdfaad449a8e02f95ca256c21d2a105f8e4157048f9fe1e897893ea18b64e0e37cb07d5ac947f27ba544caf7cbc1ad094e675aed77a366270f7eb7f46543bccfa61c526fd628408058ed00ed566ac35a9761d002e629c4fb0d430b2f4ad016fcc49c44d2981c4002da0eecc42144160e2eaea4855a' >> ${.TARGET} test: md4.ref md5.ref sha0.ref rmd160.ref sha1.ref sha256.ref sha384.ref \ sha512.ref sha512t256.ref skein256.ref skein512.ref skein1024.ref @${ECHO} if any of these test fail, the code produces wrong results @${ECHO} and should NOT be used. ${CC} ${CFLAGS} ${LDFLAGS} -DMD=4 -o mddriver ${.CURDIR}/mddriver.c libmd.a ./mddriver | cmp md4.ref - @${ECHO} MD4 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DMD=5 -o mddriver ${.CURDIR}/mddriver.c libmd.a ./mddriver | cmp md5.ref - @${ECHO} MD5 passed test -rm -f mddriver ${CC} ${CFLAGS} ${LDFLAGS} -o rmddriver ${.CURDIR}/rmddriver.c libmd.a ./rmddriver | cmp rmd160.ref - @${ECHO} RIPEMD160 passed test -rm -f rmddriver ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=0 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha0.ref - @${ECHO} SHA-0 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=1 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha1.ref - @${ECHO} SHA-1 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=256 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha256.ref - @${ECHO} SHA-256 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=384 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha384.ref - @${ECHO} SHA-384 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha512.ref - @${ECHO} SHA-512 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=512256 -o shadriver ${.CURDIR}/shadriver.c libmd.a ./shadriver | cmp sha512t256.ref - @${ECHO} SHA-512t256 passed test -rm -f shadriver ${CC} ${CFLAGS} ${LDFLAGS} -DSKEIN=256 -o skeindriver ${.CURDIR}/skeindriver.c libmd.a ./skeindriver | cmp skein256.ref - @${ECHO} SKEIN256 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSKEIN=512 -o skeindriver ${.CURDIR}/skeindriver.c libmd.a ./skeindriver | cmp skein512.ref - @${ECHO} SKEIN512 passed test ${CC} ${CFLAGS} ${LDFLAGS} -DSKEIN=1024 -o skeindriver ${.CURDIR}/skeindriver.c libmd.a ./skeindriver | cmp skein1024.ref - @${ECHO} SKEIN1024 passed test -rm -f skeindriver .include Index: stable/11/lib/libmilter/Makefile =================================================================== --- stable/11/lib/libmilter/Makefile (revision 313537) +++ stable/11/lib/libmilter/Makefile (revision 313538) @@ -1,36 +1,36 @@ # $FreeBSD$ .include PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNOT_SENDMAIL -Dsm_snprintf=snprintf CFLAGS+=-D_THREAD_SAFE CFLAGS+=-DSM_CONF_POLL .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DNETINET6 .endif # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} INCSDIR=${INCLUDEDIR}/libmilter INCS= ${SENDMAIL_DIR}/include/libmilter/mfapi.h \ ${SENDMAIL_DIR}/include/libmilter/mfdef.h LIB= milter SRCS+= sm_os.h SRCS+= main.c engine.c listener.c handler.c comm.c monitor.c smfi.c \ signal.c sm_gethost.c errstring.c strl.c worker.c CLEANFILES+=sm_os.h WARNS?= 0 sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .include Index: stable/11/lib/libmp/Makefile =================================================================== --- stable/11/lib/libmp/Makefile (revision 313537) +++ stable/11/lib/libmp/Makefile (revision 313538) @@ -1,22 +1,22 @@ # $FreeBSD$ .include PACKAGE=lib${LIB} LIB= mp SHLIB_MAJOR= 7 LIBADD= crypto MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c -CFLAGS+= -I${.CURDIR}/../../crypto +CFLAGS+= -I${SRCTOP}/crypto -VERSION_DEF= ${.CURDIR}/../libc/Versions.def +VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libngatm/Makefile =================================================================== --- stable/11/lib/libngatm/Makefile (revision 313537) +++ stable/11/lib/libngatm/Makefile (revision 313538) @@ -1,54 +1,54 @@ # $FreeBSD$ # # Author: Harti Brandt # PACKAGE=lib${LIB} LIB= ngatm SHLIB_MAJOR= 4 MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3 # source of the library lives in contrib -SDIR= ${.CURDIR}/../../sys -CTRB= ${.CURDIR}/../../contrib/ngatm +SDIR= ${SRCTOP}/sys +CTRB= ${SRCTOP}/contrib/ngatm LIBBASE= ${SDIR}/contrib/ngatm CFLAGS+= -I${LIBBASE} -I${.OBJDIR} -I${CTRB}/libngatm # CFLAGS+= -DSSCOP_DEBUG -DSSCFU_DEBUG -DUNI_DEBUG -DCCATM_DEBUG .PATH: ${LIBBASE}/netnatm ${LIBBASE}/netnatm/saal ${LIBBASE}/netnatm/misc \ ${LIBBASE}/netnatm/msg ${LIBBASE}/netnatm/sig ${LIBBASE}/netnatm/api .PATH: ${CTRB}/libngatm ${CTRB}/man SRCS= unimsg.c unimsg_common.c straddr.c \ traffic.c uni_ie.c uni_msg.c \ saal_sscop.c saal_sscfu.c \ sig_call.c sig_coord.c sig_party.c sig_print.c sig_reset.c \ sig_uni.c sig_unimsgcpy.c sig_verify.c \ cc_conn.c cc_user.c cc_sig.c cc_data.c cc_port.c unisap.c \ cc_dump.c # Includes INCSGROUPS= INCSATM INCSSAAL INCSMSG INCSSIG INCSAPI # common files INCSATMDIR= $(INCLUDEDIR)/netnatm INCSATM= unimsg.h addr.h # signaling AAL INCSSAALDIR= $(INCLUDEDIR)/netnatm/saal INCSSAAL= saal/sscfu.h saal/sscfudef.h saal/sscop.h saal/sscopdef.h # message parsing INCSMSGDIR= $(INCLUDEDIR)/netnatm/msg INCSMSG= msg/uni_config.h msg/uni_hdr.h msg/uni_ie.h msg/uni_msg.h \ msg/unimsglib.h msg/uniprint.h msg/unistruct.h # signaling layer INCSSIGDIR= $(INCLUDEDIR)/netnatm/sig INCSSIG= sig/uni.h sig/unidef.h sig/unisig.h # call control layer INCSAPIDIR= $(INCLUDEDIR)/netnatm/api INCSAPI= api/atmapi.h api/ccatm.h api/unisap.h .include Index: stable/11/lib/libnv/Makefile =================================================================== --- stable/11/lib/libnv/Makefile (revision 313537) +++ stable/11/lib/libnv/Makefile (revision 313538) @@ -1,23 +1,23 @@ # $FreeBSD$ PACKAGE=lib${LIB} SHLIBDIR?= /lib .include LIB= nv SHLIB_MAJOR= 0 -.PATH: ${.CURDIR}/../../sys/contrib/libnv ${.CURDIR}/../../sys/sys -CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR} +.PATH: ${SRCTOP}/sys/contrib/libnv ${SRCTOP}/sys/sys +CFLAGS+=-I${SRCTOP}/sys -I${.CURDIR} SRCS= dnvlist.c SRCS+= msgio.c SRCS+= nvlist.c SRCS+= nvpair.c .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libopie/Makefile =================================================================== --- stable/11/lib/libopie/Makefile (revision 313537) +++ stable/11/lib/libopie/Makefile (revision 313538) @@ -1,37 +1,37 @@ # Makefile for libopie # # $FreeBSD$ # PACKAGE=lib${LIB} -OPIE_DIST?= ${.CURDIR}/../../contrib/opie +OPIE_DIST?= ${SRCTOP}/contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} SHLIB_MAJOR= 8 KEYFILE?= \"/etc/opiekeys\" .PATH: ${DIST_DIR} LIB= opie SRCS= atob8.c btoa8.c btoh.c challenge.c getsequence.c hash.c hashlen.c \ keycrunch.c lock.c lookup.c newseed.c parsechallenge.c passcheck.c \ passwd.c randomchallenge.c readpass.c unlock.c verify.c version.c \ btoe.c accessfile.c generator.c insecure.c getutmpentry.c \ readrec.c writerec.c open.c SRCS+= opieextra.c INCS= ${OPIE_DIST}/opie.h CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \ -DKEY_FILE=${KEYFILE} ACCESSFILE?= \"/etc/opieaccess\" CFLAGS+= -DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE} WARNS?= 0 LIBADD= md MAN= ${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5 MLINKS= opie.4 skey.4 .include Index: stable/11/lib/libpam/libpam/Makefile =================================================================== --- stable/11/lib/libpam/libpam/Makefile (revision 313537) +++ stable/11/lib/libpam/libpam/Makefile (revision 313538) @@ -1,187 +1,187 @@ #- # Copyright (c) 1998 Juniper Networks, Inc. # All rights reserved. # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # # Portions of this software was developed for the FreeBSD Project by # ThinkSec AS and NAI Labs, the Security Research Division of Network # Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 # ("CBOSS"), as part of the DARPA CHATS research program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # 3. The name of the author may not be used to endorse or promote # products derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ PACKAGE=lib${LIB} -OPENPAM= ${.CURDIR}/../../../contrib/openpam +OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man # static_libpam will build libpam.a .if !defined(LIB) SHLIB= pam .endif MK_PROFILE=no SRCS= openpam_asprintf.c \ openpam_borrow_cred.c \ openpam_check_owner_perms.c \ openpam_configure.c \ openpam_constants.c \ openpam_dispatch.c \ openpam_dynamic.c \ openpam_features.c \ openpam_findenv.c \ openpam_free_data.c \ openpam_free_envlist.c \ openpam_get_feature.c \ openpam_get_option.c \ openpam_load.c \ openpam_log.c \ openpam_nullconv.c \ openpam_readline.c \ openpam_readlinev.c \ openpam_readword.c \ openpam_restore_cred.c \ openpam_set_feature.c \ openpam_set_option.c \ openpam_straddch.c \ openpam_strlcat.c \ openpam_strlcpy.c \ openpam_strlset.c \ openpam_subst.c \ openpam_ttyconv.c \ openpam_vasprintf.c \ pam_acct_mgmt.c \ pam_authenticate.c \ pam_chauthtok.c \ pam_close_session.c \ pam_end.c \ pam_error.c \ pam_get_authtok.c \ pam_get_data.c \ pam_get_item.c \ pam_get_user.c \ pam_getenv.c \ pam_getenvlist.c \ pam_info.c \ pam_open_session.c \ pam_prompt.c \ pam_putenv.c \ pam_set_data.c \ pam_set_item.c \ pam_setcred.c \ pam_setenv.c \ pam_start.c \ pam_strerror.c \ pam_verror.c \ pam_vinfo.c \ pam_vprompt.c MAN?= openpam.3 \ openpam_borrow_cred.3 \ openpam_free_data.3 \ openpam_free_envlist.3 \ openpam_get_feature.3 \ openpam_get_option.3 \ openpam_log.3 \ openpam_nullconv.3 \ openpam_readline.3 \ openpam_readlinev.3 \ openpam_readword.3 \ openpam_restore_cred.3 \ openpam_set_feature.3 \ openpam_set_option.3 \ openpam_straddch.3 \ openpam_subst.3 \ openpam_ttyconv.3 \ pam.3 \ pam_acct_mgmt.3 \ pam_authenticate.3 \ pam_chauthtok.3 \ pam_close_session.3 \ pam_conv.3 \ pam_end.3 \ pam_error.3 \ pam_get_authtok.3 \ pam_get_data.3 \ pam_get_item.3 \ pam_get_user.3 \ pam_getenv.3 \ pam_getenvlist.3 \ pam_info.3 \ pam_open_session.3 \ pam_prompt.3 \ pam_putenv.3 \ pam_set_data.3 \ pam_set_item.3 \ pam_setcred.3 \ pam_setenv.3 \ pam_sm_acct_mgmt.3 \ pam_sm_authenticate.3 \ pam_sm_chauthtok.3 \ pam_sm_close_session.3 \ pam_sm_open_session.3 \ pam_sm_setcred.3 \ pam_start.3 \ pam_strerror.3 \ pam_verror.3 \ pam_vinfo.3 \ pam_vprompt.3 \ pam.conf.5 MLINKS?= pam.conf.5 pam.d.5 CSTD?= c99 CFLAGS+= -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} CFLAGS+= -DHAVE_DLFUNC=1 CFLAGS+= -DHAVE_FDLOPEN=1 CFLAGS+= -DHAVE_FPURGE=1 CFLAGS+= -DHAVE_STRLCAT=1 CFLAGS+= -DHAVE_STRLCPY=1 HEADERS= security/openpam.h \ security/openpam_attr.h \ security/openpam_version.h \ security/pam_appl.h \ security/pam_constants.h \ security/pam_modules.h \ security/pam_types.h \ ADD_HEADERS= security/pam_mod_misc.h # Headers INCS?= ${HEADERS} ${ADD_HEADERS} INCSDIR= ${INCLUDEDIR}/security .include .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libpam/modules/Makefile.inc =================================================================== --- stable/11/lib/libpam/modules/Makefile.inc (revision 313537) +++ stable/11/lib/libpam/modules/Makefile.inc (revision 313538) @@ -1,13 +1,13 @@ # $FreeBSD$ -PAMDIR= ${.CURDIR}/../../../../contrib/openpam +PAMDIR= ${SRCTOP}/contrib/openpam MK_INSTALLLIB= no MK_PROFILE= no -CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam +CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} LIBADD+= pam .include "../Makefile.inc" Index: stable/11/lib/libpam/modules/pam_passwdqc/Makefile =================================================================== --- stable/11/lib/libpam/modules/pam_passwdqc/Makefile (revision 313537) +++ stable/11/lib/libpam/modules/pam_passwdqc/Makefile (revision 313538) @@ -1,16 +1,16 @@ # $FreeBSD$ -SRCDIR= ${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc +SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} LIB= pam_passwdqc SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c MAN= pam_passwdqc.8 WARNS?= 2 CFLAGS+= -I${SRCDIR} LIBADD+= crypt .include Index: stable/11/lib/libpam/modules/pam_ssh/Makefile =================================================================== --- stable/11/lib/libpam/modules/pam_ssh/Makefile (revision 313537) +++ stable/11/lib/libpam/modules/pam_ssh/Makefile (revision 313538) @@ -1,19 +1,19 @@ # PAM module for SSH # $FreeBSD$ -SSHDIR= ${.CURDIR}/../../../../crypto/openssh +SSHDIR= ${SRCTOP}/crypto/openssh LIB= pam_ssh MAN= pam_ssh.8 SRCS= pam_ssh.c PACKAGE= ssh WARNS?= 5 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h LIBADD= ssh .include .PATH: ${SSHDIR} Index: stable/11/lib/libpam/static_libpam/Makefile =================================================================== --- stable/11/lib/libpam/static_libpam/Makefile (revision 313537) +++ stable/11/lib/libpam/static_libpam/Makefile (revision 313538) @@ -1,69 +1,69 @@ #- # Copyright (c) 1998-2015 Juniper Networks, Inc. # All rights reserved. # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # # Portions of this software was developed for the FreeBSD Project by # ThinkSec AS and NAI Labs, the Security Research Division of Network # Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 # ("CBOSS"), as part of the DARPA CHATS research program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # 3. The name of the author may not be used to endorse or promote # products derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ -.PATH: ${.CURDIR}/../libpam +.PATH: ${SRCTOP}/lib/libpam # Only build the static library. LIB= pam NO_PIC= # Avoid redundancy with the master Makefile. MAN= INCS= MLINKS= MK_TESTS= no # # Static modules # # We build static versions of all modules and of openpam_static.o, # then link them all together into openpam_static_modules.o. None of # the modules export any symbols, but they store structures with # pointers to their service functions in a linker set which the code # in openpam_static.c traverses to locate the individual modules. # MODULE_DIR= ../modules .include "${.CURDIR}/${MODULE_DIR}/modules.inc" STATIC_MODULES= ${MODULES:C/.*/${MODULE_DIR}\/&\/lib&.a/} STATICOBJS+= openpam_static_modules.o CLEANFILES+= openpam_static.o \ openpam_static_modules.o openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC} -.include "${.CURDIR}/../libpam/Makefile" +.include "${.CURDIR:H}/libpam/Makefile" Index: stable/11/lib/libpcap/Makefile =================================================================== --- stable/11/lib/libpcap/Makefile (revision 313537) +++ stable/11/lib/libpcap/Makefile (revision 313538) @@ -1,148 +1,148 @@ # Makefile for libpcap # $FreeBSD$ SHLIBDIR?= /lib .include PACKAGE=lib${LIB} LIB= pcap SRCS= grammar.y tokdefs.h version.h pcap-bpf.c \ pcap-netmap.c \ pcap.c pcap-common.c inet.c fad-getad.c gencode.c optimize.c nametoaddr.c \ etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \ scanner.l sf-pcap.c sf-pcap-ng.c version.c # Old compatibility headers INCS= pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h PCAPINCS= pcap/pcap.h pcap/namedb.h pcap/bpf.h PCAPINCSDIR= ${INCLUDEDIR}/pcap INCSGROUPS= INCS PCAPINCS MAN= pcap.3 \ pcap_activate.3 \ pcap_breakloop.3 \ pcap_can_set_rfmon.3 \ pcap_close.3 \ pcap_compile.3 \ pcap_create.3 \ pcap_datalink.3 \ pcap_datalink_name_to_val.3 \ pcap_datalink_val_to_name.3 \ pcap_dump.3 \ pcap_dump_close.3 \ pcap_dump_file.3 \ pcap_dump_flush.3 \ pcap_dump_ftell.3 \ pcap_dump_open.3 \ pcap_file.3 \ pcap_fileno.3 \ pcap_findalldevs.3 \ pcap_freecode.3 \ pcap_get_selectable_fd.3 \ pcap_get_tstamp_precision.3 \ pcap_geterr.3 \ pcap_inject.3 \ pcap_is_swapped.3 \ pcap_lib_version.3 \ pcap_list_datalinks.3 \ pcap_list_tstamp_types.3 \ pcap_lookupdev.3 \ pcap_lookupnet.3 \ pcap_loop.3 \ pcap_major_version.3 \ pcap_next_ex.3 \ pcap_offline_filter.3 \ pcap_open_dead.3 \ pcap_open_live.3 \ pcap_open_offline.3 \ pcap_set_buffer_size.3 \ pcap_set_datalink.3 \ pcap_set_immediate_mode.3 \ pcap_set_promisc.3 \ pcap_set_rfmon.3 \ pcap_set_snaplen.3 \ pcap_set_timeout.3 \ pcap_set_tstamp_precision.3 \ pcap_set_tstamp_type.3 \ pcap_setdirection.3 \ pcap_setfilter.3 \ pcap_setnonblock.3 \ pcap_snapshot.3 \ pcap_stats.3 \ pcap_statustostr.3 \ pcap_strerror.3 \ pcap-savefile.5 \ pcap_tstamp_type_name_to_val.3 \ pcap_tstamp_type_val_to_name.3 \ pcap-filter.7 \ pcap-linktype.7 MLINKS= pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \ pcap_dump_open.3 pcap_dump_fopen.3 \ pcap_findalldevs.3 pcap_freealldevs.3 \ pcap_geterr.3 pcap_perror.3 \ pcap_inject.3 pcap_sendpacket.3 \ pcap_list_datalinks.3 pcap_free_datalinks.3 \ pcap_list_tstamp_types.3 pcap_free_tstamp_types.3 \ pcap_loop.3 pcap_dispatch.3 \ pcap_major_version.3 pcap_minor_version.3 \ pcap_next_ex.3 pcap_next.3 \ pcap_open_offline.3 pcap_fopen_offline.3 \ pcap_setnonblock.3 pcap_getnonblock.3 # Our man pages are a special copy from the distdir. See below. CLEANFILES+=${MAN} CLEANFILES+=tokdefs.h version.h version.c YFLAGS+=-p pcapyy LFLAGS+=-Ppcapyy CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcapyylval -I${.CURDIR} -I. CFLAGS+=-D_U_="__attribute__((unused))" CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif .if ${MK_PF} != "no" CFLAGS+=-DHAVE_NET_PFVAR_H .endif WARNS?= 0 SHLIB_MAJOR= 8 # # Magic to grab sources out of src/contrib # -PCAP_DISTDIR?=${.CURDIR}/../../contrib/libpcap +PCAP_DISTDIR?=${SRCTOP}/contrib/libpcap CFLAGS+=-I${PCAP_DISTDIR} .PATH: ${PCAP_DISTDIR} .PATH: ${PCAP_DISTDIR}/bpf/net version.c: ${PCAP_DISTDIR}/VERSION @rm -f $@ sed 's/.*/char pcap_version[] = "&";/' ${PCAP_DISTDIR}/VERSION > $@ version.h: ${PCAP_DISTDIR}/VERSION @rm -f $@ sed 's/.*/char pcap_version_string[] = "libpcap version &";/' ${PCAP_DISTDIR}/VERSION > $@ tokdefs.h: grammar.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} # # Magic to convert the man pages to something non Solarish # .for _page in ${MAN} ${_page}: if [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap/} ]; then \ F=${_page:S/3$/3pcap/}; \ elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile/} ]; then \ F=${_page:S/5$/manfile/}; \ else \ F=${_page:S/7$/manmisc/}; \ fi; \ sed -e 's/3PCAP/3/g' ${PCAP_DISTDIR}/$$F > ${_page} .endfor .include Index: stable/11/lib/libpe/Makefile =================================================================== --- stable/11/lib/libpe/Makefile (revision 313537) +++ stable/11/lib/libpe/Makefile (revision 313538) @@ -1,34 +1,34 @@ # $FreeBSD$ .include INTERNALLIB= -ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +ELFTCDIR= ${SRCTOP}/contrib/elftoolchain .PATH: ${ELFTCDIR}/libpe LIB= pe SRCS= libpe_buffer.c \ libpe_coff.c \ libpe_dos.c \ libpe_init.c \ libpe_rich.c \ libpe_section.c \ libpe_utils.c \ pe_buffer.c \ pe_cntl.c \ pe_coff.c \ pe_dos.c \ pe_flag.c \ pe_init.c \ pe_rich.c \ pe_section.c \ pe_symtab.c \ pe_update.c CFLAGS+=-I${ELFTCDIR}/libpe -I${ELFTCDIR}/common MAN= .include Index: stable/11/lib/libproc/Makefile =================================================================== --- stable/11/lib/libproc/Makefile (revision 313537) +++ stable/11/lib/libproc/Makefile (revision 313538) @@ -1,47 +1,47 @@ # $FreeBSD$ .include PACKAGE=lib${LIB} LIB= proc SRCS= proc_bkpt.c \ proc_create.c \ proc_regs.c \ proc_sym.c \ proc_rtld.c \ proc_util.c INCS= libproc.h CFLAGS+= -I${.CURDIR} .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE .elif ${MK_LIBCPLUSPLUS} != "no" LIBADD+= cxxrt .else LIBADD+= supcplusplus .endif LIBADD+= elf rtld_db util .if ${MK_CDDL} != "no" LIBADD+= ctf IGNORE_PRAGMA= YES -CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \ - -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \ - -I${.CURDIR}/../../sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \ + -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \ + -I${SRCTOP}/sys/cddl/compat/opensolaris .else CFLAGS+= -DNO_CTF .endif SHLIB_MAJOR= 3 MAN= .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libprocstat/zfs/Makefile =================================================================== --- stable/11/lib/libprocstat/zfs/Makefile (revision 313537) +++ stable/11/lib/libprocstat/zfs/Makefile (revision 313538) @@ -1,24 +1,24 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR:H} SRCS= zfs.c OBJS= zfs.o WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/.. +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${.CURDIR:H} CFLAGS+= -DNEED_SOLARIS_BOOLEAN all: ${OBJS} CLEANFILES= ${OBJS} .include Index: stable/11/lib/librpcsec_gss/Makefile =================================================================== --- stable/11/lib/librpcsec_gss/Makefile (revision 313537) +++ stable/11/lib/librpcsec_gss/Makefile (revision 313538) @@ -1,38 +1,38 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= rpcsec_gss SHLIB_MAJOR= 1 SRCS+= rpcsec_gss.c rpcsec_gss_prot.c rpcsec_gss_conf.c rpcsec_gss_misc.c \ svc_rpcsec_gss.c LIBADD= gssapi -VERSION_DEF= ${.CURDIR}/../libc/Versions.def +VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map -CFLAGS+= -I${.CURDIR}/../../include -CFLAGS+= -I${.CURDIR}/../../libc_rpc +CFLAGS+= -I${SRCTOP}/include +CFLAGS+= -I${SRCTOP}/lib/libc_rpc MK_PROFILE= no MAN= rpcsec_gss.3 MAN+= rpc_gss_seccreate.3 MAN+= rpc_gss_set_defaults.3 MAN+= rpc_gss_max_data_length.3 MAN+= rpc_gss_get_error.3 MAN+= rpc_gss_mech_to_oid.3 MAN+= rpc_gss_oid_to_mech.3 MAN+= rpc_gss_qop_to_num.3 MAN+= rpc_gss_get_mechanisms.3 MAN+= rpc_gss_get_mech_info.3 MAN+= rpc_gss_get_versions.3 MAN+= rpc_gss_is_installed.3 MAN+= rpc_gss_set_svc_name.3 MAN+= rpc_gss_getcred.3 MAN+= rpc_gss_set_callback.3 MAN+= rpc_gss_get_principal_name.3 MAN+= rpc_gss_svc_max_data_length.3 .include Index: stable/11/lib/librpcsvc/Makefile =================================================================== --- stable/11/lib/librpcsvc/Makefile (revision 313537) +++ stable/11/lib/librpcsvc/Makefile (revision 313538) @@ -1,43 +1,43 @@ # from: @(#)Makefile 5.10 (Berkeley) 6/24/90 # $FreeBSD$ .include -.PATH: ${.CURDIR}/../../include/rpcsvc +.PATH: ${SRCTOP}/include/rpcsvc PACKAGE=lib${LIB} LIB= rpcsvc RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \ rquota.x rstat.x rwall.x sm_inter.x spray.x yppasswd.x ypxfrd.x \ ypupdate_prot.x OTHERSRCS= rnusers.c rstat.c rwall.c SECRPCSRCS= secretkey.c xcrypt.c .if ${MK_NIS} != "no" OTHERSRCS+= yp_passwd.c yp_update.c .endif RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C INCDIRS= -I${DESTDIR}/usr/include/rpcsvc CFLAGS+= -DYP ${INCDIRS} GENSRCS= ${RPCSRCS:R:S/$/_xdr.c/g} SRCS+= ${GENSRCS} ${OTHERSRCS} ${SECRPCSRCS} CLEANFILES+= ${GENSRCS} WARNS?= 1 .include .SUFFIXES: .x _xdr.c .x_xdr.c: ${RPCCOM} -c ${.IMPSRC} -o ${.TARGET} OBJS= ${RPCSRCS:R:S/$/_xdr.o/g} ${SECRPCSRCS:R:S/$/.o/g} \ ${OTHERSRCS:R:S/$/.o/g} Index: stable/11/lib/librt/Makefile =================================================================== --- stable/11/lib/librt/Makefile (revision 313537) +++ stable/11/lib/librt/Makefile (revision 313538) @@ -1,28 +1,28 @@ # $FreeBSD$ .include PACKAGE=lib${LIB} LIB=rt SHLIB_MAJOR= 1 -CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR} +CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR} .ifndef NO_THREAD_STACK_UNWIND CFLAGS+=-fexceptions .endif CFLAGS+=-Winline -Wall LIBADD= pthread WARNS?= 2 SRCS+= aio.c mq.c sigev_thread.c timer.c PRECIOUSLIB= -VERSION_DEF=${.CURDIR}/../libc/Versions.def +VERSION_DEF=${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS=${.CURDIR}/Symbol.map .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libsbuf/Makefile =================================================================== --- stable/11/lib/libsbuf/Makefile (revision 313537) +++ stable/11/lib/libsbuf/Makefile (revision 313538) @@ -1,15 +1,15 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= sbuf SHLIBDIR?= /lib SRCS= subr_prf.c subr_sbuf.c SHLIB_MAJOR = 6 SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_DEF= ${.CURDIR}/Version.def -.PATH: ${.CURDIR}/../../sys/kern +.PATH: ${SRCTOP}/sys/kern .include Index: stable/11/lib/libsm/Makefile =================================================================== --- stable/11/lib/libsm/Makefile (revision 313537) +++ stable/11/lib/libsm/Makefile (revision 313538) @@ -1,43 +1,43 @@ # $FreeBSD$ .include PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsm CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL CFLAGS+=-DHAVE_NANOSLEEP .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DNETINET6 .endif # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} WARNS?= 2 LIB= sm SRCS+= sm_os.h SRCS+= assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \ strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c \ fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c \ fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c \ fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c \ smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c \ vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c \ wbuf.c wsetup.c string.c stringf.c \ xtrap.c strto.c test.c strcasecmp.c strrevcmp.c \ signal.c clock.c config.c sem.c shm.c mbdb.c strexit.c cf.c ldap.c \ niprop.c mpeix.c memstat.c util.c inet6_ntop.c CLEANFILES+=sm_os.h INTERNALLIB= sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .include Index: stable/11/lib/libsmb/Makefile =================================================================== --- stable/11/lib/libsmb/Makefile (revision 313537) +++ stable/11/lib/libsmb/Makefile (revision 313538) @@ -1,25 +1,25 @@ # $FreeBSD$ .include PACKAGE=lib${LIB} -CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs +CONTRIBDIR= ${SRCTOP}/contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb LIB= smb SHLIB_MAJOR= 4 LIBADD= kiconv SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c \ kiconv.c \ nb.c nb_name.c nb_net.c nbns_rq.c WARNS?= 1 CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 .endif .include Index: stable/11/lib/libsmdb/Makefile =================================================================== --- stable/11/lib/libsmdb/Makefile (revision 313537) +++ stable/11/lib/libsmdb/Makefile (revision 313538) @@ -1,26 +1,26 @@ # $FreeBSD$ PACKAGE=lib${LIB} -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmdb CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNOT_SENDMAIL # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} WARNS?= 3 LIB= smdb SRCS+= sm_os.h SRCS+= smdb.c smdb1.c smdb2.c smndbm.c CLEANFILES+=sm_os.h INTERNALLIB= sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .include Index: stable/11/lib/libsmutil/Makefile =================================================================== --- stable/11/lib/libsmutil/Makefile (revision 313537) +++ stable/11/lib/libsmutil/Makefile (revision 313538) @@ -1,26 +1,26 @@ # $FreeBSD$ PACKAGE=lib${LIB} -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmutil CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} WARNS?= 2 LIB= smutil SRCS+= sm_os.h SRCS+= debug.c err.c lockfile.c safefile.c snprintf.c cf.c CLEANFILES+=sm_os.h INTERNALLIB= sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .include Index: stable/11/lib/libsqlite3/Makefile =================================================================== --- stable/11/lib/libsqlite3/Makefile (revision 313537) +++ stable/11/lib/libsqlite3/Makefile (revision 313538) @@ -1,40 +1,40 @@ # $FreeBSD$ PACKAGE=lib${LIB} PRIVATELIB= yes LIB= sqlite3 SHLIB_MAJOR?= 0 LIBADD+= pthread SRCS= sqlite3.c -SQLITE= ${.CURDIR}/../../contrib/sqlite3 +SQLITE= ${SRCTOP}/contrib/sqlite3 .PATH: ${SQLITE} WARNS= 3 CFLAGS+= -I${SQLITE} \ -DUSE_PREAD=1 \ -DSTDC_HEADERS=1 \ -DHAVE_SYS_TYPES_H=1 \ -DHAVE_SYS_STAT_H=1 \ -DHAVE_STDLIB_H=1 \ -DHAVE_STRING_H=1 \ -DHAVE_MEMORY_H=1 \ -DHAVE_STRINGS_H=1 \ -DHAVE_INTTYPES_H=1 \ -DHAVE_STDINT_H=1 \ -DHAVE_UNISTD_H=1 \ -DHAVE_DLFCN_H=1 \ -DHAVE_USLEEP=1 \ -DHAVE_LOCALTIME_R=1 \ -DHAVE_GMTIME_R=1 \ -DHAVE_DECL_STRERROR_R=1 \ -DHAVE_STRERROR_R=1 \ -DHAVE_POSIX_FALLOCATE=1 \ -D_REENTRANT=1 \ -DSQLITE_THREADSAFE=1 \ -DSQLITE_ENABLE_FTS3 \ -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_RTREE .include Index: stable/11/lib/libstdthreads/Makefile =================================================================== --- stable/11/lib/libstdthreads/Makefile (revision 313537) +++ stable/11/lib/libstdthreads/Makefile (revision 313538) @@ -1,41 +1,41 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= stdthreads SHLIB_MAJOR= 0 INCS= threads.h SRCS= threads.h call_once.c cnd.c mtx.c thrd.c tss.c MAN= thrd_create.3 MLINKS= thrd_create.3 call_once.3 \ thrd_create.3 cnd_broadcast.3 \ thrd_create.3 cnd_destroy.3 \ thrd_create.3 cnd_init.3 \ thrd_create.3 cnd_signal.3 \ thrd_create.3 cnd_timedwait.3 \ thrd_create.3 cnd_wait.3 \ thrd_create.3 mtx_destroy.3 \ thrd_create.3 mtx_init.3 \ thrd_create.3 mtx_lock.3 \ thrd_create.3 mtx_timedlock.3 \ thrd_create.3 mtx_trylock.3 \ thrd_create.3 mtx_unlock.3 \ thrd_create.3 thrd_current.3 \ thrd_create.3 thrd_detach.3 \ thrd_create.3 thrd_equal.3 \ thrd_create.3 thrd_exit.3 \ thrd_create.3 thrd_join.3 \ thrd_create.3 thrd_sleep.3 \ thrd_create.3 thrd_yield.3 \ thrd_create.3 tss_create.3 \ thrd_create.3 tss_delete.3 \ thrd_create.3 tss_get.3 \ thrd_create.3 tss_set.3 LIBADD= pthread -VERSION_DEF= ${.CURDIR}/../libc/Versions.def +VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map .include Index: stable/11/lib/libsysdecode/Makefile =================================================================== --- stable/11/lib/libsysdecode/Makefile (revision 313537) +++ stable/11/lib/libsysdecode/Makefile (revision 313538) @@ -1,128 +1,128 @@ # $FreeBSD$ .include PACKAGE=lib${LIB} LIB= sysdecode SRCS= errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c INCS= sysdecode.h CFLAGS+= -I${.OBJDIR} -CFLAGS+= -I${.CURDIR}/../../sys -CFLAGS+= -I${.CURDIR}/../../libexec/rtld-elf +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/libexec/rtld-elf MAN= sysdecode.3 \ sysdecode_abi_to_freebsd_errno.3 \ sysdecode_cap_rights.3 \ sysdecode_enum.3 \ sysdecode_fcntl_arg.3 \ sysdecode_ioctlname.3 \ sysdecode_mask.3 \ sysdecode_quotactl_cmd.3 \ sysdecode_sigcode.3 \ sysdecode_sockopt_name.3 \ sysdecode_syscallnames.3 \ sysdecode_utrace.3 MLINKS= sysdecode_abi_to_freebsd_errno.3 sysdecode_freebsd_to_abi_errno.3 MLINKS+=sysdecode_enum.3 sysdecode_acltype.3 \ sysdecode_enum.3 sysdecode_atfd.3 \ sysdecode_enum.3 sysdecode_extattrnamespace.3 \ sysdecode_enum.3 sysdecode_fadvice.3 \ sysdecode_enum.3 sysdecode_fcntl_cmd.3 \ sysdecode_enum.3 sysdecode_getfsstat_mode.3 \ sysdecode_enum.3 sysdecode_idtype.3 \ sysdecode_enum.3 sysdecode_ipproto.3 \ sysdecode_enum.3 sysdecode_kldsym_cmd.3 \ sysdecode_enum.3 sysdecode_kldunload_flags.3 \ sysdecode_enum.3 sysdecode_lio_listio_mode.3 \ sysdecode_enum.3 sysdecode_madvice.3 \ sysdecode_enum.3 sysdecode_minherit_flags.3 \ sysdecode_enum.3 sysdecode_msgctl_cmd.3 \ sysdecode_enum.3 sysdecode_nfssvc_flags.3 \ sysdecode_enum.3 sysdecode_prio_which.3 \ sysdecode_enum.3 sysdecode_procctl_cmd.3 \ sysdecode_enum.3 sysdecode_ptrace_request.3 \ sysdecode_enum.3 sysdecode_rlimit.3 \ sysdecode_enum.3 sysdecode_rtprio_function.3 \ sysdecode_enum.3 sysdecode_scheduler_policy.3 \ sysdecode_enum.3 sysdecode_semctl_cmd.3 \ sysdecode_enum.3 sysdecode_shmctl_cmd.3 \ sysdecode_enum.3 sysdecode_shutdown_how.3 \ sysdecode_enum.3 sysdecode_sigbus_code.3 \ sysdecode_enum.3 sysdecode_sigchld_code.3 \ sysdecode_enum.3 sysdecode_sigfpe_code.3 \ sysdecode_enum.3 sysdecode_sigill_code.3 \ sysdecode_enum.3 sysdecode_signal.3 \ sysdecode_enum.3 sysdecode_sigprocmask_how.3 \ sysdecode_enum.3 sysdecode_sigsegv_code.3 \ sysdecode_enum.3 sysdecode_sigtrap_code.3 \ sysdecode_enum.3 sysdecode_sockaddr_family.3 \ sysdecode_enum.3 sysdecode_socketdomain.3 \ sysdecode_enum.3 sysdecode_sockettype.3 \ sysdecode_enum.3 sysdecode_sockopt_level.3 \ sysdecode_enum.3 sysdecode_umtx_op.3 \ sysdecode_enum.3 sysdecode_vmresult.3 \ sysdecode_enum.3 sysdecode_whence.3 MLINKS+=sysdecode_fcntl_arg.3 sysdecode_fcntl_arg_p.3 MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \ sysdecode_mask.3 sysdecode_capfcntlrights.3 \ sysdecode_mask.3 sysdecode_fcntl_fileflags.3 \ sysdecode_mask.3 sysdecode_fileflags.3 \ sysdecode_mask.3 sysdecode_filemode.3 \ sysdecode_mask.3 sysdecode_flock_operation.3 \ sysdecode_mask.3 sysdecode_mlockall_flags.3 \ sysdecode_mask.3 sysdecode_mmap_flags.3 \ sysdecode_mask.3 sysdecode_mmap_prot.3 \ sysdecode_mask.3 sysdecode_mount_flags.3 \ sysdecode_mask.3 sysdecode_msg_flags.3 \ sysdecode_mask.3 sysdecode_msync_flags.3 \ sysdecode_mask.3 sysdecode_open_flags.3 \ sysdecode_mask.3 sysdecode_pipe2_flags.3 \ sysdecode_mask.3 sysdecode_reboot_howto.3 \ sysdecode_mask.3 sysdecode_rfork_flags.3 \ sysdecode_mask.3 sysdecode_semget_flags.3 \ sysdecode_mask.3 sysdecode_sendfile_flags.3 \ sysdecode_mask.3 sysdecode_shmat_flags.3 \ sysdecode_mask.3 sysdecode_socket_type.3 \ sysdecode_mask.3 sysdecode_thr_create_flags.3 \ sysdecode_mask.3 sysdecode_umtx_cvwait_flags.3 \ sysdecode_mask.3 sysdecode_umtx_rwlock_flags.3 \ sysdecode_mask.3 sysdecode_vmprot.3 \ sysdecode_mask.3 sysdecode_wait4_options.3 \ sysdecode_mask.3 sysdecode_wait6_options.3 CLEANFILES= ioctl.c tables.h .if defined(COMPAT_32BIT) CPP+= -m32 .endif .if ${MK_PF} != "no" CFLAGS+=-DPF .endif # Workaround duplicate declarations in CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls # Workaround warning for unused ssi_cables[] in CFLAGS.gcc.ioctl.c+= -Wno-unused CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} DEPENDOBJS+= tables.h tables.h: mktables sh ${.CURDIR}/mktables ${DESTDIR}${INCLUDEDIR} ${.TARGET} # mkioctls runs find(1) for headers so needs to rebuild every time. This used # to be a hack only done in buildworld. .if !defined(_SKIP_BUILD) ioctl.c: .PHONY .endif ioctl.c: mkioctls .META env MACHINE=${MACHINE} CPP="${CPP}" \ /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} beforedepend: ioctl.c tables.h .include Index: stable/11/lib/libtelnet/Makefile =================================================================== --- stable/11/lib/libtelnet/Makefile (revision 313537) +++ stable/11/lib/libtelnet/Makefile (revision 313538) @@ -1,30 +1,30 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 # $FreeBSD$ .include PACKAGE=lib${LIB} -TELNETDIR= ${.CURDIR}/../../contrib/telnet +TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/libtelnet LIB= telnet INTERNALLIB= SRCS= genget.c getent.c misc.c CFLAGS+= -I${TELNETDIR} WARNS?= 2 .if ${MK_OPENSSL} != "no" SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA .endif .if ${MK_KERBEROS_SUPPORT} != "no" SRCS+= kerberos5.c CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif .include Index: stable/11/lib/libthr/Makefile =================================================================== --- stable/11/lib/libthr/Makefile (revision 313537) +++ stable/11/lib/libthr/Makefile (revision 313538) @@ -1,69 +1,69 @@ # $FreeBSD$ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does # not contain these strings, add -DSTRIP_FBSDID (see ) to CFLAGS # below. Note, there are no IDs for syscall stubs whose sources are generated. # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. PACKAGE= clibs SHLIBDIR?= /lib .include MK_SSP= no LIB=thr SHLIB_MAJOR= 3 WARNS?= 3 CFLAGS+=-DPTHREAD_KERNEL -CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ - -I${.CURDIR}/../../include +CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \ + -I${SRCTOP}/include CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include CFLAGS+=-I${.CURDIR}/sys -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH} -CFLAGS+=-I${.CURDIR}/../libthread_db +CFLAGS+=-I${SRCTOP}/libexec/rtld-elf +CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH} +CFLAGS+=-I${SRCTOP}/lib/libthread_db CFLAGS+=-Winline .ifndef NO_THREAD_UNWIND_STACK CFLAGS+=-fexceptions CFLAGS+=-D_PTHREAD_FORCED_UNWIND .endif LDFLAGS+=-Wl,-znodelete -VERSION_DEF=${.CURDIR}/../libc/Versions.def +VERSION_DEF=${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS=${.CURDIR}/pthread.map MAN= libthr.3 # enable extra internal consistency checks CFLAGS+=-D_PTHREADS_INVARIANTS PRECIOUSLIB= .PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} .if exists(${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc) .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" .endif .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" .if ${MK_INSTALLLIB} != "no" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .endif .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so .endif .if ${MK_PROFILE} != "no" SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a .endif .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libthr/support/Makefile.inc =================================================================== --- stable/11/lib/libthr/support/Makefile.inc (revision 313537) +++ stable/11/lib/libthr/support/Makefile.inc (revision 313538) @@ -1,29 +1,29 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string +.PATH: ${.CURDIR}/support ${SRCTOP}/lib/libc/gen ${SRCTOP}/lib/libc/string # libc must search machine_arch, then machine_cpuarch, but libthr has all its # code implemented in machine_cpuarch. Cope. -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys) -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys -CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} +.if exists(${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys) +.PATH: ${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys +CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_ARCH} .else -.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys -CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH} +.PATH: ${SRCTOP}/lib/libc/${MACHINE_CPUARCH}/sys +CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_CPUARCH} .endif SYSCALLS= thr_new SYSCALL_SRC= ${SYSCALLS:S/$/.S/} SYSCALL_OBJ= ${SYSCALLS:S/$/.pico/} ${SYSCALL_SRC}: printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' > ${.TARGET} LIBC_OBJS= SOBJS+= thr_libc.pico CLEANFILES+= ${SYSCALL_SRC} ${SYSCALL_OBJ} ${LIBC_OBJS} thr_libc.pico: ${SYSCALL_OBJ} ${LIBC_OBJS} ${CC} -fPIC -nostdlib -o ${.TARGET} -r ${.ALLSRC} Index: stable/11/lib/libthread_db/Makefile =================================================================== --- stable/11/lib/libthread_db/Makefile (revision 313537) +++ stable/11/lib/libthread_db/Makefile (revision 313538) @@ -1,24 +1,24 @@ # $FreeBSD$ .PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH} PACKAGE=lib${LIB} LIB= thread_db SHLIB_MAJOR= 3 SRCS= thread_db.c SRCS+= libpthread_md.c SRCS+= libpthread_db.c SRCS+= libthr_db.c INCS= thread_db.h CFLAGS+=-I. -I${.CURDIR} SYM_MAPS+=${.CURDIR}/Symbol.map SYMBOL_MAPS=${SYM_MAPS} -VERSION_DEF=${.CURDIR}/../libc/Versions.def +VERSION_DEF=${SRCTOP}/lib/libc/Versions.def # Unfortunately, clang gives an incorrect warning about alignment in # arch/i386/libpthread_md.c, so turn that off for now. NO_WCAST_ALIGN.clang= .include Index: stable/11/lib/libufs/Makefile =================================================================== --- stable/11/lib/libufs/Makefile (revision 313537) +++ stable/11/lib/libufs/Makefile (revision 313538) @@ -1,31 +1,31 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 6 SRCS= block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c INCS= libufs.h MAN= bread.3 cgread.3 libufs.3 sbread.3 ufs_disk_close.3 MLINKS+= bread.3 bwrite.3 MLINKS+= bread.3 berase.3 MLINKS+= cgread.3 cgread1.3 MLINKS+= cgread.3 cgwrite1.3 MLINKS+= sbread.3 sbwrite.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout.3 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3 MLINKS+= ufs_disk_close.3 ufs_disk_write.3 -.PATH: ${.CURDIR}/../../sys/ufs/ffs +.PATH: ${SRCTOP}/sys/ufs/ffs WARNS?= 2 CFLAGS+= -D_LIBUFS .if defined(LIBUFS_DEBUG) CFLAGS+= -D_LIBUFS_DEBUGGING .endif CFLAGS+= -I${.CURDIR} .include Index: stable/11/lib/libulog/Makefile =================================================================== --- stable/11/lib/libulog/Makefile (revision 313537) +++ stable/11/lib/libulog/Makefile (revision 313538) @@ -1,38 +1,38 @@ # $FreeBSD$ PACKAGE=lib${LIB} SHLIBDIR?=/lib .include LIB= ulog SHLIB_MAJOR= 0 INCS= ulog.h utempter.h SRCS= ulog.h ulog_login.c ulog_login_pseudo.c utempter.c MAN= ulog_login.3 utempter_add_record.3 MLINKS+=ulog_login.3 ulog_login_pseudo.3 \ ulog_login.3 ulog_logout.3 \ ulog_login.3 ulog_logout_pseudo.3 \ utempter_add_record.3 utempter_remove_added_record.3 \ utempter_add_record.3 utempter_remove_record.3 \ utempter_add_record.3 addToUtmp.3 \ utempter_remove_added_record.3 removeFromUtmp.3 \ utempter_remove_record.3 removeLineFromUtmp.3 LIBADD= md -VERSION_DEF= ${.CURDIR}/../libc/Versions.def +VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map .if ${MK_INSTALLLIB} != "no" SYMLINKS+=libulog.a ${LIBDIR}/libutempter.a .endif .if !defined(NO_PIC) SYMLINKS+=libulog.so ${LIBDIR}/libutempter.so .endif .if ${MK_PROFILE} != "no" SYMLINKS+=libulog_p.a ${LIBDIR}/libutempter_p.a .endif .include Index: stable/11/lib/libunbound/Makefile =================================================================== --- stable/11/lib/libunbound/Makefile (revision 313537) +++ stable/11/lib/libunbound/Makefile (revision 313538) @@ -1,44 +1,44 @@ # $FreeBSD$ PACKAGE=lib${LIB} # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../contrib/ldns -UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound +LDNSDIR= ${SRCTOP}/contrib/ldns +UNBOUNDDIR= ${SRCTOP}/contrib/unbound # Hold my beer and watch this .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/cachedb ${UNBOUNDDIR}/dns64 ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/sldns ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator LIB= unbound PRIVATELIB= PACKAGE= unbound CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} SRCS= alloc.c as112.c autotrust.c cachedb.c config_file.c configlexer.l \ configparser.y context.c dname.c dns.c dns64.c dnstree.c \ fptr_wlist.c infra.c iter_delegpt.c iter_donotq.c iter_fwd.c \ iter_hints.c iter_priv.c iter_resptype.c iter_scrub.c iter_utils.c \ iterator.c keyraw.c libunbound.c libworker.c listen_dnsport.c \ localzone.c locks.c log.c lookup3.c lruhash.c mesh.c mini_event.c \ modstack.c module.c msgencode.c msgparse.c msgreply.c net_help.c \ netevent.c outbound_list.c outside_network.c packed_rrset.c parse.c \ parseutil.c random.c rbtree.c regional.c rrdef.c rrset.c rtt.c \ sbuffer.c slabhash.c str2wire.c timehist.c tube.c \ ub_event_pluggable.c val_anchor.c val_kcache.c val_kentry.c \ val_neg.c val_nsec.c val_nsec3.c val_secalgo.c val_sigcrypt.c \ val_utils.c validator.c winsock_event.c wire2str.c WARNS?= 3 LIBADD= ssl crypto pthread # Misnamed file in upstream source configlexer.l: configlexer.lex ${CP} ${.ALLSRC} ${.TARGET} CLEANFILES+= configlexer.l # Symbol prefix for lex and yacc LFLAGS= -Pub_c_ YFLAGS= -pub_c_ -d .include Index: stable/11/lib/libutil/Makefile =================================================================== --- stable/11/lib/libutil/Makefile (revision 313537) +++ stable/11/lib/libutil/Makefile (revision 313538) @@ -1,91 +1,91 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PACKAGE=lib${LIB} SHLIBDIR?= /lib .include LIB= util SHLIB_MAJOR= 9 SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \ hexdump.c humanize_number.c kinfo_getfile.c \ kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \ kinfo_getvmobject.c kld.c \ login_auth.c login_cap.c \ login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \ pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \ stub.c trimdomain.c uucplock.c INCS= libutil.h login_cap.h CFLAGS+= -DLIBC_SCCS .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/ +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/ MAN+= expand_number.3 flopen.3 fparseln.3 hexdump.3 \ humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \ kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \ login_auth.3 login_cap.3 \ login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \ property.3 pty.3 quotafile.3 realhostname.3 realhostname_sa.3 \ _secure_path.3 trimdomain.3 uucplock.3 pw_util.3 MAN+= login.conf.5 MLINKS+= kld.3 kld_isloaded.3 kld.3 kld_load.3 MLINKS+=login_auth.3 auth_cat.3 login_auth.3 auth_checknologin.3 MLINKS+=login_cap.3 login_close.3 login_cap.3 login_getcapbool.3 \ login_cap.3 login_getcaplist.3 login_cap.3 login_getcapnum.3 \ login_cap.3 login_getcapsize.3 login_cap.3 login_getcapstr.3 \ login_cap.3 login_getcaptime.3 login_cap.3 login_getclass.3 \ login_cap.3 login_getclassbyname.3 login_cap.3 login_getpath.3 \ login_cap.3 login_getpwclass.3 login_cap.3 login_getstyle.3 \ login_cap.3 login_getuserclass.3 login_cap.3 login_setcryptfmt.3 MLINKS+=login_class.3 setclasscontext.3 login_class.3 setclassenvironment.3 \ login_class.3 setclassresources.3 login_class.3 setusercontext.3 MLINKS+=login_ok.3 auth_hostok.3 login_ok.3 auth_timeok.3 \ login_ok.3 auth_ttyok.3 MLINKS+=login_times.3 in_lt.3 login_times.3 in_ltm.3 \ login_times.3 in_ltms.3 \ login_times.3 in_lts.3 \ login_times.3 parse_lt.3 MLINKS+=pidfile.3 pidfile_close.3 \ pidfile.3 pidfile_fileno.3 \ pidfile.3 pidfile_open.3 \ pidfile.3 pidfile_remove.3 \ pidfile.3 pidfile_write.3 MLINKS+= property.3 property_find.3 property.3 properties_free.3 MLINKS+= property.3 properties_read.3 MLINKS+= pty.3 forkpty.3 pty.3 openpty.3 MLINKS+=quotafile.3 quota_close.3 \ quotafile.3 quota_fsname.3 \ quotafile.3 quota_open.3 \ quotafile.3 quota_qfname.3 \ quotafile.3 quota_read.3 \ quotafile.3 quota_statfs.3 \ quotafile.3 quota_write_limits.3 \ quotafile.3 quota_write_usage.3 MLINKS+=uucplock.3 uu_lock.3 uucplock.3 uu_lock_txfr.3 \ uucplock.3 uu_lockerr.3 uucplock.3 uu_unlock.3 MLINKS+=pw_util.3 pw_copy.3 \ pw_util.3 pw_dup.3 \ pw_util.3 pw_edit.3 \ pw_util.3 pw_equal.3 \ pw_util.3 pw_fini.3 \ pw_util.3 pw_init.3 \ pw_util.3 pw_make.3 \ pw_util.3 pw_make_v7.3 \ pw_util.3 pw_mkdb.3 \ pw_util.3 pw_lock.3 \ pw_util.3 pw_scan.3 \ pw_util.3 pw_tempname.3 \ pw_util.3 pw_tmp.3 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: stable/11/lib/libypclnt/Makefile =================================================================== --- stable/11/lib/libypclnt/Makefile (revision 313537) +++ stable/11/lib/libypclnt/Makefile (revision 313538) @@ -1,55 +1,55 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= ypclnt SHLIB_MAJOR= 4 SRCS= ypclnt_connect.c \ ypclnt_error.c \ ypclnt_free.c \ ypclnt_new.c \ ypclnt_passwd.c \ ${GENSRCS} CLEANFILES+= ${GENSRCS} INCS= ypclnt.h CFLAGS+= -I. GENSRCS=yp.h \ yp_clnt.c \ yppasswd.h \ yppasswd_xdr.c \ yppasswd_clnt.c \ yppasswd_private.h \ yppasswd_private_clnt.c \ yppasswd_private_xdr.c RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C -RPCSRC= ${.CURDIR}/../../include/rpcsvc/yp.x -RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x -RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x +RPCSRC= ${SRCTOP}/include/rpcsvc/yp.x +RPCSRC_PW= ${SRCTOP}/include/rpcsvc/yppasswd.x +RPCSRC_PRIV= ${SRCTOP}/usr.sbin/rpc.yppasswdd/yppasswd_private.x yp.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC} yp_clnt.c: ${RPCSRC} ${RPCGEN} -l -o ${.TARGET} ${RPCSRC} yppasswd.h: ${RPCSRC_PW} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PW} yppasswd_xdr.c: ${RPCSRC_PW} ${RPCGEN} -c -o ${.TARGET} ${RPCSRC_PW} yppasswd_clnt.c: ${RPCSRC_PW} ${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PW} yppasswd_private.h: ${RPCSRC_PRIV} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC_PRIV} yppasswd_private_xdr.c: ${RPCSRC_PRIV} ${RPCGEN} -c -o ${.TARGET} ${RPCSRC_PRIV} yppasswd_private_clnt.c: ${RPCSRC_PRIV} ${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PRIV} .include Index: stable/11/lib/ncurses/config.mk =================================================================== --- stable/11/lib/ncurses/config.mk (revision 313537) +++ stable/11/lib/ncurses/config.mk (revision 313538) @@ -1,54 +1,54 @@ # $FreeBSD$ # This Makefile is shared by libncurses, libform, libmenu, libpanel. -NCURSES_DIR= ${.CURDIR}/../../../contrib/ncurses +NCURSES_DIR= ${SRCTOP}/contrib/ncurses .if defined(ENABLE_WIDEC) LIB_SUFFIX= w CFLAGS+= -D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC -NCURSES_CFG_H= ${.CURDIR}/../ncurses/ncurses_cfg.h +NCURSES_CFG_H= ${.CURDIR:H}/ncurses/ncurses_cfg.h .else LIB_SUFFIX= NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h .endif CFLAGS+= -I. -.if exists(${.OBJDIR}/../ncurses${LIB_SUFFIX}) -CFLAGS+= -I${.OBJDIR}/../ncurses${LIB_SUFFIX} +.if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX}) +CFLAGS+= -I${.OBJDIR:H}/ncurses${LIB_SUFFIX} .endif -CFLAGS+= -I${.CURDIR}/../ncurses${LIB_SUFFIX} +CFLAGS+= -I${.CURDIR:H}/ncurses${LIB_SUFFIX} # for ${NCURSES_CFG_H} -CFLAGS+= -I${.CURDIR}/../ncurses +CFLAGS+= -I${.CURDIR:H}/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${NCURSES_DIR}/ncurses CFLAGS+= -Wall CFLAGS+= -DNDEBUG CFLAGS+= -DHAVE_CONFIG_H # everyone needs this .PATH: ${NCURSES_DIR}/include # tools and directories AWK?= awk TERMINFODIR?= ${SHAREDIR}/misc # Generate headers ncurses_def.h: MKncurses_def.sh ncurses_defs AWK=${AWK} sh ${NCURSES_DIR}/include/MKncurses_def.sh \ ${NCURSES_DIR}/include/ncurses_defs > ncurses_def.h # Manual pages filter MANFILTER= sed -e 's%@TERMINFO@%${TERMINFODIR}/terminfo%g' \ -e 's%@DATADIR@%/usr/share%g' \ -e 's%@NCURSES_OSPEED@%${NCURSES_OSPEED}%g' \ -e 's%@NCURSES_MAJOR@%${NCURSES_MAJOR}%g' \ -e 's%@NCURSES_MINOR@%${NCURSES_MINOR}%g' \ -e 's%@NCURSES_PATCH@%${NCURSES_PATCH}%g' \ -e 's%@TIC@%tic%g' \ -e 's%@INFOCMP@%infocmp%g' Index: stable/11/lib/ncurses/form/Makefile =================================================================== --- stable/11/lib/ncurses/form/Makefile (revision 313537) +++ stable/11/lib/ncurses/form/Makefile (revision 313538) @@ -1,168 +1,168 @@ # $FreeBSD$ -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" SRCDIR= ${NCURSES_DIR}/form LIB= form${LIB_SUFFIX} .PATH: ${SRCDIR} SRCS= \ ncurses_def.h \ fld_arg.c \ fld_attr.c \ fld_current.c \ fld_def.c \ fld_dup.c \ fld_ftchoice.c \ fld_ftlink.c \ fld_info.c \ fld_just.c \ fld_link.c \ fld_max.c \ fld_move.c \ fld_newftyp.c \ fld_opts.c \ fld_pad.c \ fld_page.c \ fld_stat.c \ fld_type.c \ fld_user.c \ frm_cursor.c \ frm_data.c \ frm_def.c \ frm_driver.c \ frm_hook.c \ frm_opts.c \ frm_page.c \ frm_post.c \ frm_req_name.c \ frm_scale.c \ frm_sub.c \ frm_user.c \ frm_win.c \ fty_alnum.c \ fty_alpha.c \ fty_enum.c \ fty_int.c \ fty_ipv4.c \ fty_num.c \ fty_regex.c CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} CFLAGS+= -I${NCURSES_DIR}/menu LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= form.h .PATH: ${NCURSES_DIR}/man MAN= \ form.3 \ form_cursor.3 \ form_data.3 \ form_driver.3 \ form_field.3 \ form_field_attributes.3 \ form_field_buffer.3 \ form_field_info.3 \ form_field_just.3 \ form_field_new.3 \ form_field_opts.3 \ form_field_userptr.3 \ form_field_validation.3 \ form_fieldtype.3 \ form_hook.3 \ form_new.3 \ form_new_page.3 \ form_opts.3 \ form_page.3 \ form_post.3 \ form_requestname.3 \ form_userptr.3 \ form_variables.3 \ form_win.3 CLEANFILES+= ${MAN:M*.3} MLINKS= form_cursor.3 pos_form_cursor.3 \ form_data.3 data_ahead.3 \ form_data.3 data_behind.3 \ form_field.3 field_count.3 \ form_field.3 form_fields.3 \ form_field.3 move_field.3 \ form_field.3 set_form_fields.3 \ form_field_attributes.3 field_back.3 \ form_field_attributes.3 field_fore.3 \ form_field_attributes.3 field_pad.3 \ form_field_attributes.3 set_field_back.3 \ form_field_attributes.3 set_field_fore.3 \ form_field_attributes.3 set_field_pad.3 \ form_field_buffer.3 field_buffer.3 \ form_field_buffer.3 field_status.3 \ form_field_buffer.3 set_field_buffer.3 \ form_field_buffer.3 set_field_status.3 \ form_field_buffer.3 set_max_field.3 \ form_field_info.3 dynamic_fieldinfo.3 \ form_field_info.3 field_info.3 \ form_field_just.3 field_just.3 \ form_field_just.3 set_field_just.3 \ form_field_new.3 dup_field.3 \ form_field_new.3 free_field.3 \ form_field_new.3 link_field.3 \ form_field_new.3 new_field.3 \ form_field_opts.3 field_opts.3 \ form_field_opts.3 field_opts_off.3 \ form_field_opts.3 field_opts_on.3 \ form_field_opts.3 set_field_opts.3 \ form_field_userptr.3 field_userptr.3 \ form_field_userptr.3 set_field_userptr.3 \ form_field_validation.3 field_arg.3 \ form_field_validation.3 field_type.3 \ form_field_validation.3 set_field_type.3 \ form_fieldtype.3 free_fieldtype.3 \ form_fieldtype.3 link_fieldtype.3 \ form_fieldtype.3 new_fieldtype.3 \ form_fieldtype.3 set_fieldtype_arg.3 \ form_fieldtype.3 set_fieldtype_choice.3 \ form_hook.3 field_init.3 \ form_hook.3 field_term.3 \ form_hook.3 form_init.3 \ form_hook.3 form_term.3 \ form_hook.3 set_field_init.3 \ form_hook.3 set_field_term.3 \ form_hook.3 set_form_init.3 \ form_hook.3 set_form_term.3 \ form_new.3 free_form.3 \ form_new.3 new_form.3 \ form_new_page.3 new_page.3 \ form_new_page.3 set_new_page.3 \ form_opts.3 form_opts_off.3 \ form_opts.3 form_opts_on.3 \ form_opts.3 set_form_opts.3 \ form_page.3 current_field.3 \ form_page.3 field_index.3 \ form_page.3 set_current_field.3 \ form_page.3 set_form_page.3 \ form_post.3 post_form.3 \ form_post.3 unpost_form.3 \ form_requestname.3 form_request_by_name.3 \ form_requestname.3 form_request_name.3 \ form_userptr.3 set_form_userptr.3 \ form_win.3 form_sub.3 \ form_win.3 scale_form.3 \ form_win.3 set_form_sub.3 \ form_win.3 set_form_win.3 .else MAN= .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET} Index: stable/11/lib/ncurses/formw/Makefile =================================================================== --- stable/11/lib/ncurses/formw/Makefile (revision 313537) +++ stable/11/lib/ncurses/formw/Makefile (revision 313538) @@ -1,5 +1,5 @@ # $FreeBSD$ ENABLE_WIDEC= -.include "${.CURDIR}/../form/Makefile" +.include "${.CURDIR:H}/form/Makefile" Index: stable/11/lib/ncurses/menu/Makefile =================================================================== --- stable/11/lib/ncurses/menu/Makefile (revision 313537) +++ stable/11/lib/ncurses/menu/Makefile (revision 313538) @@ -1,140 +1,140 @@ # $FreeBSD$ -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" SRCDIR= ${NCURSES_DIR}/menu LIB= menu${LIB_SUFFIX} .PATH: ${SRCDIR} SRCS= \ ncurses_def.h \ m_attribs.c \ m_cursor.c \ m_driver.c \ m_format.c \ m_global.c \ m_hook.c \ m_item_cur.c \ m_item_nam.c \ m_item_new.c \ m_item_opt.c \ m_item_top.c \ m_item_use.c \ m_item_val.c \ m_item_vis.c \ m_items.c \ m_new.c \ m_opts.c \ m_pad.c \ m_pattern.c \ m_post.c \ m_req_name.c \ m_scale.c \ m_spacing.c \ m_sub.c \ m_userptr.c \ m_win.c CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= menu.h eti.h .PATH: ${NCURSES_DIR}/man MAN= \ menu.3 \ menu_attributes.3 \ menu_cursor.3 \ menu_driver.3 \ menu_format.3 \ menu_hook.3 \ menu_items.3 \ menu_mark.3 \ menu_new.3 \ menu_opts.3 \ menu_pattern.3 \ menu_post.3 \ menu_requestname.3 \ menu_spacing.3 \ menu_userptr.3 \ menu_win.3 \ mitem_current.3 \ mitem_name.3 \ mitem_new.3 \ mitem_opts.3 \ mitem_userptr.3 \ mitem_value.3 \ mitem_visible.3 CLEANFILES+= ${MAN:M*.3} MLINKS= menu_attributes.3 menu_back.3 \ menu_attributes.3 menu_fore.3 \ menu_attributes.3 menu_grey.3 \ menu_attributes.3 menu_pad.3 \ menu_attributes.3 set_menu_back.3 \ menu_attributes.3 set_menu_fore.3 \ menu_attributes.3 set_menu_grey.3 \ menu_attributes.3 set_menu_pad.3 \ menu_cursor.3 pos_menu_cursor.3 \ menu_format.3 set_menu_format.3 \ menu_hook.3 item_init.3 \ menu_hook.3 item_term.3 \ menu_hook.3 menu_init.3 \ menu_hook.3 menu_term.3 \ menu_hook.3 set_item_init.3 \ menu_hook.3 set_item_term.3 \ menu_hook.3 set_menu_init.3 \ menu_hook.3 set_menu_term.3 \ menu_items.3 item_count.3 \ menu_items.3 set_menu_items.3 \ menu_mark.3 set_menu_mark.3 \ menu_new.3 free_menu.3 \ menu_new.3 new_menu.3 \ menu_opts.3 menu_opts_off.3 \ menu_opts.3 menu_opts_on.3 \ menu_opts.3 set_menu_opts.3 \ menu_pattern.3 set_menu_pattern.3 \ menu_post.3 post_menu.3 \ menu_post.3 unpost_menu.3 \ menu_requestname.3 menu_request_by_name.3 \ menu_requestname.3 menu_request_name.3 \ menu_spacing.3 set_menu_spacing.3 \ menu_userptr.3 set_menu_userptr.3 \ menu_win.3 menu_sub.3 \ menu_win.3 scale_menu.3 \ menu_win.3 set_menu_sub.3 \ menu_win.3 set_menu_win.3 \ mitem_current.3 current_item.3 \ mitem_current.3 item_index.3 \ mitem_current.3 set_current_item.3 \ mitem_current.3 set_top_row.3 \ mitem_current.3 top_row.3 \ mitem_name.3 item_description.3 \ mitem_name.3 item_name.3 \ mitem_new.3 free_item.3 \ mitem_new.3 new_item.3 \ mitem_opts.3 item_opts.3 \ mitem_opts.3 item_opts_off.3 \ mitem_opts.3 item_opts_on.3 \ mitem_opts.3 set_item_opts.3 \ mitem_userptr.3 item_userptr.3 \ mitem_userptr.3 set_item_userptr.3 \ mitem_value.3 item_value.3 \ mitem_value.3 set_item_value.3 \ mitem_visible.3 item_visible.3 .else MAN= .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET} Index: stable/11/lib/ncurses/menuw/Makefile =================================================================== --- stable/11/lib/ncurses/menuw/Makefile (revision 313537) +++ stable/11/lib/ncurses/menuw/Makefile (revision 313538) @@ -1,5 +1,5 @@ # $FreeBSD$ ENABLE_WIDEC= -.include "${.CURDIR}/../menu/Makefile" +.include "${.CURDIR:H}/menu/Makefile" Index: stable/11/lib/ncurses/ncurses/Makefile =================================================================== --- stable/11/lib/ncurses/ncurses/Makefile (revision 313537) +++ stable/11/lib/ncurses/ncurses/Makefile (revision 313538) @@ -1,1128 +1,1128 @@ # $FreeBSD$ PACKAGE= clibs SHLIBDIR?= /lib .if !defined(ENABLE_WIDEC) # Override any MAN= setting below.. MK_MAN=no .endif .include -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" LIB= ncurses${LIB_SUFFIX} SHLIB_MAJOR= 8 NO_LINT= NCURSES_MAJOR!= egrep 'NCURSES_MAJOR[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' NCURSES_MINOR!= egrep 'NCURSES_MINOR[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' NCURSES_PATCH!= egrep 'NCURSES_PATCH[ ]*=' ${NCURSES_DIR}/dist.mk | sed -e 's%^[^0-9]*%%' # From autoconf (!) .if defined(ENABLE_WIDEC) NCURSES_CH_T= cchar_t NCURSES_OK_WCHAR_T= 1 NEED_WCHAR_H= 1 .else NCURSES_CH_T= chtype NCURSES_OK_WCHAR_T= NEED_WCHAR_H= 0 .endif NCURSES_CONST= const NCURSES_EXT_COLORS= 0 NCURSES_EXT_FUNCS= 1 NCURSES_INLINE= inline NCURSES_LIBUTF8= 0 NCURSES_MBSTATE_T= 0 NCURSES_MOUSE_VERSION= 1 NCURSES_OPAQUE= 0 NCURSES_OSPEED= short NCURSES_SBOOL= char NCURSES_SIZE_T= short NCURSES_TPARM_VARARGS= 1 NCURSES_WCHAR_T= 0 NCURSES_WINT_T= 0 NCURSES_XNAMES= 1 BROKEN_LINKER= 0 BUILTIN_BOOL= 1 ENABLE_LP64= 0 ENABLE_OPAQUE= NCURSES_OPAQUE ENABLE_REENTRANT= 0 HAVE_TCGETATTR= 1 HAVE_TERMIOS_H= 1 HAVE_TERMIO_H= 0 HAVE_VSSCANF= 1 HEADER_STDBOOL= 1 # XXX amd64 1L and int ONEUL= 1UL TYPEOF_CHTYPE= long TYPEOF_MMASK_T= long TYPE_OF_BOOL= unsigned char USE_BIG_STRINGS= 1 USE_CXX_BOOL= defined(__cplusplus) GENSRCS= \ codes.c \ expanded.c \ fallback.c \ lib_gen.c \ lib_keyname.c \ names.c \ unctrl.c GENHDRS= \ curses.h \ hashsize.h \ init_keytry.h \ ncurses_def.h \ nomacros.h \ parametrized.h \ term.h \ termcap.h \ unctrl.h SRCS= ${GENHDRS} ${GENSRCS} .PATH: ${NCURSES_DIR}/ncurses/base SRCS+= \ define_key.c \ key_defined.c \ keybound.c \ keyok.c \ legacy_coding.c \ lib_addch.c \ lib_addstr.c \ lib_beep.c \ lib_bkgd.c \ lib_box.c \ lib_chgat.c \ lib_clear.c \ lib_clearok.c \ lib_clrbot.c \ lib_clreol.c \ lib_color.c \ lib_colorset.c \ lib_delch.c \ lib_delwin.c \ lib_dft_fgbg.c \ lib_echo.c \ lib_endwin.c \ lib_erase.c \ lib_flash.c \ lib_freeall.c \ lib_getch.c \ lib_getstr.c \ lib_hline.c \ lib_immedok.c \ lib_inchstr.c \ lib_initscr.c \ lib_insch.c \ lib_insdel.c \ lib_insnstr.c \ lib_instr.c \ lib_isendwin.c \ lib_leaveok.c \ lib_mouse.c \ lib_move.c \ lib_mvwin.c \ lib_newterm.c \ lib_newwin.c \ lib_nl.c \ lib_overlay.c \ lib_pad.c \ lib_printw.c \ lib_redrawln.c \ lib_refresh.c \ lib_restart.c \ lib_scanw.c \ lib_screen.c \ lib_scroll.c \ lib_scrollok.c \ lib_scrreg.c \ lib_set_term.c \ lib_slk.c \ lib_slkatr_set.c \ lib_slkatrof.c \ lib_slkatron.c \ lib_slkatrset.c \ lib_slkattr.c \ lib_slkclear.c \ lib_slkcolor.c \ lib_slkinit.c \ lib_slklab.c \ lib_slkrefr.c \ lib_slkset.c \ lib_slktouch.c \ lib_touch.c \ lib_ungetch.c \ lib_vline.c \ lib_wattroff.c \ lib_wattron.c \ lib_winch.c \ lib_window.c \ nc_panel.c \ resizeterm.c \ safe_sprintf.c \ tries.c \ version.c \ vsscanf.c \ wresize.c .PATH: ${NCURSES_DIR}/ncurses/tinfo SRCS+= \ access.c \ add_tries.c \ alloc_entry.c \ alloc_ttype.c \ captoinfo.c \ comp_captab.c \ comp_error.c \ comp_expand.c \ comp_hash.c \ comp_parse.c \ comp_scan.c \ db_iterator.c \ doalloc.c \ entries.c \ free_ttype.c \ getenv_num.c \ hashed_db.c \ home_terminfo.c \ init_keytry.c \ lib_acs.c \ lib_baudrate.c \ lib_cur_term.c \ lib_data.c \ lib_has_cap.c \ lib_kernel.c \ lib_longname.c \ lib_napms.c \ lib_options.c \ lib_print.c \ lib_raw.c \ lib_setup.c \ lib_termcap.c \ lib_termname.c \ lib_tgoto.c \ lib_ti.c \ lib_tparm.c \ lib_tputs.c \ lib_ttyflags.c \ name_match.c \ obsolete.c \ parse_entry.c \ read_entry.c \ strings.c \ trim_sgr0.c \ write_entry.c .PATH: ${NCURSES_DIR}/ncurses/tty SRCS+= \ hardscroll.c \ hashmap.c \ lib_mvcur.c \ lib_tstp.c \ lib_twait.c \ lib_vidattr.c \ tty_update.c .if defined(ENABLE_WIDEC) .PATH: ${NCURSES_DIR}/ncurses/widechar SRCS+= \ charable.c \ lib_add_wch.c \ lib_box_set.c \ lib_cchar.c \ lib_erasewchar.c \ lib_get_wch.c \ lib_get_wstr.c \ lib_hline_set.c \ lib_in_wch.c \ lib_in_wchnstr.c \ lib_ins_wch.c \ lib_inwstr.c \ lib_key_name.c \ lib_pecho_wchar.c \ lib_slk_wset.c \ lib_unget_wch.c \ lib_vid_attr.c \ lib_vline_set.c \ lib_wacs.c \ lib_wunctrl.c .endif .PATH: ${NCURSES_DIR}/ncurses/trace SRCS+= \ lib_trace.c \ visbuf.c # Currently unused, for debugging libncurses itself. DBGSRCS= \ lib_traceatr.c \ lib_tracebits.c \ lib_tracechr.c \ lib_tracedmp.c \ lib_tracemse.c \ trace_buf.c \ trace_tries.c \ trace_xnames.c \ varargs.c # From our old libtermcap. # Used instead of the hideous read_termcap.c abomination. SRCS+= termcap.c CLEANFILES= ${GENSRCS} ${GENHDRS} keys.list make_hash term.h.new \ make_keys MKterm.h.awk comp_captab.c curses.head CFLAGS+= -DFREEBSD_NATIVE -DTERMIOS # Installed HEADERS= curses.h term.h termcap.h unctrl.h SRCHDRS= ncurses_dll.h CLEANFILES+= ncurses_dll.h .if defined(ENABLE_WIDEC) INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h .endif .if ${MK_INSTALLLIB} != "no" SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFIX}.a SYMLINKS+= libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtinfo${LIB_SUFFIX}.a .endif .if !defined(NO_PIC) # no need for major at all, it's an ld-time redirection only SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libcurses${LIB_SUFFIX}.so SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermcap${LIB_SUFFIX}.so SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtermlib${LIB_SUFFIX}.so SYMLINKS+= libncurses${LIB_SUFFIX}.so ${LIBDIR}/libtinfo${LIB_SUFFIX}.so .endif .if ${MK_PROFILE} != "no" SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libcurses${LIB_SUFFIX}_p.a SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermcap${LIB_SUFFIX}_p.a SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtermlib${LIB_SUFFIX}_p.a SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFIX}_p.a .endif .if ${.CURDIR:T} == "ncursesw" .if defined(ENABLE_WIDEC) DOCSDIR= ${SHAREDIR}/doc/ncurses DOCS= ncurses-intro.html hackguide.html .endif .if ${MK_HTML} != "no" .PATH: ${NCURSES_DIR}/doc/html FILESGROUPS= DOCS .endif .endif # Generated source .ORDER: names.c codes.c names.c: MKnames.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKnames.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > names.c codes.c: MKcodes.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c lib_gen.c: MKlib_gen.sh curses.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC:N${CCACHE_BIN}} -E ${CFLAGS}" \ "${AWK}" generated < curses.h >$@ lib_keyname.c: keys.list MKkeyname.awk ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c unctrl.c: MKunctrl.awk echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk bigstrings=${USE_BIG_STRINGS} > unctrl.c comp_captab.c: MKcaptab.sh MKcaptab.awk Caps make_hash env PATH=${BTOOLSPATH:U.}:${PATH} sh ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.sh "${AWK}" \ ${USE_BIG_STRINGS} ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.awk \ ${NCURSES_DIR}/include/Caps > comp_captab.c expanded.c: MKexpanded.sh sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c fallback.c: MKfallback.sh sh ${NCURSES_DIR}/ncurses/tinfo/MKfallback.sh > fallback.c # Generated headers nomacros.h: MKlib_gen.sh curses.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CC:N${CCACHE_BIN}} -E ${CFLAGS}" \ "${AWK}" generated < curses.h | fgrep undef > $@ init_keytry.h: keys.list make_keys ${BTOOLSPATH:U.}/make_keys keys.list > init_keytry.h hashsize.h: MKhashsize.sh Caps sh ${NCURSES_DIR}/include/MKhashsize.sh ${NCURSES_DIR}/include/Caps > $@ parametrized.h: MKparametrized.sh Caps AWK=${AWK} sh ${NCURSES_DIR}/include/MKparametrized.sh \ ${NCURSES_DIR}/include/Caps > $@ term.h: MKterm.h.awk edit_cfg.sh Caps ${AWK} -f MKterm.h.awk ${NCURSES_DIR}/include/Caps > $@.new sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} $@.new mv -f $@.new $@ curses.h: curses.head MKkey_defs.sh Caps cat curses.head > $@.new AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ ${NCURSES_DIR}/include/Caps >> $@.new .if defined(ENABLE_WIDEC) cat ${NCURSES_DIR}/include/curses.wide >> $@.new .endif cat ${NCURSES_DIR}/include/curses.tail >> $@.new mv -f $@.new $@ # Generated intermediate files keys.list: MKkeys_list.sh Caps AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ ${NCURSES_DIR}/include/Caps | LC_ALL=C sort > keys.list # Build tools build-tools: make_hash make_keys make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} ${CC} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} ${CC} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ ${NCURSES_DIR}/ncurses/tinfo/make_hash.c # ./configure generated MKterm.h.awk: MKterm.h.awk.in sed <${NCURSES_DIR}/include/MKterm.h.awk.in >$@ \ -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \ -e "s%@NCURSES_USE_DATABASE@%0%g" \ -e "s%@NCURSES_USE_TERMCAP@%1%g" \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ -e "/@NCURSES_TPARM_VARARGS@/s%%${NCURSES_TPARM_VARARGS}%" \ -e "/@NCURSES_SBOOL@/s%%${NCURSES_SBOOL}%" \ -e "/@NCURSES_XNAMES@/s%%${NCURSES_XNAMES}%" \ -e "/@HAVE_TERMIOS_H@/s%%${HAVE_TERMIOS_H}%" \ -e "/@HAVE_TERMIO_H@/s%%${HAVE_TERMIO_H}%" \ -e "/@HAVE_TCGETATTR@/s%%${HAVE_TCGETATTR}%" \ -e "s%@cf_cv_enable_reentrant@%${ENABLE_REENTRANT}%g" termcap.h: termcap.h.in sed <${NCURSES_DIR}/include/termcap.h.in >$@ \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ -e "/@NCURSES_OSPEED@/s%%${NCURSES_OSPEED}%" ncurses_dll.h: ncurses_dll.h.in sed <${NCURSES_DIR}/include/ncurses_dll.h.in >$@ \ -e "s%@NCURSES_WRAP_PREFIX@%_nc_%g" curses.head: curses.h.in sed <${NCURSES_DIR}/include/curses.h.in >$@ \ -e "/@BROKEN_LINKER@/s%%${BROKEN_LINKER}%" \ -e "/@HAVE_VSSCANF@/s%%${HAVE_VSSCANF}%" \ -e "/@NCURSES_CH_T@/s%%${NCURSES_CH_T}%" \ -e "/@NCURSES_CONST@/s%%${NCURSES_CONST}%" \ -e "/@NCURSES_EXT_COLORS@/s%%${NCURSES_EXT_COLORS}%" \ -e "/@NCURSES_EXT_FUNCS@/s%%${NCURSES_EXT_FUNCS}%" \ -e "/@NCURSES_INLINE@/s%%${NCURSES_INLINE}%" \ -e "/@NCURSES_LIBUTF8@/s%%${NCURSES_LIBUTF8}%" \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MBSTATE_T@/s%%${NCURSES_MBSTATE_T}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" \ -e "/@NCURSES_MOUSE_VERSION@/s%%${NCURSES_MOUSE_VERSION}%" \ -e "/@NCURSES_OK_WCHAR_T@/s%%${NCURSES_OK_WCHAR_T}%" \ -e "/@NCURSES_OPAQUE@/s%%${NCURSES_OPAQUE}%" \ -e "/@NCURSES_PATCH@/s%%${NCURSES_PATCH}%" \ -e "/@NCURSES_SIZE_T@/s%%${NCURSES_SIZE_T}%" \ -e "/@NCURSES_TPARM_VARARGS@/s%%${NCURSES_TPARM_VARARGS}%" \ -e "/@NCURSES_WCHAR_T@/s%%${NCURSES_WCHAR_T}%" \ -e "/@NCURSES_WCHAR_T@/s%%${NCURSES_WCHAR_T}%" \ -e "/@NCURSES_WINT_T@/s%%${NCURSES_WINT_T}%" \ -e "/@NEED_WCHAR_H@/s%%${NEED_WCHAR_H}%" \ -e "/@USE_CXX_BOOL@/s%%${USE_CXX_BOOL}%" \ -e "s%@NCURSES_SP_FUNCS@%0%g" \ -e "s%@NCURSES_INTEROP_FUNCS@%0%g" \ -e "s%@NCURSES_CCHARW_MAX@%5%g" \ -e "s%@NCURSES_TPARM_ARG@%long%g" \ -e "s%@cf_cv_1UL@%${ONEUL}%g" \ -e "s%@cf_cv_builtin_bool@%${BUILTIN_BOOL}%g" \ -e "s%@cf_cv_enable_lp64@%${ENABLE_LP64}%g" \ -e "s%@cf_cv_enable_opaque@%${ENABLE_OPAQUE}%g" \ -e "s%@cf_cv_enable_reentrant@%${ENABLE_REENTRANT}%g" \ -e "s%@cf_cv_header_stdbool_h@%${HEADER_STDBOOL}%g" \ -e "s%@cf_cv_type_of_bool@%${TYPE_OF_BOOL}%g" \ -e "s%@cf_cv_typeof_chtype@%${TYPEOF_CHTYPE}%g" \ -e "s%@cf_cv_typeof_mmask_t@%${TYPEOF_MMASK_T}%g" \ -e "s/ _WCHAR_T/ __wchar_t/g" \ -e "s/ _WINT_T/ __wint_t/g" unctrl.h: unctrl.h.in sed <${NCURSES_DIR}/include/$@.in >$@ \ -e "s%@NCURSES_SP_FUNCS@%0%g" \ -e "/@NCURSES_MAJOR@/s%%${NCURSES_MAJOR}%" \ -e "/@NCURSES_MINOR@/s%%${NCURSES_MINOR}%" # MAN page gunk terminfo.5: MKterminfo.sh terminfo.head Caps sh ${NCURSES_DIR}/man/MKterminfo.sh ${NCURSES_DIR}/man/terminfo.head \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@ CLEANFILES+= terminfo.5 .if defined(ENABLE_WIDEC) .PATH: ${NCURSES_DIR}/man MAN= \ curs_addch.3 \ curs_addchstr.3 \ curs_addstr.3 \ curs_attr.3 \ curs_beep.3 \ curs_bkgd.3 \ curs_bkgrnd.3 \ curs_border.3 \ curs_border_set.3 \ curs_clear.3 \ curs_color.3 \ curs_delch.3 \ curs_deleteln.3 \ curs_extend.3 \ curs_getcchar.3 \ curs_getch.3 \ curs_getstr.3 \ curs_getyx.3 \ curs_inch.3 \ curs_inchstr.3 \ curs_initscr.3 \ curs_inopts.3 \ curs_insch.3 \ curs_insstr.3 \ curs_instr.3 \ curs_inwstr.3 \ curs_kernel.3 \ curs_legacy.3 \ curs_memleaks.3 \ curs_mouse.3 \ curs_move.3 \ curs_opaque.3 \ curs_outopts.3 \ curs_overlay.3 \ curs_pad.3 \ curs_print.3 \ curs_refresh.3 \ curs_scr_dump.3 \ curs_scroll.3 \ curs_slk.3 \ curs_sp_funcs.3 \ curs_termattrs.3 \ curs_termcap.3 \ curs_terminfo.3 \ curs_threads.3 \ curs_touch.3 \ curs_trace.3 \ curs_util.3 \ curs_variables.3 \ curs_window.3 \ default_colors.3 \ define_key.3 \ key_defined.3 \ keybound.3 \ keyok.3 \ legacy_coding.3 \ ncurses.3 \ resizeterm.3 \ term_variables.3 \ wresize.3 MAN+= \ curs_add_wch.3 \ curs_add_wchstr.3 \ curs_addwstr.3 \ curs_get_wch.3 \ curs_get_wstr.3 \ curs_in_wch.3 \ curs_in_wchstr.3 \ curs_ins_wch.3 \ curs_ins_wstr.3 \ curs_printw.3 \ curs_scanw.3 MAN+= term.5 terminfo.5 MAN+= term.7 .endif CLEANFILES+= ${MAN:M*.3} MLINKS= ncurses.3 curses.3 \ curs_addch.3 addch.3 \ curs_addch.3 echochar.3 \ curs_addch.3 mvaddch.3 \ curs_addch.3 mvwaddch.3 \ curs_addch.3 waddch.3 \ curs_addch.3 wechochar.3 \ curs_addchstr.3 addchnstr.3 \ curs_addchstr.3 addchstr.3 \ curs_addchstr.3 mvaddchnstr.3 \ curs_addchstr.3 mvaddchstr.3 \ curs_addchstr.3 mvwaddchnstr.3 \ curs_addchstr.3 mvwaddchstr.3 \ curs_addchstr.3 waddchnstr.3 \ curs_addchstr.3 waddchstr.3 \ curs_addstr.3 addnstr.3 \ curs_addstr.3 addstr.3 \ curs_addstr.3 mvaddnstr.3 \ curs_addstr.3 mvaddstr.3 \ curs_addstr.3 mvwaddnstr.3 \ curs_addstr.3 mvwaddstr.3 \ curs_addstr.3 waddnstr.3 \ curs_addstr.3 waddstr.3 \ curs_attr.3 PAIR_NUMBER.3 \ curs_attr.3 attr_get.3 \ curs_attr.3 attr_off.3 \ curs_attr.3 attr_on.3 \ curs_attr.3 attr_set.3 \ curs_attr.3 attroff.3 \ curs_attr.3 attron.3 \ curs_attr.3 attrset.3 \ curs_attr.3 chgat.3 \ curs_attr.3 color_set.3 \ curs_attr.3 mvchgat.3 \ curs_attr.3 mvwchgat.3 \ curs_attr.3 standend.3 \ curs_attr.3 standout.3 \ curs_attr.3 wattr_get.3 \ curs_attr.3 wattr_off.3 \ curs_attr.3 wattr_on.3 \ curs_attr.3 wattr_set.3 \ curs_attr.3 wattroff.3 \ curs_attr.3 wattron.3 \ curs_attr.3 wattrset.3 \ curs_attr.3 wchgat.3 \ curs_attr.3 wcolor_set.3 \ curs_attr.3 wstandend.3 \ curs_attr.3 wstandout.3 \ curs_beep.3 beep.3 \ curs_beep.3 flash.3 \ curs_bkgd.3 bkgd.3 \ curs_bkgd.3 bkgdset.3 \ curs_bkgd.3 getbkgd.3 \ curs_bkgd.3 wbkgd.3 \ curs_bkgd.3 wbkgdset.3 \ curs_bkgrnd.3 bkgrnd.3 \ curs_bkgrnd.3 bkgrndset.3 \ curs_bkgrnd.3 getbkgrnd.3 \ curs_bkgrnd.3 wbkgrnd.3 \ curs_bkgrnd.3 wbkgrndset.3 \ curs_bkgrnd.3 wgetbkgrnd.3 \ curs_border.3 border.3 \ curs_border.3 box.3 \ curs_border.3 hline.3 \ curs_border.3 mvhline.3 \ curs_border.3 mvvline.3 \ curs_border.3 mvwhline.3 \ curs_border.3 mvwvline.3 \ curs_border.3 vline.3 \ curs_border.3 wborder.3 \ curs_border.3 whline.3 \ curs_border.3 wvline.3 \ curs_border_set.3 border_set.3 \ curs_border_set.3 box_set.3 \ curs_border_set.3 hline_set.3 \ curs_border_set.3 mvhline_set.3 \ curs_border_set.3 mvvline_set.3 \ curs_border_set.3 mvwhline_set.3 \ curs_border_set.3 mvwvline_set.3 \ curs_border_set.3 vline_set.3 \ curs_border_set.3 wborder_set.3 \ curs_border_set.3 whline_set.3 \ curs_border_set.3 wvline_set.3 \ curs_clear.3 clear.3 \ curs_clear.3 clrtobot.3 \ curs_clear.3 clrtoeol.3 \ curs_clear.3 erase.3 \ curs_clear.3 wclear.3 \ curs_clear.3 wclrtobot.3 \ curs_clear.3 wclrtoeol.3 \ curs_clear.3 werase.3 \ curs_color.3 COLOR_PAIR.3 \ curs_color.3 can_change_color.3 \ curs_color.3 color_content.3 \ curs_color.3 has_colors.3 \ curs_color.3 init_color.3 \ curs_color.3 init_pair.3 \ curs_color.3 pair_content.3 \ curs_color.3 start_color.3 \ curs_delch.3 delch.3 \ curs_delch.3 mvdelch.3 \ curs_delch.3 mvwdelch.3 \ curs_delch.3 wdelch.3 \ curs_deleteln.3 deleteln.3 \ curs_deleteln.3 insdelln.3 \ curs_deleteln.3 insertln.3 \ curs_deleteln.3 wdeleteln.3 \ curs_deleteln.3 winsdelln.3 \ curs_deleteln.3 winsertln.3 \ curs_extend.3 curses_version.3 \ curs_extend.3 use_extended_names.3 \ curs_getcchar.3 getcchar.3 \ curs_getcchar.3 setcchar.3 \ curs_getch.3 getch.3 \ curs_getch.3 has_key.3 \ curs_getch.3 mvgetch.3 \ curs_getch.3 mvwgetch.3 \ curs_getch.3 ungetch.3 \ curs_getch.3 wgetch.3 \ curs_getstr.3 getnstr.3 \ curs_getstr.3 getstr.3 \ curs_getstr.3 mvgetnstr.3 \ curs_getstr.3 mvgetstr.3 \ curs_getstr.3 mvwgetnstr.3 \ curs_getstr.3 mvwgetstr.3 \ curs_getstr.3 wgetnstr.3 \ curs_getstr.3 wgetstr.3 \ curs_getyx.3 getbegyx.3 \ curs_getyx.3 getmaxyx.3 \ curs_getyx.3 getparyx.3 \ curs_getyx.3 getyx.3 \ curs_inch.3 inch.3 \ curs_inch.3 mvinch.3 \ curs_inch.3 mvwinch.3 \ curs_inch.3 winch.3 \ curs_inchstr.3 inchnstr.3 \ curs_inchstr.3 inchstr.3 \ curs_inchstr.3 mvinchnstr.3 \ curs_inchstr.3 mvinchstr.3 \ curs_inchstr.3 mvwinchnstr.3 \ curs_inchstr.3 mvwinchstr.3 \ curs_inchstr.3 winchnstr.3 \ curs_inchstr.3 winchstr.3 \ curs_initscr.3 delscreen.3 \ curs_initscr.3 endwin.3 \ curs_initscr.3 initscr.3 \ curs_initscr.3 isendwin.3 \ curs_initscr.3 newterm.3 \ curs_initscr.3 set_term.3 \ curs_inopts.3 cbreak.3 \ curs_inopts.3 echo.3 \ curs_inopts.3 halfdelay.3 \ curs_inopts.3 intrflush.3 \ curs_inopts.3 keypad.3 \ curs_inopts.3 meta.3 \ curs_inopts.3 nocbreak.3 \ curs_inopts.3 nodelay.3 \ curs_inopts.3 noecho.3 \ curs_inopts.3 noqiflush.3 \ curs_inopts.3 noraw.3 \ curs_inopts.3 notimeout.3 \ curs_inopts.3 qiflush.3 \ curs_inopts.3 raw.3 \ curs_inopts.3 timeout.3 \ curs_inopts.3 typeahead.3 \ curs_inopts.3 wtimeout.3 \ curs_insch.3 insch.3 \ curs_insch.3 mvinsch.3 \ curs_insch.3 mvwinsch.3 \ curs_insch.3 winsch.3 \ curs_insstr.3 insnstr.3 \ curs_insstr.3 insstr.3 \ curs_insstr.3 mvinsnstr.3 \ curs_insstr.3 mvinsstr.3 \ curs_insstr.3 mvwinsnstr.3 \ curs_insstr.3 mvwinsstr.3 \ curs_insstr.3 winsnstr.3 \ curs_insstr.3 winsstr.3 \ curs_instr.3 innstr.3 \ curs_instr.3 instr.3 \ curs_instr.3 mvinnstr.3 \ curs_instr.3 mvinstr.3 \ curs_instr.3 mvwinnstr.3 \ curs_instr.3 mvwinstr.3 \ curs_instr.3 winnstr.3 \ curs_instr.3 winstr.3 \ curs_kernel.3 curs_set.3 \ curs_kernel.3 def_prog_mode.3 \ curs_kernel.3 def_shell_mode.3 \ curs_kernel.3 getsyx.3 \ curs_kernel.3 napms.3 \ curs_kernel.3 reset_prog_mode.3 \ curs_kernel.3 reset_shell_mode.3 \ curs_kernel.3 resetty.3 \ curs_kernel.3 ripoffline.3 \ curs_kernel.3 savetty.3 \ curs_kernel.3 setsyx.3 \ curs_legacy.3 getbegx.3 \ curs_legacy.3 getbegy.3 \ curs_legacy.3 getcurx.3 \ curs_legacy.3 getcury.3 \ curs_legacy.3 getmaxx.3 \ curs_legacy.3 getmaxy.3 \ curs_legacy.3 getparx.3 \ curs_legacy.3 getpary.3 \ curs_memleaks.3 _nc_free_and_exit.3 \ curs_memleaks.3 _nc_freeall.3 \ curs_mouse.3 getmouse.3 \ curs_mouse.3 mouse_trafo.3 \ curs_mouse.3 mouseinterval.3 \ curs_mouse.3 mousemask.3 \ curs_mouse.3 ungetmouse.3 \ curs_mouse.3 wenclose.3 \ curs_mouse.3 wmouse_trafo.3 \ curs_move.3 move.3 \ curs_move.3 wmove.3 \ curs_opaque.3 is_cleared.3 \ curs_opaque.3 is_idcok.3 \ curs_opaque.3 is_idlok.3 \ curs_opaque.3 is_immedok.3 \ curs_opaque.3 is_keypad.3 \ curs_opaque.3 is_leaveok.3 \ curs_opaque.3 is_nodelay.3 \ curs_opaque.3 is_notimeout.3 \ curs_opaque.3 is_scrollok.3 \ curs_opaque.3 is_syncok.3 \ curs_opaque.3 is_timeout.3 \ curs_opaque.3 wgetparent.3 \ curs_opaque.3 wgetscrreg.3 \ curs_outopts.3 clearok.3 \ curs_outopts.3 idcok.3 \ curs_outopts.3 idlok.3 \ curs_outopts.3 immedok.3 \ curs_outopts.3 leaveok.3 \ curs_outopts.3 nl.3 \ curs_outopts.3 nonl.3 \ curs_outopts.3 scrollok.3 \ curs_outopts.3 setscrreg.3 \ curs_outopts.3 wsetscrreg.3 \ curs_overlay.3 copywin.3 \ curs_overlay.3 overlay.3 \ curs_overlay.3 overwrite.3 \ curs_pad.3 newpad.3 \ curs_pad.3 pecho_wchar.3 \ curs_pad.3 pechochar.3 \ curs_pad.3 pnoutrefresh.3 \ curs_pad.3 prefresh.3 \ curs_pad.3 subpad.3 \ curs_print.3 mcprint.3 \ curs_refresh.3 doupdate.3 \ curs_refresh.3 redrawwin.3 \ curs_refresh.3 refresh.3 \ curs_refresh.3 wnoutrefresh.3 \ curs_refresh.3 wredrawln.3 \ curs_refresh.3 wrefresh.3 \ curs_scr_dump.3 scr_dump.3 \ curs_scr_dump.3 scr_init.3 \ curs_scr_dump.3 scr_restore.3 \ curs_scr_dump.3 scr_set.3 \ curs_scroll.3 scrl.3 \ curs_scroll.3 scroll.3 \ curs_scroll.3 wscrl.3 \ curs_slk.3 slk_attr.3 \ curs_slk.3 slk_attr_off.3 \ curs_slk.3 slk_attr_on.3 \ curs_slk.3 slk_attr_set.3 \ curs_slk.3 slk_attroff.3 \ curs_slk.3 slk_attron.3 \ curs_slk.3 slk_attrset.3 \ curs_slk.3 slk_clear.3 \ curs_slk.3 slk_color.3 \ curs_slk.3 slk_init.3 \ curs_slk.3 slk_label.3 \ curs_slk.3 slk_noutrefresh.3 \ curs_slk.3 slk_refresh.3 \ curs_slk.3 slk_restore.3 \ curs_slk.3 slk_set.3 \ curs_slk.3 slk_touch.3 \ curs_sp_funcs.3 sp_funcs.3 \ curs_sp_funcs.3 assume_default_colors_sp.3 \ curs_sp_funcs.3 baudrate_sp.3 \ curs_sp_funcs.3 beep_sp.3 \ curs_sp_funcs.3 can_change_color_sp.3 \ curs_sp_funcs.3 cbreak_sp.3 \ curs_sp_funcs.3 ceiling_panel.3 \ curs_sp_funcs.3 color_content_sp.3 \ curs_sp_funcs.3 curs_set_sp.3 \ curs_sp_funcs.3 def_prog_mode_sp.3 \ curs_sp_funcs.3 def_shell_mode_sp.3 \ curs_sp_funcs.3 define_key_sp.3 \ curs_sp_funcs.3 del_curterm_sp.3 \ curs_sp_funcs.3 delay_output_sp.3 \ curs_sp_funcs.3 doupdate_sp.3 \ curs_sp_funcs.3 echo_sp.3 \ curs_sp_funcs.3 endwin_sp.3 \ curs_sp_funcs.3 erasechar_sp.3 \ curs_sp_funcs.3 filter_sp.3 \ curs_sp_funcs.3 flash_sp.3 \ curs_sp_funcs.3 flushinp_sp.3 \ curs_sp_funcs.3 get_escdelay_sp.3 \ curs_sp_funcs.3 getmouse_sp.3 \ curs_sp_funcs.3 getwin_sp.3 \ curs_sp_funcs.3 ground_panel.3 \ curs_sp_funcs.3 halfdelay_sp.3 \ curs_sp_funcs.3 has_colors_sp.3 \ curs_sp_funcs.3 has_ic_sp.3 \ curs_sp_funcs.3 has_il_sp.3 \ curs_sp_funcs.3 has_key_sp.3 \ curs_sp_funcs.3 has_mouse_sp.3 \ curs_sp_funcs.3 init_color_sp.3 \ curs_sp_funcs.3 init_pair_sp.3 \ curs_sp_funcs.3 intrflush_sp.3 \ curs_sp_funcs.3 is_term_resized_sp.3 \ curs_sp_funcs.3 isendwin_sp.3 \ curs_sp_funcs.3 key_defined_sp.3 \ curs_sp_funcs.3 keybound_sp.3 \ curs_sp_funcs.3 keyname_sp.3 \ curs_sp_funcs.3 keyok_sp.3 \ curs_sp_funcs.3 killchar_sp.3 \ curs_sp_funcs.3 mcprint_sp.3 \ curs_sp_funcs.3 mouseinterval_sp.3 \ curs_sp_funcs.3 mousemask_sp.3 \ curs_sp_funcs.3 mvcur_sp.3 \ curs_sp_funcs.3 napms_sp.3 \ curs_sp_funcs.3 new_form_sp.3 \ curs_sp_funcs.3 new_menu_sp.3 \ curs_sp_funcs.3 new_prescr.3 \ curs_sp_funcs.3 newpad_sp.3 \ curs_sp_funcs.3 newterm_sp.3 \ curs_sp_funcs.3 newwin_sp.3 \ curs_sp_funcs.3 nl_sp.3 \ curs_sp_funcs.3 nocbreak_sp.3 \ curs_sp_funcs.3 noecho_sp.3 \ curs_sp_funcs.3 nofilter_sp.3 \ curs_sp_funcs.3 nonl_sp.3 \ curs_sp_funcs.3 noqiflush_sp.3 \ curs_sp_funcs.3 noraw_sp.3 \ curs_sp_funcs.3 pair_content_sp.3 \ curs_sp_funcs.3 putp_sp.3 \ curs_sp_funcs.3 qiflush_sp.3 \ curs_sp_funcs.3 raw_sp.3 \ curs_sp_funcs.3 reset_prog_mode_sp.3 \ curs_sp_funcs.3 reset_shell_mode_sp.3 \ curs_sp_funcs.3 resetty_sp.3 \ curs_sp_funcs.3 resize_term_sp.3 \ curs_sp_funcs.3 resizeterm_sp.3 \ curs_sp_funcs.3 restartterm_sp.3 \ curs_sp_funcs.3 ripoffline_sp.3 \ curs_sp_funcs.3 savetty_sp.3 \ curs_sp_funcs.3 scr_init_sp.3 \ curs_sp_funcs.3 scr_restore_sp.3 \ curs_sp_funcs.3 scr_set_sp.3 \ curs_sp_funcs.3 set_curterm_sp.3 \ curs_sp_funcs.3 set_escdelay_sp.3 \ curs_sp_funcs.3 set_tabsize_sp.3 \ curs_sp_funcs.3 slk_attr_set_sp.3 \ curs_sp_funcs.3 slk_attr_sp.3 \ curs_sp_funcs.3 slk_attroff_sp.3 \ curs_sp_funcs.3 slk_attron_sp.3 \ curs_sp_funcs.3 slk_attrset_sp.3 \ curs_sp_funcs.3 slk_clear_sp.3 \ curs_sp_funcs.3 slk_color_sp.3 \ curs_sp_funcs.3 slk_init_sp.3 \ curs_sp_funcs.3 slk_label_sp.3 \ curs_sp_funcs.3 slk_noutrefresh_sp.3 \ curs_sp_funcs.3 slk_refresh_sp.3 \ curs_sp_funcs.3 slk_restore_sp.3 \ curs_sp_funcs.3 slk_set_sp.3 \ curs_sp_funcs.3 slk_touch_sp.3 \ curs_sp_funcs.3 start_color_sp.3 \ curs_sp_funcs.3 term_attrs_sp.3 \ curs_sp_funcs.3 termattrs_sp.3 \ curs_sp_funcs.3 termname_sp.3 \ curs_sp_funcs.3 tgetent_sp.3 \ curs_sp_funcs.3 tgetflag_sp.3 \ curs_sp_funcs.3 tgetnum_sp.3 \ curs_sp_funcs.3 tgetstr_sp.3 \ curs_sp_funcs.3 tigetflag_sp.3 \ curs_sp_funcs.3 tigetnum_sp.3 \ curs_sp_funcs.3 tigetstr_sp.3 \ curs_sp_funcs.3 tputs_sp.3 \ curs_sp_funcs.3 typeahead_sp.3 \ curs_sp_funcs.3 unctrl_sp.3 \ curs_sp_funcs.3 unget_wch_sp.3 \ curs_sp_funcs.3 ungetch_sp.3 \ curs_sp_funcs.3 ungetmouse_sp.3 \ curs_sp_funcs.3 update_panels_sp.3 \ curs_sp_funcs.3 use_default_colors_sp.3 \ curs_sp_funcs.3 use_env_sp.3 \ curs_sp_funcs.3 use_legacy_coding_sp.3 \ curs_sp_funcs.3 vid_attr_sp.3 \ curs_sp_funcs.3 vid_puts_sp.3 \ curs_sp_funcs.3 vidattr_sp.3 \ curs_sp_funcs.3 vidputs_sp.3 \ curs_sp_funcs.3 wunctrl_sp.3 \ curs_termattrs.3 baudrate.3 \ curs_termattrs.3 erasechar.3 \ curs_termattrs.3 erasewchar.3 \ curs_termattrs.3 has_ic.3 \ curs_termattrs.3 has_il.3 \ curs_termattrs.3 killchar.3 \ curs_termattrs.3 killwchar.3 \ curs_termattrs.3 longname.3 \ curs_termattrs.3 term_attrs.3 \ curs_termattrs.3 termattrs.3 \ curs_termattrs.3 termname.3 \ curs_termcap.3 termcap.3 \ curs_termcap.3 tgetent.3 \ curs_termcap.3 tgetflag.3 \ curs_termcap.3 tgetnum.3 \ curs_termcap.3 tgetstr.3 \ curs_termcap.3 tgoto.3 \ curs_termcap.3 tputs.3 \ curs_terminfo.3 del_curterm.3 \ curs_terminfo.3 mvcur.3 \ curs_terminfo.3 putp.3 \ curs_terminfo.3 restartterm.3 \ curs_terminfo.3 set_curterm.3 \ curs_terminfo.3 setterm.3 \ curs_terminfo.3 setupterm.3 \ curs_terminfo.3 tigetflag.3 \ curs_terminfo.3 tigetnum.3 \ curs_terminfo.3 tigetstr.3 \ curs_terminfo.3 tparm.3 \ curs_terminfo.3 vid_attr.3 \ curs_terminfo.3 vid_puts.3 \ curs_terminfo.3 vidattr.3 \ curs_terminfo.3 vidputs.3 \ curs_threads.3 set_escdelay.3 \ curs_threads.3 set_tabsize.3 \ curs_threads.3 use_screen.3 \ curs_threads.3 use_window.3 \ curs_touch.3 is_linetouched.3 \ curs_touch.3 is_wintouched.3 \ curs_touch.3 touchline.3 \ curs_touch.3 touchwin.3 \ curs_touch.3 untouchwin.3 \ curs_touch.3 wtouchln.3 \ curs_trace.3 _nc_tracebits.3 \ curs_trace.3 _traceattr.3 \ curs_trace.3 _traceattr2.3 \ curs_trace.3 _tracechar.3 \ curs_trace.3 _tracechtype.3 \ curs_trace.3 _tracechtype2.3 \ curs_trace.3 _tracedump.3 \ curs_trace.3 _tracef.3 \ curs_trace.3 _tracemouse.3 \ curs_trace.3 trace.3 \ curs_util.3 delay_output.3 \ curs_util.3 filter.3 \ curs_util.3 flushinp.3 \ curs_util.3 getwin.3 \ curs_util.3 key_name.3 \ curs_util.3 keyname.3 \ curs_util.3 nofilter.3 \ curs_util.3 putwin.3 \ curs_util.3 unctrl.3 \ curs_util.3 use_env.3 \ curs_util.3 wunctrl.3 \ curs_window.3 delwin.3 \ curs_window.3 derwin.3 \ curs_window.3 dupwin.3 \ curs_window.3 mvderwin.3 \ curs_window.3 mvwin.3 \ curs_window.3 newwin.3 \ curs_window.3 subwin.3 \ curs_window.3 syncok.3 \ curs_window.3 wcursyncup.3 \ curs_window.3 wsyncdown.3 \ curs_window.3 wsyncup.3 \ default_colors.3 assume_default_colors.3 \ default_colors.3 use_default_colors.3 \ legacy_coding.3 use_legacy_coding.3 \ resizeterm.3 is_term_resized.3 \ resizeterm.3 resize_term.3 .if defined(ENABLE_WIDEC) MLINKS+=curs_add_wch.3 add_wch.3 \ curs_add_wch.3 echo_wchar.3 \ curs_add_wch.3 mvadd_wch.3 \ curs_add_wch.3 mvwadd_wch.3 \ curs_add_wch.3 wadd_wch.3 \ curs_add_wch.3 wecho_wchar.3 \ curs_add_wchstr.3 add_wchnstr.3 \ curs_add_wchstr.3 add_wchstr.3 \ curs_add_wchstr.3 mvadd_wchnstr.3 \ curs_add_wchstr.3 mvadd_wchstr.3 \ curs_add_wchstr.3 mvwadd_wchnstr.3 \ curs_add_wchstr.3 mvwadd_wchstr.3 \ curs_add_wchstr.3 wadd_wchnstr.3 \ curs_add_wchstr.3 wadd_wchstr.3 \ curs_addwstr.3 addnwstr.3 \ curs_addwstr.3 addwstr.3 \ curs_addwstr.3 mvaddnwstr.3 \ curs_addwstr.3 mvaddwstr.3 \ curs_addwstr.3 mvwaddnwstr.3 \ curs_addwstr.3 mvwaddwstr.3 \ curs_addwstr.3 waddnwstr.3 \ curs_addwstr.3 waddwstr.3 \ curs_get_wch.3 get_wch.3 \ curs_get_wch.3 mvget_wch.3 \ curs_get_wch.3 mvwget_wch.3 \ curs_get_wch.3 unget_wch.3 \ curs_get_wch.3 wget_wch.3 \ curs_get_wstr.3 get_wstr.3 \ curs_get_wstr.3 getn_wstr.3 \ curs_get_wstr.3 mvget_wstr.3 \ curs_get_wstr.3 mvgetn_wstr.3 \ curs_get_wstr.3 mvwget_wstr.3 \ curs_get_wstr.3 mvwgetn_wstr.3 \ curs_get_wstr.3 wget_wstr.3 \ curs_get_wstr.3 wgetn_wstr.3 \ curs_in_wch.3 in_wch.3 \ curs_in_wch.3 mvin_wch.3 \ curs_in_wch.3 mvwin_wch.3 \ curs_in_wch.3 win_wch.3 \ curs_in_wchstr.3 in_wchnstr.3 \ curs_in_wchstr.3 in_wchstr.3 \ curs_in_wchstr.3 mvin_wchnstr.3 \ curs_in_wchstr.3 mvin_wchstr.3 \ curs_in_wchstr.3 mvwin_wchnstr.3 \ curs_in_wchstr.3 mvwin_wchstr.3 \ curs_in_wchstr.3 win_wchnstr.3 \ curs_in_wchstr.3 win_wchstr.3 \ curs_ins_wch.3 ins_wch.3 \ curs_ins_wch.3 mvins_wch.3 \ curs_ins_wch.3 mvwins_wch.3 \ curs_ins_wch.3 wins_wch.3 \ curs_ins_wstr.3 ins_nwstr.3 \ curs_ins_wstr.3 ins_wstr.3 \ curs_ins_wstr.3 mvins_nwstr.3 \ curs_ins_wstr.3 mvins_wstr.3 \ curs_ins_wstr.3 mvwins_nwstr.3 \ curs_ins_wstr.3 mvwins_wstr.3 \ curs_ins_wstr.3 wins_nwstr.3 \ curs_ins_wstr.3 wins_wstr.3 \ curs_inwstr.3 innwstr.3 \ curs_inwstr.3 inwstr.3 \ curs_inwstr.3 mvinnwstr.3 \ curs_inwstr.3 mvinwstr.3 \ curs_inwstr.3 mvwinnwstr.3 \ curs_inwstr.3 mvwinwstr.3 \ curs_inwstr.3 winnwstr.3 \ curs_inwstr.3 winwstr.3 \ curs_printw.3 mvprintw.3 \ curs_printw.3 mvwprintw.3 \ curs_printw.3 printw.3 \ curs_printw.3 vw_printw.3 \ curs_printw.3 vwprintw.3 \ curs_printw.3 wprintw.3 \ curs_scanw.3 mvscanw.3 \ curs_scanw.3 mvwscanw.3 \ curs_scanw.3 scanw.3 \ curs_scanw.3 vw_scanw.3 \ curs_scanw.3 vwscanw.3 \ curs_scanw.3 wscanw.3 .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET} Index: stable/11/lib/ncurses/ncursesw/Makefile =================================================================== --- stable/11/lib/ncurses/ncursesw/Makefile (revision 313537) +++ stable/11/lib/ncurses/ncursesw/Makefile (revision 313538) @@ -1,7 +1,7 @@ # $FreeBSD$ ENABLE_WIDEC= -.PATH: ${.CURDIR}/../ncurses +.PATH: ${.CURDIR:H}/ncurses -.include "${.CURDIR}/../ncurses/Makefile" +.include "${.CURDIR:H}/ncurses/Makefile" Index: stable/11/lib/ncurses/panel/Makefile =================================================================== --- stable/11/lib/ncurses/panel/Makefile (revision 313537) +++ stable/11/lib/ncurses/panel/Makefile (revision 313538) @@ -1,68 +1,68 @@ # $FreeBSD$ -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" SRCDIR= ${NCURSES_DIR}/panel LIB= panel${LIB_SUFFIX} .PATH: ${SRCDIR} SRCS= \ ncurses_def.h \ p_above.c \ p_below.c \ p_bottom.c \ p_delete.c \ p_hidden.c \ p_hide.c \ p_move.c \ p_new.c \ p_replace.c \ p_show.c \ p_top.c \ p_update.c \ p_user.c \ p_win.c \ panel.c CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= panel.h # generate MAN .PATH: ${NCURSES_DIR}/man MAN= \ panel.3 CLEANFILES+= ${MAN:M*.3} MLINKS= panel.3 bottom_panel.3 \ panel.3 del_panel.3 \ panel.3 hide_panel.3 \ panel.3 move_panel.3 \ panel.3 new_panel.3 \ panel.3 panel_above.3 \ panel.3 panel_below.3 \ panel.3 panel_hidden.3 \ panel.3 panel_userptr.3 \ panel.3 panel_window.3 \ panel.3 replace_panel.3 \ panel.3 set_panel_userptr.3 \ panel.3 show_panel.3 \ panel.3 top_panel.3 \ panel.3 update_panels.3 .else MAN= .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET} Index: stable/11/lib/ncurses/panelw/Makefile =================================================================== --- stable/11/lib/ncurses/panelw/Makefile (revision 313537) +++ stable/11/lib/ncurses/panelw/Makefile (revision 313538) @@ -1,5 +1,5 @@ # $FreeBSD$ ENABLE_WIDEC= -.include "${.CURDIR}/../panel/Makefile" +.include "${.CURDIR:H}/panel/Makefile" Index: stable/11 =================================================================== --- stable/11 (revision 313537) +++ stable/11 (revision 313538) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r312452-312512