pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Reverted the change that tried to make b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9094be4ba74d
branches:  trunk
changeset: 537171:9094be4ba74d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jan 04 14:22:06 2008 +0000

description:
Reverted the change that tried to make binary packages more sane because
it had severe consequences: pkg_create gets lots of information from the
filename into which the package is written. The extension decides what
compression to apply, and the basename gets recorded as the @name. This
part needs more work.

Noticed by stoned@.

diffstat:

 mk/flavor/pkg/package.mk |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (24 lines):

diff -r 0dc9a8ec6920 -r 9094be4ba74d mk/flavor/pkg/package.mk
--- a/mk/flavor/pkg/package.mk  Fri Jan 04 14:10:05 2008 +0000
+++ b/mk/flavor/pkg/package.mk  Fri Jan 04 14:22:06 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.13 2008/01/03 23:21:48 rillig Exp $
+# $NetBSD: package.mk,v 1.14 2008/01/04 14:22:06 rillig Exp $
 
 PKG_SUFX?=             .tgz
 PKGFILE?=              ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
@@ -40,13 +40,7 @@
 
 ${PKGFILE}: ${_CONTENTS_TARGETS}
        ${RUN} ${MKDIR} ${.TARGET:H}
-       ${RUN} if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} ${.TARGET}.tmp; then \
-               ${MV} -f ${.TARGET}.tmp ${.TARGET};                     \
-       else                                                            \
-               exitcode=$$?;                                           \
-               ${RM} -f ${.TARGET}.tmp;                                \
-               exit $$exitcode;                                        \
-       fi
+       ${RUN} ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} ${.TARGET}
 
 ######################################################################
 ### package-remove (PRIVATE)



Home | Main Index | Thread Index | Old Index