DELTA 324744 247504 543 SVN!!>d==# $FreeBSD$ PORTNAME= pkg DISTVERSION= 1.1.4 PORTREVISION= 3ENDREP DELTA SVN1311--- ./libpkg/pkg.h.in.orig 2013-07-06 12:48:19.000000000 +0200 +++ ./libpkg/pkg.h.in 2013-09-19 20:59:25.679219359 +0200 @@ -626,7 +626,7 @@ #define PKG_CONTAINS_STATIC_LIBS (1U << 25) #define PKG_CONTAINS_H_OR_LA (1U << 26) -int pkg_analyse_files(struct pkgdb *, struct pkg *); +int pkg_analyse_files(struct pkgdb *, struct pkg *, const char *stage); /** * Suggest if a package could be marked architecture independent or ENDREP DELTA 326389 110 369 SVNxK|m y2+Mhx^TkkH,ɒlIvGStY(E(QFڙSSvڰKq_܇Ų~?feO((~0Sh2 DAq]FuSh: ItqԨ^\?{:X@Zq ]%z^] z:ZOJW6^*&b=6Ȇhû?w3`BoAA@ “w}Ѳ,ZpEj۷, .'Y6E>◴Z V%δ }‹q=;CsE\9=_r,rd ,3jiV\(2tϔQ%%Uyysza!FD/ݕ~W:Е=vi;^)ȫ5ώQ+acrkmy?7Ix VNV"ք8`53 C$dїy+@xRn%kwz҃}bH$5CX'`®0 /)8jO^].> =ܒ2VK'dmXYL[TE^BDU(: )I"0]/o&;f2LcqSynok si=eu+/y6e,JmkC N-%l1bXmkr'#"$&A.ENDREP DELTA SVN--- ./libpkg/pkgdb.c.orig 2013-09-19 20:55:45.183234062 +0200 +++ ./libpkg/pkgdb.c 2013-09-19 20:55:15.578236583 +0200 @@ -2661,7 +2661,7 @@ return (EPKG_FATAL); } - if ((ret = pkg_analyse_files(db, pkg)) == EPKG_OK) { + if ((ret = pkg_analyse_files(db, pkg, NULL)) == EPKG_OK) { if (!db->prstmt_initialized && prstmt_initialize(db) != EPKG_OK) return (EPKG_FATAL); ENDREP DELTA SVN]_]]--- ./libpkg/private/elf_tables.h.orig 2013-07-06 12:48:19.000000000 +0200 +++ ./libpkg/private/elf_tables.h 2013-09-19 21:52:03.661029778 +0200 @@ -59,7 +59,9 @@ { -1, NULL } }; -#define EF_MIPS_ABI 0x0000F000 +#ifndef EF_MIPS_ABI +#define EF_MIPS_ABI 0x0000f000 +#endif #define E_MIPS_ABI_O32 0x00001000 #define E_MIPS_ABI_N32 0x00000020 ENDREP DELTA SVN+-++--- ./pkg/register.c.orig 2013-09-19 20:56:18.299519000 +0200 +++ ./pkg/register.c 2013-09-19 20:56:34.568231772 +0200 @@ -285,7 +285,7 @@ */ if (!testing_mode) - pkg_analyse_files(db, pkg); + pkg_analyse_files(db, pkg, input_path); pkg_get(pkg, PKG_ARCH, &arch); if (arch == NULL) { ENDREP id: 9-290111.0.r327648/2653 type: file pred: 9-290111.0.r326389/507 count: 82 text: 327648 0 79 3105 453d7ba185cc2f6a4bb7b42dae5e6a00 19b7857a8f85900c83f87f06df291433fd87280f 327647-70tl/_4 props: 308433 713 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /head/ports-mgmt/pkg/Makefile copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: 5-327648.0.r327648/3063 type: file count: 0 text: 327648 110 450 433 4d843233e31683650db076654752a261 d9e084913be5cc9efef01cdf530cb848553227dc 327647-70tl/_7 props: 327648 2952 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-libpkg__pkg.h.in copyroot: 0 / id: 6-323162.0-326387.r327648/3354 type: file pred: 6-323162.0-326387.r326389/809 count: 3 text: 327648 573 927 3659 ea3ba1ed3a550dcdba04eccce2bf1c39 e6ce4630a0057f72a8aac812fa4aa3d3c0adfbaa 327647-70tl/_8 props: 323162 1352 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c copyroot: 326387 /head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: 9-327648.0.r327648/3855 type: file count: 0 text: 327648 1528 404 387 b9f0a4a6eba7e9a5ef538c0416f8702c 0fac48d166027dd8d36a761f1fa5afd88cbbc594 327647-70tl/_a props: 327648 3744 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: b-327648.0.r327648/4257 type: file count: 0 text: 327648 1945 366 349 e70aebcd67b4904c93975669e2a6e0df 608297089dcc163902cfa99093093f229c2ee423 327647-70tl/_c props: 327648 4146 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-libpkg__private__elf_tables.h copyroot: 0 / PLAIN K 15 fbsd:nokeywords V 3 yes K 13 svn:eol-style V 6 native K 13 svn:mime-type V 10 text/plain END ENDREP id: d-327648.0.r327648/4673 type: file count: 0 text: 327648 2324 316 299 82b0f63734ed64dc5a17729901d6d114 f0ad24206d1f48eeecfe5bb58cc7a6e5df22c232 327647-70tl/_e props: 327648 4562 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/pkg/files/patch-pkg__register.c copyroot: 0 / PLAIN K 22 patch-libpkg__pkg.h.in V 28 file 5-327648.0.r327648/3063 K 23 patch-libpkg__pkg_elf.c V 35 file 6-323162.0-326387.r327648/3354 K 21 patch-libpkg__pkgdb.c V 28 file 9-327648.0.r327648/3855 K 35 patch-libpkg__private__elf_tables.h V 28 file b-327648.0.r327648/4257 K 21 patch-pkg__register.c V 28 file d-327648.0.r327648/4673 END ENDREP id: 5-323162.0.r327648/5310 type: dir pred: 5-323162.0.r326389/1283 count: 3 text: 327648 4964 333 333 a066736d8da99152e07fc30c8b5ee327 cpath: /head/ports-mgmt/pkg/files copyroot: 0 / PLAIN K 8 Makefile V 28 file 9-290111.0.r327648/2653 K 8 distinfo V 27 file c-290111.0.r322385/816 K 5 files V 27 dir 5-323162.0.r327648/5310 K 9 pkg-descr V 28 file e-290111.0.r315596/1050 K 11 pkg-message V 26 file 6-290863.0.r302930/51 K 9 pkg-plist V 28 file 6-293981.0.r321664/1078 END ENDREP id: 8-290111.0.r327648/5793 type: dir pred: 8-290111.0.r326389/1762 count: 90 text: 327648 5495 285 285 7632ac4716559cbecb2a471ca27d047a cpath: /head/ports-mgmt/pkg copyroot: 0 / PLAIN K 8 Makefile V 28 file 3-183782.0.r327356/1508 K 4 bpkg V 31 dir 2-194791.0.r300897/22721360 K 3 bpm V 29 dir 2-117177.0.r326449/272354 K 5 bxpkg V 29 dir 4-268962.0.r326840/163920 K 6 chucky V 27 dir 4-325275.0.r325275/4398 K 12 dialog4ports V 27 dir 4-314119.0.r327356/2281 K 19 dialog4ports-static V 27 dir 6-327356.0.r327356/3389 K 10 distilator V 28 dir 4-263291.0.r326530/15813 K 13 fastest_sites V 29 dir 4-209737.0.r308777/480325 K 7 fbsdmon V 30 dir 4-290366.0.r322783/1006343 K 8 genplist V 27 dir 2-190440.0.r320519/2004 K 16 gnome-packagekit V 30 dir gw-254099.0.r326159/408695 K 8 hs-porte V 29 dir 4-222410.0.r319894/948835 K 9 jailaudit V 27 dir 2-149353.0.r315407/1056 K 11 kpackagekit V 27 dir 4-255504.0.r325971/1111 K 10 kports-qt4 V 30 dir f-166850.0.r324744/2165704 K 7 lsknobs V 31 dir 4-206131.0.r300897/22656444 K 9 managepkg V 29 dir 2-141993.0.r316786/845170 K 9 mkreadmes V 31 dir 4-292578.0.r300897/22759599 K 14 p5-App-Pm2Port V 30 dir 4-246423.0.r324174/2184359 K 15 p5-FreeBSD-Pkgs V 28 dir 4-216841.0.r326526/84510 K 27 p5-FreeBSD-Pkgs-FindUpdates V 28 dir 4-233011.0.r326530/16672 K 20 p5-FreeBSD-Portindex V 28 dir 2-122069.0.r324134/79184 K 16 p5-FreeBSD-Ports V 28 dir 2-47770.0.r324171/980861 K 26 p5-FreeBSD-Ports-INDEXhash V 28 dir 4-212731.0.r326530/17548 K 10 packagekit V 27 dir ha-254099.0.r326134/638 K 14 packagekit-qt4 V 32 dir hs-254099.0.r300897/22706022 K 11 pbi-manager V 27 dir 4-273580.0.r304780/1629 K 8 pchecker V 27 dir 4-292125.0.r319779/1035 K 3 pib V 25 dir 3-5132.0.r317316/1898 K 3 pkg V 27 dir 8-290111.0.r327648/5793 K 9 pkg-devel V 33 dir 8-290111.0-319432.r326776/721 K 10 pkg-orphan V 28 dir 2-149953.0.r326530/18354 K 9 pkg-plist V 27 dir 4-286386.0.r307149/1928 K 10 pkg-rmleaf V 27 dir 4-318266.0.r318266/3761 K 10 pkg_add_it V 31 dir 4-221281.0.r300897/22773215 K 11 pkg_cleanup V 31 dir 4-204988.0.r300897/22730322 K 13 pkg_cutleaves V 27 dir 2-89898.0.r326530/19141 K 11 pkg_install V 26 dir 2-86245.0.r302929/1547 K 8 pkg_jail V 27 dir 4-251482.0.r309818/1905 K 10 pkg_remove V 27 dir 2-24740.0.r304813/60936 K 11 pkg_replace V 28 dir 2-175972.0.r316834/59414 K 12 pkg_rmleaves V 29 dir 2-125307.0.r305369/576975 K 10 pkg_search V 31 dir 2-203382.0.r300897/22650660 K 13 pkg_trackinst V 29 dir 2-134560.0.r312502/383403 K 8 pkg_tree V 27 dir 2-48688.0.r326526/85347 K 5 pkgfe V 31 dir 2-155130.0.r300897/22685156 K 10 pkgs_which V 28 dir 4-270739.0.r327368/18183 K 9 pkgsearch V 31 dir 2-200152.0.r300897/22702758 K 20 port-authoring-tools V 26 dir 2-110096.0.r314002/864 K 22 port-maintenance-tools V 26 dir 9-110096.0.r314001/480 K 9 portaudit V 25 dir 2-99292.0.r324124/726 K 12 portaudit-db V 27 dir 4-111367.0.r324417/1505 K 11 portbuilder V 29 dir 2-273368.0.r310522/393749 K 12 portcheckout V 28 dir f-14283.0.r327086/327093 K 8 portconf V 27 dir 2-164795.0.r324628/1524 K 13 portdowngrade V 26 dir 2-94875.0.r319411/1268 K 8 porteasy V 27 dir k-32876.0.r326530/19970 K 7 portell V 30 dir g-72810.0.r300897/22672088 K 8 portless V 31 dir g-165086.0.r300897/22654284 K 8 portlint V 26 dir d-6943.0.r326530/20733 K 10 portmaster V 27 dir 2-156552.0.r327279/1179 K 7 portrac V 31 dir 4-241334.0.r300897/22796127 K 9 portscout V 28 dir 2-182924.0.r327365/86358 K 10 portsearch V 31 dir 2-155006.0.r300897/22652119 K 10 portshaker V 27 dir 4-256205.0.r311212/1195 K 17 portshaker-config V 27 dir 4-256206.0.r311212/1872 K 8 portsopt V 27 dir 2-181373.0.r300904/1012 K 14 portsreinstall V 27 dir 4-288022.0.r324135/1130 K 9 porttools V 26 dir e-83314.0.r321565/2676 K 8 porttree V 31 dir 4-285177.0.r300897/22649204 K 15 portupdate-scan V 28 dir 2-203636.0.r326530/21515 K 11 portupgrade V 26 dir 2-39990.0.r327590/1180 K 17 portupgrade-devel V 26 dir f-39990.0.r327448/1152 K 9 poudriere V 27 dir 4-290206.0.r326628/1439 K 15 poudriere-devel V 34 dir 4-290206.0-302633.r327357/1262 K 9 prhistory V 30 dir 4-313161.0.r322783/1007100 K 7 psearch V 31 dir 2-156281.0.r300897/22627682 K 4 pver V 26 dir 4-236161.0.r305411/888 K 8 symports V 29 dir 4-236535.0.r305369/577658 K 9 tinderbox V 27 dir i-152082.0.r323207/1473 K 15 tinderbox-devel V 26 dir x-152082.0.r312505/624 K 23 vulnerability-test-port V 28 dir 2-99322.0.r314333/169048 K 12 wanted-ports V 29 dir 4-256557.0.r308940/123935 K 3 xps V 27 dir 4-223946.0.r324108/1833 END ENDREP id: 1-5132.0.r327648/10291 type: dir pred: 1-5132.0.r327590/5684 count: 2441 text: 327648 5973 4305 4305 11ad4c035c3bba2262636157be3bd098 cpath: /head/ports-mgmt copyroot: 0 / PLAIN K 7 CHANGES V 26 file 1-99373.0.r327609/505 K 9 COPYRIGHT V 26 file 1-146787.0.r309727/49 K 4 GIDs V 27 file 1-168311.0.r327064/383 K 5 KNOBS V 28 file 1-147337.0.r325547/1017 K 8 Keywords V 28 dir 1-314142.0.r314142/35921 K 5 LEGAL V 25 file 1-748.0.r325483/2440 K 5 MOVED V 26 file 1-69878.0.r327435/246 K 8 Makefile V 22 file 1-6.0.r318556/629 K 2 Mk V 22 dir 1-5.0.r327631/4585 K 6 README V 29 file 1-2408.0.r300895/4775053 K 9 Templates V 24 dir 1-2932.0.r326136/838 K 5 Tools V 26 dir 3-15302.0.r322448/3080 K 4 UIDs V 27 file 4-168311.0.r327064/666 K 8 UPDATING V 28 file 1-102685.0.r327605/8403 K 13 accessibility V 26 dir 1-42583.0.r326494/8619 K 6 arabic V 27 dir 1-38973.0.r325230/47771 K 9 archivers V 25 dir 1-242.0.r327627/12432 K 5 astro V 24 dir 1-301.0.r327634/9221 K 5 audio V 25 dir 1-148.0.r327645/45538 K 10 benchmarks V 23 dir 1-62.0.r327343/9486 K 7 biology V 25 dir 1-9066.0.r327550/5377 K 3 cad V 24 dir 1-276.0.r327542/5707 K 7 chinese V 26 dir 1-3770.0.r327338/56383 K 5 comms V 23 dir 1-76.0.r327541/8997 K 10 converters V 26 dir 1-1561.0.r327380/14327 K 9 databases V 25 dir 1-771.0.r327616/52876 K 9 deskutils V 26 dir 1-2098.0.r327535/63647 K 5 devel V 25 dir 1-73.0.r327646/242607 K 3 dns V 26 dir 1-6145.0.r327643/10143 K 7 editors V 23 dir 4-6.0.r327589/24424 K 9 emulators V 25 dir 1-181.0.r327522/10566 K 7 finance V 26 dir 1-4110.0.r327530/72808 K 6 french V 28 dir 1-25673.0.r325254/245558 K 3 ftp V 24 dir 1-199.0.r327585/6999 K 5 games V 25 dir 1-104.0.r327569/59543 K 6 german V 25 dir 1-7451.0.r327391/3439 K 8 graphics V 24 dir 1-94.0.r327636/55456 K 6 hebrew V 26 dir 3-31142.0.r327422/1615 K 9 hungarian V 29 dir 1p-38973.0.r325230/148768 K 3 irc V 25 dir 1-42.0.r327625/255680 K 8 japanese V 25 dir 1-410.0.r327517/18850 K 4 java V 25 dir 1-2798.0.r327594/8654 K 6 korean V 27 dir 1-5873.0.r327041/143573 K 4 lang V 24 dir 1-15.0.r327575/24024 K 4 mail V 24 dir 1-57.0.r327647/48822 K 4 math V 25 dir 1-162.0.r327630/36170 K 4 misc V 24 dir 7-35.0.r327577/26465 K 10 multimedia V 25 dir d-333.0.r327593/28134 K 3 net V 24 dir 1-22.0.r327613/69150 K 6 net-im V 28 dir 15-11144.0.r327623/11014 K 8 net-mgmt V 26 dir r-1011.0.r327621/19178 K 7 net-p2p V 26 dir g-29106.0.r327611/6483 K 4 news V 25 dir 1-145.0.r327278/59838 K 4 palm V 27 dir 1-6646.0.r327168/237809 K 6 polish V 27 dir tv-38973.0.r327392/2401 K 10 ports-mgmt V 26 dir 1-5132.0.r327648/10291 K 10 portuguese V 26 dir 1-17842.0.r326788/2242 K 5 print V 25 dir 1-79.0.r327535/521951 K 7 russian V 25 dir 1-1559.0.r327422/5308 K 7 science V 26 dir n-5356.0.r327638/10554 K 8 security V 25 dir 1-269.0.r327637/54785 K 6 shells V 23 dir w-6.0.r327035/29289 K 8 sysutils V 25 dir b-339.0.r327628/52622 K 8 textproc V 25 dir 1-322.0.r327644/84114 K 9 ukrainian V 26 dir g-39704.0.r327422/6845 K 10 vietnamese V 27 dir 1-4812.0.r325230/182135 K 3 www V 26 dir 1-114.0.r327635/124569 K 3 x11 V 24 dir 1-16.0.r327629/25474 K 10 x11-clocks V 24 dir 1-931.0.r327270/3755 K 11 x11-drivers V 27 dir 1-157567.0.r327049/4750 K 6 x11-fm V 24 dir 1-691.0.r327434/3245 K 9 x11-fonts V 25 dir 1-543.0.r327411/93747 K 11 x11-servers V 25 dir 1n-710.0.r324704/3751 K 10 x11-themes V 28 dir 1-14410.0.r327535/640825 K 12 x11-toolkits V 26 dir 1-120.0.r327625/324206 K 6 x11-wm V 23 dir 1-40.0.r327525/9239 END ENDREP id: 2-1.0.r327648/13777 type: dir pred: 2-1.0.r327647/52302 count: 327325 text: 327648 10468 3296 3296 dc47d2491b63f413a7fb79ffb9828bc7 props: 308235 235189 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r325814/31077 K 4 head V 23 dir 2-1.0.r327648/13777 K 8 svnadmin V 22 dir 3-1.0.r326462/1256 K 4 tags V 22 dir 8-1.0.r316236/4666 END ENDREP id: 0.0.r327648/14175 type: dir pred: 0.0.r327647/52701 count: 327648 text: 327648 14000 162 162 51cc905c1f2159470d5f1f01471a1d5b props: 326465 0 620 0 631089891639cf20878ff168189d346f cpath: / copyroot: 0 / minfo-cnt: 6 9-290111.0.t327647-70tl modify-file true false /head/ports-mgmt/pkg/Makefile _5.0.t327647-70tl add-file true true /head/ports-mgmt/pkg/files/patch-libpkg__pkg.h.in 6-323162.0-326387.t327647-70tl modify-file true false /head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c _9.0.t327647-70tl add-file true true /head/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c _b.0.t327647-70tl add-file true true /head/ports-mgmt/pkg/files/patch-libpkg__private__elf_tables.h _d.0.t327647-70tl add-file true true /head/ports-mgmt/pkg/files/patch-pkg__register.c 14175 14397