Page MenuHomeFreeBSD
Files F109749084

D26019.diff
No OneTemporary
Actions

D26019.diff
View Options

Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1
+++ head/Makefile.inc1
@@ -552,6 +552,13 @@
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 @@
-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 @@
-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\" ' \
Index: head/release/packages/binutils.ucl
===================================================================
--- head/release/packages/binutils.ucl
+++ head/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 ]
Index: head/release/packages/caroot.ucl
===================================================================
--- head/release/packages/caroot.ucl
+++ head/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 ]
Index: head/release/packages/clang.ucl
===================================================================
--- head/release/packages/clang.ucl
+++ head/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 ]
Index: head/release/packages/gdb.ucl
===================================================================
--- head/release/packages/gdb.ucl
+++ head/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 ]
Index: head/release/packages/generate-ucl.sh
===================================================================
--- head/release/packages/generate-ucl.sh
+++ head/release/packages/generate-ucl.sh
@@ -146,6 +146,9 @@
-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
}
Index: head/release/packages/groff.ucl
===================================================================
--- head/release/packages/groff.ucl
+++ head/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 ]
Index: head/release/packages/jail.ucl
===================================================================
--- head/release/packages/jail.ucl
+++ head/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"
Index: head/release/packages/kernel.ucl
===================================================================
--- head/release/packages/kernel.ucl
+++ head/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 ]
Index: head/release/packages/lld.ucl
===================================================================
--- head/release/packages/lld.ucl
+++ head/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 ]
Index: head/release/packages/lldb.ucl
===================================================================
--- head/release/packages/lldb.ucl
+++ head/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 ]
Index: head/release/packages/runtime.ucl
===================================================================
--- head/release/packages/runtime.ucl
+++ head/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"
Index: head/release/packages/ssh.ucl
===================================================================
--- head/release/packages/ssh.ucl
+++ head/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 ]
Index: head/release/packages/svn.ucl
===================================================================
--- head/release/packages/svn.ucl
+++ head/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 ]
Index: head/release/packages/template.ucl
===================================================================
--- head/release/packages/template.ucl
+++ head/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 ]
Index: head/release/packages/unbound.ucl
===================================================================
--- head/release/packages/unbound.ucl
+++ head/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 ]
Index: head/release/packages/utilities.ucl
===================================================================
--- head/release/packages/utilities.ucl
+++ head/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"

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 10, 1:31 AM (21 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16567867
Default Alt Text
D26019.diff (9 KB)

Event Timeline