Update to 4.11.1 from 2.5.4 Changelog: * Many bugfixes and improvements. * New commands.diff -r1.76 -r1.77 pkgsrc/misc/rpm/Makefile
(ryoon)
@@ -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 | |||
3 | DISTNAME= rpm-2.5.4 | 3 | DISTNAME= rpm-4.11.1 | |
4 | PKGREVISION= 8 | |||
5 | CATEGORIES= misc | 4 | CATEGORIES= misc | |
6 | MASTER_SITES= http://rpm.org/releases/historical/rpm-2.5.x/ | 5 | MASTER_SITES= http://rpm.org/releases/rpm-4.11.x/ | |
6 | EXTRACT_SUFX= .tar.bz2 | |||
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.rpm.org/ | 9 | HOMEPAGE= http://www.rpm.org/ | |
10 | COMMENT= The Red Hat Package Manager | 10 | COMMENT= The Red Hat Package Manager | |
11 | LICENSE= gnu-lgpl-v2 OR gnu-gpl-v2 | 11 | LICENSE= gnu-lgpl-v2 OR gnu-gpl-v2 | |
12 | 12 | |||
13 | CONFLICTS+= rpm2cpio<1.0nb1 | 13 | CONFLICTS+= rpm2cpio<1.0nb1 | |
14 | 14 | |||
15 | NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting | 15 | NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting | |
16 | 16 | |||
17 | MAKE_JOBS_SAFE= no | 17 | MAKE_JOBS_SAFE= no | |
18 | 18 | |||
19 | USE_PKGLOCALEDIR= yes | 19 | USE_PKGLOCALEDIR= yes | |
20 | USE_TOOLS+= gmake msgfmt | 20 | USE_TOOLS+= bash:run gmake msgfmt perl:run | |
21 | GNU_CONFIGURE= yes | 21 | GNU_CONFIGURE= yes | |
22 | 22 | |||
23 | GMAKE_REQD+= 3.82nb1 | 23 | GMAKE_REQD+= 3.82nb1 | |
24 | GMAKE= ${TOOLS_GMAKE} | 24 | GMAKE= ${TOOLS_GMAKE} | |
25 | 25 | |||
26 | REPLACE_BASH+= scripts/* | |||
27 | REPLACE_PERL+= scripts/* | |||
28 | ||||
29 | # To avoid build directory references. | |||
30 | CONFIGURE_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 | |
27 | CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} | 33 | CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} | |
34 | CONFIGURE_ARGS+= --without-lua | |||
35 | CONFIGURE_ARGS+= --with-external-db | |||
36 | ||||
37 | BDB_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. | |
30 | CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q} | 40 | CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q} | |
31 | 41 | |||
32 | # Needs help finding bdb. | 42 | # Needs help finding bdb. | |
33 | LIBS+= ${BDB_LIBS:Q} | 43 | BUILDLINK_TRANSFORM+= rename:-ldb:${BDB_LIBS} | |
34 | LDFLAGS+= ${PTHREAD_LDFLAGS} | 44 | LDFLAGS+= ${PTHREAD_LDFLAGS} | |
35 | 45 | |||
36 | MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man8 | 46 | MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man8 | |
37 | MAKE_FLAGS+= ROOT=${DESTDIR} | 47 | MAKE_FLAGS+= ROOT=${DESTDIR} | |
38 | 48 | |||
39 | RPMDIR= ${RPM_DB_PREFIX}/lib/rpm | 49 | RPMDIR= ${RPM_DB_PREFIX}/lib/rpm | |
40 | FILES_SUBST+= RPMDIR=${RPMDIR:Q} | 50 | FILES_SUBST+= RPMDIR=${RPMDIR:Q} | |
41 | 51 | |||
42 | .include "../../mk/bsd.prefs.mk" | 52 | .include "../../mk/bsd.prefs.mk" | |
43 | 53 | |||
44 | post-configure: | |||
45 | cd ${WRKSRC}/po && ${MV} cz.po cs.po | |||
46 | ||||
47 | pre-install: | |||
48 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/rpm | |||
49 | ||||
50 | .if defined(RANLIB) | |||
51 | post-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 | # | |
58 | BROKEN_GETTEXT_DETECTION= yes | 57 | BROKEN_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" |
@@ -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 $ | |
2 | bin/gendiff | 2 | bin/gendiff | |
3 | bin/rpm | 3 | bin/rpm | |
4 | bin/rpm2cpio | 4 | bin/rpm2cpio | |
5 | include/rpm/dbindex.h | 5 | bin/rpmbuild | |
6 | bin/rpmdb | |||
7 | bin/rpmgraph | |||
8 | bin/rpmkeys | |||
9 | bin/rpmquery | |||
10 | bin/rpmsign | |||
11 | bin/rpmspec | |||
12 | bin/rpmverify | |||
13 | include/rpm/argv.h | |||
6 | include/rpm/header.h | 14 | include/rpm/header.h | |
15 | include/rpm/rpmbase64.h | |||
16 | include/rpm/rpmbuild.h | |||
17 | include/rpm/rpmcallback.h | |||
18 | include/rpm/rpmcli.h | |||
19 | include/rpm/rpmdb.h | |||
20 | include/rpm/rpmds.h | |||
21 | include/rpm/rpmfc.h | |||
22 | include/rpm/rpmfi.h | |||
23 | include/rpm/rpmfileutil.h | |||
24 | include/rpm/rpmio.h | |||
25 | include/rpm/rpmkeyring.h | |||
26 | include/rpm/rpmlegacy.h | |||
7 | include/rpm/rpmlib.h | 27 | include/rpm/rpmlib.h | |
8 | lib/librpm.a | 28 | include/rpm/rpmlog.h | |
29 | include/rpm/rpmmacro.h | |||
30 | include/rpm/rpmpgp.h | |||
31 | include/rpm/rpmpol.h | |||
32 | include/rpm/rpmprob.h | |||
33 | include/rpm/rpmps.h | |||
34 | include/rpm/rpmsign.h | |||
35 | include/rpm/rpmspec.h | |||
36 | include/rpm/rpmsq.h | |||
37 | include/rpm/rpmstring.h | |||
38 | include/rpm/rpmstrpool.h | |||
39 | include/rpm/rpmsw.h | |||
40 | include/rpm/rpmtag.h | |||
41 | include/rpm/rpmtd.h | |||
42 | include/rpm/rpmte.h | |||
43 | include/rpm/rpmts.h | |||
44 | include/rpm/rpmtypes.h | |||
45 | include/rpm/rpmurl.h | |||
46 | include/rpm/rpmutil.h | |||
47 | include/rpm/rpmvf.h | |||
48 | lib/librpm.la | |||
49 | lib/librpmbuild.la | |||
50 | lib/librpmio.la | |||
51 | lib/librpmsign.la | |||
52 | lib/pkgconfig/rpm.pc | |||
53 | lib/rpm-plugins/exec.la | |||
54 | lib/rpm/brp-compress | |||
55 | lib/rpm/brp-java-gcjcompile | |||
56 | lib/rpm/brp-python-bytecompile | |||
57 | lib/rpm/brp-python-hardlink | |||
58 | lib/rpm/brp-strip | |||
59 | lib/rpm/brp-strip-comment-note | |||
60 | lib/rpm/brp-strip-shared | |||
61 | lib/rpm/brp-strip-static-archive | |||
62 | lib/rpm/check-buildroot | |||
63 | lib/rpm/check-files | |||
64 | lib/rpm/check-prereqs | |||
65 | lib/rpm/check-rpaths | |||
66 | lib/rpm/check-rpaths-worker | |||
67 | lib/rpm/config.guess | |||
68 | lib/rpm/config.sub | |||
69 | lib/rpm/desktop-file.prov | |||
70 | lib/rpm/fileattrs/desktop.attr | |||
71 | lib/rpm/fileattrs/elf.attr | |||
72 | lib/rpm/fileattrs/font.attr | |||
73 | lib/rpm/fileattrs/libtool.attr | |||
74 | lib/rpm/fileattrs/mono.attr | |||
75 | lib/rpm/fileattrs/ocaml.attr | |||
76 | lib/rpm/fileattrs/perl.attr | |||
77 | lib/rpm/fileattrs/perllib.attr | |||
78 | lib/rpm/fileattrs/pkgconfig.attr | |||
79 | lib/rpm/fileattrs/python.attr | |||
80 | lib/rpm/fileattrs/script.attr | |||
81 | lib/rpm/find-lang.sh | |||
9 | lib/rpm/find-provides | 82 | lib/rpm/find-provides | |
10 | lib/rpm/find-requires | 83 | lib/rpm/find-requires | |
11 | lib/rpm/freshen.sh | 84 | lib/rpm/fontconfig.prov | |
85 | lib/rpm/libtooldeps.sh | |||
86 | lib/rpm/macros | |||
87 | lib/rpm/macros.perl | |||
88 | lib/rpm/macros.php | |||
89 | lib/rpm/macros.python | |||
12 | lib/rpm/mkinstalldirs | 90 | lib/rpm/mkinstalldirs | |
13 | lib/rpm/rpmpopt | 91 | lib/rpm/mono-find-provides | |
92 | lib/rpm/mono-find-requires | |||
93 | lib/rpm/ocaml-find-provides.sh | |||
94 | lib/rpm/ocaml-find-requires.sh | |||
95 | lib/rpm/osgideps.pl | |||
96 | lib/rpm/perl.prov | |||
97 | lib/rpm/perl.req | |||
98 | lib/rpm/perldeps.pl | |||
99 | lib/rpm/pkgconfigdeps.sh | |||
100 | lib/rpm/platform/aarch64--gnu/macros | |||
101 | lib/rpm/platform/alpha--gnu/macros | |||
102 | lib/rpm/platform/alphaev5--gnu/macros | |||
103 | lib/rpm/platform/alphaev56--gnu/macros | |||
104 | lib/rpm/platform/alphaev6--gnu/macros | |||
105 | lib/rpm/platform/alphaev67--gnu/macros | |||
106 | lib/rpm/platform/alphapca56--gnu/macros | |||
107 | lib/rpm/platform/amd64--gnu/macros | |||
108 | lib/rpm/platform/armv3l--gnu/macros | |||
109 | lib/rpm/platform/armv4b--gnu/macros | |||
110 | lib/rpm/platform/armv4l--gnu/macros | |||
111 | lib/rpm/platform/armv5tejl--gnu/macros | |||
112 | lib/rpm/platform/armv5tel--gnu/macros | |||
113 | lib/rpm/platform/armv6l--gnu/macros | |||
114 | lib/rpm/platform/armv7l--gnu/macros | |||
115 | lib/rpm/platform/athlon--gnu/macros | |||
116 | lib/rpm/platform/geode--gnu/macros | |||
117 | lib/rpm/platform/i386--gnu/macros | |||
118 | lib/rpm/platform/i486--gnu/macros | |||
119 | lib/rpm/platform/i586--gnu/macros | |||
120 | lib/rpm/platform/i686--gnu/macros | |||
121 | lib/rpm/platform/ia32e--gnu/macros | |||
122 | lib/rpm/platform/ia64--gnu/macros | |||
123 | lib/rpm/platform/noarch--gnu/macros | |||
124 | lib/rpm/platform/pentium3--gnu/macros | |||
125 | lib/rpm/platform/pentium4--gnu/macros | |||
126 | lib/rpm/platform/ppc--gnu/macros | |||
127 | lib/rpm/platform/ppc32dy4--gnu/macros | |||
128 | lib/rpm/platform/ppc64--gnu/macros | |||
129 | lib/rpm/platform/ppc64iseries--gnu/macros | |||
130 | lib/rpm/platform/ppc64p7--gnu/macros | |||
131 | lib/rpm/platform/ppc64pseries--gnu/macros | |||
132 | lib/rpm/platform/ppc8260--gnu/macros | |||
133 | lib/rpm/platform/ppc8560--gnu/macros | |||
134 | lib/rpm/platform/ppciseries--gnu/macros | |||
135 | lib/rpm/platform/ppcpseries--gnu/macros | |||
136 | lib/rpm/platform/s390--gnu/macros | |||
137 | lib/rpm/platform/s390x--gnu/macros | |||
138 | lib/rpm/platform/sh--gnu/macros | |||
139 | lib/rpm/platform/sh3--gnu/macros | |||
140 | lib/rpm/platform/sh4--gnu/macros | |||
141 | lib/rpm/platform/sh4a--gnu/macros | |||
142 | lib/rpm/platform/sparc--gnu/macros | |||
143 | lib/rpm/platform/sparc64--gnu/macros | |||
144 | lib/rpm/platform/sparc64v--gnu/macros | |||
145 | lib/rpm/platform/sparcv8--gnu/macros | |||
146 | lib/rpm/platform/sparcv9--gnu/macros | |||
147 | lib/rpm/platform/sparcv9v--gnu/macros | |||
148 | lib/rpm/platform/${MACHINE_ARCH}--gnu/macros | |||
149 | lib/rpm/pythondeps.sh | |||
150 | lib/rpm/rpm.daily | |||
151 | lib/rpm/rpm.log | |||
152 | lib/rpm/rpm.supp | |||
153 | lib/rpm/rpm2cpio.sh | |||
154 | lib/rpm/rpmdb_loadcvt | |||
155 | lib/rpm/rpmdeps | |||
156 | lib/rpm/rpmpopt-${PKGVERSION} | |||
14 | lib/rpm/rpmrc | 157 | lib/rpm/rpmrc | |
158 | lib/rpm/script.req | |||
159 | lib/rpm/tcl.req | |||
160 | lib/rpm/tgpg | |||
161 | man/fr/man8/rpm.8 | |||
162 | man/ja/man8/rpm.8 | |||
163 | man/ja/man8/rpm2cpio.8 | |||
164 | man/ja/man8/rpmbuild.8 | |||
165 | man/ja/man8/rpmgraph.8 | |||
166 | man/ko/man8/rpm.8 | |||
167 | man/ko/man8/rpm2cpio.8 | |||
168 | man/man1/gendiff.1 | |||
15 | man/man8/rpm.8 | 169 | man/man8/rpm.8 | |
16 | man/man8/rpm2cpio.8 | 170 | man/man8/rpm2cpio.8 | |
171 | man/man8/rpmbuild.8 | |||
172 | man/man8/rpmdb.8 | |||
173 | man/man8/rpmdeps.8 | |||
174 | man/man8/rpmgraph.8 | |||
175 | man/man8/rpmkeys.8 | |||
176 | man/man8/rpmsign.8 | |||
177 | man/man8/rpmspec.8 | |||
178 | man/pl/man1/gendiff.1 | |||
179 | man/pl/man8/rpm.8 | |||
180 | man/pl/man8/rpm2cpio.8 | |||
181 | man/pl/man8/rpmbuild.8 | |||
182 | man/pl/man8/rpmdeps.8 | |||
183 | man/pl/man8/rpmgraph.8 | |||
184 | man/ru/man8/rpm.8 | |||
185 | man/ru/man8/rpm2cpio.8 | |||
186 | man/sk/man8/rpm.8 | |||
187 | share/locale/br/LC_MESSAGES/rpm.mo | |||
188 | share/locale/ca/LC_MESSAGES/rpm.mo | |||
17 | share/locale/cs/LC_MESSAGES/rpm.mo | 189 | share/locale/cs/LC_MESSAGES/rpm.mo | |
190 | share/locale/da/LC_MESSAGES/rpm.mo | |||
18 | share/locale/de/LC_MESSAGES/rpm.mo | 191 | share/locale/de/LC_MESSAGES/rpm.mo | |
192 | share/locale/el/LC_MESSAGES/rpm.mo | |||
193 | share/locale/eo/LC_MESSAGES/rpm.mo | |||
194 | share/locale/es/LC_MESSAGES/rpm.mo | |||
19 | share/locale/fi/LC_MESSAGES/rpm.mo | 195 | share/locale/fi/LC_MESSAGES/rpm.mo | |
20 | share/locale/fr/LC_MESSAGES/rpm.mo | 196 | share/locale/fr/LC_MESSAGES/rpm.mo | |
197 | share/locale/is/LC_MESSAGES/rpm.mo | |||
198 | share/locale/it/LC_MESSAGES/rpm.mo | |||
199 | share/locale/ja/LC_MESSAGES/rpm.mo | |||
200 | share/locale/ko/LC_MESSAGES/rpm.mo | |||
201 | share/locale/ms/LC_MESSAGES/rpm.mo | |||
202 | share/locale/nb/LC_MESSAGES/rpm.mo | |||
203 | share/locale/nl/LC_MESSAGES/rpm.mo | |||
204 | share/locale/pl/LC_MESSAGES/rpm.mo | |||
205 | share/locale/pt/LC_MESSAGES/rpm.mo | |||
21 | share/locale/pt_BR/LC_MESSAGES/rpm.mo | 206 | share/locale/pt_BR/LC_MESSAGES/rpm.mo | |
22 | share/locale/ru/LC_MESSAGES/rpm.mo | 207 | share/locale/ru/LC_MESSAGES/rpm.mo | |
23 | share/locale/sk/LC_MESSAGES/rpm.mo | 208 | share/locale/sk/LC_MESSAGES/rpm.mo | |
209 | share/locale/sl/LC_MESSAGES/rpm.mo | |||
24 | share/locale/sr/LC_MESSAGES/rpm.mo | 210 | share/locale/sr/LC_MESSAGES/rpm.mo | |
211 | share/locale/sr@latin/LC_MESSAGES/rpm.mo | |||
25 | share/locale/sv/LC_MESSAGES/rpm.mo | 212 | share/locale/sv/LC_MESSAGES/rpm.mo | |
213 | share/locale/te/LC_MESSAGES/rpm.mo | |||
26 | share/locale/tr/LC_MESSAGES/rpm.mo | 214 | share/locale/tr/LC_MESSAGES/rpm.mo | |
215 | share/locale/uk/LC_MESSAGES/rpm.mo | |||
216 | share/locale/zh_CN/LC_MESSAGES/rpm.mo | |||
217 | share/locale/zh_TW/LC_MESSAGES/rpm.mo | |||
218 | @pkgdir var/tmp |
@@ -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 | |||
3 | SHA1 (rpm-2.5.4.tar.gz) = a7fcd67883aec8d5f17483d5efebe7e5f5453462 | 3 | SHA1 (rpm-4.11.1.tar.bz2) = 31ddc4185137ce3f718c99e91dcb040614fe820c | |
4 | RMD160 (rpm-2.5.4.tar.gz) = 6c9a46d370fe97c7fcf7f814db049ea2bba300da | 4 | RMD160 (rpm-4.11.1.tar.bz2) = 3acb73dffef60c5e98ad23d2551ebca0837c218c | |
5 | Size (rpm-2.5.4.tar.gz) = 727849 bytes | 5 | Size (rpm-4.11.1.tar.bz2) = 3778922 bytes | |
6 | SHA1 (patch-aa) = 3ee3193cc8e9043017b1f507b606c72acab77ddb | 6 | SHA1 (patch-ac) = a9d4fb93a47f705b9220d886853b805f3b741ca2 | |
7 | SHA1 (patch-ab) = 63635f4f7fd96b4e7a40bfbaffd5673b40db3a13 | 7 | SHA1 (patch-build_rpmfc.c) = dab644d99d7ed43850443433b242d6ec16630b9c | |
8 | SHA1 (patch-ac) = ed4545088fc0cc56fd577fbc122a073f12d751aa | 8 | SHA1 (patch-cb) = c52dfaec6cf89d069f26900265d34f7ad91092f0 | |
9 | SHA1 (patch-ba) = c6a062e733e09eb56144177444188dcaf0cfcb06 | 9 | SHA1 (patch-configure.ac) = c9df0915b2c9c08fd059a3c9a2c89fe25d3e194d | |
10 | SHA1 (patch-bb) = dc0ea2dd366b793003218858ca3d67bc285a2089 | 10 | SHA1 (patch-misc_fts.c) = 26443c47db5e2211a926cf0f8b26b1f70475edda | |
11 | SHA1 (patch-bd) = 1c9cd4587314ee45bccdf08c6ecaabbe641aaa5d | 11 | SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53 | |
12 | SHA1 (patch-be) = ed237b47e9f8033e8fdfc4258a1bdd5ebaff469e | 12 | SHA1 (patch-system.h) = 21336b9d2a7afbc0573ba0ce09c0849e5bef2548 | |
13 | SHA1 (patch-ca) = 7f4b008eee3b9f1bd3abc49686f70a327376af55 | |||
14 | SHA1 (patch-cb) = 30f98037c6a5ba753bc19b20564e177ad1e8c1a9 | |||
15 | SHA1 (patch-cc) = d5955ec8b51950aadf930a62743601c2d4a0a127 | |||
16 | SHA1 (patch-cd) = 30e28a8f9453d4a4553ed08eeb43ba049fb35567 | |||
17 | SHA1 (patch-ce) = 9cbf130f8f10b5c8368028cfab295d9c61db2e7c | |||
18 | SHA1 (patch-cf) = 636b77cd05f9eb5083d11aa362a5b75d424014ad | |||
19 | SHA1 (patch-cg) = bc094d702cb13b5c89d696770bbcaffaca3b853c |
@@ -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" |
$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"
$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"
$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>
$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>
$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
@@ -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 |