diff options
| author | tron <tron@pkgsrc.org> | 2010-12-22 09:36:35 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-12-22 09:36:35 +0000 |
| commit | bf26db0ee5b1186d2d49dd8d907bf7c7d2a89508 (patch) | |
| tree | 96450a59cf422b86e49295c62d9032520c48e77c /pkgtools | |
| parent | 0df3c7b8330246f38ee47f744b72a3cfe28b7f58 (diff) | |
| download | pkgsrc-bf26db0ee5b1186d2d49dd8d907bf7c7d2a89508.tar.gz | |
Update "rpm2pkg" package to version 3.1.7. Changes since 3.1.6:
- Use "xzcat" instead of "lzcat". This package now doesn't depend on the
"archivers/xz" package under NetBSD-current because "xzcat" is part of
the base distribution.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 8 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/files/rpm2pkg.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index c485c743e69..c3bd93f25bc 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.53 2010/11/11 13:07:34 tron Exp $ +# $NetBSD: Makefile,v 1.54 2010/12/22 09:36:35 tron Exp $ -DISTNAME= rpm2pkg-3.1.6 +DISTNAME= rpm2pkg-3.1.7 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -16,11 +16,11 @@ CONFLICTS+= suse-base<=6.4 PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c99 -USE_TOOLS+= lzcat:run +USE_TOOLS+= xzcat:run WRKSRC= ${WRKDIR} CPPFLAGS+= ${BUILDLINK_CPPFLAGS.bzip2} ${BUILDLINK_CPPFLAGS.rpm} \ - ${BUILDLINK_CPPFLAGS.zlib} -DLZCAT=\"${TOOLS_PATH.lzcat:Q}\" + ${BUILDLINK_CPPFLAGS.zlib} -DXZCAT=\"${TOOLS_PATH.xzcat:Q}\" LIBS+= -lintl -lz -lbz2 .include "../../mk/compiler.mk" diff --git a/pkgtools/rpm2pkg/files/rpm2pkg.c b/pkgtools/rpm2pkg/files/rpm2pkg.c index ec970852723..ed1510644ed 100644 --- a/pkgtools/rpm2pkg/files/rpm2pkg.c +++ b/pkgtools/rpm2pkg/files/rpm2pkg.c @@ -1,4 +1,4 @@ -/* $NetBSD: rpm2pkg.c,v 1.18 2010/11/11 13:07:34 tron Exp $ */ +/* $NetBSD: rpm2pkg.c,v 1.19 2010/12/22 09:36:35 tron Exp $ */ /*- * Copyright (c) 2001-2010 The NetBSD Foundation, Inc. @@ -314,7 +314,7 @@ Open(int fd) } } else { /* lzma ... hopefully */ -#ifdef LZCAT +#ifdef XZCAT int pfds[2]; char *path, *argv[3]; pid_t pid; @@ -324,7 +324,7 @@ Open(int fd) return (NULL); } - path = LZCAT; + path = XZCAT; argv[0] = strrchr(path, '/'); if (argv[0] == NULL) argv[0] = path; |