DELTA 305920 1487 721 SVNB#bB C,L$Kw`5.if defined(WITH_PKGNG) OPTIONS_DEFAULT+= PKGNGPATCH .endifEXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::with_pkgng_current . if ${PORT_OPTIONS:MZSH} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-files::zsh-completions . endifENDREP DELTA SVNdiff --git a/portmaster b/portmaster index ee95f41..3abb942 100755 --- portmaster +++ portmaster @@ -385,7 +385,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then [ -n "$port_dbdir" ] && export port_dbdir # Detect if pkgng is being used - use_pkgng="`pm_make_b -V WITH_PKGNG`" + use_pkgng=`pm_make_b -f/usr/share/mk/bsd.port.mk -V WITH_PKGNG 2>/dev/null` [ -n "$use_pkgng" ] && export use_pkgng fi ENDREP DELTA 289512 277 634 SVN-%portmaster.github.com ENDREP id: 4-156552.0.r306077/790 type: file pred: 4-156552.0.r305945/634 count: 94 text: 306077 0 261 2211 e1ab750f991b79053e996f3ecdcc4c2c 10e58bb4e3925187549a67f7d33c86c96f259aef 306076-6k6d/_4 props: 300897 22785326 38 0 b6b34f029ed66be42751a530d6e4b830 cpath: /head/ports-mgmt/portmaster/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-306077.0.r306077/1211 type: file count: 0 text: 306077 290 419 402 1ed917c9a07006b72c89e71cf32d67a5 4100cca257a02f6b3164e93eb0f85adcf4f5b572 306076-6k6d/_7 props: 306077 1100 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current copyroot: 0 / PLAIN K 37 extra-patch-files::with_pkgng_current V 28 file 5-306077.0.r306077/1211 K 34 extra-patch-files::zsh-completions V 28 file 6-305945.0.r305945/1056 END ENDREP id: 5-305945.0.r306077/1692 type: dir pred: 5-305945.0.r305945/1456 count: 1 text: 306077 1524 155 155 fd9f19fd30ff05df15e2a1c8afd3280e cpath: /head/ports-mgmt/portmaster/files copyroot: 0 / id: d-156552.0.r306077/1884 type: file pred: d-156552.0.r305653/1500 count: 12 text: 306077 722 40 1189 625b1fa70f6f5b528867c9b7a4039ba3 96da5d6740109cef40826e6d3b556b49788fd30d 306076-6k6d/_8 props: 300897 22784962 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/ports-mgmt/portmaster/pkg-descr copyroot: 0 / PLAIN K 8 Makefile V 27 file 4-156552.0.r306077/790 K 8 distinfo V 28 file 5-258899.0.r305904/1204 K 5 files V 27 dir 5-305945.0.r306077/1692 K 9 pkg-descr V 28 file d-156552.0.r306077/1884 K 11 pkg-message V 28 file 6-305920.0.r305920/3223 END ENDREP id: 2-156552.0.r306077/2450 type: dir pred: 2-156552.0.r305945/1868 count: 179 text: 306077 2198 239 239 c9719b28b04e9c3668467abcca0ac49b cpath: /head/ports-mgmt/portmaster copyroot: 0 / PLAIN K 8 Makefile V 28 file 3-183782.0.r302633/1313 K 4 bpkg V 31 dir 2-194791.0.r300897/22721360 K 3 bpm V 31 dir 2-117177.0.r300897/22715174 K 5 bxpkg V 26 dir 4-268962.0.r301277/544 K 10 distilator V 31 dir 4-263291.0.r300897/22717047 K 13 fastest_sites V 31 dir 4-209737.0.r300897/22669934 K 7 fbsdmon V 27 dir 4-290366.0.r305087/1453 K 8 genplist V 31 dir 2-190440.0.r300897/22680663 K 16 gnome-packagekit V 32 dir gw-254099.0.r300897/22701293 K 8 hs-porte V 29 dir 4-222410.0.r301879/737503 K 9 jailaudit V 31 dir 2-149353.0.r300897/22754721 K 11 kpackagekit V 31 dir 4-255504.0.r300897/22807173 K 6 kports V 31 dir 2-166850.0.r300897/22679219 K 10 kports-qt4 V 31 dir f-166850.0.r300897/22633875 K 7 lsknobs V 31 dir 4-206131.0.r300897/22656444 K 9 managepkg V 31 dir 2-141993.0.r300897/22778062 K 9 mkreadmes V 31 dir 4-292578.0.r300897/22759599 K 14 p5-App-Pm2Port V 31 dir 4-246423.0.r300897/22746332 K 15 p5-FreeBSD-Pkgs V 31 dir 4-216841.0.r300897/22643327 K 27 p5-FreeBSD-Pkgs-FindUpdates V 31 dir 4-233011.0.r300897/22741344 K 20 p5-FreeBSD-Portindex V 31 dir 2-122069.0.r300897/22752837 K 16 p5-FreeBSD-Ports V 30 dir 2-47770.0.r300897/22739401 K 26 p5-FreeBSD-Ports-INDEXhash V 31 dir 4-212731.0.r300897/22709415 K 10 packagekit V 32 dir ha-254099.0.r300897/22744423 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.r305346/1146 K 3 pib V 29 dir 3-5132.0.r300897/22762922 K 3 pkg V 26 dir 8-290111.0.r305135/618 K 10 pkg-orphan V 31 dir 2-149953.0.r300897/22750917 K 9 pkg-plist V 31 dir 4-286386.0.r300897/22707480 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 30 dir 2-89898.0.r300897/22639988 K 11 pkg_install V 26 dir 2-86245.0.r302929/1547 K 8 pkg_jail V 29 dir 4-251482.0.r305832/929300 K 10 pkg_remove V 27 dir 2-24740.0.r304813/60936 K 11 pkg_replace V 31 dir 2-175972.0.r300897/22711316 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 31 dir 2-134560.0.r300897/22749455 K 8 pkg_tree V 30 dir 2-48688.0.r300897/22645883 K 5 pkgfe V 31 dir 2-155130.0.r300897/22685156 K 10 pkgs_which V 31 dir 4-270739.0.r300897/22631546 K 9 pkgsearch V 31 dir 2-200152.0.r300897/22702758 K 20 port-authoring-tools V 31 dir 2-110096.0.r300897/22771332 K 22 port-maintenance-tools V 31 dir 9-110096.0.r300897/22786941 K 9 portaudit V 30 dir 2-99292.0.r300897/22803849 K 12 portaudit-db V 31 dir 4-111367.0.r300897/22691143 K 11 portbuilder V 27 dir 2-273368.0.r304069/1083 K 9 portcheck V 31 dir 2-181444.0.r300897/22624797 K 12 portcheckout V 30 dir f-14283.0.r300897/22765879 K 8 portconf V 31 dir 2-164795.0.r300897/22636882 K 13 portdowngrade V 30 dir 2-94875.0.r300897/22719229 K 8 porteasy V 28 dir k-32876.0.r303710/395581 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 25 dir d-6943.0.r305554/1533 K 11 portmanager V 26 dir 3-153963.0.r303713/929 K 10 portmaster V 27 dir 2-156552.0.r306077/2450 K 7 portrac V 31 dir 4-241334.0.r300897/22796127 K 9 portscout V 31 dir 2-182924.0.r300897/22647756 K 10 portsearch V 31 dir 2-155006.0.r300897/22652119 K 10 portshaker V 31 dir 4-256205.0.r300897/22676211 K 17 portshaker-config V 31 dir 4-256206.0.r300897/22774697 K 8 portsopt V 27 dir 2-181373.0.r300904/1012 K 14 portsreinstall V 27 dir 4-288022.0.r302611/1472 K 9 porttools V 30 dir e-83314.0.r300897/22792135 K 8 porttree V 31 dir 4-285177.0.r300897/22649204 K 15 portupdate-scan V 31 dir 2-203636.0.r300897/22704955 K 11 portupgrade V 26 dir 2-39990.0.r306076/1925 K 17 portupgrade-devel V 26 dir f-39990.0.r306076/2960 K 9 poudriere V 27 dir 4-290206.0.r305926/1067 K 15 poudriere-devel V 34 dir 4-290206.0-302633.r306013/1263 K 7 psearch V 31 dir 2-156281.0.r300897/22627682 K 4 pver V 26 dir 4-236161.0.r305411/888 K 5 qtpkg V 28 dir 2-37499.0.r303952/396638 K 8 symports V 29 dir 4-236535.0.r305369/577658 K 9 tinderbox V 29 dir i-152082.0.r302724/641300 K 15 tinderbox-devel V 29 dir x-152082.0.r302724/642092 K 23 vulnerability-test-port V 30 dir 2-99322.0.r300897/22724315 K 12 wanted-ports V 31 dir 4-256557.0.r300897/22683297 K 3 xps V 31 dir 4-223946.0.r300897/22767317 END ENDREP id: 1-5132.0.r306077/6965 type: dir pred: 1-5132.0.r306076/7480 count: 2154 text: 306077 2638 4314 4314 d5349d5f919464d7d0cabec494553c9a cpath: /head/ports-mgmt copyroot: 0 / PLAIN K 10 .cvsignore V 23 file 1-7295.0.r7322/129 K 7 CHANGES V 26 file 1-99373.0.r305638/571 K 9 COPYRIGHT V 31 file 1-146787.0.r300895/3679195 K 4 GIDs V 28 file 1-168311.0.r305277/3634 K 5 KNOBS V 31 file 1-147337.0.r300895/4669965 K 5 LEGAL V 25 file 1-748.0.r304644/2195 K 5 MOVED V 26 file 1-69878.0.r305980/686 K 8 Makefile V 21 file 1-6.0.r302115/94 K 2 Mk V 22 dir 1-5.0.r305917/4581 K 6 README V 29 file 1-2408.0.r300895/4775053 K 9 Templates V 28 dir 1-2932.0.r300895/4753190 K 5 Tools V 26 dir 3-15302.0.r305939/3731 K 4 UIDs V 28 file 4-168311.0.r305277/3917 K 8 UPDATING V 27 file 1-102685.0.r305995/703 K 13 accessibility V 26 dir 1-42583.0.r303740/4860 K 6 arabic V 27 dir 1-38973.0.r303028/57544 K 9 archivers V 25 dir 1-242.0.r305842/11337 K 5 astro V 24 dir 1-301.0.r305910/8422 K 5 audio V 25 dir 1-148.0.r306067/46887 K 10 benchmarks V 24 dir 1-62.0.r305832/91318 K 7 biology V 26 dir 1-9066.0.r305832/96855 K 3 cad V 25 dir 1-276.0.r305610/73471 K 7 chinese V 25 dir 1-3770.0.r306065/7853 K 5 comms V 25 dir 1-76.0.r305832/106344 K 10 converters V 26 dir 1-1561.0.r306010/12909 K 9 databases V 25 dir 1-771.0.r306046/50271 K 9 deskutils V 26 dir 1-2098.0.r305957/15859 K 5 devel V 25 dir 1-73.0.r306073/229929 K 3 dns V 27 dir 1-6145.0.r305832/437146 K 7 editors V 24 dir 4-6.0.r305921/386286 K 9 emulators V 25 dir 1-181.0.r305847/12671 K 7 finance V 27 dir 1-4110.0.r305921/397984 K 6 french V 28 dir 1-25673.0.r305911/235280 K 3 ftp V 24 dir 1-199.0.r306016/6604 K 5 games V 25 dir 1-104.0.r306048/58594 K 6 german V 27 dir 1-7451.0.r305911/238859 K 8 graphics V 24 dir 1-94.0.r306050/56468 K 6 hebrew V 28 dir 3-31142.0.r303028/171428 K 9 hungarian V 28 dir 1p-38973.0.r304374/92858 K 3 irc V 23 dir 1-42.0.r305935/8335 K 8 japanese V 25 dir 1-410.0.r305947/19561 K 4 java V 25 dir 1-2798.0.r305755/8976 K 6 korean V 25 dir 1-5873.0.r305552/3642 K 4 lang V 24 dir 1-15.0.r306068/20325 K 4 mail V 24 dir 1-57.0.r306028/42264 K 4 math V 25 dir 1-162.0.r306015/36252 K 4 misc V 24 dir 7-35.0.r305876/31646 K 10 multimedia V 25 dir d-333.0.r306054/21359 K 3 net V 24 dir 1-22.0.r306075/68672 K 6 net-im V 29 dir 15-11144.0.r305832/891714 K 8 net-mgmt V 26 dir r-1011.0.r306047/18876 K 7 net-p2p V 26 dir g-29106.0.r306005/7646 K 4 news V 26 dir 1-145.0.r305832/928643 K 4 palm V 27 dir 1-6646.0.r305610/743116 K 6 polish V 27 dir tv-38973.0.r305705/2013 K 10 ports-mgmt V 25 dir 1-5132.0.r306077/6965 K 10 portuguese V 28 dir 1-17842.0.r305832/936299 K 5 print V 24 dir 1-79.0.r306003/18799 K 7 russian V 27 dir 1-1559.0.r305911/242900 K 7 science V 26 dir n-5356.0.r306000/11323 K 8 security V 25 dir 1-269.0.r306051/65082 K 6 shells V 25 dir w-6.0.r305832/1018982 K 8 sysutils V 25 dir b-339.0.r306064/54090 K 8 textproc V 26 dir 1-322.0.r306010/397646 K 9 ukrainian V 28 dir g-39704.0.r304374/122945 K 10 vietnamese V 27 dir 1-4812.0.r303028/208383 K 3 www V 26 dir 1-114.0.r306069/188531 K 3 x11 V 24 dir 1-16.0.r306055/25778 K 10 x11-clocks V 24 dir 1-931.0.r305982/4513 K 11 x11-drivers V 29 dir 1-157567.0.r302594/703766 K 6 x11-fm V 24 dir 1-691.0.r305879/2874 K 9 x11-fonts V 24 dir 1-543.0.r305603/9761 K 11 x11-servers V 26 dir 1n-710.0.r303429/95798 K 10 x11-themes V 28 dir 1-14410.0.r305477/107835 K 12 x11-toolkits V 25 dir 1-120.0.r305970/19504 K 6 x11-wm V 24 dir 1-40.0.r305794/11028 END ENDREP id: 2-1.0.r306077/10477 type: dir pred: 2-1.0.r306076/10992 count: 305895 text: 306077 7141 3323 3323 45523dc6b9a0b62d9f7f072aa61d89b3 props: 7322 2684 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 21 dir 0-1.0.r16195/3625 K 4 head V 23 dir 2-1.0.r306077/10477 K 8 svnadmin V 22 dir 3-1.0.r305681/1458 K 4 tags V 24 dir 8-1.0.r293834/871064 END ENDREP id: 0.0.r306077/10870 type: dir pred: 0.0.r306076/11385 count: 306077 text: 306077 10695 162 162 61d0cba9ed8ed7d79cd96180a0bdb78b cpath: / copyroot: 0 / 4-156552.0.t306076-6k6d modify-file true false /head/ports-mgmt/portmaster/Makefile _5.0.t306076-6k6d add-file true true /head/ports-mgmt/portmaster/files/extra-patch-files::with_pkgng_current d-156552.0.t306076-6k6d modify-file true false /head/ports-mgmt/portmaster/pkg-descr 10870 11024