diff options
author | tron <tron@pkgsrc.org> | 2010-06-13 13:08:51 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2010-06-13 13:08:51 +0000 |
commit | c1efc24ac7e0e1b3b69803e43c82b27ef86abc1b (patch) | |
tree | 3d7d5cf17efd7ee1c99c31d4dfafe47116ae18a1 /pkgtools/rpm2pkg/Makefile | |
parent | 813731b2ac18ac68a200d2dfb8281665b5e30212 (diff) | |
download | pkgsrc-c1efc24ac7e0e1b3b69803e43c82b27ef86abc1b.tar.gz |
Update "rpm2pkg" to version 3.0. Changes since version 2.3:
- Don't use the original "rpm" libraries. All we need to do is to identify
a file as an RPM file and afterwards find the BZip2 or GZip compressed
section at the end of the file.
- Use C99's "stdbool.h" instead of home-grown defines.
Diffstat (limited to 'pkgtools/rpm2pkg/Makefile')
-rw-r--r-- | pkgtools/rpm2pkg/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 042dad875bc..f7c2552d59f 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.43 2009/06/14 22:44:34 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2010/06/13 13:08:51 tron Exp $ -DISTNAME= rpm2pkg-2.3 +DISTNAME= rpm2pkg-3.0 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -14,11 +14,12 @@ CONFLICTS+= suse-base<=6.4 PKG_DESTDIR_SUPPORT= user-destdir +USE_LANGUAGES= c99 WRKSRC= ${WRKDIR} CPPFLAGS+= ${BUILDLINK_CPPFLAGS.bzip2} ${BUILDLINK_CPPFLAGS.rpm} \ ${BUILDLINK_CPPFLAGS.zlib} -LIBS+= -lrpm -lintl -lz -lbz2 +LIBS+= -lintl -lz -lbz2 .include "../../mk/compiler.mk" @@ -26,6 +27,10 @@ LIBS+= -lrpm -lintl -lz -lbz2 CFLAGS+= -Wall -Wshadow -Wsign-compare -Wunused-value .endif +.if ${OPSYS} == "NetBSD" && defined(USE_SSP) && (${USE_SSP} != "no") +CFLAGS+= -fstack-protector -Wstack-protector --param ssp-buffer-size=1 +.endif + INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin do-build: @@ -39,7 +44,6 @@ do-install: .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../misc/rpm/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |