cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean-up register-plist logic, so that package is uniformously deleted

Browse Source 
if a problem occurs.
This commit is contained in:
espie 2005-09-05 12:43:07 +00:00
parent 9763c8d7dd
commit 9fc55bc3e6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*- #-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make: # ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.705 2005/09/04 22:32:37 espie Exp $ # $OpenBSD: bsd.port.mk,v 1.706 2005/09/05 12:43:07 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $ # $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
# #
@ -158,6 +158,7 @@ PERMIT_DISTFILES_FTP = No
.if defined(show) .if defined(show)
.MAIN: show .MAIN: show
show: show:
. for _s in ${show} . for _s in ${show}
@echo ${${_s}:Q} @echo ${${_s}:Q}
@ -1951,6 +1952,12 @@ ${_UPDATE_COOKIE}: ${_PACKAGE_COOKIES}
# The real package # The real package
.if empty(PLIST_DB)
_register_plist=:
.else
_register_plist=perl /usr/ports/infrastructure/package/register-plist ${PLIST_DB} ${PKGFILE${SUBPACKAGE}}
.endif
_package: ${_PKG_PREREQ} _package: ${_PKG_PREREQ}
.if target(pre-package) .if target(pre-package)
@cd ${.CURDIR} && exec ${MAKE} pre-package @cd ${.CURDIR} && exec ${MAKE} pre-package
@ -1969,14 +1976,13 @@ _package: ${_PKG_PREREQ}
@cd ${.CURDIR} && \ @cd ${.CURDIR} && \
if ${SUDO} ${PKG_CMD} ${PKG_ARGS} ${PKGFILE${SUBPACKAGE}}; then \ if ${SUDO} ${PKG_CMD} ${PKG_ARGS} ${PKGFILE${SUBPACKAGE}}; then \
mode=`id -u`:`id -g`; ${SUDO} ${CHOWN} $${mode} ${PKGFILE${SUBPACKAGE}}; \ mode=`id -u`:`id -g`; ${SUDO} ${CHOWN} $${mode} ${PKGFILE${SUBPACKAGE}}; \
if ${_register_plist}; then \
${MAKE} _package-links; \ ${MAKE} _package-links; \
else \ exit 0; \
${SUDO} ${MAKE} _internal-clean=package; \ fi; \
exit 1; \ fi && \
fi ${SUDO} ${MAKE} _internal-clean=package && \
.if !empty(PLIST_DB) exit 1
@perl /usr/ports/infrastructure/package/register-plist ${PLIST_DB} ${PKGFILE${SUBPACKAGE}}
.endif
# End of PACKAGE. # End of PACKAGE.
.endif .endif
.if target(post-package) .if target(post-package)