aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2020-08-11 08:42:24 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2020-08-11 08:42:24 +0000
commit82087d4b689e2478d2dcc00408d4c7f471cd88f1 (patch)
tree59d60a6b154afe4c2632283a9d79edb566921efe
parentb453d3d239d0dddd47740530389be1ceb70d9566 (diff)
downloadsrc-82087d4b689e2478d2dcc00408d4c7f471cd88f1.tar.gz
src-82087d4b689e2478d2dcc00408d4c7f471cd88f1.zip
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
Notes
Notes: svn path=/head/; revision=364103
-rw-r--r--Makefile.inc113
-rw-r--r--release/packages/binutils.ucl6
-rw-r--r--release/packages/caroot.ucl6
-rw-r--r--release/packages/clang.ucl6
-rw-r--r--release/packages/gdb.ucl6
-rwxr-xr-xrelease/packages/generate-ucl.sh3
-rw-r--r--release/packages/groff.ucl6
-rw-r--r--release/packages/jail.ucl6
-rw-r--r--release/packages/kernel.ucl6
-rw-r--r--release/packages/lld.ucl6
-rw-r--r--release/packages/lldb.ucl6
-rw-r--r--release/packages/runtime.ucl6
-rw-r--r--release/packages/ssh.ucl6
-rw-r--r--release/packages/svn.ucl6
-rw-r--r--release/packages/template.ucl6
-rw-r--r--release/packages/unbound.ucl6
-rw-r--r--release/packages/utilities.ucl6
17 files changed, 61 insertions, 45 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 00abab63d24b..cc2fb0d698d8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -552,6 +552,13 @@ SOURCE_DATE_EPOCH= ${TIMEEPOCHNOW:gmtime}
SOURCE_DATE_EPOCH= ${PKG_TIMESTAMP}
.endif
+PKG_NAME_PREFIX?= FreeBSD
+PKG_MAINTAINER?= re@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,^""$,${_default_flavor},}: _pkgbootstrap
-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,^""$,${_default_flavor},}-${_kerne
-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\" ' \
diff --git a/release/packages/binutils.ucl b/release/packages/binutils.ucl
index fcf05b313b38..ec246dfacd75 100644
--- a/release/packages/binutils.ucl
+++ b/release/packages/binutils.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ GPLv2 ]
diff --git a/release/packages/caroot.ucl b/release/packages/caroot.ucl
index f0d1730f9976..bc298efcabf4 100644
--- a/release/packages/caroot.ucl
+++ b/release/packages/caroot.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = %PKG_MAINTAINER%
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ BSD2CLAUSE ]
diff --git a/release/packages/clang.ucl b/release/packages/clang.ucl
index 3f8820abcbdf..0642f21d1daa 100644
--- a/release/packages/clang.ucl
+++ b/release/packages/clang.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ NCSA ]
diff --git a/release/packages/gdb.ucl b/release/packages/gdb.ucl
index fcf05b313b38..ec246dfacd75 100644
--- a/release/packages/gdb.ucl
+++ b/release/packages/gdb.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ GPLv2 ]
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 38bbb992d454..d9c791da290e 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -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
}
diff --git a/release/packages/groff.ucl b/release/packages/groff.ucl
index fcf05b313b38..ec246dfacd75 100644
--- a/release/packages/groff.ucl
+++ b/release/packages/groff.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ GPLv2 ]
diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl
index fcb9a567125b..8448a15ebf7b 100644
--- a/release/packages/jail.ucl
+++ b/release/packages/jail.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
vital = true
licenselogic = "single"
diff --git a/release/packages/kernel.ucl b/release/packages/kernel.ucl
index d7684a6d889d..b7317cae507c 100644
--- a/release/packages/kernel.ucl
+++ b/release/packages/kernel.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ BSD2CLAUSE ]
diff --git a/release/packages/lld.ucl b/release/packages/lld.ucl
index 3f8820abcbdf..0642f21d1daa 100644
--- a/release/packages/lld.ucl
+++ b/release/packages/lld.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ NCSA ]
diff --git a/release/packages/lldb.ucl b/release/packages/lldb.ucl
index 3f8820abcbdf..0642f21d1daa 100644
--- a/release/packages/lldb.ucl
+++ b/release/packages/lldb.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ NCSA ]
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index b17971acb2eb..6b51c830ab5c 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
vital = true
licenselogic = "single"
diff --git a/release/packages/ssh.ucl b/release/packages/ssh.ucl
index faf264e00f10..415094e9d69f 100644
--- a/release/packages/ssh.ucl
+++ b/release/packages/ssh.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ ISCL ]
diff --git a/release/packages/svn.ucl b/release/packages/svn.ucl
index 5211101e9e8c..f80da47be55b 100644
--- a/release/packages/svn.ucl
+++ b/release/packages/svn.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ APACHE20 ]
diff --git a/release/packages/template.ucl b/release/packages/template.ucl
index 38844f0f0898..f7cea7af8893 100644
--- a/release/packages/template.ucl
+++ b/release/packages/template.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ BSD2CLAUSE ]
diff --git a/release/packages/unbound.ucl b/release/packages/unbound.ucl
index 1ba9560abf12..d250e76752f9 100644
--- a/release/packages/unbound.ucl
+++ b/release/packages/unbound.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
licenselogic = "single"
licenses = [ BSD4CLAUSE ]
diff --git a/release/packages/utilities.ucl b/release/packages/utilities.ucl
index 936b46e4cb4c..ab5725d1c1d8 100644
--- a/release/packages/utilities.ucl
+++ b/release/packages/utilities.ucl
@@ -2,13 +2,13 @@
# $FreeBSD$
#
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
origin = "base"
version = "%VERSION%"
comment = "%COMMENT% %VCS_REVISION%"
categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
prefix = "/"
vital = true
licenselogic = "single"