/
patch-portmaster-pkgng
1229 lines (1131 loc) · 36 KB
/
patch-portmaster-pkgng
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
$FreeBSD$
--- portmaster.sh.in.orig
+++ portmaster.sh.in
@@ -49,7 +49,7 @@
#=============== Begin functions we always want to have ===============
version () {
- echo '' ; echo "===>>> Version 3.12.2"
+ echo '' ; echo "===>>> Version 3.12.2 (pkgng patch 1.1)"
#svn='$FreeBSD: user/dougb/portmaster/portmaster 237588 2012-06-26 01:32:58Z dougb $'
}
@@ -136,6 +136,8 @@
if [ -n "$files" ]; then
pm_sv Deleting \'install complete\' flags
pm_find_s $pdb -type f -name PM_UPGRADE_DONE_FLAG -delete
+ [ -n "$use_pkgng" ] &&
+ pm_find_s $pdb -type d -depth 1 -empty ! -path \*\.zfs/\* -delete 2>/dev/null
fi
fi
if [ -z "$BACKUP" -a -z "$NO_BACKUP" -a -n "$NB_DELETE" ]; then
@@ -187,9 +189,14 @@
fi
: ${PAGER:='less -e'}
- ( for f in $DISPLAY_LIST; do
- echo "===>>> pkg-message for $f" ; cat $pdb/$f/+DISPLAY ; echo ''
- done
+ ( if [ -z "$use_pkgng" ]; then
+ for f in $DISPLAY_LIST; do
+ echo "===>>> pkg-message for $f"
+ cat $pdb/$f/+DISPLAY ; echo ''
+ done
+ else
+ pkg query "===>>> pkg-message for %n-%v\n%M" $DISPLAY_LIST
+ fi
echo "===>>> Done displaying pkg-message files" ; echo '' ) | $PAGER ;;
esac
@@ -233,10 +240,14 @@
if [ -n "$build_deps_il" ]; then
echo "===>>> Deleting installed build-only dependencies"
cd
- for f in $build_deps_il; do
- pm_v " $f"
- pm_pkg_delete_s -f $f
- done
+ if [ -z "$use_pkgng" ]; then
+ for f in $build_deps_il; do
+ pm_v " $f"
+ pm_pkg_delete_s -f $f
+ done
+ else
+ pm_pkg_delete_s -f $build_deps_il
+ fi
echo ''
fi
@@ -324,7 +335,13 @@
unset -v PM_URB_LIST;
$PM_SU_CMD /usr/bin/nice /usr/bin/make $PM_MAKE_ARGS $*; ); }
pm_mkdir_s () { $PM_SU_CMD /bin/mkdir -p $1; }
-pm_pkg_delete_s () { $PM_SU_CMD /usr/sbin/pkg_delete $*; }
+pm_pkg_delete_s () {
+ if [ -z "$use_pkgng" ]; then
+ $PM_SU_CMD /usr/sbin/pkg_delete $*;
+ else
+ $PM_SU_CMD /usr/local/sbin/pkg delete -y $*;
+ fi
+}
pm_rm_s () { $PM_SU_CMD /bin/rm $*; }
pm_rmdir_s () { $PM_SU_CMD /bin/rmdir $*; }
pm_unlink_s () { [ -e "$1" ] && $PM_SU_CMD /bin/unlink $1; }
@@ -372,6 +389,10 @@
[ -z "$port_dbdir" ] &&
port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null`
[ -n "$port_dbdir" ] && export port_dbdir
+
+ # Detect if pkgng is being used
+ use_pkgng="`pm_make_b -V WITH_PKGNG`"
+ [ -n "$use_pkgng" ] && export use_pkgng
fi
usage () {
@@ -528,12 +549,17 @@
pattern=`globstrip $1`
- glob_dirs=`find $pdb -maxdepth 1 -type d -name ${pattern}\*`
+ if [ -z "$use_pkgng" ]; then
+ glob_dirs=`find $pdb -depth 1 -type d -name ${pattern}\*`
+ else
+ glob_dirs=`pkg query -g "%n-%v" ${pattern}\*`
+ fi
case "$glob_dirs" in
# Match a newline in multiple responses from find
*'
'*) return 2 ;;
- $pdb/*) return ;;
+ '') ;;
+ *) return ;;
esac
unset glob_dirs
@@ -543,20 +569,35 @@
origin_from_pdb () {
local o
- o=`grep -m1 '@comment ORIGIN:' $pdb/$1/+CONTENTS 2>/dev/null` && {
- echo ${o#@comment ORIGIN:}; return 0; }
+ if [ -z "$use_pkgng" ]; then
+ o=`grep -m1 '@comment ORIGIN:' $pdb/$1/+CONTENTS 2>/dev/null` && {
+ echo ${o#@comment ORIGIN:}; return 0; }
+ else
+ pkg info -qo $1 2>/dev/null && return 0
+ fi
case "$1" in bsdpan-*) return 3 ;; esac
- if [ -e "$pdb/$1/+IGNOREME" ]; then
+ if [ -e "$pdb/$1/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $1 ); then
if [ -n "$PM_VERBOSE" -o -n "$LIST_ORIGINS" ]; then
- echo " ===>>> No ORIGIN in $pdb/$1/+CONTENTS" >&2
+ if [ -z "$use_pkgng" ]; then
+ echo " ===>>> No ORIGIN in $pdb/$1/+CONTENTS" >&2
+ else
+ # An error above doesn't necessarily mean there's
+ # a problem in +MANIFEST, so don't mention it
+ echo " ===>>> No origin available for $1" >&2
+ fi
echo " ===>>> $pdb/$1/+IGNOREME exists" >&2
echo '' >&2
fi
return 2
else
- echo " ===>>> No ORIGIN in $pdb/$1/+CONTENTS" >&2
+ if [ -z "$use_pkgng" ]; then
+ echo " ===>>> No ORIGIN in $pdb/$1/+CONTENTS" >&2
+ else
+ # Same as above
+ echo " ===>>> No origin available for $1" >&2
+ fi
echo '' >&2
fi
return 1
@@ -698,12 +739,17 @@
o) REPLACE_ORIGIN=oopt ;;
p) fail 'The -p option has been deprecated' ;;
r) PM_URB=ropt
- if [ -d "$pdb/$OPTARG" ]; then
+ if [ -d "$pdb/$OPTARG" ] && ( [ -z "$use_pkgng" ] || pkg info -e $OPTARG ); then
glob_dirs=$OPTARG
else
+ case "$OPTARG" in */*) fail 'The argument to -r must be a package name, or a glob pattern' ;; esac
find_glob_dirs $OPTARG
case $? in
- 1) fail "$pdb/$OPTARG does not exist" ;;
+ 1) if [ -z "$use_pkgng" ]; then
+ fail "$pdb/$OPTARG does not exist"
+ else
+ fail "$OPTARG is not installed"
+ fi ;;
2) fail 'The argument to -r must match only one port' ;;
esac
fi
@@ -785,6 +831,12 @@
fail 'The -[ar] options are not compatible with other updates'
if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then
+ if [ -n "$use_pkgng" ]; then
+ unset PM_PACKAGES PM_PACKAGES_BUILD PM_PACKAGES_LOCAL PM_PACKAGES_NEWER PM_ALWAYS_FETCH PM_DELETE_PACKAGES
+ echo "===>>> Package installation support cannot be used with pkgng yet,"
+ echo " it will be disabled"
+ echo ''
+ fi
[ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] &&
fail Package installation support requires FreeBSD 6.4 or newer
fi
@@ -851,7 +903,12 @@
fi
unset INDEXFILE INDEXDIR
- PM_INDEX_PORTS=`pkg_version -Ivl\< $PM_INDEX | cut -f1 -d\<`
+ if [ -z "$use_pkgng" ]; then
+ pkg_version="pkg_version"
+ else
+ pkg_version="pkg version"
+ fi
+ PM_INDEX_PORTS=`$pkg_version -Ivl\< $PM_INDEX | cut -f1 -d\<`
export PM_INDEX_PORTS
if [ -z "$pd" -o "$pd" != /usr/ports ]; then
@@ -908,6 +965,10 @@
iport_from_origin () {
local sn dir
+ if [ -n "$use_pkgng" ]; then
+ pkg info -q ${1} || return 1
+ return
+ fi
sn=${1#*/} ; sn=${sn%-*} ; sn=${sn%%[0-9]*}
if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/${sn}*/+CONTENTS 2>/dev/null`; then
@@ -936,7 +997,9 @@
done
}
+# Useless with pkgng
check_dependency_files () {
+ [ -n "$use_pkgng" ] && return
# Global: grep_deps
local origin iport ro_opd
@@ -1018,7 +1081,9 @@
fi
}
+# Also useless with pkgng
update_contents () {
+ [ -n "$use_pkgng" ] && return
local IFS delete contents origin n_port old_origin iport new_cont
local o_seen line d_missing d_origin d_iport prev_line answer
@@ -1116,7 +1181,7 @@
for l in `grep "^$sf|" $pd/MOVED`; do
case "$l" in
${sf}\|\|*) [ -n "$iport" ] || iport=`iport_from_origin $sf`
- if [ -e "$pdb/$iport/+IGNOREME" ]; then
+ if [ -e "$pdb/$iport/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $iport ); then
if [ -n "$PM_VERBOSE" ]; then
echo ''
echo " ===>>> The $sf port has been deleted"
@@ -1151,7 +1216,7 @@
echo ''
[ -n "$iport" ] || iport=`iport_from_origin $sf`
- [ -e "$pdb/$iport/+IGNOREME" ] || return 1
+ [ -e "$pdb/$iport/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $iport ) || return 1
fi
return 0
}
@@ -1162,35 +1227,62 @@
echo '############' > $DI_FILES # Make the file > 0 bytes
echo "===>>> Gathering distinfo list for installed ports"
echo ''
- for pkg in ${pdb}/*; do
- [ -d $pkg ] || continue
- iport=${pkg#$pdb/}
+ if [ -z "$use_pkgng" ]; then
+ for pkg in ${pdb}/*; do
+ [ -d $pkg ] || continue
+ iport=${pkg#$pdb/}
- origin=`origin_from_pdb $iport` || continue
+ origin=`origin_from_pdb $iport` || continue
- if [ ! -d "$pd/$origin" ]; then
- find_moved_port $origin $iport nonfatal >/dev/null
- [ -n "$moved_npd" ] || continue
- origin=$moved_npd
- fi
+ if [ ! -d "$pd/$origin" ]; then
+ find_moved_port $origin $iport nonfatal >/dev/null
+ [ -n "$moved_npd" ] || continue
+ origin=$moved_npd
+ fi
- origin="${pd}/${origin}"
+ origin="${pd}/${origin}"
- if [ -s "${origin}/distinfo" ]; then
- distinfo="${origin}/distinfo"
- else
- pm_cd $origin || continue
- distinfo=`pm_make -V DISTINFO_FILE`
- [ -n "$distinfo" ] || fail "No DISTINFO_FILE in $origin"
- fi
+ if [ -s "${origin}/distinfo" ]; then
+ distinfo="${origin}/distinfo"
+ else
+ pm_cd $origin || continue
+ distinfo=`pm_make -V DISTINFO_FILE`
+ [ -n "$distinfo" ] || fail "No DISTINFO_FILE in $origin"
+ fi
- if [ -s "$distinfo" ]; then
- grep '^SHA256 ' $distinfo | while read disc1 f disc2; do
- f=${f#(} ; f=${f%)}
- echo $f >> $DI_FILES
- done
- fi
- done
+ if [ -s "$distinfo" ]; then
+ grep '^SHA256 ' $distinfo | while read disc1 f disc2; do
+ f=${f#(} ; f=${f%)}
+ echo $f >> $DI_FILES
+ done
+ fi
+ done
+ else
+ pkg query -a "%n-%v %o" | while read pkg origin; do
+ if [ ! -d "$pd/${origin}" ]; then
+ find_moved_port $origin $pkg nonfatal >/dev/null
+ [ -n "$moved_npd" ] || continue
+ origin=$moved_npd
+ fi
+
+ origin="${pd}/${origin}"
+
+ if [ -s "${origin}/distinfo" ]; then
+ distinfo="${origin}/distinfo"
+ else
+ pm_cd $origin || continue
+ distinfo=`pm_make -V DISTINFO_FILE`
+ [ -n "$distinfo" ] || fail "No DISTINFO_FILE in $origin"
+ fi
+
+ if [ -s "$distinfo" ]; then
+ grep '^SHA256 ' $distinfo | while read disc1 f disc2; do
+ f=${f#(} ; f=${f%)}
+ echo $f >> $DI_FILES
+ done
+ fi
+ done
+ fi
# Tell safe_exit that we are done
pm_unlink ${DI_FILES}-e
@@ -1236,25 +1328,45 @@
}
ports_by_category () {
- local pkg
+ local pkg dep rdep
pm_v "===>>> Sorting ports by category"
- for pkg in $pdb/*; do
- if [ -s "$pkg/+REQUIRED_BY" ]; then
- if grep -ql '^@pkgdep ' $pkg/+CONTENTS 2>/dev/null; then
- branches="$branches ${pkg#$pdb/}"
+ if [ -z "$use_pkgng" ]; then
+ for pkg in $pdb/*; do
+ if [ -s "$pkg/+REQUIRED_BY" ]; then
+ if grep -ql '^@pkgdep ' $pkg/+CONTENTS 2>/dev/null; then
+ branches="$branches ${pkg#$pdb/}"
+ else
+ trunks="$trunks ${pkg#$pdb/}"
+ fi
else
- trunks="$trunks ${pkg#$pdb/}"
+ if grep -ql '^@pkgdep ' $pkg/+CONTENTS 2>/dev/null; then
+ leaves="$leaves ${pkg#$pdb/}"
+ else
+ [ -d "$pkg" ] || continue
+ roots="$roots ${pkg#$pdb/}"
+ fi
fi
- else
- if grep -ql '^@pkgdep ' $pkg/+CONTENTS 2>/dev/null; then
- leaves="$leaves ${pkg#$pdb/}"
+ done
+ else
+ while read pkg dep rdep; do
+ if [ $rdep -eq 1 ]; then
+ if [ $dep -eq 1 ]; then
+ branches="$branches $pkg"
+ else
+ trunks="$trunks $pkg"
+ fi
else
- [ -d "$pkg" ] || continue
- roots="$roots ${pkg#$pdb/}"
+ if [ $dep -eq 1 ]; then
+ leaves="$leaves $pkg"
+ else
+ roots="$roots $pkg"
+ fi
fi
- fi
- done
+ done << EOF
+`pkg query -a "%n-%v %?d %?r"`
+EOF
+ fi
}
delete_empty_dist_subdirs () {
@@ -1302,7 +1414,9 @@
esac
}
+# Useless with pkgng
update_required_by () {
+ [ -n "$use_pkgng" ] && /bin/unlink $grep_deps && unset grep_deps && return
# Global: grep_deps
local do_update
@@ -1357,11 +1471,15 @@
echo "===>>> Checking for stale packages"
for package in `find $PACKAGES -type f | sort`; do
- pkg_dir=${package##*/} ; pkg_dir=${pkg_dir%\.tbz} ; echo ''
+ pkg_dir=${package##*/} ; pkg_dir=${pkg_dir%\.*} ; echo ''
- origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` ||
- fail Empty origin in $package
+ [ -n "$use_pkgng" ] &&
+ origin=`pkg query -F $package "%o" 2>/dev/null` ||
+ origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` ||
+ origin=`tar -O -zxvf $package '+MANIFEST' 2>/dev/null | grep '^origin:'` ||
+ fail "Empty origin in $package"
origin=${origin#@comment ORIGIN:}
+ origin=${origin#origin: }
if [ -z "$PM_INDEX" ]; then
if [ -d "$pd/$origin" ]; then
@@ -1377,16 +1495,28 @@
fi
if [ -n "$port_ver" ]; then
- if [ "${port_ver}.tbz" = "${package##*/}" ]; then
+ if [ "$port_ver" = "$pkg_dir" ]; then
echo "===>>> ${package##*/} is up to date"
- if [ ! -d "${pdb}/${pkg_dir}" ]; then
- echo " ===>>> $pkg_dir is not installed"
- echo " ===>>> Path: ${package}"
- get_answer_yn y "\n\t===>>> Delete stale package: ${package##*/}"
- case "$?" in
- 0) echo " ===>>> Deleting $package"
- pm_unlink_s $package ;;
- esac
+ if [ -z "$use_pkgng" ]; then
+ if [ ! -d "${pdb}/${pkg_dir}" ]; then
+ echo " ===>>> $pkg_dir is not installed"
+ echo " ===>>> Path: ${package}"
+ get_answer_yn y "\n\t===>>> Delete stale package: ${package##*/}"
+ case "$?" in
+ 0) echo " ===>>> Deleting $package"
+ pm_unlink_s $package ;;
+ esac
+ fi
+ else
+ if ! pkg info -e $pkg_dir; then
+ echo " ===>>> $pkg_dir is not installed"
+ echo " ===>>> Path: ${package}"
+ get_answer_yn y "\n\t===>>> Delete stale package: ${package##*/}"
+ case "$?" in
+ 0) echo " ===>>> Deleting $package"
+ pm_unlink_s $package ;;
+ esac
+ fi
fi
unset port_ver
continue
@@ -1397,10 +1527,18 @@
unset port_ver
- if [ -d "${pdb}/${pkg_dir}" ]; then
- echo " ===>>> ${package##*/} matches the installed version"
+ if [ -z "$use_pkgng" ]; then
+ if [ -d "${pdb}/${pkg_dir}" ]; then
+ echo " ===>>> ${package##*/} matches the installed version"
+ else
+ echo " ===>>> ${package##*/} is not installed"
+ fi
else
- echo " ===>>> ${package##*/} is not installed"
+ if pkg info -e $pkg_dir; then
+ echo " ===>>> ${package##*/} matches the installed version"
+ else
+ echo " ===>>> ${package##*/} is not installed"
+ fi
fi
fi
@@ -1439,6 +1577,10 @@
fi # [ -n "$CLEAN_PACKAGES" ]
if [ -n "$CHECK_DEPENDS" ]; then
+ if [ -n "$use_pkgng" ]; then
+ pkg check -adv
+ exit
+ fi
PM_VERBOSE=pmv_check_depends
IFS='
'
@@ -1485,24 +1627,42 @@
unique_list=':'
echo "===>>> Building list of installed port names"; echo ''
- for pkg in $pdb/*; do
- [ -d $pkg ] || continue
+ if [ -z "$use_pkgng" ]; then
+ for pkg in $pdb/*; do
+ [ -d $pkg ] || continue
- iport=${pkg#$pdb/}
- origin=`origin_from_pdb $iport` || continue
+ iport=${pkg#$pdb/}
+ origin=`origin_from_pdb $iport` || continue
- if [ ! -d "$pd/$origin" ]; then
- find_moved_port $origin $iport nonfatal >/dev/null
- [ -n "$moved_npd" ] || continue
- origin=$moved_npd
- fi
+ if [ ! -d "$pd/$origin" ]; then
+ find_moved_port $origin $iport nonfatal >/dev/null
+ [ -n "$moved_npd" ] || continue
+ origin=$moved_npd
+ fi
- if ! pm_cd $pd/$origin; then
- echo " ===>>> $pd/$origin does not exist for $pkg"
- continue
- fi
- unique_list="${unique_list}`make -V UNIQUENAME`:"
- done
+ if ! pm_cd $pd/$origin; then
+ echo " ===>>> $pd/$origin does not exist for $pkg"
+ continue
+ fi
+ unique_list="${unique_list}`make -V UNIQUENAME`:"
+ done
+ else
+ while read pkg origin; do
+ if [ ! -d "$pd/$origin" ]; then
+ find_moved_port $origin $pkg nonfatal >/dev/null
+ [ -n "$moved_npd" ] || continue
+ origin=$moved_npd
+ fi
+
+ if ! pm_cd $pd/$origin; then
+ echo " ===>>> $pd/$origin does not exist for $pkg"
+ continue
+ fi
+ unique_list="${unique_list}`make -V UNIQUENAME`:"
+ done << EOF
+`pkg query -a "%n-%v %o"`
+EOF
+ fi
echo "===>>> Checking $port_dbdir"
@@ -1603,7 +1763,7 @@
if [ -z "$do_update" -a -z "$skip" -a -z "$PM_INDEX_ONLY" ] && [ -d "$pd/$origin" ]; then
if ! pm_cd $pd/$origin; then
- if [ -e "$pdb/$iport/+IGNOREME" ]; then
+ if [ -e "$pdb/$iport/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $iport ); then
echo " ===>>> Warning: Unable to cd to $pd/$origin"
echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME"
echo ''
@@ -1620,13 +1780,13 @@
# If the port has moved and no +IGNOREME, we have to update it
if [ -n "$moved_npd" ]; then
- if [ ! -e "$pdb/$iport/+IGNOREME" ]; then
- do_update=do_update_moved
- else
+ if [ -e "$pdb/$iport/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $iport ); then
echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME"
echo ''
CUR_DEPS="${CUR_DEPS}${iport}:${origin}:"
return 0
+ else
+ do_update=do_update_moved
fi
fi
fi
@@ -1643,14 +1803,20 @@
unset port_ver
fi
else
- case `pkg_version -t $iport $port_ver` in
+ local pkg_version
+ if [ -z "$use_pkgng" ]; then
+ pkg_version="pkg_version"
+ else
+ pkg_version="pkg version"
+ fi
+ case `$pkg_version -t $iport $port_ver` in
\<) do_update=upd_lt ;;
=) ;; # Can be reached if same version with different options
\>) if [ -n "$PM_VERBOSE" ]; then
echo " ===>>> Port version $port_ver does not"
echo " ===>>> seem newer than installed $iport"
fi ;;
- *) fail "pkg_version -t $iport $port_ver gave an unexpected result"
+ *) fail "$pkg_version -t $iport $port_ver gave an unexpected result"
esac
[ -z "$do_update" ] && {
@@ -1666,8 +1832,9 @@
if [ -n "$LIST_PLUS" ]; then
if [ -z "$moved_npd" ]; then
echo " ===>>> New version available: $port_ver"
- [ -e "$pdb/$iport/+IGNOREME" ] &&
+ if [ -e "$pdb/$iport/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $iport ); then
echo " ===>>> +IGNOREME file is present for $1"
+ fi
pm_cd_pd $origin && check_state
num_updates=$(( $num_updates + 1 ))
else
@@ -1722,7 +1889,13 @@
fi
pm_cd $pkgdir || fail "Cannot cd into $pkgdir to create a package"
- if $PM_SU_CMD pkg_create -b $2; then
+ local pkg_create
+ if [ -z "$use_pkgng" ]; then
+ pkg_create="pkg_create -b"
+ else
+ pkg_create="pkg create "
+ fi
+ if $PM_SU_CMD $pkg_create $2; then
if [ "$1" = "$pbu" ]; then
if [ -n "$BACKUP" ]; then
echo " ===>>> Package saved to $1" ; echo ''
@@ -2061,10 +2234,14 @@
fi
if [ -n "$EXPUNGE" ]; then
- if [ ! -d "$pdb/$EXPUNGE" ]; then
+ if [ ! -d "$pdb/$EXPUNGE" ] || ( [ -n "$use_pkgng" ] && ! pkg info -e $EXPUNGE ); then
find_glob_dirs $EXPUNGE
case $? in
- 1) fail "No such directory/port: $pdb/$EXPUNGE" ;;
+ 1) if [ -z "$use_pkgng" ]; then
+ fail "No such directory/port: $pdb/$EXPUNGE"
+ else
+ fail "No such port: $EXPUNGE"
+ fi ;;
2) echo "===>>> $EXPUNGE matched multiple ports"
fail "The -e option works with only one port at a time" ;;
0) EXPUNGE=${glob_dirs#$pdb/}
@@ -2073,15 +2250,24 @@
fi
origin=`origin_from_pdb $EXPUNGE`
- deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`
+ if [ -z "$use_pkgng" ]; then
+ deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`
+ else
+ deplist=`pkg query "%rn-%rv" $origin`
+ fi
if [ -n "$deplist" ]; then
echo "===>>> Warning: Ports with dependencies on ${EXPUNGE}:"
- for dep in $deplist; do
- dep=${dep%/+CON*} ; echo " ${dep##*/}"
- done
+ if [ -z "$use_pkgng" ]; then
+ for dep in $deplist; do
+ dep=${dep%/+CON*} ; echo " ${dep##*/}"
+ done
+ else
+ echo "$deplist" | sed 's/^/ /'
+ fi
get_answer_yn n "\n\t===>>> Delete this dependency data"
case "$?" in
- 0) for f in $deplist; do
+ 0) [ -n "$use_pkgng" ] && exit 1 #TODO
+ for f in $deplist; do
update_contents delete $f $origin
done ;;
*) exit 1 ;;
@@ -2091,8 +2277,13 @@
[ -n "$BACKUP" ] && { init_packages ; pm_pkg_create $pbu $EXPUNGE; }
[ -z "$DONT_SCRUB_DISTFILES" ] && { delete_all_distfiles $origin; delete_dist_list; }
- echo "===>>> Running pkg_delete -f $EXPUNGE"
- pm_pkg_delete_s -f $EXPUNGE || fail 'pkg_delete failed'
+ if [ -z "$use_pkgng" ]; then
+ pkg_delete="pkg_delete"
+ else
+ pkg_delete="pkg delete"
+ fi
+ echo "===>>> Running $pkg_delete -f $EXPUNGE"
+ pm_pkg_delete_s -f $EXPUNGE || fail "$pkg_delete failed"
echo '' ; echo "===>>> Running ${0##*/} -s $ARGS"
exec $0 -s $ARGS
@@ -2102,13 +2293,21 @@
if [ -n "$CLEAN_STALE" ]; then
[ -z "$no_del_list" ] && export no_del_list=':'
- for file in `find $pdb -type f -name \+REQUIRED_BY -empty` ; do
+ if [ -z "$use_pkgng" ]; then
+ find_stale_ports="find $pdb -type f -name \+REQUIRED_BY -empty"
+ else
+ find_stale_ports="pkg query -a \"%?r %n-%v\" | awk '/^0/ { print \$2 }'"
+ fi
+ for file in `eval $find_stale_ports` ; do
iport="${file%/+REQUIRED_BY}" ; iport=${iport#$pdb/}
case "$no_del_list" in *:${iport}:*) continue ;; esac
origin=`origin_from_pdb $iport`
- deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`
+ deplist=""
+ if [ -z "$use_pkgng" ]; then
+ deplist=`grep -l DEPORIGIN:$origin$ $pdb/*/+CONTENTS`
+ fi
if [ -n "$deplist" ]; then
echo ''
echo "===>>> Warning: Unrecorded dependencies on ${iport}:"
@@ -2121,22 +2320,32 @@
continue
fi
- pkg_info $iport
+ if [ -z "$use_pkgng" ]; then
+ pkg_info $iport
+ pkg_delete="pkg_delete"
+ else
+ pkg info -f $iport
+ pkg_delete="pkg delete"
+ fi
get_answer_yn n "\t===>>> ${iport} is no longer depended on, delete"
case "$?" in
0) [ -n "$BACKUP" ] && { init_packages ; pm_pkg_create $pbu $iport; }
[ -z "$DONT_SCRUB_DISTFILES" ] && { delete_all_distfiles $origin; delete_dist_list; }
- echo "===>>> Running pkg_delete -f $iport"
- pm_pkg_delete_s -f $iport || fail 'pkg_delete failed'
+ echo "===>>> Running $pkg_delete -f $iport"
+ pm_pkg_delete_s -f $iport || fail "$pkg_delete failed"
exec $0 -s $ARGS ;;
- *) get_answer_yn n "\t===>>> Delete this dependency data"
- case "$?" in
- 0) pm_unlink_s $file ;;
- *) no_del_list="${no_del_list}${iport}:" ;;
- esac ;;
+ *) if [ -z "$use_pkgng" ]; then
+ get_answer_yn n "\t===>>> Delete this dependency data"
+ case "$?" in
+ 0) pm_unlink_s $file ;;
+ *) no_del_list="${no_del_list}${iport}:" ;;
+ esac
+ else
+ no_del_list="${no_del_list}${iport}:"
+ fi ;;
esac
done
exit 0
@@ -2159,7 +2368,7 @@
# to go out to the disk if we don't have to.
[ -z "$RESTART" ] && return 1
- if [ ! -e "$pdb/${1}/PM_UPGRADE_DONE_FLAG" ]; then
+ if [ ! -e "$pdb/${1}/PM_UPGRADE_DONE_FLAG" ] || ( [ -n "$use_pkgng" ] && ! pkg info -e $1 ); then
return 1
else
already_done $1
@@ -2176,7 +2385,7 @@
case "$INTERACTIVE_YES" in *:${1}:*) return 0 ;; esac
case "$INTERACTIVE_NO" in *:${1}:*) return 1 ;; esac
- if [ -e "$pdb/$1/+IGNOREME" ]; then
+ if [ -e "$pdb/$1/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $1 ); then
echo ''
echo "===>>> +IGNOREME file is present for $1"
echo ''
@@ -2281,7 +2490,13 @@
fail "No entry for $origin in $PM_INDEX"
fi
- case `pkg_version -t $iport $new_port 2>/dev/null` in
+ local pkg_version
+ if [ -z "$use_pkgng" ]; then
+ pkg_version="pkg_version"
+ else
+ pkg_version="pkg version"
+ fi
+ case `$pkg_version -t $iport $new_port 2>/dev/null` in
\<) build_l="${build_l}\tUpgrade $iport to $new_port\n" ;;
=) build_l="${build_l}\tRe-install $iport\n" ;;
\>) build_l="${build_l}\tDowngrade $iport to $new_port\n" ;;
@@ -2430,6 +2645,18 @@
rundeps=`gen_dep_list run-depends-list`
for dep in $d_port_list; do
+ # If the port is already installed, do not mark
+ # it as a build-only dependency, or it will be
+ # installed by package and/or removed
+ if [ -z "$use_pkgng" ]; then
+ iport_from_origin ${dep#$pd/} >/dev/null &&
+ run_dl="$run_dl $dep" &&
+ continue
+ else
+ pkg info -e ${dep#$pd/} &&
+ run_dl="$run_dl $dep" &&
+ continue
+ fi
case "$rundeps" in
*" ${dep} "*|*${dep}*)
varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'`
@@ -2499,7 +2726,11 @@
fail "Cannot cd to $d_port"
fi
for glob in $conflicts; do
- confl_p=`pkg_info -I $glob 2>/dev/null`
+ if [ -z "$use_pkgng" ]; then
+ confl_p=`pkg_info -I $glob 2>/dev/null`
+ else
+ confl_p=`pkg query -g "%n-%v" $glob 2>/dev/null`
+ fi
if [ -n "$confl_p" ]; then
confl_p=${confl_p%% *}
d_port="$pd/`origin_from_pdb $confl_p`"
@@ -2639,7 +2870,11 @@
done
for dep in $build_only_dl_g; do
- grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS && continue
+ if [ -z "$use_pkgng" ]; then
+ grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS && continue
+ else
+ [ "`pkg query "%?r" ${dep#$pd/}`" = "1" ] && continue
+ fi
[ -n "$PM_DEL_BUILD_ONLY" ] &&
iport_from_origin ${dep#$pd/} >/dev/null && continue
temp_bodlg="$temp_bodlg $dep"
@@ -2666,7 +2901,7 @@
urb_update () {
# Global: PM_URB_UP
- local verb origin req_by
+ local verb origin req_by req_by_o
verb=checking ; [ -n "$1" ] && verb=updating
@@ -2676,15 +2911,25 @@
echo ''
for origin in $PM_URB_ORIGINS; do
- for req_by in `grep -l DEPORIGIN:${origin}$ $pdb/*/+CONTENTS`; do
- req_by="${req_by%/+CONTENTS}"
- req_by="${req_by##*/}"
+ if [ -z "$use_pkgng" ]; then
+ for req_by in `grep -l DEPORIGIN:${origin}$ $pdb/*/+CONTENTS`; do
+ req_by="${req_by%/+CONTENTS}"
+ req_by="${req_by##*/}"
- case " $PM_URB_IPORTS" in *" $req_by "*) continue ;; esac
- case " $PM_URB_ORIGINS" in *" `origin_from_pdb $req_by` "*) continue ;; esac
+ case " $PM_URB_IPORTS" in *" $req_by "*) continue ;; esac
+ case " $PM_URB_ORIGINS" in *" `origin_from_pdb $req_by` "*) continue ;; esac
- PM_URB_LIST="${PM_URB_LIST} ${req_by}"
- done
+ PM_URB_LIST="${PM_URB_LIST} ${req_by}"
+ done
+ else
+ while read req_by req_by_o; do
+ case " $PM_URB_IPORTS" in *" $req_by "*) continue ;; esac
+ case " $PM_URB_ORIGINS" in *" $req_by_o "*) continue ;; esac
+ PM_URB_LIST="${PM_URB_LIST} ${req_by}"
+ done << EOF
+`pkg query "%rn-%rv %ro" ${origin}`
+EOF
+ fi
done
if [ -n "$PM_URB_LIST" ]; then
@@ -2696,7 +2941,11 @@
for req_by in $PM_URB_LIST; do
# Probably not needed, but JIC
- [ -d "$pdb/$req_by" ] || continue
+ if [ -z "$use_pkgng" ]; then
+ [ -d "$pdb/$req_by" ] || continue
+ else
+ pkg info -e $req_by || continue
+ fi
pm_v "===>>> $req_by depends on $PM_URB_IPORTS"
@@ -2737,12 +2986,16 @@
else
fail "$pd/${port} does not exist"
fi ;;
- *) if [ -d "$pdb/$port" ]; then
+ *) if [ -d "$pdb/$port" ] && ( [ -z "$use_pkgng" ] || pkg info -e $port ); then
worklist_temp="$worklist_temp $port"
else
find_glob_dirs $port
case $? in
- 1) fail "$pdb/$port does not exist" ;;
+ 1) if [ -z "$use_pkgng" ]; then
+ fail "$pdb/$port does not exist"
+ else
+ fail "$port is not installed"
+ fi ;;
*) local dir
for dir in $glob_dirs; do
worklist_temp="$worklist_temp ${dir#$pdb/}"
@@ -2850,9 +3103,16 @@
*/*) origin=$port ;;
*) # If an installed version does not exist at this
# point it probably got updated as a dependency
- if [ ! -d "$pdb/$port" ]; then
- numports=$(( $numports - 1 ))
- continue
+ if [ -z "$use_pkgng" ]; then
+ if [ ! -d "$pdb/$port" ]; then
+ numports=$(( $numports - 1 ))
+ continue
+ fi
+ else
+ if ! pkg info -e $port; then
+ numports=$(( $numports - 1 ))
+ continue
+ fi
fi
origin=`origin_from_pdb $port` ;;
esac
@@ -3076,11 +3336,16 @@
case "$argv" in
'') echo '' ; no_valid_port ;;
$pd/*) portdir=${argv#$pd/} ;;
- $pdb/*) upg_port=${argv#$pdb/} ;;
+ $pdb/*) if [ -z "$use_pkgng" ]; then
+ upg_port=${argv#$pdb/}
+ else
+ echo '' ; no_valid_port
+ fi ;;
/*) echo '' ; no_valid_port ;;
*/*) portdir=$argv ;;
\.) portdir=${PWD##*/ports/} ;; # Not always $pd, could be symlink
- *) [ -d "$pdb/$argv" ] && upg_port=$argv ;;
+ *) [ -d "$pdb/$argv" ] && ( [ -z "$use_pkgng" ] || pkg info -e $argv ) &&
+ upg_port=$argv ;;
esac
if [ -z "$portdir" -a -z "$upg_port" ]; then
@@ -3113,7 +3378,7 @@
case "$arg2" in
*/*) ro_opd=$arg2 ; ro_upg_port=`iport_from_origin $ro_opd` ;;
- *) if [ -d "$pdb/$arg2" ]; then
+ *) if [ -d "$pdb/$arg2" ] && ( [ -z "$use_pkgng" ] || pkg info -e $arg2 ); then
ro_upg_port=$arg2
else
find_glob_dirs $arg2 && ro_upg_port=${glob_dirs#$pdb/}
@@ -3128,12 +3393,21 @@
unset arg2
if [ -z "$ro_upg_port" ]; then
- if ! grep -ql "DEPORIGIN:$ro_opd$" $pdb/*/+CONTENTS; then
+ if [ -z "$use_pkgng" ]; then
+ grep -ql "DEPORIGIN:$ro_opd$" $pdb/*/+CONTENTS
+ else
+ pkg query -a "%do" | grep -q "^$ro_opd$"
+ fi
+ if [ "$?" -eq 1 ]; then
echo ''
- echo "===>>> The second argument to -o can be a port in $pdb,"
+ if [ -z "$use_pkgng" ]; then
+ echo "===>>> The second argument to -o can be a port in $pdb,"
+ else
+ echo "===>>> The second argument to -o can be a package name,"
+ fi
echo " or a port directory from $pd"
echo ''
- echo " $ro_opd does not seem to be installed,"
+ echo " $arg2 does not seem to be installed,"
echo ' or listed as a dependency'
echo '' ; no_valid_port
fi
@@ -3165,7 +3439,7 @@
fi
[ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ] && upg_port=`iport_from_origin ${portdir}`
-if [ -e "$pdb/$upg_port/+IGNOREME" ]; then
+if [ -e "$pdb/$upg_port/+IGNOREME" ] && ( [ -z "$use_pkgng" ] || pkg info -e $upg_port ); then
# Adding to CUR_DEPS means we will not get here in the build unless -G
if [ -z "$PM_BUILDING" ]; then
# Only need to prompt for this once if -ai
@@ -3562,7 +3836,12 @@
pm_v "===>>> Available package ($latest_pv) matches the current version"
elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then
if [ -n "$upg_port" ]; then
- case `pkg_version -t $upg_port $latest_pv` in
+ if [ -z "$use_pkgng" ]; then
+ pkg_version="pkg_version"
+ else
+ pkg_version="pkg version"
+ fi
+ case `$pkg_version -t $upg_port $latest_pv` in
\<) use_package=up_newer
pm_v "===>>> Available package ($latest_pv)"
pm_v " is newer than installed ($upg_port)" ;;
@@ -3578,7 +3857,12 @@
pm_v "===>>> There is a package available ($latest_pv)"