Date: Tue, 10 May 2016 00:51:50 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299293 - in head/share: examples examples/FreeBSD_version examples/find_interface examples/hwpmc examples/ipfilter examples/kld examples/kld/cdev examples/kld/cdev/module examples/kld/... Message-ID: <201605100051.u4A0pogB095092@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue May 10 00:51:50 2016 New Revision: 299293 URL: https://svnweb.freebsd.org/changeset/base/299293 Log: 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 Modified: head/share/examples/FreeBSD_version/Makefile head/share/examples/Makefile head/share/examples/find_interface/Makefile head/share/examples/hwpmc/Makefile head/share/examples/ipfilter/Makefile head/share/examples/kld/Makefile head/share/examples/kld/cdev/Makefile head/share/examples/kld/cdev/module/Makefile head/share/examples/kld/cdev/test/Makefile head/share/examples/kld/dyn_sysctl/Makefile head/share/examples/kld/firmware/Makefile head/share/examples/kld/firmware/fwconsumer/Makefile head/share/examples/kld/firmware/fwimage/Makefile head/share/examples/kld/khelp/Makefile head/share/examples/kld/random_adaptor/Makefile head/share/examples/kld/syscall/Makefile head/share/examples/kld/syscall/module/Makefile head/share/examples/kld/syscall/test/Makefile head/share/examples/libusb20/Makefile head/share/examples/libvgl/Makefile head/share/examples/perfmon/Makefile head/share/examples/pf/Makefile head/share/examples/ppi/Makefile head/share/examples/scsi_target/Makefile head/share/examples/ses/Makefile head/share/examples/ses/getencstat/Makefile head/share/examples/ses/sesd/Makefile head/share/examples/ses/setencstat/Makefile head/share/examples/ses/setobjstat/Makefile head/share/examples/smbfs/Makefile head/share/examples/smbfs/print/Makefile head/share/examples/sunrpc/Makefile head/share/examples/sunrpc/dir/Makefile head/share/examples/sunrpc/msg/Makefile head/share/examples/sunrpc/sort/Makefile head/share/sendmail/Makefile Modified: head/share/examples/FreeBSD_version/Makefile ============================================================================== --- head/share/examples/FreeBSD_version/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/FreeBSD_version/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/${PROG} PROG= FreeBSD_version MAN= Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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 Modified: head/share/examples/find_interface/Makefile ============================================================================== --- head/share/examples/find_interface/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/find_interface/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/${PROG} PROG= find_interface MAN= Modified: head/share/examples/hwpmc/Makefile ============================================================================== --- head/share/examples/hwpmc/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/hwpmc/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/hwpmc PROG= overhead LDFLAGS+= -lpmc MAN= Modified: head/share/examples/ipfilter/Makefile ============================================================================== --- head/share/examples/ipfilter/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/ipfilter/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=examples FILES= README # dist sample files Modified: head/share/examples/kld/Makefile ============================================================================== --- head/share/examples/kld/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -67,6 +67,8 @@ # $FreeBSD$ # +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld SUBDIR= cdev dyn_sysctl firmware khelp random_adaptor syscall .include <bsd.subdir.mk> Modified: head/share/examples/kld/cdev/Makefile ============================================================================== --- head/share/examples/kld/cdev/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/cdev/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/cdev SUBDIR= module test load unload: _SUBDIR Modified: head/share/examples/kld/cdev/module/Makefile ============================================================================== --- head/share/examples/kld/cdev/module/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/cdev/module/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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 Modified: head/share/examples/kld/cdev/test/Makefile ============================================================================== --- head/share/examples/kld/cdev/test/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/cdev/test/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -66,6 +66,8 @@ # # $FreeBSD$ # +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/cdev/test PROG= testcdev MAN= WARNS?= 5 Modified: head/share/examples/kld/dyn_sysctl/Makefile ============================================================================== --- head/share/examples/kld/dyn_sysctl/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/dyn_sysctl/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/${KMOD} SRCS = dyn_sysctl.c KMOD = dyn_sysctl Modified: head/share/examples/kld/firmware/Makefile ============================================================================== --- head/share/examples/kld/firmware/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/firmware/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/firmware SUBDIR= fwimage fwconsumer .include <bsd.subdir.mk> Modified: head/share/examples/kld/firmware/fwconsumer/Makefile ============================================================================== --- head/share/examples/kld/firmware/fwconsumer/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/firmware/fwconsumer/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/fwconsumer KMOD= fw_consumer SRCS= fw_consumer.c Modified: head/share/examples/kld/firmware/fwimage/Makefile ============================================================================== --- head/share/examples/kld/firmware/fwimage/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/firmware/fwimage/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/fwimage KMOD= beastie FIRMWS= firmware.img:beastie Modified: head/share/examples/kld/khelp/Makefile ============================================================================== --- head/share/examples/kld/khelp/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/khelp/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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 Modified: head/share/examples/kld/random_adaptor/Makefile ============================================================================== --- head/share/examples/kld/random_adaptor/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/random_adaptor/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/${KMOD} KMOD= random_adaptor_example SRCS= ${KMOD}.c Modified: head/share/examples/kld/syscall/Makefile ============================================================================== --- head/share/examples/kld/syscall/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/syscall/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/syscall SUBDIR= module test load unload: _SUBDIR Modified: head/share/examples/kld/syscall/module/Makefile ============================================================================== --- head/share/examples/kld/syscall/module/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/syscall/module/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,6 +1,8 @@ # Makefile for building the sample syscall module # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/${KMOD} KMOD= syscall SRCS= syscall.c Modified: head/share/examples/kld/syscall/test/Makefile ============================================================================== --- head/share/examples/kld/syscall/test/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/kld/syscall/test/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,6 +1,8 @@ # Makefile for simple caller of syscall # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/kld/test PROG= call MAN= WARNS?= 5 Modified: head/share/examples/libusb20/Makefile ============================================================================== --- head/share/examples/libusb20/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/libusb20/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,4 +1,7 @@ # $FreeBSD$ + +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/libusb20 TARGETS= bulk control CFLAGS+= -Wall Modified: head/share/examples/libvgl/Makefile ============================================================================== --- head/share/examples/libvgl/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/libvgl/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/libvgl PROG= demo MAN= DPADD= ${LIBVGL} Modified: head/share/examples/perfmon/Makefile ============================================================================== --- head/share/examples/perfmon/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/perfmon/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/${PROG} PROG= perfmon MAN= Modified: head/share/examples/pf/Makefile ============================================================================== --- head/share/examples/pf/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/pf/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=examples FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ pf.conf \ Modified: head/share/examples/ppi/Makefile ============================================================================== --- head/share/examples/ppi/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/ppi/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -2,6 +2,8 @@ # # $FreeBSD$ +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/ppi PROG= ppilcd MAN= Modified: head/share/examples/scsi_target/Makefile ============================================================================== --- head/share/examples/scsi_target/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/scsi_target/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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} Modified: head/share/examples/ses/Makefile ============================================================================== --- head/share/examples/ses/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/ses/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -32,6 +32,8 @@ # mjacob@feral.com # +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/ses UNUSED = getobjmap getnobj getobjstat SUBDIR = getencstat setencstat setobjstat sesd Modified: head/share/examples/ses/getencstat/Makefile ============================================================================== --- head/share/examples/ses/getencstat/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/ses/getencstat/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -34,6 +34,8 @@ .PATH: ${.CURDIR}/../srcs +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/ses/${PROG} PROG= getencstat SRCS= getencstat.c eltsub.c MAN= getencstat.8 Modified: head/share/examples/ses/sesd/Makefile ============================================================================== --- head/share/examples/ses/sesd/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/ses/sesd/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -34,6 +34,8 @@ .PATH: ${.CURDIR}/../srcs +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/ses/${PROG} PROG= sesd SRCS= sesd.c eltsub.c MAN= sesd.8 Modified: head/share/examples/ses/setencstat/Makefile ============================================================================== --- head/share/examples/ses/setencstat/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/ses/setencstat/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -34,6 +34,8 @@ .PATH: ${.CURDIR}/../srcs +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/ses/${PROG} PROG= setencstat SRCS= setencstat.c eltsub.c MAN= setencstat.8 Modified: head/share/examples/ses/setobjstat/Makefile ============================================================================== --- head/share/examples/ses/setobjstat/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/ses/setobjstat/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -34,6 +34,8 @@ .PATH: ${.CURDIR}/../srcs +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/ses/${PROG} PROG= setobjstat SRCS= setobjstat.c eltsub.c MAN= setobjstat.8 Modified: head/share/examples/smbfs/Makefile ============================================================================== --- head/share/examples/smbfs/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/smbfs/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=examples FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc Modified: head/share/examples/smbfs/print/Makefile ============================================================================== --- head/share/examples/smbfs/print/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/smbfs/print/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE=examples FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj Modified: head/share/examples/sunrpc/Makefile ============================================================================== --- head/share/examples/sunrpc/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/sunrpc/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -4,6 +4,11 @@ # # Build all demo services # +# $FreeBSD$ +# + +PACKAGE=examples +FILESDIR=${SHAREDIR}/examples/sunrpc MAKE = make LIB= Modified: head/share/examples/sunrpc/dir/Makefile ============================================================================== --- head/share/examples/sunrpc/dir/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/sunrpc/dir/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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 Modified: head/share/examples/sunrpc/msg/Makefile ============================================================================== --- head/share/examples/sunrpc/msg/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/sunrpc/msg/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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 Modified: head/share/examples/sunrpc/sort/Makefile ============================================================================== --- head/share/examples/sunrpc/sort/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/examples/sunrpc/sort/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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 Modified: head/share/sendmail/Makefile ============================================================================== --- head/share/sendmail/Makefile Tue May 10 00:47:49 2016 (r299292) +++ head/share/sendmail/Makefile Tue May 10 00:51:50 2016 (r299293) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605100051.u4A0pogB095092>