Use PLIST_ORIGIN instead of rolling own version using PLIST_COMMENT.

MFC after:	6 days

1 files changed, 5 insertions, 4 deletions

diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 21bc33e..2c0b0ef 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -99,10 +99,6 @@ pkg_perform(char **pkgs)
     }
     plist.head = plist.tail = NULL;
 
-    /* Add the origin if asked, at the top */
-    if (Origin)
-	add_plist(&plist, PLIST_COMMENT, strconcat("ORIGIN:", Origin));
-
     /* Stick the dependencies, if any, at the top */
     if (Pkgdeps) {
 	char **deps;
@@ -160,6 +156,11 @@ pkg_perform(char **pkgs)
     /* Prefix should add an @cwd to the packing list */
     if (Prefix)
 	add_plist_top(&plist, PLIST_CWD, Prefix);
+
+    /* Add the origin if asked, at the top */
+    if (Origin)
+	add_plist_top(&plist, PLIST_ORIGIN, Origin);
+
     /*
      * Run down the list and see if we've named it, if not stick in a name
      * at the top.