From d3cd95cf88d7b7d9ad809def9a665f6f9b71112f Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 18 Mar 2015 09:39:31 +0000
Subject: [PATCH] Now that pkg create can directly accept both a file and a
 plist in command line, directly use it

---
 Makefile.inc1                                       | 12 +++++-------
 release/packages/{acpi/+MANIFEST => acpi.ucl}       |  0
 release/packages/{at/+MANIFEST => at.ucl}           |  0
 release/packages/{bhyve/+MANIFEST => bhyve.ucl}     |  0
 .../{development/+MANIFEST => development.ucl}      |  0
 release/packages/{docs/+MANIFEST => docs.ucl}       |  0
 release/packages/{runtime/+MANIFEST => kernel.ucl}  |  3 +++
 release/packages/{kernel/+MANIFEST => profile.ucl}  |  0
 release/packages/{profile/+MANIFEST => runtime.ucl} |  0
 release/packages/ssh.ucl                            | 13 +++++++++++++
 release/packages/{svn/+MANIFEST => svn.ucl}         |  0
 release/packages/{syscons/+MANIFEST => syscons.ucl} |  0
 release/packages/{unbound/+MANIFEST => unbound.ucl} |  0
 13 files changed, 21 insertions(+), 7 deletions(-)
 rename release/packages/{acpi/+MANIFEST => acpi.ucl} (100%)
 rename release/packages/{at/+MANIFEST => at.ucl} (100%)
 rename release/packages/{bhyve/+MANIFEST => bhyve.ucl} (100%)
 rename release/packages/{development/+MANIFEST => development.ucl} (100%)
 rename release/packages/{docs/+MANIFEST => docs.ucl} (100%)
 rename release/packages/{runtime/+MANIFEST => kernel.ucl} (82%)
 rename release/packages/{kernel/+MANIFEST => profile.ucl} (100%)
 rename release/packages/{profile/+MANIFEST => runtime.ucl} (100%)
 create mode 100644 release/packages/ssh.ucl
 rename release/packages/{svn/+MANIFEST => svn.ucl} (100%)
 rename release/packages/{syscons/+MANIFEST => syscons.ucl} (100%)
 rename release/packages/{unbound/+MANIFEST => unbound.ucl} (100%)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 7426817137f..aee9ab58e87 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1214,24 +1214,22 @@ create-world-packages:
 		${DESTDIR}/METALOG
 	@for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
-		test -d ${SRCDIR}/release/packages/$${plist%.plist} || \
+		test -f ${SRCDIR}/release/packages/$${plist%.plist}.ucl || \
 			( echo "Unkown package FreeBSD-$${plist%.plist}" ; false ) ; \
 	done
 	@for plist in ${DESTDIR}/*.plist; do \
 		plist=$${plist##*/} ; \
 		pkgname=$${plist%.plist} ; \
-		rm -rf ${DESTDIR}/$${pkgname}-manifestdir ; \
-		cp -r ${SRCDIR}/release/packages/$${pkgname} \
-			${DESTDIR}/$${pkgname}-manifestdir ; \
-		sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
+		sed -e "s/%VERSION%/${PKG_VERSION}/" \
 			-e "s/%PKGNAME%/$${pkgname}/" \
 			-e "s/%COMMENT%/Generic comment for $${pkgname}/" \
 			-e "s/%DESC%/Generic description for $${pkgname}/" \
-			${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \
+			${SRCDIR}/release/packages/$${pkgname}.ucl \
+			> ${DESTDIR}/$${pkgname}.ucl ; \
 		awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
 			${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \
 		pkg -o ABI_FILE=${DESTDIR}/bin/sh \
-			create -m ${DESTDIR}/$${pkgname}-manifestdir \
+			create -M ${DESTDIR}/$${pkgname}.ucl \
 			-p ${DESTDIR}/$${pkgname}.plist \
 			-r ${DESTDIR} -o ${DESTDIR} ; \
 	done
diff --git a/release/packages/acpi/+MANIFEST b/release/packages/acpi.ucl
similarity index 100%
rename from release/packages/acpi/+MANIFEST
rename to release/packages/acpi.ucl
diff --git a/release/packages/at/+MANIFEST b/release/packages/at.ucl
similarity index 100%
rename from release/packages/at/+MANIFEST
rename to release/packages/at.ucl
diff --git a/release/packages/bhyve/+MANIFEST b/release/packages/bhyve.ucl
similarity index 100%
rename from release/packages/bhyve/+MANIFEST
rename to release/packages/bhyve.ucl
diff --git a/release/packages/development/+MANIFEST b/release/packages/development.ucl
similarity index 100%
rename from release/packages/development/+MANIFEST
rename to release/packages/development.ucl
diff --git a/release/packages/docs/+MANIFEST b/release/packages/docs.ucl
similarity index 100%
rename from release/packages/docs/+MANIFEST
rename to release/packages/docs.ucl
diff --git a/release/packages/runtime/+MANIFEST b/release/packages/kernel.ucl
similarity index 82%
rename from release/packages/runtime/+MANIFEST
rename to release/packages/kernel.ucl
index 862adb1b89d..49a8d081337 100644
--- a/release/packages/runtime/+MANIFEST
+++ b/release/packages/kernel.ucl
@@ -11,3 +11,6 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
+post-install = <<EOD
+/usr/sbin/kldxref /boot/kernel
+EOD
diff --git a/release/packages/kernel/+MANIFEST b/release/packages/profile.ucl
similarity index 100%
rename from release/packages/kernel/+MANIFEST
rename to release/packages/profile.ucl
diff --git a/release/packages/profile/+MANIFEST b/release/packages/runtime.ucl
similarity index 100%
rename from release/packages/profile/+MANIFEST
rename to release/packages/runtime.ucl
diff --git a/release/packages/ssh.ucl b/release/packages/ssh.ucl
new file mode 100644
index 00000000000..cd40be5c79b
--- /dev/null
+++ b/release/packages/ssh.ucl
@@ -0,0 +1,13 @@
+name = "FreeBSD-ssh"
+origin = "base"
+version = "%VERSION%"
+comment = "Secure SHell"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ ISCL ]
+desc = <<EOD
+TODO
+EOD
diff --git a/release/packages/svn/+MANIFEST b/release/packages/svn.ucl
similarity index 100%
rename from release/packages/svn/+MANIFEST
rename to release/packages/svn.ucl
diff --git a/release/packages/syscons/+MANIFEST b/release/packages/syscons.ucl
similarity index 100%
rename from release/packages/syscons/+MANIFEST
rename to release/packages/syscons.ucl
diff --git a/release/packages/unbound/+MANIFEST b/release/packages/unbound.ucl
similarity index 100%
rename from release/packages/unbound/+MANIFEST
rename to release/packages/unbound.ucl