Page MenuHomeFreeBSD
Files F148064327

D8677.id22615.diff
No OneTemporary
Actions

D8677.id22615.diff
View Options

Index: Mk/bsd.commands.mk
===================================================================
--- Mk/bsd.commands.mk
+++ Mk/bsd.commands.mk
@@ -123,7 +123,7 @@
.elif !defined(_PKGTOOLSDEFINED)
_PKGTOOLSDEFINED= yes
PKG_BIN?= ${LOCALBASE}/sbin/pkg-static
-PKG_CMD?= ${PKG_BIN} register
+PKG_REGISTER?= ${PKG_BIN} register
PKG_DELETE?= ${PKG_BIN} delete -y
PKG_INFO?= ${PKG_BIN} info -g
PKG_VERSION?= ${PKG_BIN} version
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1804,9 +1804,6 @@
gio-querymodules \
gtk-query-immodules \
ldconfig \
- load-octave-pkg \
- ocamlfind \
- update-desktop-database update-mime-database \
gdk-pixbuf-query-loaders catalog.ports \
glib-compile-schemas \
ccache-update-links
@@ -4587,9 +4584,9 @@
@${ECHO_MSG} "===> Registering installation for ${PKGNAME}"
.endif
.if defined(INSTALLS_DEPENDS)
- @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CMD} -d ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
+ @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} -d ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
.else
- @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CMD} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
+ @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
.endif
@${RM} -r ${METADIR}
.endif
Index: ports-mgmt/pkg-devel/Makefile
===================================================================
--- ports-mgmt/pkg-devel/Makefile
+++ ports-mgmt/pkg-devel/Makefile
@@ -23,7 +23,7 @@
INSTALL_TARGET= install-strip
PORTDOCS= NEWS
-# Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
+# Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
# so that pkg-static is used from the wrkdir
USE_SUBMAKE= yes

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 12:36 PM (20 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29770746
Default Alt Text
D8677.id22615.diff (1 KB)

Event Timeline