Fri Sep 13 12:41:32 2013 UTC ()
Update to 4.11.1 from 2.5.4

Changelog:
* Many bugfixes and improvements.
* New commands.


(ryoon)
diff -r1.76 -r1.77 pkgsrc/misc/rpm/Makefile
diff -r1.7 -r1.8 pkgsrc/misc/rpm/PLIST
diff -r1.9 -r1.10 pkgsrc/misc/rpm/distinfo
diff -r1.6 -r0 pkgsrc/misc/rpm/patches/patch-aa
diff -r1.8 -r0 pkgsrc/misc/rpm/patches/patch-ab
diff -r1.10 -r1.11 pkgsrc/misc/rpm/patches/patch-ac
diff -r1.2 -r0 pkgsrc/misc/rpm/patches/patch-ba
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-bb
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-bd
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-be
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-ca
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-cc
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-cd
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-ce
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-cf
diff -r1.1 -r0 pkgsrc/misc/rpm/patches/patch-cg
diff -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-build_rpmfc.c
diff -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-misc_fts.c
diff -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-misc_fts.h
diff -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-system.h
diff -r1.1 -r1.2 pkgsrc/misc/rpm/patches/patch-cb

cvs diff -r1.76 -r1.77 pkgsrc/misc/rpm/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/rpm/Makefile 2013/05/21 07:57:50 1.76
+++ pkgsrc/misc/rpm/Makefile 2013/09/13 12:41:32 1.77
@@ -1,65 +1,66 @@ @@ -1,65 +1,66 @@
1# $NetBSD: Makefile,v 1.76 2013/05/21 07:57:50 sbd Exp $ 1# $NetBSD: Makefile,v 1.77 2013/09/13 12:41:32 ryoon Exp $
2 2
3DISTNAME= rpm-2.5.4 3DISTNAME= rpm-4.11.1
4PKGREVISION= 8 
5CATEGORIES= misc 4CATEGORIES= misc
6MASTER_SITES= http://rpm.org/releases/historical/rpm-2.5.x/ 5MASTER_SITES= http://rpm.org/releases/rpm-4.11.x/
 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.rpm.org/ 9HOMEPAGE= http://www.rpm.org/
