Author: manu Date: Tue Aug 11 08:42:24 2020 New Revision: 364103 URL: https://svnweb.freebsd.org/changeset/base/364103
Log: pkgbase: Add PKG_NAME_PREFIX, PKG_MAINTAINER and PKG_WWW This is useful for downstream users to customize the packages. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D26019 Modified: head/Makefile.inc1 head/release/packages/binutils.ucl head/release/packages/caroot.ucl head/release/packages/clang.ucl head/release/packages/gdb.ucl head/release/packages/generate-ucl.sh head/release/packages/groff.ucl head/release/packages/jail.ucl head/release/packages/kernel.ucl head/release/packages/lld.ucl head/release/packages/lldb.ucl head/release/packages/runtime.ucl head/release/packages/ssh.ucl head/release/packages/svn.ucl head/release/packages/template.ucl head/release/packages/unbound.ucl head/release/packages/utilities.ucl Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Aug 11 08:31:40 2020 (r364102) +++ head/Makefile.inc1 Tue Aug 11 08:42:24 2020 (r364103) @@ -552,6 +552,13 @@ SOURCE_DATE_EPOCH= ${TIMEEPOCHNOW:gmtime} SOURCE_DATE_EPOCH= ${PKG_TIMESTAMP} .endif +PKG_NAME_PREFIX?= FreeBSD +PKG_MAINTAINER?= r...@freebsd.org +PKG_WWW?= https://www.FreeBSD.org +.export PKG_NAME_PREFIX +.export PKG_MAINTAINER +.export PKG_WWW + .if !defined(_MKSHOWCONFIG) _CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \ -m ${.CURDIR}/share/mk MK_AUTO_OBJ=no -V CPUTYPE @@ -1906,6 +1913,9 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul -e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s/%PKG_WWW%/${PKG_WWW}/" \ ${SRCDIR}/release/packages/kernel.ucl \ > ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ awk -F\" ' \ @@ -1939,6 +1949,9 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ -e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ + -e "s/%PKG_WWW%/${PKG_WWW}/" \ ${SRCDIR}/release/packages/kernel.ucl \ > ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ awk -F\" ' \ Modified: head/release/packages/binutils.ucl ============================================================================== --- head/release/packages/binutils.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/binutils.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ GPLv2 ] Modified: head/release/packages/caroot.ucl ============================================================================== --- head/release/packages/caroot.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/caroot.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = %PKG_MAINTAINER% +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ BSD2CLAUSE ] Modified: head/release/packages/clang.ucl ============================================================================== --- head/release/packages/clang.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/clang.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ NCSA ] Modified: head/release/packages/gdb.ucl ============================================================================== --- head/release/packages/gdb.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/gdb.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ GPLv2 ] Modified: head/release/packages/generate-ucl.sh ============================================================================== --- head/release/packages/generate-ucl.sh Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/generate-ucl.sh Tue Aug 11 08:42:24 2020 (r364103) @@ -146,6 +146,9 @@ EOF -e "s/%COMMENT%/${comment}/" \ -e "s/%DESC%/${desc}/" \ -e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \ + -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ + -e "s/%PKG_WWW%/${PKG_WWW}/" \ + -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ ${uclfile} return 0 } Modified: head/release/packages/groff.ucl ============================================================================== --- head/release/packages/groff.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/groff.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ GPLv2 ] Modified: head/release/packages/jail.ucl ============================================================================== --- head/release/packages/jail.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/jail.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" vital = true licenselogic = "single" Modified: head/release/packages/kernel.ucl ============================================================================== --- head/release/packages/kernel.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/kernel.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ BSD2CLAUSE ] Modified: head/release/packages/lld.ucl ============================================================================== --- head/release/packages/lld.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/lld.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ NCSA ] Modified: head/release/packages/lldb.ucl ============================================================================== --- head/release/packages/lldb.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/lldb.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ NCSA ] Modified: head/release/packages/runtime.ucl ============================================================================== --- head/release/packages/runtime.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/runtime.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" vital = true licenselogic = "single" Modified: head/release/packages/ssh.ucl ============================================================================== --- head/release/packages/ssh.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/ssh.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ ISCL ] Modified: head/release/packages/svn.ucl ============================================================================== --- head/release/packages/svn.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/svn.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ APACHE20 ] Modified: head/release/packages/template.ucl ============================================================================== --- head/release/packages/template.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/template.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ BSD2CLAUSE ] Modified: head/release/packages/unbound.ucl ============================================================================== --- head/release/packages/unbound.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/unbound.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" licenselogic = "single" licenses = [ BSD4CLAUSE ] Modified: head/release/packages/utilities.ucl ============================================================================== --- head/release/packages/utilities.ucl Tue Aug 11 08:31:40 2020 (r364102) +++ head/release/packages/utilities.ucl Tue Aug 11 08:42:24 2020 (r364103) @@ -2,13 +2,13 @@ # $FreeBSD$ # -name = "FreeBSD-%PKGNAME%" +name = "%PKG_NAME_PREFIX%-%PKGNAME%" origin = "base" version = "%VERSION%" comment = "%COMMENT% %VCS_REVISION%" categories = [ base ] -maintainer = "r...@freebsd.org" -www = "https://www.FreeBSD.org"; +maintainer = "%PKG_MAINTAINER%" +www = "%PKG_WWW%" prefix = "/" vital = true licenselogic = "single" _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
