diff --git a/lib/libcasper/Makefile.inc b/lib/libcasper/Makefile.inc index 00bd221feb27..73a761ba4ce3 100644 --- a/lib/libcasper/Makefile.inc +++ b/lib/libcasper/Makefile.inc @@ -1,7 +1,9 @@ .include +PACKAGE?= libcasper + .if ${MK_CASPER} != "no" CFLAGS+=-DWITH_CASPER .endif .include "../Makefile.inc" diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile index 4db26f665f19..1a794791570f 100644 --- a/lib/libcasper/libcasper/Makefile +++ b/lib/libcasper/libcasper/Makefile @@ -1,43 +1,41 @@ -PACKAGE= runtime - SHLIBDIR?= /lib .include .if ${MK_CASPER} != "no" SHLIB= casper SHLIB_MAJOR= 1 SRCS= libcasper.c SRCS+= libcasper_impl.c SRCS+= libcasper_service.c SRCS+= service.c SRCS+= zygote.c .endif INCS= libcasper.h INCS+= libcasper_service.h LIBADD= nv CFLAGS+=-I${.CURDIR} MAN+= libcasper.3 MAN+= libcasper_service.3 MLINKS+=libcasper.3 cap_init.3 MLINKS+=libcasper.3 cap_wrap.3 MLINKS+=libcasper.3 cap_unwrap.3 MLINKS+=libcasper.3 cap_sock.3 MLINKS+=libcasper.3 cap_clone.3 MLINKS+=libcasper.3 cap_close.3 MLINKS+=libcasper.3 cap_limit_get.3 MLINKS+=libcasper.3 cap_limit_set.3 MLINKS+=libcasper.3 cap_send_nvlist.3 MLINKS+=libcasper.3 cap_recv_nvlist.3 MLINKS+=libcasper.3 cap_xfer_nvlist.3 MLINKS+=libcasper.3 cap_service_open.3 MLINKS+=libcasper_service.3 CREATE_SERVICE.3 .include diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile index 4b11c97d29e5..b090c553bd28 100644 --- a/lib/libcasper/services/cap_dns/Makefile +++ b/lib/libcasper/services/cap_dns/Makefile @@ -1,31 +1,29 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_dns SRCS= cap_dns.c .endif INCS= cap_dns.h LIBADD= nv CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_dns.3 MLINKS+=cap_dns.3 libcap_dns.3 MLINKS+=cap_dns.3 cap_dns_type_limit.3 MLINKS+=cap_dns.3 cap_dns_family_limit.3 .include diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile index 2c52d0887a48..9d70d0ab9237 100644 --- a/lib/libcasper/services/cap_fileargs/Makefile +++ b/lib/libcasper/services/cap_fileargs/Makefile @@ -1,38 +1,36 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_fileargs SRCS= cap_fileargs.c .endif INCS= cap_fileargs.h LIBADD= nv CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_fileargs.3 MLINKS+=cap_fileargs.3 libcap_fileargs.3 MLINKS+=cap_fileargs.3 fileargs_cinit.3 MLINKS+=cap_fileargs.3 fileargs_cinitnv.3 MLINKS+=cap_fileargs.3 fileargs_fopen.3 MLINKS+=cap_fileargs.3 fileargs_free.3 MLINKS+=cap_fileargs.3 fileargs_init.3 MLINKS+=cap_fileargs.3 fileargs_initnv.3 MLINKS+=cap_fileargs.3 fileargs_lstat.3 MLINKS+=cap_fileargs.3 fileargs_open.3 MLINKS+=cap_fileargs.3 fileargs_realpath.3 .include diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile index a921dfa87e7c..13e695813bcf 100644 --- a/lib/libcasper/services/cap_grp/Makefile +++ b/lib/libcasper/services/cap_grp/Makefile @@ -1,44 +1,42 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_grp SRCS= cap_grp.c .endif INCS= cap_grp.h LIBADD= nv CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_grp.3 MLINKS+=cap_grp.3 libcap_grp.3 MLINKS+=cap_grp.3 cap_getgrent.3 MLINKS+=cap_grp.3 cap_getgrnam.3 MLINKS+=cap_grp.3 cap_getgrgid.3 MLINKS+=cap_grp.3 cap_getgrent_r.3 MLINKS+=cap_grp.3 cap_getgrnam_r.3 MLINKS+=cap_grp.3 cap_getgrgid_r.3 MLINKS+=cap_grp.3 cap_setgroupent.3 MLINKS+=cap_grp.3 cap_setgrent.3 MLINKS+=cap_grp.3 cap_endgrent.3 MLINKS+=cap_grp.3 cap_grp_limit_cmds.3 MLINKS+=cap_grp.3 cap_grp_limit_fields.3 MLINKS+=cap_grp.3 cap_grp_limit_groups.3 .include # GCC 13 complains incorrectly about free after failed realloc: GCC bug #110501 CFLAGS.cap_grp.c+= ${NO_WUSE_AFTER_FREE} diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile index 1ba35a674a05..4e9814118c41 100644 --- a/lib/libcasper/services/cap_net/Makefile +++ b/lib/libcasper/services/cap_net/Makefile @@ -1,46 +1,44 @@ SHLIBDIR?= /lib .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_net SRCS= cap_net.c .endif INCS= cap_net.h LIBADD= nv CFLAGS+=-I${.CURDIR} CFLAGS+=-DWITH_CASPER HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_net.3 MLINKS+=cap_net.3 libcap_net.3 MLINKS+=cap_net.3 cap_bind.3 MLINKS+=cap_net.3 cap_connect.3 MLINKS+=cap_net.3 cap_net_free.3 MLINKS+=cap_net.3 cap_net_limit.3 MLINKS+=cap_net.3 cap_net_limit_addr2name.3 MLINKS+=cap_net.3 cap_net_limit_addr2name_family.3 MLINKS+=cap_net.3 cap_net_limit_bind.3 MLINKS+=cap_net.3 cap_net_limit_connect.3 MLINKS+=cap_net.3 cap_net_limit_init.3 MLINKS+=cap_net.3 cap_net_limit_name2addr.3 MLINKS+=cap_net.3 cap_net_limit_name2addr_family.3 MLINKS+=cap_net.3 cap_getaddrinfo.3 MLINKS+=cap_net.3 cap_gethostbyaddr.3 MLINKS+=cap_net.3 cap_gethostbyname.3 MLINKS+=cap_net.3 cap_gethostbyname2.3 MLINKS+=cap_net.3 cap_getnameinfo.3 .include diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile index 853052e78d04..a330eeedeb11 100644 --- a/lib/libcasper/services/cap_netdb/Makefile +++ b/lib/libcasper/services/cap_netdb/Makefile @@ -1,33 +1,31 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_netdb SRCS= cap_netdb.c .endif INCS= cap_netdb.h LIBADD= nv CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_netdb.3 MLINKS+=cap_netdb.3 libcap_netdb.3 MLINKS+=cap_netdb.3 cap_getprotobyname.3 .include # GCC 13 complains incorrectly about free after failed realloc: GCC bug #110501 CFLAGS.cap_netdb.c+= ${NO_WUSE_AFTER_FREE} diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile index a1e97845c736..ba8df80d5ad7 100644 --- a/lib/libcasper/services/cap_pwd/Makefile +++ b/lib/libcasper/services/cap_pwd/Makefile @@ -1,44 +1,42 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_pwd SRCS= cap_pwd.c .endif INCS= cap_pwd.h LIBADD= nv CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_pwd.3 MLINKS+=cap_pwd.3 libcap_pwd.3 MLINKS+=cap_pwd.3 cap_getpwent.3 MLINKS+=cap_pwd.3 cap_getpwnam.3 MLINKS+=cap_pwd.3 cap_getpwuid.3 MLINKS+=cap_pwd.3 cap_getpwent_r.3 MLINKS+=cap_pwd.3 cap_getpwnam_r.3 MLINKS+=cap_pwd.3 cap_getpwuid_r.3 MLINKS+=cap_pwd.3 cap_setpassent.3 MLINKS+=cap_pwd.3 cap_setpwent.3 MLINKS+=cap_pwd.3 cap_endpwent.3 MLINKS+=cap_pwd.3 cap_pwd_limit_cmds.3 MLINKS+=cap_pwd.3 cap_pwd_limit_fields.3 MLINKS+=cap_pwd.3 cap_pwd_limit_users.3 .include # GCC 13 complains incorrectly about free after failed realloc: GCC bug #110501 CFLAGS.cap_pwd.c+= ${NO_WUSE_AFTER_FREE} diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile index 522313df4ffc..4408bad4efb4 100644 --- a/lib/libcasper/services/cap_sysctl/Makefile +++ b/lib/libcasper/services/cap_sysctl/Makefile @@ -1,34 +1,32 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_sysctl SRCS= cap_sysctl.c .endif INCS= cap_sysctl.h LIBADD= nv CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests MAN+= cap_sysctl.3 MLINKS+=cap_sysctl.3 libcap_sysctl.3 \ cap_sysctl.3 cap_sysctlbyname.3 \ cap_sysctl.3 cap_nametomib.3 \ cap_sysctl.3 cap_sysctl_limit_init.3 \ cap_sysctl.3 cap_sysctl_limit_mib.3 \ cap_sysctl.3 cap_sysctl_limit_name.3 \ cap_sysctl.3 cap_sysctl_limit.3 .include diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile index 88979d8bed23..d18ad6d76ede 100644 --- a/lib/libcasper/services/cap_syslog/Makefile +++ b/lib/libcasper/services/cap_syslog/Makefile @@ -1,30 +1,28 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper .if ${MK_CASPER} != "no" SHLIB= cap_syslog SRCS= cap_syslog.c .endif INCS= cap_syslog.h LIBADD= nv CFLAGS+=-I${.CURDIR} MAN+= cap_syslog.3 MLINKS+= cap_syslog.3 libcap_syslog.3 MLINKS+= cap_syslog.3 cap_vsyslog.3 MLINKS+= cap_syslog.3 cap_openlog.3 MLINKS+= cap_syslog.3 cap_closelog.3 MLINKS+= cap_syslog.3 cap_setlogmask.3 .include diff --git a/lib/libcasper/services/tests/Makefile b/lib/libcasper/services/tests/Makefile index 29b1b564beca..4b6c72fd86e8 100644 --- a/lib/libcasper/services/tests/Makefile +++ b/lib/libcasper/services/tests/Makefile @@ -1,4 +1,6 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests KYUAFILE= yes .include diff --git a/lib/libcasper/tests/Makefile b/lib/libcasper/tests/Makefile index 29b1b564beca..4b6c72fd86e8 100644 --- a/lib/libcasper/tests/Makefile +++ b/lib/libcasper/tests/Makefile @@ -1,4 +1,6 @@ .PATH: ${SRCTOP}/tests + +PACKAGE= tests KYUAFILE= yes .include