10COMMENT= The Red Hat Package Manager 10COMMENT= The Red Hat Package Manager
11LICENSE= gnu-lgpl-v2 OR gnu-gpl-v2 11LICENSE= gnu-lgpl-v2 OR gnu-gpl-v2
12 12
13CONFLICTS+= rpm2cpio<1.0nb1 13CONFLICTS+= rpm2cpio<1.0nb1
14 14
15NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting 15NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting
16 16
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
19USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
20USE_TOOLS+= gmake msgfmt 20USE_TOOLS+= bash:run gmake msgfmt perl:run
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22 22
23GMAKE_REQD+= 3.82nb1 23GMAKE_REQD+= 3.82nb1
24GMAKE= ${TOOLS_GMAKE} 24GMAKE= ${TOOLS_GMAKE}
25 25
 26REPLACE_BASH+= scripts/*
 27REPLACE_PERL+= scripts/*
 28
 29# To avoid build directory references.
 30CONFIGURE_ENV+= MYPATH=/sbin:/bin:/usr/sbin:/usr/bin
 31
26# this is needed in addition of USE_PKGLOCALEDIR 32# this is needed in addition of USE_PKGLOCALEDIR
27CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} 33CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR}
 34CONFIGURE_ARGS+= --without-lua
 35CONFIGURE_ARGS+= --with-external-db
 36
 37BDB_ACCEPTED= db4 db5
28 38
29# The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm. 39# The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
30CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q} 40CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q}
31 41
32# Needs help finding bdb. 42# Needs help finding bdb.
33LIBS+= ${BDB_LIBS:Q} 43BUILDLINK_TRANSFORM+= rename:-ldb:${BDB_LIBS}
34LDFLAGS+= ${PTHREAD_LDFLAGS} 44LDFLAGS+= ${PTHREAD_LDFLAGS}
35 45
36MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man8 46MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man8
37MAKE_FLAGS+= ROOT=${DESTDIR} 47MAKE_FLAGS+= ROOT=${DESTDIR}
38 48
39RPMDIR= ${RPM_DB_PREFIX}/lib/rpm 49RPMDIR= ${RPM_DB_PREFIX}/lib/rpm
40FILES_SUBST+= RPMDIR=${RPMDIR:Q} 50FILES_SUBST+= RPMDIR=${RPMDIR:Q}
41 51
42.include "../../mk/bsd.prefs.mk" 52.include "../../mk/bsd.prefs.mk"
43 53
44post-configure: 
45 cd ${WRKSRC}/po && ${MV} cz.po cs.po 
46 
47pre-install: 
48 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/rpm 
49 
50.if defined(RANLIB) 
51post-install: 
52 $(RANLIB) ${DESTDIR}${PREFIX}/lib/librpm.a 
53.endif 
54 
55# The configure script doesn't detect whether libintl.so has any 54# The configure script doesn't detect whether libintl.so has any
56# library dependencies. 55# library dependencies.
57# 56#
58BROKEN_GETTEXT_DETECTION= yes 57BROKEN_GETTEXT_DETECTION= yes
59 58
60.include "../../devel/gettext-lib/buildlink3.mk" 59.include "../../devel/gettext-lib/buildlink3.mk"
 60.include "../../devel/nss/buildlink3.mk"
 61.include "../../devel/nspr/buildlink3.mk"
61.include "../../devel/popt/buildlink3.mk" 62.include "../../devel/popt/buildlink3.mk"
62.include "../../devel/zlib/buildlink3.mk" 63.include "../../devel/zlib/buildlink3.mk"
63 64
64.include "../../mk/bdb.buildlink3.mk" 65.include "../../mk/bdb.buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"

cvs diff -r1.7 -r1.8 pkgsrc/misc/rpm/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/rpm/PLIST 2009/06/14 20:52:13 1.7
+++ pkgsrc/misc/rpm/PLIST 2013/09/13 12:41:32 1.8
@@ -1,26 +1,218 @@ @@ -1,26 +1,218 @@
1@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:52:13 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.8 2013/09/13 12:41:32 ryoon Exp $
2bin/gendiff 2bin/gendiff
3bin/rpm 3bin/rpm
4bin/rpm2cpio 4bin/rpm2cpio
5include/rpm/dbindex.h 5bin/rpmbuild
 6bin/rpmdb
 7bin/rpmgraph
 8bin/rpmkeys
 9bin/rpmquery
 10bin/rpmsign
 11bin/rpmspec
 12bin/rpmverify
 13include/rpm/argv.h
6include/rpm/header.h 14include/rpm/header.h
 15include/rpm/rpmbase64.h
 16include/rpm/rpmbuild.h
 17include/rpm/rpmcallback.h
 18include/rpm/rpmcli.h
 19include/rpm/rpmdb.h
 20include/rpm/rpmds.h
 21include/rpm/rpmfc.h
 22include/rpm/rpmfi.h
 23include/rpm/rpmfileutil.h
 24include/rpm/rpmio.h
 25include/rpm/rpmkeyring.h
 26include/rpm/rpmlegacy.h
7include/rpm/rpmlib.h 27include/rpm/rpmlib.h
8lib/librpm.a 28include/rpm/rpmlog.h
 29include/rpm/rpmmacro.h
 30include/rpm/rpmpgp.h
 31include/rpm/rpmpol.h
 32include/rpm/rpmprob.h
 33include/rpm/rpmps.h
 34include/rpm/rpmsign.h
 35include/rpm/rpmspec.h
 36include/rpm/rpmsq.h
 37include/rpm/rpmstring.h
 38include/rpm/rpmstrpool.h
 39include/rpm/rpmsw.h
 40include/rpm/rpmtag.h
 41include/rpm/rpmtd.h
 42include/rpm/rpmte.h
 43include/rpm/rpmts.h
 44include/rpm/rpmtypes.h
 45include/rpm/rpmurl.h
 46include/rpm/rpmutil.h
 47include/rpm/rpmvf.h
 48lib/librpm.la
 49lib/librpmbuild.la
 50lib/librpmio.la
 51lib/librpmsign.la
 52lib/pkgconfig/rpm.pc
 53lib/rpm-plugins/exec.la
 54lib/rpm/brp-compress
 55lib/rpm/brp-java-gcjcompile
 56lib/rpm/brp-python-bytecompile
 57lib/rpm/brp-python-hardlink
 58lib/rpm/brp-strip
 59lib/rpm/brp-strip-comment-note
 60lib/rpm/brp-strip-shared
 61lib/rpm/brp-strip-static-archive
 62lib/rpm/check-buildroot
 63lib/rpm/check-files
 64lib/rpm/check-prereqs
 65lib/rpm/check-rpaths
 66lib/rpm/check-rpaths-worker
 67lib/rpm/config.guess
 68lib/rpm/config.sub
 69lib/rpm/desktop-file.prov
 70lib/rpm/fileattrs/desktop.attr
 71lib/rpm/fileattrs/elf.attr
 72lib/rpm/fileattrs/font.attr
 73lib/rpm/fileattrs/libtool.attr
 74lib/rpm/fileattrs/mono.attr
 75lib/rpm/fileattrs/ocaml.attr
 76lib/rpm/fileattrs/perl.attr
 77lib/rpm/fileattrs/perllib.attr
 78lib/rpm/fileattrs/pkgconfig.attr
 79lib/rpm/fileattrs/python.attr
 80lib/rpm/fileattrs/script.attr
 81lib/rpm/find-lang.sh
9lib/rpm/find-provides 82lib/rpm/find-provides
10lib/rpm/find-requires 83lib/rpm/find-requires
11lib/rpm/freshen.sh 84lib/rpm/fontconfig.prov
 85lib/rpm/libtooldeps.sh
 86lib/rpm/macros
 87lib/rpm/macros.perl
 88lib/rpm/macros.php
 89lib/rpm/macros.python
12lib/rpm/mkinstalldirs 90lib/rpm/mkinstalldirs
13lib/rpm/rpmpopt 91lib/rpm/mono-find-provides
 92lib/rpm/mono-find-requires
 93lib/rpm/ocaml-find-provides.sh
 94lib/rpm/ocaml-find-requires.sh
 95lib/rpm/osgideps.pl
 96lib/rpm/perl.prov
 97lib/rpm/perl.req
 98lib/rpm/perldeps.pl
 99lib/rpm/pkgconfigdeps.sh
 100lib/rpm/platform/aarch64--gnu/macros
 101lib/rpm/platform/alpha--gnu/macros
 102lib/rpm/platform/alphaev5--gnu/macros
 103lib/rpm/platform/alphaev56--gnu/macros
 104lib/rpm/platform/alphaev6--gnu/macros
 105lib/rpm/platform/alphaev67--gnu/macros
 106lib/rpm/platform/alphapca56--gnu/macros
 107lib/rpm/platform/amd64--gnu/macros
 108lib/rpm/platform/armv3l--gnu/macros
 109lib/rpm/platform/armv4b--gnu/macros
 110lib/rpm/platform/armv4l--gnu/macros
 111lib/rpm/platform/armv5tejl--gnu/macros
 112lib/rpm/platform/armv5tel--gnu/macros
 113lib/rpm/platform/armv6l--gnu/macros
 114lib/rpm/platform/armv7l--gnu/macros
 115lib/rpm/platform/athlon--gnu/macros
 116lib/rpm/platform/geode--gnu/macros
 117lib/rpm/platform/i386--gnu/macros
 118lib/rpm/platform/i486--gnu/macros
 119lib/rpm/platform/i586--gnu/macros
 120lib/rpm/platform/i686--gnu/macros
 121lib/rpm/platform/ia32e--gnu/macros
 122lib/rpm/platform/ia64--gnu/macros
 123lib/rpm/platform/noarch--gnu/macros
 124lib/rpm/platform/pentium3--gnu/macros
 125lib/rpm/platform/pentium4--gnu/macros
 126lib/rpm/platform/ppc--gnu/macros
 127lib/rpm/platform/ppc32dy4--gnu/macros
 128lib/rpm/platform/ppc64--gnu/macros
 129lib/rpm/platform/ppc64iseries--gnu/macros
 130lib/rpm/platform/ppc64p7--gnu/macros
 131lib/rpm/platform/ppc64pseries--gnu/macros
 132lib/rpm/platform/ppc8260--gnu/macros
 133lib/rpm/platform/ppc8560--gnu/macros
 134lib/rpm/platform/ppciseries--gnu/macros
 135lib/rpm/platform/ppcpseries--gnu/macros
 136lib/rpm/platform/s390--gnu/macros
 137lib/rpm/platform/s390x--gnu/macros
 138lib/rpm/platform/sh--gnu/macros
 139lib/rpm/platform/sh3--gnu/macros
 140lib/rpm/platform/sh4--gnu/macros
 141lib/rpm/platform/sh4a--gnu/macros
 142lib/rpm/platform/sparc--gnu/macros
 143lib/rpm/platform/sparc64--gnu/macros
 144lib/rpm/platform/sparc64v--gnu/macros
 145lib/rpm/platform/sparcv8--gnu/macros
 146lib/rpm/platform/sparcv9--gnu/macros
 147lib/rpm/platform/sparcv9v--gnu/macros
 148lib/rpm/platform/${MACHINE_ARCH}--gnu/macros
 149lib/rpm/pythondeps.sh
 150lib/rpm/rpm.daily
 151lib/rpm/rpm.log
 152lib/rpm/rpm.supp
 153lib/rpm/rpm2cpio.sh
 154lib/rpm/rpmdb_loadcvt
 155lib/rpm/rpmdeps
 156lib/rpm/rpmpopt-${PKGVERSION}
14lib/rpm/rpmrc 157lib/rpm/rpmrc
 158lib/rpm/script.req
 159lib/rpm/tcl.req
 160lib/rpm/tgpg
 161man/fr/man8/rpm.8
 162man/ja/man8/rpm.8
 163man/ja/man8/rpm2cpio.8
 164man/ja/man8/rpmbuild.8
 165man/ja/man8/rpmgraph.8
 166man/ko/man8/rpm.8
 167man/ko/man8/rpm2cpio.8
 168man/man1/gendiff.1
15man/man8/rpm.8 169man/man8/rpm.8
16man/man8/rpm2cpio.8 170man/man8/rpm2cpio.8
 171man/man8/rpmbuild.8
 172man/man8/rpmdb.8
 173man/man8/rpmdeps.8
 174man/man8/rpmgraph.8
 175man/man8/rpmkeys.8
 176man/man8/rpmsign.8
 177man/man8/rpmspec.8
 178man/pl/man1/gendiff.1
 179man/pl/man8/rpm.8
 180man/pl/man8/rpm2cpio.8
 181man/pl/man8/rpmbuild.8
 182man/pl/man8/rpmdeps.8
 183man/pl/man8/rpmgraph.8
 184man/ru/man8/rpm.8
 185man/ru/man8/rpm2cpio.8
 186man/sk/man8/rpm.8
 187share/locale/br/LC_MESSAGES/rpm.mo
 188share/locale/ca/LC_MESSAGES/rpm.mo
17share/locale/cs/LC_MESSAGES/rpm.mo 189share/locale/cs/LC_MESSAGES/rpm.mo
 190share/locale/da/LC_MESSAGES/rpm.mo
18share/locale/de/LC_MESSAGES/rpm.mo 191share/locale/de/LC_MESSAGES/rpm.mo
 192share/locale/el/LC_MESSAGES/rpm.mo
 193share/locale/eo/LC_MESSAGES/rpm.mo
 194share/locale/es/LC_MESSAGES/rpm.mo
19share/locale/fi/LC_MESSAGES/rpm.mo 195share/locale/fi/LC_MESSAGES/rpm.mo
20share/locale/fr/LC_MESSAGES/rpm.mo 196share/locale/fr/LC_MESSAGES/rpm.mo
 197share/locale/is/LC_MESSAGES/rpm.mo
 198share/locale/it/LC_MESSAGES/rpm.mo
 199share/locale/ja/LC_MESSAGES/rpm.mo
 200share/locale/ko/LC_MESSAGES/rpm.mo
 201share/locale/ms/LC_MESSAGES/rpm.mo
 202share/locale/nb/LC_MESSAGES/rpm.mo
 203share/locale/nl/LC_MESSAGES/rpm.mo
 204share/locale/pl/LC_MESSAGES/rpm.mo
 205share/locale/pt/LC_MESSAGES/rpm.mo
21share/locale/pt_BR/LC_MESSAGES/rpm.mo 206share/locale/pt_BR/LC_MESSAGES/rpm.mo
22share/locale/ru/LC_MESSAGES/rpm.mo 207share/locale/ru/LC_MESSAGES/rpm.mo
23share/locale/sk/LC_MESSAGES/rpm.mo 208share/locale/sk/LC_MESSAGES/rpm.mo
 209share/locale/sl/LC_MESSAGES/rpm.mo
24share/locale/sr/LC_MESSAGES/rpm.mo 210share/locale/sr/LC_MESSAGES/rpm.mo
 211share/locale/sr@latin/LC_MESSAGES/rpm.mo
25share/locale/sv/LC_MESSAGES/rpm.mo 212share/locale/sv/LC_MESSAGES/rpm.mo
 213share/locale/te/LC_MESSAGES/rpm.mo
26share/locale/tr/LC_MESSAGES/rpm.mo 214share/locale/tr/LC_MESSAGES/rpm.mo
 215share/locale/uk/LC_MESSAGES/rpm.mo
 216share/locale/zh_CN/LC_MESSAGES/rpm.mo
 217share/locale/zh_TW/LC_MESSAGES/rpm.mo
 218@pkgdir var/tmp

cvs diff -r1.9 -r1.10 pkgsrc/misc/rpm/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/rpm/distinfo 2007/02/18 11:17:03 1.9
+++ pkgsrc/misc/rpm/distinfo 2013/09/13 12:41:32 1.10
@@ -1,19 +1,12 @@ @@ -1,19 +1,12 @@
1$NetBSD: distinfo,v 1.9 2007/02/18 11:17:03 tonio Exp $ 1$NetBSD: distinfo,v 1.10 2013/09/13 12:41:32 ryoon Exp $
2 2
3SHA1 (rpm-2.5.4.tar.gz) = a7fcd67883aec8d5f17483d5efebe7e5f5453462 3SHA1 (rpm-4.11.1.tar.bz2) = 31ddc4185137ce3f718c99e91dcb040614fe820c
4RMD160 (rpm-2.5.4.tar.gz) = 6c9a46d370fe97c7fcf7f814db049ea2bba300da 4RMD160 (rpm-4.11.1.tar.bz2) = 3acb73dffef60c5e98ad23d2551ebca0837c218c
5Size (rpm-2.5.4.tar.gz) = 727849 bytes 5Size (rpm-4.11.1.tar.bz2) = 3778922 bytes
6SHA1 (patch-aa) = 3ee3193cc8e9043017b1f507b606c72acab77ddb 6SHA1 (patch-ac) = a9d4fb93a47f705b9220d886853b805f3b741ca2
7SHA1 (patch-ab) = 63635f4f7fd96b4e7a40bfbaffd5673b40db3a13 7SHA1 (patch-build_rpmfc.c) = dab644d99d7ed43850443433b242d6ec16630b9c
8SHA1 (patch-ac) = ed4545088fc0cc56fd577fbc122a073f12d751aa 8SHA1 (patch-cb) = c52dfaec6cf89d069f26900265d34f7ad91092f0
9SHA1 (patch-ba) = c6a062e733e09eb56144177444188dcaf0cfcb06 9SHA1 (patch-configure.ac) = c9df0915b2c9c08fd059a3c9a2c89fe25d3e194d
10SHA1 (patch-bb) = dc0ea2dd366b793003218858ca3d67bc285a2089 10SHA1 (patch-misc_fts.c) = 26443c47db5e2211a926cf0f8b26b1f70475edda
11SHA1 (patch-bd) = 1c9cd4587314ee45bccdf08c6ecaabbe641aaa5d 11SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53
12SHA1 (patch-be) = ed237b47e9f8033e8fdfc4258a1bdd5ebaff469e 12SHA1 (patch-system.h) = 21336b9d2a7afbc0573ba0ce09c0849e5bef2548
13SHA1 (patch-ca) = 7f4b008eee3b9f1bd3abc49686f70a327376af55 
14SHA1 (patch-cb) = 30f98037c6a5ba753bc19b20564e177ad1e8c1a9 
15SHA1 (patch-cc) = d5955ec8b51950aadf930a62743601c2d4a0a127 
16SHA1 (patch-cd) = 30e28a8f9453d4a4553ed08eeb43ba049fb35567 
17SHA1 (patch-ce) = 9cbf130f8f10b5c8368028cfab295d9c61db2e7c 
18SHA1 (patch-cf) = 636b77cd05f9eb5083d11aa362a5b75d424014ad 
19SHA1 (patch-cg) = bc094d702cb13b5c89d696770bbcaffaca3b853c 

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-aa

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-ab

cvs diff -r1.10 -r1.11 pkgsrc/misc/rpm/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/misc/rpm/patches/Attic/patch-ac 2004/07/24 04:43:10 1.10
+++ pkgsrc/misc/rpm/patches/Attic/patch-ac 2013/09/13 12:41:32 1.11
@@ -1,47 +1,31 @@ @@ -1,47 +1,31 @@
1$NetBSD: patch-ac,v 1.10 2004/07/24 04:43:10 grant Exp $ 1$NetBSD: patch-ac,v 1.11 2013/09/13 12:41:32 ryoon Exp $
2 2
3--- configure.orig 1998-09-29 06:50:23.000000000 +1000 3--- configure.orig 2013-06-27 09:29:11.000000000 +0000
4+++ configure 4+++ configure
5@@ -1565,7 +1565,6 @@ do 5@@ -17093,7 +17093,7 @@ fi
6 echo $ac_n "checking for $dir/lib in LIBS""... $ac_c" 1>&6 6 if test "$cross_compiling" = "yes"; then
7 echo "configure:1567: checking for $dir/lib in LIBS" >&5 7 MYPATH=":"
8 if test -d $dir/lib ; then 
9- addlib $dir/lib 
10 echo "$ac_t""yes" 1>&6 
11 else 
12 echo "$ac_t""no" 1>&6 
13@@ -1574,7 +1573,6 @@ echo "configure:1567: checking for $dir/ 
14 echo $ac_n "checking for $dir/include in INCPATH""... $ac_c" 1>&6 
15 echo "configure:1576: checking for $dir/include in INCPATH" >&5 
16 if test -d $dir/include ; then 
17- INCPATH="$INCPATH -I$dir/include" 
18 echo "$ac_t""yes" 1>&6 
19 else 
20 echo "$ac_t""no" 1>&6 
21@@ -1584,12 +1582,11 @@ done 
22 echo $ac_n "checking for /usr/ucblib in LIBS""... $ac_c" 1>&6 
23 echo "configure:1586: checking for /usr/ucblib in LIBS" >&5 
24 if test -d /usr/ucblib ; then 
25- if test "$build" = "mips-sni-sysv4" ; then 
26- addlib /usr/ccs/lib -lc 
27- fi 
28- 
29- addlib /usr/ucblib 
30-  
31+# if test "$build" = "mips-sni-sysv4" ; then 
32+# addlib /usr/ccs/lib -lc 
33+# fi 
34+# 
35+# addlib /usr/ucblib 
36 echo "$ac_t""yes" 1>&6 
37 else 8 else
38 echo "$ac_t""no" 1>&6 9- MYPATH=$PATH
39@@ -4065,7 +4062,7 @@ else 10+ MYPATH=$MYPATH
40 NBMAKEFILE= 
41 fi 11 fi
42  12
43-subdirs="popt" 13 # Extract the first word of "7zip", so it can be a program name with args.
44+#subdirs="popt" 14@@ -24310,7 +24310,7 @@ host_os_noversion=`echo "${host_os}" | s
45  15
46 trap '' 1 2 15 16 for provscript in ${host_cpu}-${host_os_exact}.prov ${host_os_exact}.prov ${host_os_major}.prov ${host_os_noversion}.prov none ; do {
47 cat > confcache <<\EOF 17 if test -f ${srcdir}/autodeps/${provscript} ; then
 18- if [ ${provscript} == none ] ; then
 19+ if [ ${provscript} = none ] ; then
 20 echo "*** no default provides information is available for ${host_os_noversion}"
 21 else
 22 echo "using ${srcdir}/autodeps/${provscript} for automatic provides generation"
 23@@ -24323,7 +24323,7 @@ for provscript in ${host_cpu}-${host_os_
 24
 25 for reqscript in ${host_cpu}-${host_os_exact}.req ${host_os_exact}.req ${host_os_major}.req ${host_os_noversion}.req none ; do {
 26 if test -f ${srcdir}/autodeps/${reqscript} ; then
 27- if [ ${reqscript} == none ] ; then
 28+ if [ ${reqscript} = none ] ; then
 29 echo "*** no default requires information is available for ${host_os_noversion}"
 30 else
 31 echo "using ${srcdir}/autodeps/${reqscript} for automatic requires generation"

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-ba

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-bb

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-bd

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-be

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-ca

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-cc

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-cd

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-ce

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-cf

File Deleted: pkgsrc/misc/rpm/patches/Attic/patch-cg

File Added: pkgsrc/misc/rpm/patches/patch-build_rpmfc.c
$NetBSD: patch-build_rpmfc.c,v 1.1 2013/09/13 12:41:32 ryoon Exp $

* basemname(3) requires libgen.h on NetBSD.

--- build/rpmfc.c.orig	2013-06-10 15:55:10.000000000 +0000
+++ build/rpmfc.c
@@ -16,6 +16,10 @@
 #include <rpm/rpmfi.h>
 #include <rpm/rpmstrpool.h>
 
+#if defined(__NetBSD__)
+#include <libgen.h>
+#endif
+
 #include "build/rpmbuild_internal.h"
 
 #include "debug.h"

File Added: pkgsrc/misc/rpm/patches/patch-configure.ac
$NetBSD: patch-configure.ac,v 1.1 2013/09/13 12:41:32 ryoon Exp $

--- configure.ac.orig	2013-06-27 09:29:00.000000000 +0000
+++ configure.ac
@@ -777,7 +777,7 @@ changequote([, ])
 
 for provscript in ${host_cpu}-${host_os_exact}.prov ${host_os_exact}.prov ${host_os_major}.prov ${host_os_noversion}.prov none ; do {
     if test -f ${srcdir}/autodeps/${provscript} ; then
-       if [[ ${provscript} == none ]] ; then
+       if [[ ${provscript} = none ]] ; then
            echo "*** no default provides information is available for ${host_os_noversion}"
        else
            echo "using ${srcdir}/autodeps/${provscript} for automatic provides generation"
@@ -790,7 +790,7 @@ for provscript in ${host_cpu}-${host_os_
 
 for reqscript in ${host_cpu}-${host_os_exact}.req ${host_os_exact}.req ${host_os_major}.req ${host_os_noversion}.req none ; do {
     if test -f ${srcdir}/autodeps/${reqscript} ; then
-       if [[ ${reqscript} == none ]] ; then
+       if [[ ${reqscript} = none ]] ; then
            echo "*** no default requires information is available for ${host_os_noversion}"
        else
 	  echo "using ${srcdir}/autodeps/${reqscript} for automatic requires generation"

File Added: pkgsrc/misc/rpm/patches/patch-misc_fts.c
$NetBSD: patch-misc_fts.c,v 1.1 2013/09/13 12:41:32 ryoon Exp $

* Definitions for NetBSD.

--- misc/fts.c.orig	2012-11-18 08:21:06.000000000 +0000
+++ misc/fts.c
@@ -61,6 +61,11 @@ static char sccsid[] = "@(#)fts.c	8.6 (B
 #   define _STAT_VER		0
 #   define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp))
 #endif
+#if defined(__NetBSD__)
+#   define __errno_location() 	(&errno)
+#   define stat64		stat
+#   define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
+#endif
 #include "system.h"
 #include <stdlib.h>
 #include <string.h>

File Added: pkgsrc/misc/rpm/patches/Attic/patch-misc_fts.h
$NetBSD: patch-misc_fts.h,v 1.1 2013/09/13 12:41:32 ryoon Exp $

* Definition for NetBSD.

--- misc/fts.h.orig	2013-06-10 15:55:10.000000000 +0000
+++ misc/fts.h
@@ -61,6 +61,10 @@
 # define _D_EXACT_NAMLEN(d) (strlen((d)->d_name))
 #endif
 
+#if defined(__NetBSD__)
+# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
+#endif
+
 #endif
 
 #include <sys/types.h>

File Added: pkgsrc/misc/rpm/patches/patch-system.h
$NetBSD: patch-system.h,v 1.1 2013/09/13 12:41:32 ryoon Exp $

* NetBSD has setprogname(3).

--- system.h.orig	2013-01-30 15:33:12.000000000 +0000
+++ system.h
@@ -112,7 +112,7 @@ typedef	char * security_context_t;
 #define _free(_ptr) rfree((_ptr))
 
 /* Retrofit glibc __progname */
