0802764 Move pkg2ng into scripts and install it properly — HardenedBSD-pkg

HardenedBSD Package Manager

Move pkg2ng into scripts and install it properly

Baptiste Daroussin committed 12 years ago

commit 0802764707e8a7f419e890d6ffa91e493e6eddc2
parent 941a11fe6ae7e7d92449b08be09d74c0695a86d7

3 files changed +16 -15

deleted ports/pkg2ng

@@ -1,14 +0,0 @@

 #!/bin/sh
 : "${PORTSDIR:=/usr/ports}"
 if [ -f ${PORTSDIR}/Mk/bsd.pkgng.mk ]; then
 	FORCE_POST=$(make _POSTMKINCLUDED=1 -f ${PORTSDIR}/Mk/bsd.pkgng.mk -V _FORCE_POST_PATTERNS)
 else
 	FORCE_POST="rmdir kldxref mkfontscale mkfontdir fc-cache fonts.dir fonts.scale gtk-update-icon-cache gio-querymodules ldconfig update-desktop-database update-mime-database gdk-pixbuf-query-loaders catalog.ports glib-compile-schemas"
 fi
 FORCE_PORT=$FORCE_POST pkg convert
 # Delete the portupgrade pkgdb to avoid discrepencies. It will be auto recreated.
 rm -f /var/db/pkg/pkgdb.db > /dev/null 2>&1

modified scripts/Makefile

@@ -1,4 +1,5 @@

 SUBDIR=	periodic \
 	completion
 	completion \
 	sbin
 .include <bsd.subdir.mk>

added scripts/sbin/pkg2ng.in

@@ -0,0 +1,14 @@

 #!/bin/sh
 : "${PORTSDIR:=/usr/ports}"
 if [ -f ${PORTSDIR}/Mk/bsd.pkgng.mk ]; then
 	FORCE_POST=$(make _POSTMKINCLUDED=1 -f ${PORTSDIR}/Mk/bsd.pkgng.mk -V _FORCE_POST_PATTERNS)
 else
 	FORCE_POST="rmdir kldxref mkfontscale mkfontdir fc-cache fonts.dir fonts.scale gtk-update-icon-cache gio-querymodules ldconfig update-desktop-database update-mime-database gdk-pixbuf-query-loaders catalog.ports glib-compile-schemas"
 fi
 FORCE_PORT=$FORCE_POST __PREFIX__/sbin/pkg convert
 # Delete the portupgrade pkgdb to avoid discrepencies. It will be auto recreated.
 rm -f /var/db/pkg/pkgdb.db > /dev/null 2>&1