summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2008-01-04 14:22:06 +0000
committerrillig <rillig@pkgsrc.org>2008-01-04 14:22:06 +0000
commit48dafd63f459bcabccbb8eb73bd2b8abbd2ebae0 (patch)
treeed0b87a76f34c0255afcffe733bbdcdc9d8f79ca
parent2f12b5522d5923daa25a838bed7114eac607a324 (diff)
downloadpkgsrc-48dafd63f459bcabccbb8eb73bd2b8abbd2ebae0.tar.gz
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@.
-rw-r--r--mk/flavor/pkg/package.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk
index ada236d2efc..5d937e59999 100644
--- a/mk/flavor/pkg/package.mk
+++ b/mk/flavor/pkg/package.mk
@@ -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 @@ _PKG_ARGS_PACKAGE+= -E
${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)