Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F105809075
D21506.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
14 KB
Referenced Files
None
Subscribers
None
D21506.diff
View Options
Index: head/bin/uuidgen/Makefile
===================================================================
--- head/bin/uuidgen/Makefile
+++ head/bin/uuidgen/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=runtime
PROG= uuidgen
.include <bsd.prog.mk>
Index: head/lib/libalias/libalias/Makefile
===================================================================
--- head/lib/libalias/libalias/Makefile
+++ head/lib/libalias/libalias/Makefile
@@ -3,7 +3,6 @@
.PATH: ${SRCTOP}/sys/netinet/libalias
CONFS= libalias.conf
-PACKAGE=lib${LIB}
LIB= alias
SHLIBDIR?= /lib
SHLIB_MAJOR= 7
Index: head/lib/libauditd/Makefile
===================================================================
--- head/lib/libauditd/Makefile
+++ head/lib/libauditd/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
#
-PACKAGE=lib${LIB}
OPENBSMDIR= ${SRCTOP}/contrib/openbsm
_LIBAUDITDDIR= ${OPENBSMDIR}/libauditd
_LIBBSMDIR= ${OPENBSMDIR}/libbsm
Index: head/lib/libbe/Makefile
===================================================================
--- head/lib/libbe/Makefile
+++ head/lib/libbe/Makefile
@@ -4,7 +4,6 @@
.include <src.opts.mk>
-PACKAGE= lib${LIB}
LIB= be
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
Index: head/lib/libcalendar/Makefile
===================================================================
--- head/lib/libcalendar/Makefile
+++ head/lib/libcalendar/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE= lib${LIB}
LIB= calendar
SRCS= calendar.c easter.c
Index: head/lib/libcapsicum/Makefile
===================================================================
--- head/lib/libcapsicum/Makefile
+++ head/lib/libcapsicum/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
-
INCS= capsicum_helpers.h
MAN+= capsicum_helpers.3
Index: head/lib/libcom_err/Makefile
===================================================================
--- head/lib/libcom_err/Makefile
+++ head/lib/libcom_err/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= com_err
SRCS= com_err.c error.c
INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
Index: head/lib/libdevctl/Makefile
===================================================================
--- head/lib/libdevctl/Makefile
+++ head/lib/libdevctl/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= devctl
SRCS= devctl.c
INCS= devctl.h
Index: head/lib/libdevinfo/Makefile
===================================================================
--- head/lib/libdevinfo/Makefile
+++ head/lib/libdevinfo/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= devinfo
SRCS= devinfo.c
INCS= devinfo.h
Index: head/lib/libdevstat/Makefile
===================================================================
--- head/lib/libdevstat/Makefile
+++ head/lib/libdevstat/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= devstat
SHLIBDIR?= /lib
# Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
Index: head/lib/libfetch/Makefile
===================================================================
--- head/lib/libfetch/Makefile
+++ head/lib/libfetch/Makefile
@@ -2,7 +2,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB= fetch
CFLAGS+= -I.
SRCS= fetch.c common.c ftp.c http.c file.c \
Index: head/lib/libgpio/Makefile
===================================================================
--- head/lib/libgpio/Makefile
+++ head/lib/libgpio/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= gpio
SHLIB_MAJOR= 0
Index: head/lib/libgssapi/Makefile
===================================================================
--- head/lib/libgssapi/Makefile
+++ head/lib/libgssapi/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= gssapi
SHLIB_MAJOR= 10
VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
Index: head/lib/libmemstat/Makefile
===================================================================
--- head/lib/libmemstat/Makefile
+++ head/lib/libmemstat/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
WARNS?= 3
LIB= memstat
SHLIB_MAJOR= 3
Index: head/lib/libmp/Makefile
===================================================================
--- head/lib/libmp/Makefile
+++ head/lib/libmp/Makefile
@@ -2,7 +2,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB= mp
SHLIB_MAJOR= 7
LIBADD= crypto
Index: head/lib/libmt/Makefile
===================================================================
--- head/lib/libmt/Makefile
+++ head/lib/libmt/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= mt
SHLIBDIR?= /lib
SRCS= mtlib.c
Index: head/lib/libnetgraph/Makefile
===================================================================
--- head/lib/libnetgraph/Makefile
+++ head/lib/libnetgraph/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
-PACKAGE=lib${LIB}
LIB= netgraph
WARNS?= 3
MAN= netgraph.3
Index: head/lib/libngatm/Makefile
===================================================================
--- head/lib/libngatm/Makefile
+++ head/lib/libngatm/Makefile
@@ -2,7 +2,6 @@
#
# Author: Harti Brandt <harti@freebsd.org>
#
-PACKAGE=lib${LIB}
LIB= ngatm
SHLIB_MAJOR= 4
MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
Index: head/lib/libpcap/Makefile
===================================================================
--- head/lib/libpcap/Makefile
+++ head/lib/libpcap/Makefile
@@ -5,7 +5,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB= pcap
SRCS= bpf_dump.c \
Index: head/lib/libpjdlog/Makefile
===================================================================
--- head/lib/libpjdlog/Makefile
+++ head/lib/libpjdlog/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
#
-PACKAGE=lib${LIB}
SHLIBDIR?= /lib
.include <bsd.own.mk>
Index: head/lib/libpmc/Makefile
===================================================================
--- head/lib/libpmc/Makefile
+++ head/lib/libpmc/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= pmc
SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
Index: head/lib/libproc/Makefile
===================================================================
--- head/lib/libproc/Makefile
+++ head/lib/libproc/Makefile
@@ -2,7 +2,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB= proc
SRCS= crc32.c \
Index: head/lib/libprocstat/Makefile
===================================================================
--- head/lib/libprocstat/Makefile
+++ head/lib/libprocstat/Makefile
@@ -2,7 +2,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB= procstat
SRCS= cd9660.c \
Index: head/lib/libradius/Makefile
===================================================================
--- head/lib/libradius/Makefile
+++ head/lib/libradius/Makefile
@@ -26,7 +26,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB= radius
SRCS= radlib.c
INCS= radlib.h radlib_vs.h
Index: head/lib/librpcsvc/Makefile
===================================================================
--- head/lib/librpcsvc/Makefile
+++ head/lib/librpcsvc/Makefile
@@ -5,7 +5,6 @@
.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 \
Index: head/lib/librt/Makefile
===================================================================
--- head/lib/librt/Makefile
+++ head/lib/librt/Makefile
@@ -2,7 +2,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB=rt
SHLIB_MAJOR= 1
CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
Index: head/lib/librtld_db/Makefile
===================================================================
--- head/lib/librtld_db/Makefile
+++ head/lib/librtld_db/Makefile
@@ -2,7 +2,6 @@
.include <bsd.own.mk>
-PACKAGE=lib${LIB}
LIB= rtld_db
SHLIB_MAJOR= 2
MAN= librtld_db.3
Index: head/lib/libsysdecode/Makefile
===================================================================
--- head/lib/libsysdecode/Makefile
+++ head/lib/libsysdecode/Makefile
@@ -2,7 +2,6 @@
.include <src.opts.mk>
-PACKAGE=lib${LIB}
LIB= sysdecode
SRCS= errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c
Index: head/lib/libtacplus/Makefile
===================================================================
--- head/lib/libtacplus/Makefile
+++ head/lib/libtacplus/Makefile
@@ -24,7 +24,6 @@
#
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= tacplus
SRCS= taclib.c
INCS= taclib.h
Index: head/lib/libugidfw/Makefile
===================================================================
--- head/lib/libugidfw/Makefile
+++ head/lib/libugidfw/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= ugidfw
SHLIB_MAJOR= 5
SRCS= ugidfw.c
Index: head/lib/libulog/Makefile
===================================================================
--- head/lib/libulog/Makefile
+++ head/lib/libulog/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
SHLIBDIR?=/lib
.include <src.opts.mk>
Index: head/lib/libusb/Makefile
===================================================================
--- head/lib/libusb/Makefile
+++ head/lib/libusb/Makefile
@@ -4,7 +4,6 @@
# Makefile for the FreeBSD specific LibUSB 2.0
#
-PACKAGE=lib${LIB}
LIB= usb
SHLIB_MAJOR= 3
SHLIB_MINOR= 0
Index: head/lib/libusbhid/Makefile
===================================================================
--- head/lib/libusbhid/Makefile
+++ head/lib/libusbhid/Makefile
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= usbhid
MAN= usbhid.3
Index: head/lib/libwrap/Makefile
===================================================================
--- head/lib/libwrap/Makefile
+++ head/lib/libwrap/Makefile
@@ -5,7 +5,6 @@
.include <src.opts.mk>
CONFS= hosts.allow
-PACKAGE=lib${LIB}
LIB= wrap
SHLIB_MAJOR= 6
INCS= tcpd.h
Index: head/lib/libypclnt/Makefile
===================================================================
--- head/lib/libypclnt/Makefile
+++ head/lib/libypclnt/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=lib${LIB}
LIB= ypclnt
SHLIB_MAJOR= 4
SRCS= ypclnt_connect.c \
Index: head/release/packages/Makefile.package
===================================================================
--- head/release/packages/Makefile.package
+++ head/release/packages/Makefile.package
@@ -84,6 +84,8 @@
tests_DESC= Test Suite
unbound_COMMENT= Unbound DNS Resolver
unbound_DESC= Unbound DNS Resolver
+utilities_COMMENT= Non-vital programs and librairies
+utilities_DESC= Non-vital programs and librairies
vi_COMMENT= Vi Editor
vi_DESC= Vi Editor
wpa_COMMENT= 802.11 Supplicant
Index: head/sbin/devd/Makefile
===================================================================
--- head/sbin/devd/Makefile
+++ head/sbin/devd/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
WARNS?= 3
-PACKAGE=runtime
+PACKAGE=utilities
CONFGROUPS= CONFS DEVD
CONFS= devd.conf
DEVD= devmatch.conf
Index: head/sbin/nfsiod/Makefile
===================================================================
--- head/sbin/nfsiod/Makefile
+++ head/sbin/nfsiod/Makefile
@@ -1,7 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-PACKAGE=runtime
PROG= nfsiod
MAN= nfsiod.8
Index: head/sbin/nos-tun/Makefile
===================================================================
--- head/sbin/nos-tun/Makefile
+++ head/sbin/nos-tun/Makefile
@@ -1,6 +1,5 @@
# $FreeBSD$
-PACKAGE=runtime
PROG= nos-tun
MAN= nos-tun.8
WARNS?= 3
Index: head/sbin/setkey/Makefile
===================================================================
--- head/sbin/setkey/Makefile
+++ head/sbin/setkey/Makefile
@@ -29,7 +29,6 @@
.include <src.opts.mk>
-PACKAGE=runtime
PROG= setkey
MAN= setkey.8
SRCS= setkey.c parse.y token.l
Index: head/share/mk/bsd.confs.mk
===================================================================
--- head/share/mk/bsd.confs.mk
+++ head/share/mk/bsd.confs.mk
@@ -44,9 +44,9 @@
. if defined(NO_ROOT)
. if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
. if defined(${group}PACKAGE)
-${group}TAGS+= package=${${group}PACKAGE:Uruntime}
+${group}TAGS+= package=${${group}PACKAGE:Uutilities}
. else
-${group}TAGS+= package=${PACKAGE:Uruntime}
+${group}TAGS+= package=${PACKAGE:Uutilities}
. endif
. endif
${group}TAGS+= config
Index: head/share/mk/bsd.dirs.mk
===================================================================
--- head/share/mk/bsd.dirs.mk
+++ head/share/mk/bsd.dirs.mk
@@ -21,7 +21,7 @@
. if defined(NO_ROOT)
. if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*}
-${dir}TAGS+= package=${${dir}PACKAGE:Uruntime}
+${dir}TAGS+= package=${${dir}PACKAGE:Uutilities}
. endif
${dir}TAG_ARGS= -T ${${dir}TAGS:[*]:S/ /,/g}
. endif
Index: head/share/mk/bsd.doc.mk
===================================================================
--- head/share/mk/bsd.doc.mk
+++ head/share/mk/bsd.doc.mk
@@ -83,7 +83,7 @@
.if defined(NO_ROOT)
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+= package=${PACKAGE:Uruntime}
+TAGS+= package=${PACKAGE:Uutilities}
.endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
.endif
Index: head/share/mk/bsd.files.mk
===================================================================
--- head/share/mk/bsd.files.mk
+++ head/share/mk/bsd.files.mk
@@ -40,7 +40,7 @@
.if defined(NO_ROOT)
.if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
-${group}TAGS+= package=${${group}PACKAGE:Uruntime}
+${group}TAGS+= package=${${group}PACKAGE:Uutilities}
.endif
${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
.endif
Index: head/share/mk/bsd.incs.mk
===================================================================
--- head/share/mk/bsd.incs.mk
+++ head/share/mk/bsd.incs.mk
@@ -10,7 +10,7 @@
.if defined(NO_ROOT)
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+= package=${PACKAGE:Uruntime}
+TAGS+= package=${PACKAGE:Uutilities}
.endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
.endif
Index: head/share/mk/bsd.lib.mk
===================================================================
--- head/share/mk/bsd.lib.mk
+++ head/share/mk/bsd.lib.mk
@@ -66,7 +66,7 @@
.if defined(NO_ROOT)
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+= package=${PACKAGE:Uruntime}
+TAGS+= package=${PACKAGE:Uutilities}
.endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
.endif
Index: head/share/mk/bsd.prog.mk
===================================================================
--- head/share/mk/bsd.prog.mk
+++ head/share/mk/bsd.prog.mk
@@ -73,7 +73,7 @@
.if defined(NO_ROOT)
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+= package=${PACKAGE:Uruntime}
+TAGS+= package=${PACKAGE:Uutilities}
.endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
.endif
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Dec 22, 12:25 AM (18 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15549202
Default Alt Text
D21506.diff (14 KB)
Attached To
Mode
D21506: pkgbase: Create a FreeBSD-utilities package and make it the default one
Attached
Detach File
Event Timeline
Log In to Comment