Date: Mon, 18 Mar 2002 20:50:03 -0800 (PST) From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: freebsd-ports@FreeBSD.org Subject: Re: ports/36078: Fix MASTER_SITES_NN recursive bug Message-ID: <200203190450.g2J4o3R10420@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/36078; it has been noted by GNATS. From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/36078: Fix MASTER_SITES_NN recursive bug Date: Tue, 19 Mar 2002 01:37:55 -0300 --r5Pyd7+fXNt84Ff3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The files mentioned in the description. --r5Pyd7+fXNt84Ff3 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="Makefile.tgz-uuencode" begin 600 Makefile.tgz M'XL(`)Z+ECP``^T9:W/:2#)?T:^8=;RY[*T9'C:Q32W98,`.B6U8P+M)U551 M0AI`1M(H&LF89+G??MTS$HB7G>PFN:LK=96Q--/3TZ_IQ^A*G["A9;,L<\>Z M:[`GWP`*^?R+?)X\(:1P7"K@?X!\]!\&BT>'A!P?'95*^=*+0@E'2L>'3TC^ M6S"S#J$(=)^0)[;%P_L'\*9CQNSOP=#WA:?DFDV)Q_U`$(/;-C,"B[O$B=R" M#+E?SHS&7`3"\"TOT)Z2NAXP8O@,_IGE3*87,O(F=$DA3XJ%<NFD7#HBM4:W M1PJGI\>`_L>8.X"6J;HFK!'DK<T<A_RBJ]=7$WREH\"E!G=>:D]AQ?ZYS]A9 MMUY6?.4\WW*#7(*)K#[T[-Q5Q./!'2G0TP(IYO/%7+Z0*Q9)OE@^?%$N%4G@ MLSOND\:]1_:!MM9N=7K7U:M&944F'/V]T>DV6]>5S#'-'VJU:J]QT>HT&]U* M1FZO756[O4:GWVWV8`R\=AP$7CF7FTZG=.0*9)X._-R/W9NS>K/S8ZY\T;QJ M]]N=YG7OX'6[>?WV3:-WT&E<M\B_M$PFL=CD)B[.E>5D-%%<$DKB"^ZP8&RY MH\1T-*6[/!@S/Y?DLZ^0*O*4[7^*99^3D>5X6:75!)]RI\S8L]S)+8.9F&TR M9I;-<^5ZX[QZ<]G3VF\OD$SWYOR\^:Z2D<;0ZLUN[[QYB?J2X:20)"Q'BAKP M!F_PU^B`5M&TKR)+4^Z/-(U:KF&')B._#(1)$8$ZDY?:?_N(_%]#?(BRB?/P MM?=X)/Z_*.9+B_@/H1_0#DM'Q33^?P](X__6^(\CG<;O335T]%@^R.Q_6HF[ MK9M.K7'>ZEPTRMW<_B)T'FQ)"KEY,L([S!DP7U#^D3FZ9<NTHH>Y?X\8'PXG M.<\<,M?P9UZ`-&N=]^U>OUT_7\\I(V:/]5!0%\+XV#LYR1NY`CT:L$#'J'[R M[EV_WOD]N0A,Q&B0Y:YMN8R:3`Z`@OW`<NDE#P+F.UQ`>O$,^]"TA,P.]3?K M^XYU7QACN6V=3UV;ZR8BGA[G%QL.E9B6[W.?&H).+6%09H8Y+QQ$PT*9.E<] M;U_F1N(X?[A0X%\B,>0N.%$9G_OGK>M>=UN.S'Q&?MQ,C8_E0A*EWHMNY!/= MN7J3?/2[O?I\X1M+_J24";16[W6C\P!BPA/F*VZQ_VEA[?F:X7&J_J;?[=3F MRI0@?^WR,#$08T76FR<,";Q)C2CLM0H"US3?=&-*D:)0)PM=)\]>XUVO4ZWU M^JWKR_>5S(JJ'BT8KEO]6KW3NJID]FJZ2\!]9V3`"#JH;PU"B$\8O\@0UNQI MVI(R[H,,26OO?XI9`"N^FT/\(=<\8&4"]10LMVT^A8J+!%-.=)\1"%JV+&@$ M(.@!&>MWC(B9`R=G(LC4"L9(P8;@Z),[.,H83=U0GFH(9^!2DAA'Z@XEI`=4 M[[AEDM!UF<&$T'W+GB$),SI!B(\2R3T/8)A`J4<,Z-9&#*D(1B`WN23T1K[" M1L916T@E=&&54+)(II%_4)-:3[6D+ZX8)BN/358$9O8%S5-(DG3T45OUR6T+ M9!F:7`)<5$W3PK0"FJO[%FJEC,,7R\71N#37ZS:I,S%YPP)R4BC6<B>%$OP< MXM-)'G_PZ;14`PH/QSQ-NGPEDS',6QC0%B<`^#;9G6&>)'A$GS\@^I)3<X4C M/!RDC2$!N#\@@QE1T9$DHB-0$8%EV\3SP2IN<$!NH;J0%%#_A@ZFP@!*+$$< M2PBT%9;T$%C,6S*$A!KZ;"G5%P5E.@X<6T,A*EC#F[?RN8]9K9(ITA?J5:4^ M=?;GV2@&(,Y<B\-!/"UQY[&"Y,A5];H`JA-9I$\+J#6IEN>2?Q$:Z+\@K,NG M!#33:5PVJMT&^1#JMA7,?@+TOZO>OZX9W``T@P/R.=+,(8U>8\W@"VIF@3/7 MXK@83Z]J1HXL-",W+$@K<R\02DD[I8[='.+J`>C/4V68&7HVNR<R_X"+K+IY M(L4FCD^R.(H](0K6RM?-VU-J1)Y^@=E-ZIID,43-R-@:C6,S)5EL>(*[!\"I M.*"4+AE9YD<J>.@;#)`AF"!3FLH,H.HE4C06J?R(%FD^'HK5KEY1\0G<N;9, M,TND5?7+DZO2,D@#.@5AF<T]"/V><J>D0.TQ#WC7`4?)Q;H'-[&82/A6E.0W M)9-I39XNZU:HMTBD`D2[8C2R/&+PILY8C#C7%IEQ@;$AC0%1-$Y>H6M)(4`4 M+J.W5H/@VVF>]6_:[4K&_G!_G`=G`,<AZME./#OR&3.R"(SCH[RE$-6+EWR6 MJW!OGWFV;C`'8I=4%Y2;?<$,ZL&1E,E.QVPHR(R'F,(@E9@DJD>!6ZPX%)>) M&@3R]H)(VN'_[\&B__^`_<:WV>/A_K]0*"WO?P^/"L=X_WM8.$[[_^\!G]7_ M2]_8[/R+)<C2,^SS3Q)]/J1ABY,N.2?GS/>9Y>OD%ZG<5Y"MAS1T!W3@OR0, MHPG=VN_C;CFYYVJ/?UA<]OBGX#?EHU*YF"<3-]S6X"NF$ZW]KQ4"4?<WZ"DN M^]'0?*71_Q4B^4JG+RFL-OI1EC!\.O-HP'."#X,I]`6Y1&L*O]0-W)"Z7/:D M$,;ODT*MH=YZ5(YC3[,=P[>&$ZAL`F:,7;`.U0T*2$AZ*SID*\K'%H?B'2RU M:(UA>,K]"5X?;V<F:JD]RV/W,N7MW`$P=;F-'FY(I\6=U4I/G=W0/!A>+LC^ MDX@)LUD`;J?\4"4)U<E80@Z"0\YDWS/57>QK+$#S],"`]@>2RI#\8(*;N,Q\ MCAUC7^V$>_?KU]U^N]JKO>Z?53M@U0Z6H6U<2>)^:X:YS("2079OL(N;[9S7 MR,M2H4A,5T"&"Z(2H0N<,5)M74+7)Z#3Q*Y+*#ZAW#Q0C9?/!S9S)(:8S'QN M3)AL1'WN0-7O8C/`@=;(YZ%K?F0^ITH/0`])X=8&=SS;`DF!1U@*[$%7NS>T M[IFYAV]H1L6LW%A3`DH/_;F2O)`Q)N;8EY\7X"E7!FD4KKR=^#DZ(]E"_I!* M92+"@<T-W8Y(JJX=*HXV(&>]@D:9:X*ZGY)']:RMW+)(S)\KZ$8)]I9NGYA0 M@QZ?,I]A_085D&"JK]O`@H.G2_$V9NYT.V2&;1D3.;_TX@C+"@RTZ[V<C2^- M-K`4K1'XYH[]S3O=%;,=W+EP3K=.8'\X$]L9%R-++MK%"^?#]872TB-+E?^* MET<D<O1[RPD=+,*VT!K9NA!XZ2'B^\<-,H@FC(^C'<IUAWP`W2ZUY"\2&4^V M$CE=C7Y;&'4M`PC0B;]-52H(!>/DW,BD03BUF`R3>B"9`6TG0]0COF=#.Q2` M^TVV6\AR3&IML:H00?P9,#'GZ*:\EP@#`W^X#_4]IX:^RS0-3,$^KT$K)K?7 MOC2^`462^?//Y_&*/YJ]UVK%;S>-FX;"_NG9LYTDMRY8D$?Z&^3/FA?]7JO> M^DSBJ^B/DX:NIW;3Z32N:^^_8(>-5<N-UB+FZNV]I#6/[C*3$Y>M6O5R]4)? M!LO</$$ONN0$JK+H64.-`NC72WZ;D?A!\^W"WVZ1A[!W:A>J,/38;^1^*_F+ MJ`3V(60ARTJ-+!/45C+DV3/RPY<I;$.6K^/KJWEX8(VR`3<Y7:3B-4%6J>P6 M8X<=MPKQM4_5ID@&=XT0>@#7F.V4:H/>P\+M=KN5CP6JX5C_6-"NUMY6+Z`P M-6\'__H''B)CHH_PK$&AP%S!B,F9D$=-WG3(6A"*:-?4?1/C052H62Y6C8O/ M#%"2"SS17;S+!07JH1T068#(>Q.\H3=T%VLXAX/T%I1T@YELL;#2@Q1G$KS( M_$Y6>@`G.7+9O&KVH",JY4^_J=6@%LH.&1:?>&V>7;RJF>7LPVGP[*9Y65?[ MM=H]Z"^Z_6H=6HU>L]M8BIYYM?^I47O=ZE]U+^9D;V]]X#T/9:P-!5O[^C,( M+=LDW).V+F\LW'N8NT="VAJQK=B5&1,9YNK06ZC8CWV`<D>\B0M=HI/EF@T& MH2_/0&<R\G4',HP(\.:.#]&35=F1E3%T;W=]_WB0_&MA<)OLJ[A2\EATB"I] M#)21Z%(3CW']0$S\6P=I%^L;2QZTW593H0/J)!$^H5UD\I-B,(9(4CS*;RS[ MDF-=N;ZY.FMTMF[]/`Y@"J>R_^E+*,]_VDI4L$"5,R"XKD(CWAX+KI0RY/[6 M93,>^@1J]P#Z:;`67CO'1_.S+;\[]*QM^/0!:I\37M+;[1122"&%%%)((844 M4D@AA1122"&%%%)((8444D@AA1122"&%%%)((8444DCA^\)_`,HFCD$`4``` ` end --r5Pyd7+fXNt84Ff3 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-bsd.port.mk-fix" --- bsd.port.mk.orig Sun Mar 17 17:17:38 2002 +++ bsd.port.mk Sun Mar 17 18:00:38 2002 @@ -1352,22 +1352,22 @@ # XXX simpler/faster solution but not the best space wise, suggestions please .for _S in ${MASTER_SITES} _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -MASTER_SITES_TMP= . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/,/ /g} . if defined(_MASTER_SITE_SUBDIR_${_group}) +MASTER_SITES_TMP= . for dir in ${_MASTER_SITE_SUBDIR_${_group}} MASTER_SITES_TMP+= ${_MASTER_SITES_${_group}:S^%SUBDIR%^${dir}^} . endfor . else -MASTER_SITES_TMP+= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} +MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} . endif _MASTER_SITES_${_group}:= ${MASTER_SITES_TMP} . endfor . endif .endfor -MASTER_SITES_TMP= .if defined(_MASTER_SITE_SUBDIR_DEFAULT) +MASTER_SITES_TMP= . for dir in ${_MASTER_SITE_SUBDIR_DEFAULT} MASTER_SITES_TMP+= ${_MASTER_SITES_DEFAULT:S^%SUBDIR%^${dir}^} . endfor @@ -1378,22 +1378,22 @@ MASTER_SITES_TMP= .for _S in ${PATCH_SITES} _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -PATCH_SITES_TMP= . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/,/ /g} . if defined(_PATCH_SITE_SUBDIR_${_group}) +PATCH_SITES_TMP= . for dir in ${_PATCH_SITE_SUBDIR_${_group}} PATCH_SITES_TMP+= ${_PATCH_SITES_${_group}:S^%SUBDIR%^${dir}^} . endfor . else -PATCH_SITES_TMP+= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} +PATCH_SITES_TMP= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} . endif _PATCH_SITES_${_group}:= ${PATCH_SITES_TMP} . endfor . endif .endfor -PATCH_SITES_TMP= .if defined(_PATCH_SITE_SUBDIR_DEFAULT) +PATCH_SITES_TMP= . for dir in ${_PATCH_SITE_SUBDIR_DEFAULT} PATCH_SITES_TMP+= ${_PATCH_SITES_DEFAULT:S^%SUBDIR%^${dir}^} . endfor --r5Pyd7+fXNt84Ff3 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-bsd.port.mk-enhance" --- /usr/ports/Mk/bsd.port.mk.orig Sun Mar 17 04:15:24 2002 +++ /usr/ports/Mk/bsd.port.mk Sun Mar 17 15:20:03 2002 @@ -1352,25 +1352,47 @@ # XXX simpler/faster solution but not the best space wise, suggestions please .for _S in ${MASTER_SITES} _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -MASTER_SITES_TMP= . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/,/ /g} -. if defined(_MASTER_SITE_SUBDIR_${_group}) -. for dir in ${_MASTER_SITE_SUBDIR_${_group}} -MASTER_SITES_TMP+= ${_MASTER_SITES_${_group}:S^%SUBDIR%^${dir}^} -. endfor +. if !defined(_MASTER_SITE_SUBDIR_${_group}) +MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} . else -MASTER_SITES_TMP+= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} +_S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%*} +. if empty(_S_TEMP_TEMP) +MASTER_SITES_TMP= ${_MASTER_SITES_${_group}} +. else +MASTER_SITES_TMP= +. for site in ${_MASTER_SITES_${_group}} +_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +. if empty(_S_TEMP_TEMP) +MASTER_SITES_TMP+= ${site} +. else +. for dir in ${_MASTER_SITE_SUBDIR_${_group}} +MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} +. endfor +. endif +. endfor +. endif . endif _MASTER_SITES_${_group}:= ${MASTER_SITES_TMP} . endfor . endif .endfor -MASTER_SITES_TMP= .if defined(_MASTER_SITE_SUBDIR_DEFAULT) -. for dir in ${_MASTER_SITE_SUBDIR_DEFAULT} -MASTER_SITES_TMP+= ${_MASTER_SITES_DEFAULT:S^%SUBDIR%^${dir}^} -. endfor +_S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%*} +. if defined(_S_TEMP) +MASTER_SITES_TMP= +. for site in ${_MASTER_SITES_DEFAULT} +_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +. if empty(_S_TEMP_TEMP) +MASTER_SITES_TMP+= ${site} +. else +. for dir in ${_MASTER_SITE_SUBDIR_DEFAULT} +MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} +. endfor +. endif +. endfor +. endif .else MASTER_SITES_TMP= ${_MASTER_SITES_DEFAULT:S^%SUBDIR%/^^} .endif @@ -1378,25 +1400,47 @@ MASTER_SITES_TMP= .for _S in ${PATCH_SITES} _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -PATCH_SITES_TMP= . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/,/ /g} -. if defined(_PATCH_SITE_SUBDIR_${_group}) -. for dir in ${_PATCH_SITE_SUBDIR_${_group}} -PATCH_SITES_TMP+= ${_PATCH_SITES_${_group}:S^%SUBDIR%^${dir}^} -. endfor +. if !defined(_PATCH_SITE_SUBDIR_${_group}) +PATCH_SITES_TMP= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} . else -PATCH_SITES_TMP+= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} +_S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%*} +. if empty(_S_TEMP_TEMP) +PATCH_SITES_TMP= ${_PATCH_SITES_${_group}} +. else +PATCH_SITES_TMP= +. for site in ${_PATCH_SITES_${_group}} +_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +. if empty(_S_TEMP_TEMP) +PATCH_SITES_TMP+= ${site} +. else +. for dir in ${_PATCH_SITE_SUBDIR_${_group}} +PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} +. endfor +. endif +. endfor +. endif . endif _PATCH_SITES_${_group}:= ${PATCH_SITES_TMP} . endfor . endif .endfor -PATCH_SITES_TMP= .if defined(_PATCH_SITE_SUBDIR_DEFAULT) -. for dir in ${_PATCH_SITE_SUBDIR_DEFAULT} -PATCH_SITES_TMP+= ${_PATCH_SITES_DEFAULT:S^%SUBDIR%^${dir}^} -. endfor +_S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%*} +. if defined(_S_TEMP) +PATCH_SITES_TMP= +. for site in ${_PATCH_SITES_DEFAULT} +_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +. if empty(_S_TEMP_TEMP) +PATCH_SITES_TMP+= ${site} +. else +. for dir in ${_PATCH_SITE_SUBDIR_DEFAULT} +PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^} +. endfor +. endif +. endfor +. endif .else PATCH_SITES_TMP= ${_PATCH_SITES_DEFAULT:S^%SUBDIR%/^^} .endif --r5Pyd7+fXNt84Ff3 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-bsd.port.mk-strict" --- bsd.port.mk.orig Sun Mar 17 17:05:35 2002 +++ bsd.port.mk Sun Mar 17 17:07:41 2002 @@ -1357,13 +1357,13 @@ . if !defined(_MASTER_SITE_SUBDIR_${_group}) MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} . else -_S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%*} +_S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M*%SUBDIR%/*} . if empty(_S_TEMP_TEMP) MASTER_SITES_TMP= ${_MASTER_SITES_${_group}} . else MASTER_SITES_TMP= . for site in ${_MASTER_SITES_${_group}} -_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} . if empty(_S_TEMP_TEMP) MASTER_SITES_TMP+= ${site} . else @@ -1379,11 +1379,11 @@ . endif .endfor .if defined(_MASTER_SITE_SUBDIR_DEFAULT) -_S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%*} +_S_TEMP= ${_MASTER_SITES_DEFAULT:M*%SUBDIR%/*} . if defined(_S_TEMP) MASTER_SITES_TMP= . for site in ${_MASTER_SITES_DEFAULT} -_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} . if empty(_S_TEMP_TEMP) MASTER_SITES_TMP+= ${site} . else @@ -1405,13 +1405,13 @@ . if !defined(_PATCH_SITE_SUBDIR_${_group}) PATCH_SITES_TMP= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} . else -_S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%*} +_S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M*%SUBDIR%/*} . if empty(_S_TEMP_TEMP) PATCH_SITES_TMP= ${_PATCH_SITES_${_group}} . else PATCH_SITES_TMP= . for site in ${_PATCH_SITES_${_group}} -_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} . if empty(_S_TEMP_TEMP) PATCH_SITES_TMP+= ${site} . else @@ -1427,11 +1427,11 @@ . endif .endfor .if defined(_PATCH_SITE_SUBDIR_DEFAULT) -_S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%*} +_S_TEMP= ${_PATCH_SITES_DEFAULT:M*%SUBDIR%/*} . if defined(_S_TEMP) PATCH_SITES_TMP= . for site in ${_PATCH_SITES_DEFAULT} -_S_TEMP_TEMP= ${site:M*%SUBDIR%*} +_S_TEMP_TEMP= ${site:M*%SUBDIR%/*} . if empty(_S_TEMP_TEMP) PATCH_SITES_TMP+= ${site} . else --r5Pyd7+fXNt84Ff3-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203190450.g2J4o3R10420>