diff options
| author | tron <tron@pkgsrc.org> | 2011-01-19 16:23:02 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2011-01-19 16:23:02 +0000 |
| commit | 284c6f0f4fb04810c509f66e3f3e6a6bb29d52a2 (patch) | |
| tree | 4d7667d3b9b694fd38f2c94c1fe0a22960e3c4bd /pkgtools | |
| parent | 973d0136bcbe0d4ac1bd57b2e5d2fadce9702410 (diff) | |
| download | pkgsrc-284c6f0f4fb04810c509f66e3f3e6a6bb29d52a2.tar.gz | |
Update "rpm2pkg" package to version 3.2.1:
- Go back to manual installation to avoid problems on unprivileged
NetBSD installation. This fixes PR pkg/44415 by Hauke Fath.
- Don't install "rpm2pkg.cat8" any more as it is not really useful.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 11 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/PLIST | 3 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/files/Makefile | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 0129d5b4e7c..fde227b149c 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2011/01/12 00:26:33 tron Exp $ +# $NetBSD: Makefile,v 1.57 2011/01/19 16:23:02 tron Exp $ -DISTNAME= rpm2pkg-3.2.0 +DISTNAME= rpm2pkg-3.2.1 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -25,10 +25,15 @@ WRKSRC= ${WRKDIR} .include "../../mk/compiler.mk" -INSTALLATION_DIRS= ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/xz/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${DESTDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/rpm2pkg/PLIST b/pkgtools/rpm2pkg/PLIST index 98cee306723..5ddbaa01866 100644 --- a/pkgtools/rpm2pkg/PLIST +++ b/pkgtools/rpm2pkg/PLIST @@ -1,4 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2011/01/12 00:26:33 tron Exp $ +@comment $NetBSD: PLIST,v 1.3 2011/01/19 16:23:02 tron Exp $ sbin/rpm2pkg -man/cat8/rpm2pkg.0 man/man8/rpm2pkg.8 diff --git a/pkgtools/rpm2pkg/files/Makefile b/pkgtools/rpm2pkg/files/Makefile index 06959c85ba6..616e96f3451 100644 --- a/pkgtools/rpm2pkg/files/Makefile +++ b/pkgtools/rpm2pkg/files/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2011/01/19 11:49:18 tron Exp $ +# $NetBSD: Makefile,v 1.3 2011/01/19 16:23:02 tron Exp $ PROG= rpm2pkg SRCS= fileio.c package-list.c parse-rpm.c rpm2pkg.c SRCS+= fileio-bzlib.c fileio-lzma.c fileio-plain.c fileio-zlib.c -MAN= rpm2pkg.8 +MAN= BINDIR= ${PREFIX}/sbin LDADD= -lbz2 -llzma -lz WARNS= 4 -NEED_OWN_INSTALL_TARGET= yes - #CFLAGS+= -g #LDFLAGS+= -g |