[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Made the code simpler and added "set -e".

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3c10023bad8
branches:  trunk
changeset: 519727:f3c10023bad8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 08 20:24:03 2006 +0000

description:
Made the code simpler and added "set -e".

diffstat:

 mk/flavor/pkg/package.mk |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (29 lines):

diff -r 74fa41cc9cb3 -r f3c10023bad8 mk/flavor/pkg/package.mk
--- a/mk/flavor/pkg/package.mk  Sun Oct 08 19:15:02 2006 +0000
+++ b/mk/flavor/pkg/package.mk  Sun Oct 08 20:24:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.3 2006/10/06 14:51:36 joerg Exp $
+# $NetBSD: package.mk,v 1.4 2006/10/08 20:24:03 rillig Exp $
 
 PKG_SUFX?=             .tgz
 PKGFILE?=              ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
@@ -37,14 +37,13 @@
 
 ${PKGFILE}: ${_CONTENTS_TARGETS}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} ${.TARGET};                  \
-       exitcode=$$?;                                                   \
-       if ${TEST} $$exitcode -ne 0; then                               \
-               ${ERROR_MSG} "(${PKG_CREATE:T}: exitcode $$exitcode)";  \
+       ${_PKG_SILENT}${_PKG_DEBUG} set -e;                             \
+       ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} ${.TARGET} || {              \
+               exitcode=$$?;                                           \
+               ${ERROR_MSG} "${PKG_CREATE:T} failed ($$exitcode)";     \
                ${RM} -f ${.TARGET};                                    \
                exit 1;                                                 \
-       fi
+       }
 
 ######################################################################
 ### package-remove (PRIVATE)