-#if defined __GLIBC__ && __GLIBC__ >= 2
+#if (defined __GLIBC__ && __GLIBC__ >= 2) || defined(__NetBSD__)
 #if __GLIBC_MINOR__ >= 1
 #define	__progname	__assert_program_name
 #endif

cvs diff -r1.1 -r1.2 pkgsrc/misc/rpm/patches/Attic/patch-cb (expand / switch to unified diff)

--- pkgsrc/misc/rpm/patches/Attic/patch-cb 2003/10/19 16:05:21 1.1
+++ pkgsrc/misc/rpm/patches/Attic/patch-cb 2013/09/13 12:41:32 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-cb,v 1.1 2003/10/19 16:05:21 grant Exp $ 1$NetBSD: patch-cb,v 1.2 2013/09/13 12:41:32 ryoon Exp $
2 2
3--- build/pack.c.orig 1998-09-28 06:16:43.000000000 +1000 3--- build/pack.c.orig 2013-06-10 15:55:10.000000000 +0000
4+++ build/pack.c 4+++ build/pack.c
5@@ -4,7 +4,6 @@ 5@@ -6,6 +6,7 @@
6 #include <sys/stat.h> 6 #include "system.h"
7 #include <sys/wait.h> 7
8 #include <fcntl.h> 
9-#include <malloc.h> 
10 #include <string.h> 
11 #include <errno.h> 8 #include <errno.h>
12 #include <signal.h> 9+#include <sys/wait.h>
 10 #include <netdb.h>
 11 #include <time.h>
 12