Update share/examples/* to properly install /usr/share/examples.

As result of this, a new examples package is now created. Note, this is only effective with 'SHARED=copies' (the default), as the 'SHARED=symlinks' mechanism will create a symlink to the source tree version of the file(s). Sponsored by: The FreeBSD Foundation
2016-05-10 00:51:50 +00:00 · 2016-05-10 00:51:50 +00:00 · 214f3b8bf1
commit 214f3b8bf1
parent b3ef210088
36 changed files with 90 additions and 4 deletions
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/${PROG}
 PROG=	FreeBSD_version
 MAN=

--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@ -4,6 +4,15 @@

 .include <src.opts.mk>

+PACKAGE=examples
+FILESDIR=	${SHAREDIR}/examples
+
+.for _XFILE in ${XFILES}
+FILESGROUPS+=	${_XFILE}
+PACKAGE_${_XFILE}?=examples
+${_XFILE}DIR=	${SHAREDIR}/examples/${_XFILE:H}
+.endfor
+
 LDIRS=	BSD_daemon \
 	FreeBSD_version \
 	IPv6 \
@ -232,7 +241,7 @@ copies:
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
 	    -f ${.CURDIR}/../../etc/mtree/BSD.usr.dist -p ${DESTDIR}/usr
 .for file in ${XFILES}
-	${INSTALL} -T package=${PACKAGE_${file}:Uruntime} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
+	${INSTALL} -T package=${PACKAGE_${file}:Uexamples} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
 		${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file}
 .endfor

--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/${PROG}
 PROG=	find_interface
 MAN=

--- a/share/examples/hwpmc/Makefile
+++ b/share/examples/hwpmc/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/hwpmc
 PROG=	overhead
 LDFLAGS+= -lpmc
 MAN=
--- a/share/examples/ipfilter/Makefile
+++ b/share/examples/ipfilter/Makefile
@ -1,5 +1,6 @@
 # $FreeBSD$

+PACKAGE=examples
 FILES=	README

 # dist sample files
--- a/share/examples/kld/Makefile
+++ b/share/examples/kld/Makefile
@ -67,6 +67,8 @@
 #	$FreeBSD$
 #

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld
 SUBDIR=	cdev dyn_sysctl firmware khelp random_adaptor syscall

 .include <bsd.subdir.mk>
--- a/share/examples/kld/cdev/Makefile
+++ b/share/examples/kld/cdev/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/cdev
 SUBDIR=	module test

 load unload: _SUBDIR
--- a/share/examples/kld/cdev/module/Makefile
+++ b/share/examples/kld/cdev/module/Makefile
@ -1,6 +1,8 @@
 # Makefile for kld char device driver.
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/${KMOD}/module
 KMOD=	cdev
 SRCS=	cdev.c cdevmod.c

--- a/share/examples/kld/cdev/test/Makefile
+++ b/share/examples/kld/cdev/test/Makefile
@ -66,6 +66,8 @@
 #
 # $FreeBSD$
 #
+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/cdev/test
 PROG=	testcdev
 MAN=
 WARNS?=	5
--- a/share/examples/kld/dyn_sysctl/Makefile
+++ b/share/examples/kld/dyn_sysctl/Makefile
@ -1,5 +1,7 @@
 #	$FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/${KMOD}
 SRCS	= dyn_sysctl.c
 KMOD	= dyn_sysctl

--- a/share/examples/kld/firmware/Makefile
+++ b/share/examples/kld/firmware/Makefile
@ -1,5 +1,7 @@
 #	$FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/firmware
 SUBDIR= fwimage fwconsumer

 .include <bsd.subdir.mk>
--- a/share/examples/kld/firmware/fwconsumer/Makefile
+++ b/share/examples/kld/firmware/fwconsumer/Makefile
@ -1,5 +1,7 @@
 #	$FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/fwconsumer
 KMOD=	fw_consumer
 SRCS=	fw_consumer.c

--- a/share/examples/kld/firmware/fwimage/Makefile
+++ b/share/examples/kld/firmware/fwimage/Makefile
@ -1,5 +1,7 @@
 #	$FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/fwimage
 KMOD=	beastie
 FIRMWS=	firmware.img:beastie

--- a/share/examples/kld/khelp/Makefile
+++ b/share/examples/kld/khelp/Makefile
@ -5,6 +5,8 @@
 # Change if the src tree you are compiling for is not in /usr/src
 #SYSDIR=/usr/src/sys

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/khelp
 KMOD=	h_example
 SRCS=	h_example.c

--- a/share/examples/kld/random_adaptor/Makefile
+++ b/share/examples/kld/random_adaptor/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/${KMOD}
 KMOD=  random_adaptor_example
 SRCS=  ${KMOD}.c

--- a/share/examples/kld/syscall/Makefile
+++ b/share/examples/kld/syscall/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/syscall
 SUBDIR=	module test

 load unload: _SUBDIR
--- a/share/examples/kld/syscall/module/Makefile
+++ b/share/examples/kld/syscall/module/Makefile
@ -1,6 +1,8 @@
 # Makefile for building the sample syscall module
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/${KMOD}
 KMOD=	syscall
 SRCS=	syscall.c

--- a/share/examples/kld/syscall/test/Makefile
+++ b/share/examples/kld/syscall/test/Makefile
@ -1,6 +1,8 @@
 # Makefile for simple caller of syscall
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/kld/test
 PROG=	call
 MAN=
 WARNS?=	5
--- a/share/examples/libusb20/Makefile
+++ b/share/examples/libusb20/Makefile
@ -1,4 +1,7 @@
 # $FreeBSD$
+
+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/libusb20
 TARGETS=	bulk control
 CFLAGS+=	-Wall

--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/libvgl
 PROG=	demo
 MAN=
 DPADD=	${LIBVGL}
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/${PROG}
 PROG=	perfmon
 MAN=

--- a/share/examples/pf/Makefile
+++ b/share/examples/pf/Makefile
@ -1,5 +1,6 @@
 # $FreeBSD$

+PACKAGE=examples
 FILES=	faq-example1 faq-example2 faq-example3 \
 	ackpri queue1 queue2 queue3 queue4 \
 	pf.conf \
--- a/share/examples/ppi/Makefile
+++ b/share/examples/ppi/Makefile
@ -2,6 +2,8 @@
 #
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/ppi
 PROG=	ppilcd
 MAN=

--- a/share/examples/scsi_target/Makefile
+++ b/share/examples/scsi_target/Makefile
@ -1,5 +1,7 @@
 # $FreeBSD$

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/${PROG}
 PROG=	scsi_target
 SRCS=	scsi_target.h scsi_target.c scsi_cmds.c
 DPADD=	${LIBCAM} ${LIBSBUF}
--- a/share/examples/ses/Makefile
+++ b/share/examples/ses/Makefile
@ -32,6 +32,8 @@
 # mjacob@feral.com
 #

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/ses
 UNUSED	= getobjmap getnobj getobjstat
 SUBDIR	= getencstat setencstat setobjstat sesd

--- a/share/examples/ses/getencstat/Makefile
+++ b/share/examples/ses/getencstat/Makefile
@ -34,6 +34,8 @@

 .PATH: ${.CURDIR}/../srcs

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/ses/${PROG}
 PROG=	getencstat
 SRCS=	getencstat.c eltsub.c
 MAN=	getencstat.8
--- a/share/examples/ses/sesd/Makefile
+++ b/share/examples/ses/sesd/Makefile
@ -34,6 +34,8 @@

 .PATH: ${.CURDIR}/../srcs

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/ses/${PROG}
 PROG=	sesd
 SRCS=	sesd.c eltsub.c
 MAN=	sesd.8
--- a/share/examples/ses/setencstat/Makefile
+++ b/share/examples/ses/setencstat/Makefile
@ -34,6 +34,8 @@

 .PATH: ${.CURDIR}/../srcs

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/ses/${PROG}
 PROG=	setencstat
 SRCS=	setencstat.c eltsub.c
 MAN=	setencstat.8
--- a/share/examples/ses/setobjstat/Makefile
+++ b/share/examples/ses/setobjstat/Makefile
@ -34,6 +34,8 @@

 .PATH: ${.CURDIR}/../srcs

+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/ses/${PROG}
 PROG=	setobjstat
 SRCS=	setobjstat.c eltsub.c
 MAN=	setobjstat.8
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@ -1,5 +1,6 @@
 # $FreeBSD$

+PACKAGE=examples
 FILESDIR= ${SHAREDIR}/examples/smbfs
 FILES=	dot.nsmbrc

--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@ -1,5 +1,6 @@
 # $FreeBSD$

+PACKAGE=examples
 FILESDIR= ${SHAREDIR}/examples/smbfs/print
 FILES=	lj6l ljspool printcap.sample tolj

--- a/share/examples/sunrpc/Makefile
+++ b/share/examples/sunrpc/Makefile
@ -4,6 +4,11 @@
 #
 #   Build all demo services
 #
+# $FreeBSD$
+#
+
+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/sunrpc
 MAKE = make
 LIB=

--- a/share/examples/sunrpc/dir/Makefile
+++ b/share/examples/sunrpc/dir/Makefile
@ -1,6 +1,10 @@
 #
 # @(#)Makefile	2.1 88/08/02 4.0 RPCSRC
 #
+# $FreeBSD$
+#
+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/sunrpc/dir
 BIN = dir_svc rls
 GEN = dir_clnt.c dir_svc.c dir_xdr.c dir.h
 LIB = -lrpclib
--- a/share/examples/sunrpc/msg/Makefile
+++ b/share/examples/sunrpc/msg/Makefile
@ -1,6 +1,10 @@
 #
 # @(#)Makefile	2.1 88/08/11 4.0 RPCSRC
 #
+# $FreeBSD$
+#
+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/sunrpc/msg
 BIN = printmsg msg_svc rprintmsg
 GEN = msg_clnt.c msg_svc.c msg.h
 LIB = -lrpclib
--- a/share/examples/sunrpc/sort/Makefile
+++ b/share/examples/sunrpc/sort/Makefile
@ -1,7 +1,10 @@
 #
 # @(#)Makefile	2.1 88/08/11 4.0 RPCSRC
 #
-
+# $FreeBSD$
+#
+PACKAGE=examples
+FILESDIR=${SHAREDIR}/examples/sunrpc/sort
 BIN =  rsort sort_svc
 GEN = sort_clnt.c sort_svc.c sort_xdr.c sort.h
 LIB = -lrpclib
--- a/share/sendmail/Makefile
+++ b/share/sendmail/Makefile
@ -2,11 +2,15 @@
 #
 # Doing a make install builds /usr/share/sendmail/

+PACKAGE=	sendmail
+FILESGROUPS+=	SM
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 CFDIR=	cf
 CFPACKAGE=	sendmail
 CFDIRS!=	(cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print)
 CFFILES!=	(cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print)
+SMFILES= 	${CFFILES}
+SMFILESDIR=	${DDIR}

 DDIR=	${DESTDIR}${SHAREDIR}/sendmail

@ -22,10 +26,10 @@ META_TARGETS+=	copies symlinks
 copies:
 	if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi
 .for dir in ${CFDIRS}
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir}
+	${INSTALL} -T package=${PACKAGE:Usendmail} ${TAGS_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir}
 .endfor
 .for file in ${CFFILES}
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file}
+	${INSTALL} -T package=${PACKAGE:Usendmail} ${TAGS_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file}
 .endfor

 symlinks: