- Update to 3.1.15 - all local patches are now merged upstream Port maintainer (neuroworker@gmail.com) is cc'd. Generated with FreeBSD Port Tools 0.99_11 (mode: update, diff: ports)
Maintainer of audio/libmikmod, Please note that PR ports/184753 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/184753 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Looks good, i think its can be commited. 2013/12/14 Edwin Groothuis <edwin@freebsd.org> > Maintainer of audio/libmikmod, > > Please note that PR ports/184753 has just been submitted. > > If it contains a patch for an upgrade, an enhancement or a bug fix > you agree on, reply to this email stating that you approve the patch > and a committer will take care of it. > > The full text of the PR can be found at: > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/184753 > > -- > Edwin Groothuis via the GNATS Auto Assign Tool > edwin@FreeBSD.org >
State Changed From-To: feedback->open Maintainer has approved.
Responsible Changed From-To: freebsd-ports-bugs->riggs I'll take it.
State Changed From-To: open->feedback There are some issues with this patch. 1) Does not apply cleanly 2) How should files/patch-libmikmod__Makefile.in be handled? 3) Stage orphans. Please take a look, thanks!
diff -Naur /usr/ports/audio/libmikmod/Makefile /home/hsn/ports/libmikmod/Makefile --- /usr/ports/audio/libmikmod/Makefile 2014-02-06 00:16:38.000000000 +0100 +++ /home/hsn/ports/libmikmod/Makefile 2014-02-13 15:08:01.000000000 +0100 @@ -1,24 +1,35 @@ # Created by: Michael Haro <mharo@area51.fremont.ca.us> -# $FreeBSD: head/audio/libmikmod/Makefile 342894 2014-02-05 23:16:38Z bapt $ +# $FreeBSD: audio/libmikmod/Makefile 329271 2013-10-04 08:52:32Z bapt $ PORTNAME= libmikmod -PORTVERSION= 3.1.12 -PORTREVISION= 2 +PORTVERSION= 3.1.15 CATEGORIES= audio -MASTER_SITES= SF/mikmod/libmikmod%20%28source%29/${PORTVERSION}/ +MASTER_SITES= SF/mikmod/${PORTNAME}/${PORTVERSION}/ MAINTAINER= neuroworker@gmail.com COMMENT= MikMod Sound Library +LICENSE= LGPL21 + +USE_AUTOTOOLS= libtool WANT_GNOME= yes -USES= gmake libtool +USE_GNOME= lthack +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" -CONFIGURE_ARGS= --disable-esd USE_LDCONFIG= yes INFO= mikmod +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound +CONFIGURE_ARGS+= --enable-esd +.else +CONFIGURE_ARGS+= --disable-esd +.endif + post-extract: @${RM} -f ${WRKSRC}/docs/mikmod.info-* @@ -31,4 +42,4 @@ -e 's|-lc_r|${PTHREAD_LIBS:S/"//g}|g' \ ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -Naur /usr/ports/audio/libmikmod/distinfo /home/hsn/ports/libmikmod/distinfo --- /usr/ports/audio/libmikmod/distinfo 2014-01-22 16:30:13.000000000 +0100 +++ /home/hsn/ports/libmikmod/distinfo 2013-12-13 11:58:48.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (libmikmod-3.1.12.tar.gz) = 891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32 -SIZE (libmikmod-3.1.12.tar.gz) = 618011 +SHA256 (libmikmod-3.1.15.tar.gz) = c4ddd7fef14afe2c38fe8bb647eec415912b8cc150e992031c86b968deabdb63 +SIZE (libmikmod-3.1.15.tar.gz) = 1008296 diff -Naur /usr/ports/audio/libmikmod/files/patch-64bit-fix /home/hsn/ports/libmikmod/files/patch-64bit-fix --- /usr/ports/audio/libmikmod/files/patch-64bit-fix 2014-01-22 18:40:44.000000000 +0100 +++ /home/hsn/ports/libmikmod/files/patch-64bit-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -diff -ru include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in ---- include/mikmod.h.in 2007-12-15 01:24:19.000000000 -0800 -+++ include/mikmod.h.in 2009-10-05 00:18:56.000000000 -0700 -@@ -85,7 +85,7 @@ - - @DOES_NOT_HAVE_SIGNED@ - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ -diff -ru include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h ---- include/mikmod_internals.h 2007-12-15 04:24:51.000000000 -0800 -+++ include/mikmod_internals.h 2009-10-05 00:19:15.000000000 -0700 -@@ -50,7 +50,7 @@ - /*========== More type definitions */ - - /* SLONGLONG: 64bit, signed */ --#if defined (__arch64__) || defined(__alpha) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - typedef long SLONGLONG; - #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) diff -Naur /usr/ports/audio/libmikmod/files/patch-CVE-2009-0179 /home/hsn/ports/libmikmod/files/patch-CVE-2009-0179 --- /usr/ports/audio/libmikmod/files/patch-CVE-2009-0179 2014-01-22 18:40:44.000000000 +0100 +++ /home/hsn/ports/libmikmod/files/patch-CVE-2009-0179 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -diff -ur loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c ---- loaders/load_xm.c 2004-01-21 18:43:53.000000000 +0100 -+++ loaders/load_xm.c 2008-04-16 04:30:45.000000000 +0200 -@@ -622,7 +622,8 @@ - /* read the remainder of the header */ - for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader); - -- if(_mm_eof(modreader)) { -+ /* last instrument is at the end of file in version 0x0104 */ -+ if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) { - free(nextwav);free(wh); - nextwav=NULL;wh=NULL; - _mm_errno = MMERR_LOADING_SAMPLEINFO; -diff -ur playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c ---- playercode/mloader.c 2004-01-21 18:43:53.000000000 +0100 -+++ playercode/mloader.c 2008-04-16 04:30:45.000000000 +0200 -@@ -450,10 +450,12 @@ - if (!l->Init || l->Init()) { - _mm_rewind(modreader); - ok = l->Load(curious); -- /* propagate inflags=flags for in-module samples */ -- for (t = 0; t < of.numsmp; t++) -- if (of.samples[t].inflags == 0) -- of.samples[t].inflags = of.samples[t].flags; -+ if (ok) { -+ /* propagate inflags=flags for in-module samples */ -+ for (t = 0; t < of.numsmp; t++) -+ if (of.samples[t].inflags == 0) -+ of.samples[t].inflags = of.samples[t].flags; -+ } - } else - ok = 0; - diff -Naur /usr/ports/audio/libmikmod/files/patch-exitcrash /home/hsn/ports/libmikmod/files/patch-exitcrash --- /usr/ports/audio/libmikmod/files/patch-exitcrash 2014-01-22 18:40:44.000000000 +0100 +++ /home/hsn/ports/libmikmod/files/patch-exitcrash 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -diff -ru playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c ---- playercode/virtch_common.c 2007-12-15 01:26:53.000000000 -0800 -+++ playercode/virtch_common.c 2009-10-05 00:37:12.000000000 -0700 -@@ -347,7 +347,7 @@ - - void VC1_SampleUnload(SWORD handle) - { -- if (handle<MAXSAMPLEHANDLES) { -+ if (Samples && handle<MAXSAMPLEHANDLES) { - if (Samples[handle]) - free(Samples[handle]); - Samples[handle]=NULL; diff -Naur /usr/ports/audio/libmikmod/files/patch-libmikmod__Makefile.in /home/hsn/ports/libmikmod/files/patch-libmikmod__Makefile.in --- /usr/ports/audio/libmikmod/files/patch-libmikmod__Makefile.in 2014-01-19 18:31:48.000000000 +0100 +++ /home/hsn/ports/libmikmod/files/patch-libmikmod__Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- ./libmikmod/Makefile.in.orig 2014-01-19 10:54:34.000000000 -0200 -+++ ./libmikmod/Makefile.in 2014-01-19 10:54:45.000000000 -0200 -@@ -72,7 +72,7 @@ - rm -f Makefile - - $(LIB): $(OBJ) -- $(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(libdir) - - dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \ - $(top_srcdir)/dlapi/dlfcn.h diff -Naur /usr/ports/audio/libmikmod/files/patch-md_sngchn /home/hsn/ports/libmikmod/files/patch-md_sngchn --- /usr/ports/audio/libmikmod/files/patch-md_sngchn 2014-01-22 18:40:44.000000000 +0100 +++ /home/hsn/ports/libmikmod/files/patch-md_sngchn 1970-01-01 01:00:00.000000000 +0100 @@ -1,110 +0,0 @@ -diff -ru playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- playercode/mplayer.c 2007-12-15 01:26:28.000000000 -0800 -+++ playercode/mplayer.c 2009-10-04 23:48:36.000000000 -0700 -@@ -52,6 +52,8 @@ - will wait */ - /*static*/ MODULE *pf = NULL; - -+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices) -+ - #define HIGH_OCTAVE 2 /* number of above-range octaves */ - - static UWORD oldperiods[OCTAVE*2]={ -@@ -248,14 +250,14 @@ - MP_VOICE *a; - ULONG t,k,tvol,pp; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (((mod->voice[t].main.kick==KICK_ABSENT)|| - (mod->voice[t].main.kick==KICK_ENV))&& - Voice_Stopped_internal(t)) - return t; - - tvol=0xffffffUL;t=-1;a=mod->voice; -- for (k=0;k<md_sngchn;k++,a++) { -+ for (k=0;k<NUMVOICES(mod);k++,a++) { - /* allow us to take over a nonexisting sample */ - if (!a->main.s) - return k; -@@ -2249,12 +2251,12 @@ - - switch (dat) { - case 0x0: /* past note cut */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.fadevol=0; - break; - case 0x1: /* past note off */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) { - mod->voice[t].main.keyoff|=KEY_OFF; - if ((!(mod->voice[t].venv.flg & EF_ON))|| -@@ -2263,7 +2265,7 @@ - } - break; - case 0x2: /* past note fade */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.keyoff|=KEY_FADE; - break; -@@ -2318,7 +2320,7 @@ - SAMPLE *s; - - mod->totalchn=mod->realchn=0; -- for (channel=0;channel<md_sngchn;channel++) { -+ for (channel=0;channel<NUMVOICES(mod);channel++) { - aout=&mod->voice[channel]; - i=aout->main.i; - s=aout->main.s; -@@ -2736,7 +2738,7 @@ - if (a->dct!=DCT_OFF) { - int t; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if ((!Voice_Stopped_internal(t))&& - (mod->voice[t].masterchn==channel)&& - (a->main.sample==mod->voice[t].main.sample)) { -@@ -2978,6 +2980,11 @@ - if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE)))) - return 1; - -+ /* mod->numvoices was used during loading to clamp md_sngchn. -+ After loading it's used to remember how big mod->voice is. -+ */ -+ mod->numvoices = md_sngchn; -+ - Player_Init_internal(mod); - return 0; - } -@@ -3086,7 +3093,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3111,7 +3118,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3138,7 +3145,7 @@ - pf->sngpos=pos; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; diff -Naur /usr/ports/audio/libmikmod/files/patch-ngvolume /home/hsn/ports/libmikmod/files/patch-ngvolume --- /usr/ports/audio/libmikmod/files/patch-ngvolume 2014-01-22 18:40:44.000000000 +0100 +++ /home/hsn/ports/libmikmod/files/patch-ngvolume 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -diff -ru playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- playercode/mplayer.c 2009-10-05 00:19:59.000000000 -0700 -+++ playercode/mplayer.c 2009-10-05 00:44:35.000000000 -0700 -@@ -3019,7 +3019,7 @@ - { - MUTEX_LOCK(vars); - if (pf) -- pf->volume=(volume<0)?0:(volume>128)?128:volume; -+ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume; - MUTEX_UNLOCK(vars); - } - diff -Naur /usr/ports/audio/libmikmod/pkg-plist /home/hsn/ports/libmikmod/pkg-plist --- /usr/ports/audio/libmikmod/pkg-plist 2014-02-06 00:01:02.000000000 +0100 +++ /home/hsn/ports/libmikmod/pkg-plist 2014-02-13 15:07:44.000000000 +0100 @@ -4,6 +4,5 @@ lib/libmikmod.la lib/libmikmod.so lib/libmikmod.so.2 -lib/libmikmod.so.2.0.4 -man/man1/libmikmod-config.1.gz share/aclocal/libmikmod.m4 +man/man1/libmikmod-config.1.gz
begin 644 mikmod.patch M9&EF9B`M3F%U<B`O=7-R+W!O<G1S+V%U9&EO+VQI8FUI:VUO9"]-86ME9FEL M92`O:&]M92]H<VXO<&]R=',O;&EB;6EK;6]D+TUA:V5F:6QE"BTM+2`O=7-R M+W!O<G1S+V%U9&EO+VQI8FUI:VUO9"]-86ME9FEL90DR,#$T+3`R+3`V(#`P M.C$V.C,X+C`P,#`P,#`P,"`K,#$P,`HK*RL@+VAO;64O:'-N+W!O<G1S+VQI M8FUI:VUO9"]-86ME9FEL90DR,#$T+3`R+3$S(#$U.C`X.C`Q+C`P,#`P,#`P M,"`K,#$P,`I`0"`M,2PR-"`K,2PS-2!`0`H@(R!#<F5A=&5D(&)Y.B!-:6-H M865L($AA<F\@/&UH87)O0&%R96$U,2YF<F5M;VYT+F-A+G5S/@HM(R`D1G)E M94)31#H@:&5A9"]A=61I;R]L:6)M:6MM;V0O36%K969I;&4@,S0R.#DT(#(P M,30M,#(M,#4@,C,Z,38Z,SA:(&)A<'0@)`HK(R`D1G)E94)31#H@875D:6\O M;&EB;6EK;6]D+TUA:V5F:6QE(#,R.3(W,2`R,#$S+3$P+3`T(#`X.C4R.C,R M6B!B87!T("0*(`H@4$]25$Y!344]"6QI8FUI:VUO9`HM4$]25%9%4E-)3TX] M"3,N,2XQ,@HM4$]25%)%5DE324]./0DR"BM03U)45D524TE/3CT),RXQ+C$U M"B!#051%1T]22453/0EA=61I;PHM34%35$527U-)5$53/0E31B]M:6MM;V0O M;&EB;6EK;6]D)3(P)3(X<V]U<F-E)3(Y+R1[4$]25%9%4E-)3TY]+PHK34%3 M5$527U-)5$53/0E31B]M:6MM;V0O)'M03U)43D%-17TO)'M03U)45D524TE/ M3GTO"B`*($U!24Y404E.15(]"6YE=7)O=V]R:V5R0&=M86EL+F-O;0H@0T]- M345.5#T)36EK36]D(%-O=6YD($QI8G)A<GD*(`HK3$E#14Y313T)3$=03#(Q M"BL**U5315]!551/5$]/3%,]"6QI8G1O;VP*(%=!3E1?1TY/344]"7EE<PHM M55-%4ST)"6=M86ME(&QI8G1O;VP**U5315]'3D]-13T);'1H86-K"BM54T53 M/0D)9VUA:V4*($=.55]#3TY&24=54D4]"7EE<PH@0T].1DE'55)%7T5.5CT) M34%+14E.1D\](FUA:V5I;F9O("TM;F\M<W!L:70B"BU#3TY&24=54D5?05)' M4ST)+2UD:7-A8FQE+65S9`H@55-%7TQ$0T].1DE'/0EY97,*(`H@24Y&3ST) M"6UI:VUO9`H@"BLN:6YC;'5D92`\8G-D+G!O<G0N<')E+FUK/@HK"BLN:68@ M)'M(059%7T=.3TU%.DUE<V]U;F1](3TB(@HK55-%7T=.3TU%*ST)97-O=6YD M"BM#3TY&24=54D5?05)'4RL]"2TM96YA8FQE+65S9`HK+F5L<V4**T-/3D9) M1U5215]!4D=3*ST)+2UD:7-A8FQE+65S9`HK+F5N9&EF"BL*('!O<W0M97AT M<F%C=#H*(`E`)'M237T@+68@)'M74DM34D-]+V1O8W,O;6EK;6]D+FEN9F\M M*@H@"D!`("TS,2PT("LT,BPT($!`"B`)"2UE("=S?"UL8U]R?"1[4%1(4D5! M1%],24)3.E,O(B\O9WU\9R<@7`H@"0DD>U=22U-20WTO8V]N9FEG=7)E"B`* M+2YI;F-L=61E(#QB<V0N<&]R="YM:SX**RYI;F-L=61E(#QB<V0N<&]R="YP M;W-T+FUK/@ID:69F("U.875R("]U<W(O<&]R=',O875D:6\O;&EB;6EK;6]D M+V1I<W1I;F9O("]H;VUE+VAS;B]P;W)T<R]L:6)M:6MM;V0O9&ES=&EN9F\* M+2TM("]U<W(O<&]R=',O875D:6\O;&EB;6EK;6]D+V1I<W1I;F9O"3(P,30M M,#$M,C(@,38Z,S`Z,3,N,#`P,#`P,#`P("LP,3`P"BLK*R`O:&]M92]H<VXO M<&]R=',O;&EB;6EK;6]D+V1I<W1I;F9O"3(P,3,M,3(M,3,@,3$Z-3@Z-#@N M,#`P,#`P,#`P("LP,3`P"D!`("TQ+#(@*S$L,B!`0`HM4TA!,C4V("AL:6)M M:6MM;V0M,RXQ+C$R+G1A<BYG>BD@/2`X.3%A,F(W.#`S,#9E-F5F.#9E,S@Q M9C0U.64W,6$P.#5D-&4W9C4V8SDW,&$X-SED,V)F,S0Q8S`Q8F1F8S,R"BU3 M25I%("AL:6)M:6MM;V0M,RXQ+C$R+G1A<BYG>BD@/2`V,3@P,3$**U-(03(U M-B`H;&EB;6EK;6]D+3,N,2XQ-2YT87(N9WHI(#T@8S1D9&0W9F5F,31A9F4R M8S,X9F4X8F(V-#=E96,T,34Y,3)B.&-C,34P93DY,C`S,6,X-F(Y-CAD96%B M9&(V,PHK4TE:12`H;&EB;6EK;6]D+3,N,2XQ-2YT87(N9WHI(#T@,3`P.#(Y M-@ID:69F("U.875R("]U<W(O<&]R=',O875D:6\O;&EB;6EK;6]D+V9I;&5S M+W!A=&-H+38T8FET+69I>"`O:&]M92]H<VXO<&]R=',O;&EB;6EK;6]D+V9I M;&5S+W!A=&-H+38T8FET+69I>`HM+2T@+W5S<B]P;W)T<R]A=61I;R]L:6)M M:6MM;V0O9FEL97,O<&%T8V@M-C1B:70M9FEX"3(P,30M,#$M,C(@,3@Z-#`Z M-#0N,#`P,#`P,#`P("LP,3`P"BLK*R`O:&]M92]H<VXO<&]R=',O;&EB;6EK M;6]D+V9I;&5S+W!A=&-H+38T8FET+69I>`DQ.3<P+3`Q+3`Q(#`Q.C`P.C`P M+C`P,#`P,#`P,"`K,#$P,`I`0"`M,2PR-"`K,"PP($!`"BUD:69F("UR=2!I M;F-L=61E+VUI:VUO9"YH+FEN(&QI8FUI:VUO9"TS+C$N,3(O:6YC;'5D92]M M:6MM;V0N:"YI;@HM+2TM(&EN8VQU9&4O;6EK;6]D+F@N:6X),C`P-RTQ,BTQ M-2`P,3HR-#HQ.2XP,#`P,#`P,#`@+3`X,#`*+2LK*R!I;F-L=61E+VUI:VUO M9"YH+FEN"3(P,#DM,3`M,#4@,#`Z,3@Z-38N,#`P,#`P,#`P("TP-S`P"BU` M0"`M.#4L-R`K.#4L-R!`0`HM(`HM($!$3T537TY/5%](059%7U-)1TY%1$`* M+2`*+2TC:68@9&5F:6YE9"A?7V%R8V@V-%]?*2!\?"!D969I;F5D*%]?86QP M:&$I('Q\(&1E9FEN960H7U]X.#9?-C0I"BTK(VEF(&1E9FEN960H7U]A<F-H M-C1?7RD@?'P@9&5F:6YE9"A?7V%L<&AA*2!\?"!D969I;F5D*%]?>#@V7S8T M*2!\?"!D969I;F5D*%],4#8T*0HM("\J(#8T(&)I="!A<F-H:71E8W1U<F5S M("HO"BT@"BT@='EP961E9B!S:6=N960@8VAA<B`@("`@4T)95$4[("`@("`@ M+RH@,2!B>71E+"!S:6=N960@*B\*+61I9F8@+7)U(&EN8VQU9&4O;6EK;6]D M7VEN=&5R;F%L<RYH(&QI8FUI:VUO9"TS+C$N,3(O:6YC;'5D92]M:6MM;V1? M:6YT97)N86QS+F@*+2TM+2!I;F-L=61E+VUI:VUO9%]I;G1E<FYA;',N:`DR M,#`W+3$R+3$U(#`T.C(T.C4Q+C`P,#`P,#`P,"`M,#@P,`HM*RLK(&EN8VQU M9&4O;6EK;6]D7VEN=&5R;F%L<RYH"3(P,#DM,3`M,#4@,#`Z,3DZ,34N,#`P M,#`P,#`P("TP-S`P"BU`0"`M-3`L-R`K-3`L-R!`0`HM("\J/3T]/3T]/3T] M/2!-;W)E('1Y<&4@9&5F:6YI=&EO;G,@*B\*+2`*+2`O*B!33$].1TQ/3D<Z M(#8T8FET+"!S:6=N960@*B\*+2TC:68@9&5F:6YE9"`H7U]A<F-H-C1?7RD@ M?'P@9&5F:6YE9"A?7V%L<&AA*0HM*R-I9B!D969I;F5D*%]?87)C:#8T7U\I M('Q\(&1E9FEN960H7U]A;'!H82D@?'P@9&5F:6YE9"A?7W@X-E\V-"D@?'P@ M9&5F:6YE9"A?3%`V-"D*+2!T>7!E9&5F(&QO;F<)"5-,3TY'3$].1SL*+2`C M9&5F:6YE($Y!5$E615\V-$))5%])3E0*+2`C96QI9B!D969I;F5D*%]?5T%4 M0T]-0U]?*0ID:69F("U.875R("]U<W(O<&]R=',O875D:6\O;&EB;6EK;6]D M+V9I;&5S+W!A=&-H+4-612TR,#`Y+3`Q-SD@+VAO;64O:'-N+W!O<G1S+VQI M8FUI:VUO9"]F:6QE<R]P871C:"U#5D4M,C`P.2TP,3<Y"BTM+2`O=7-R+W!O M<G1S+V%U9&EO+VQI8FUI:VUO9"]F:6QE<R]P871C:"U#5D4M,C`P.2TP,3<Y M"3(P,30M,#$M,C(@,3@Z-#`Z-#0N,#`P,#`P,#`P("LP,3`P"BLK*R`O:&]M M92]H<VXO<&]R=',O;&EB;6EK;6]D+V9I;&5S+W!A=&-H+4-612TR,#`Y+3`Q M-SD),3DW,"TP,2TP,2`P,3HP,#HP,"XP,#`P,#`P,#`@*S`Q,#`*0$`@+3$L M,S,@*S`L,"!`0`HM9&EF9B`M=7(@;&]A9&5R<R]L;V%D7WAM+F,@;&EB;6EK M;6]D+3,N,2XQ,2]L;V%D97)S+VQO861?>&TN8PHM+2TM(&QO861E<G,O;&]A M9%]X;2YC"3(P,#0M,#$M,C$@,3@Z-#,Z-3,N,#`P,#`P,#`P("LP,3`P"BTK M*RL@;&]A9&5R<R]L;V%D7WAM+F,),C`P."TP-"TQ-B`P-#HS,#HT-2XP,#`P M,#`P,#`@*S`R,#`*+4!`("TV,C(L-R`K-C(R+#@@0$`*+2`)"0D)+RH@<F5A M9"!T:&4@<F5M86EN9&5R(&]F('1H92!H96%D97(@*B\*+2`)"0D)9F]R*'4] M:&5A9&5N9"U?;6U?9G1E;&PH;6]D<F5A9&5R*3MU.W4M+2D@7VUM7W)E861? M54)95$4H;6]D<F5A9&5R*3L*+2`*+2T)"0D):68H7VUM7V5O9BAM;V1R96%D M97(I*2!["BTK"0D)"2\J(&QA<W0@:6YS=')U;65N="!I<R!A="!T:&4@96YD M(&]F(&9I;&4@:6X@=F5R<VEO;B`P>#`Q,#0@*B\*+2L)"0D):68H7VUM7V5O M9BAM;V1R96%D97(I("8F("AM:"T^=F5R<VEO;CPP>#`Q,#0@?'P@=#QO9BYN M=6UI;G,M,2DI('L*+2`)"0D)"69R964H;F5X='=A=BD[9G)E92AW:"D["BT@ M"0D)"0EN97AT=V%V/4Y53$P[=V@]3E5,3#L*+2`)"0D)"5]M;5]E<G)N;R`] M($U-15)27TQ/041)3D=?4T%-4$Q%24Y&3SL*+61I9F8@+75R('!L87EE<F-O M9&4O;6QO861E<BYC(&QI8FUI:VUO9"TS+C$N,3$O<&QA>65R8V]D92]M;&]A M9&5R+F,*+2TM+2!P;&%Y97)C;V1E+VUL;V%D97(N8PDR,#`T+3`Q+3(Q(#$X M.C0S.C4S+C`P,#`P,#`P,"`K,#$P,`HM*RLK('!L87EE<F-O9&4O;6QO861E M<BYC"3(P,#@M,#0M,38@,#0Z,S`Z-#4N,#`P,#`P,#`P("LP,C`P"BU`0"`M M-#4P+#$P("LT-3`L,3(@0$`*+2`):68@*"%L+3Y);FET('Q\(&PM/DEN:70H M*2D@>PHM(`D)7VUM7W)E=VEN9"AM;V1R96%D97(I.PHM(`D);VL@/2!L+3Y, M;V%D*&-U<FEO=7,I.PHM+0D)+RH@<')O<&%G871E(&EN9FQA9W,]9FQA9W,@ M9F]R(&EN+6UO9'5L92!S86UP;&5S("HO"BTM"0EF;W(@*'0@/2`P.R!T(#P@ M;V8N;G5M<VUP.R!T*RLI"BTM"0D):68@*&]F+G-A;7!L97-;=%TN:6YF;&%G M<R`]/2`P*0HM+0D)"0EO9BYS86UP;&5S6W1=+FEN9FQA9W,@/2!O9BYS86UP M;&5S6W1=+F9L86=S.PHM*PD):68@*&]K*2!["BTK"0D)+RH@<')O<&%G871E M(&EN9FQA9W,]9FQA9W,@9F]R(&EN+6UO9'5L92!S86UP;&5S("HO"BTK"0D) M9F]R("AT(#T@,#L@="`\(&]F+FYU;7-M<#L@="LK*0HM*PD)"0EI9B`H;V8N M<V%M<&QE<UMT72YI;F9L86=S(#T](#`I"BTK"0D)"0EO9BYS86UP;&5S6W1= M+FEN9FQA9W,@/2!O9BYS86UP;&5S6W1=+F9L86=S.PHM*PD)?0HM(`E](&5L M<V4*+2`)"6]K(#T@,#L*+2`*9&EF9B`M3F%U<B`O=7-R+W!O<G1S+V%U9&EO M+VQI8FUI:VUO9"]F:6QE<R]P871C:"UE>&ET8W)A<V@@+VAO;64O:'-N+W!O M<G1S+VQI8FUI:VUO9"]F:6QE<R]P871C:"UE>&ET8W)A<V@*+2TM("]U<W(O M<&]R=',O875D:6\O;&EB;6EK;6]D+V9I;&5S+W!A=&-H+65X:71C<F%S:`DR M,#$T+3`Q+3(R(#$X.C0P.C0T+C`P,#`P,#`P,"`K,#$P,`HK*RL@+VAO;64O M:'-N+W!O<G1S+VQI8FUI:VUO9"]F:6QE<R]P871C:"UE>&ET8W)A<V@),3DW M,"TP,2TP,2`P,3HP,#HP,"XP,#`P,#`P,#`@*S`Q,#`*0$`@+3$L,3(@*S`L M,"!`0`HM9&EF9B`M<G4@<&QA>65R8V]D92]V:7)T8VA?8V]M;6]N+F,@;&EB M;6EK;6]D+3,N,2XQ,B]P;&%Y97)C;V1E+W9I<G1C:%]C;VUM;VXN8PHM+2TM M('!L87EE<F-O9&4O=FER=&-H7V-O;6UO;BYC"3(P,#<M,3(M,34@,#$Z,C8Z M-3,N,#`P,#`P,#`P("TP.#`P"BTK*RL@<&QA>65R8V]D92]V:7)T8VA?8V]M M;6]N+F,),C`P.2TQ,"TP-2`P,#HS-SHQ,BXP,#`P,#`P,#`@+3`W,#`*+4!` M("TS-#<L-R`K,S0W+#<@0$`*+2`*+2!V;VED(%9#,5]386UP;&55;FQO860H M4U=/4D0@:&%N9&QE*0HM('L*+2T):68@*&AA;F1L93Q-05A304U03$5(04Y$ M3$53*2!["BTK"6EF("A386UP;&5S("8F(&AA;F1L93Q-05A304U03$5(04Y$ M3$53*2!["BT@"0EI9B`H4V%M<&QE<UMH86YD;&5=*0HM(`D)"69R964H4V%M M<&QE<UMH86YD;&5=*3L*+2`)"5-A;7!L97-;:&%N9&QE73U.54Q,.PID:69F M("U.875R("]U<W(O<&]R=',O875D:6\O;&EB;6EK;6]D+V9I;&5S+W!A=&-H M+6QI8FUI:VUO9%]?36%K969I;&4N:6X@+VAO;64O:'-N+W!O<G1S+VQI8FUI M:VUO9"]F:6QE<R]P871C:"UL:6)M:6MM;V1?7TUA:V5F:6QE+FEN"BTM+2`O M=7-R+W!O<G1S+V%U9&EO+VQI8FUI:VUO9"]F:6QE<R]P871C:"UL:6)M:6MM M;V1?7TUA:V5F:6QE+FEN"3(P,30M,#$M,3D@,3@Z,S$Z-#@N,#`P,#`P,#`P M("LP,3`P"BLK*R`O:&]M92]H<VXO<&]R=',O;&EB;6EK;6]D+V9I;&5S+W!A M=&-H+6QI8FUI:VUO9%]?36%K969I;&4N:6X),3DW,"TP,2TP,2`P,3HP,#HP M,"XP,#`P,#`P,#`@*S`Q,#`*0$`@+3$L,3$@*S`L,"!`0`HM+2TM("XO;&EB M;6EK;6]D+TUA:V5F:6QE+FEN+F]R:6<),C`Q-"TP,2TQ.2`Q,#HU-#HS-"XP M,#`P,#`P,#`@+3`R,#`*+2LK*R`N+VQI8FUI:VUO9"]-86ME9FEL92YI;@DR M,#$T+3`Q+3$Y(#$P.C4T.C0U+C`P,#`P,#`P,"`M,#(P,`HM0$`@+3<R+#<@ M*S<R+#<@0$`*+2`)<FT@+68@36%K969I;&4*+2`*+2`D*$Q)0BDZ("0H3T)* M*0HM+0DD*$Q)0E1/3TPI("TM;6]D93UL:6YK("0H0T,I("UV97)S:6]N+6EN M9F\@,CHT.C`@+6\@)$`@)"A/0DHI("0H3$E"4D%265],24(I("UR<&%T:"`D M*$1%4U1$25(I)"AL:6)D:7(I"BTK"20H3$E"5$]/3"D@+2UM;V1E/6QI;FL@ M)"A#0RD@+79E<G-I;VXM:6YF;R`R.C0Z,"`M;R`D0"`D*$]"2BD@)"A,24)2 M05)97TQ)0BD@+7)P871H("0H;&EB9&ER*0HM(`HM(&1L7VAP=7@N;&\Z"20H M=&]P7W-R8V1I<BDO9&QA<&DO9&Q?:'!U>"YC(%P*+2`)"0DD*'1O<%]S<F-D M:7(I+V1L87!I+V1L9F-N+F@*9&EF9B`M3F%U<B`O=7-R+W!O<G1S+V%U9&EO M+VQI8FUI:VUO9"]F:6QE<R]P871C:"UM9%]S;F=C:&X@+VAO;64O:'-N+W!O M<G1S+VQI8FUI:VUO9"]F:6QE<R]P871C:"UM9%]S;F=C:&X*+2TM("]U<W(O M<&]R=',O875D:6\O;&EB;6EK;6]D+V9I;&5S+W!A=&-H+6UD7W-N9V-H;@DR M,#$T+3`Q+3(R(#$X.C0P.C0T+C`P,#`P,#`P,"`K,#$P,`HK*RL@+VAO;64O M:'-N+W!O<G1S+VQI8FUI:VUO9"]F:6QE<R]P871C:"UM9%]S;F=C:&X),3DW M,"TP,2TP,2`P,3HP,#HP,"XP,#`P,#`P,#`@*S`Q,#`*0$`@+3$L,3$P("LP M+#`@0$`*+61I9F8@+7)U('!L87EE<F-O9&4O;7!L87EE<BYC(&QI8FUI:VUO M9"TS+C$N,3(O<&QA>65R8V]D92]M<&QA>65R+F,*+2TM+2!P;&%Y97)C;V1E M+VUP;&%Y97(N8PDR,#`W+3$R+3$U(#`Q.C(V.C(X+C`P,#`P,#`P,"`M,#@P M,`HM*RLK('!L87EE<F-O9&4O;7!L87EE<BYC"3(P,#DM,3`M,#0@,C,Z-#@Z M,S8N,#`P,#`P,#`P("TP-S`P"BU`0"`M-3(L-B`K-3(L."!`0`HM("`@('=I M;&P@=V%I="`J+PHM("\J<W1A=&EC*B\@34]$54Q%("IP9B`]($Y53$P["BT@ M"BTK(V1E9FEN92!.54U63TE#15,H;6]D*0DH;61?<VYG8VAN(#P@*&UO9"DM M/FYU;79O:6-E<R`_(&UD7W-N9V-H;B`Z("AM;V0I+3YN=6UV;VEC97,I"BTK M"BT@(V1E9FEN90E(24=(7T]#5$%610D),@DO*B!N=6UB97(@;V8@86)O=F4M M<F%N9V4@;V-T879E<R`J+PHM(`HM('-T871I8PE55T]21"!O;&1P97)I;V1S M6T]#5$%612HR73U["BU`0"`M,C0X+#$T("LR-3`L,30@0$`*+2`)35!?5D]) M0T4@*F$["BT@"55,3TY'('0L:RQT=F]L+'!P.PHM(`HM+0EF;W(@*'0],#MT M/&UD7W-N9V-H;CMT*RLI"BTK"69O<B`H=#TP.W0\3E5-5D])0T53*&UO9"D[ M="LK*0HM(`D):68@*"@H;6]D+3YV;VEC95MT72YM86EN+FMI8VL]/4M)0TM? M04)314Y4*7Q\"BT@"0D)("AM;V0M/G9O:6-E6W1=+FUA:6XN:VEC:ST]2TE# M2U]%3E8I*28F"BT@"0D@("!6;VEC95]3=&]P<&5D7VEN=&5R;F%L*'0I*0HM M(`D)"7)E='5R;B!T.PHM(`HM(`ET=F]L/3!X9F9F9F9F54P[=#TM,3MA/6UO M9"T^=F]I8V4["BTM"69O<B`H:STP.VL\;61?<VYG8VAN.VLK*RQA*RLI('L* M+2L)9F]R("AK/3`[:SQ.54U63TE#15,H;6]D*3MK*RLL82LK*2!["BT@"0DO M*B!A;&QO=R!U<R!T;R!T86ME(&]V97(@82!N;VYE>&ES=&EN9R!S86UP;&4@ M*B\*+2`)"6EF("@A82T^;6%I;BYS*0HM(`D)"7)E='5R;B!K.PHM0$`@+3(R M-#DL,3(@*S(R-3$L,3(@0$`*+2`*+2`)<W=I=&-H("AD870I('L*+2`)8V%S M92`P>#`Z("\J('!A<W0@;F]T92!C=70@*B\*+2T)"69O<B`H=#TP.W0\;61? M<VYG8VAN.W0K*RD*+2L)"69O<B`H=#TP.W0\3E5-5D])0T53*&UO9"D[="LK M*0HM(`D)"6EF("AM;V0M/G9O:6-E6W1=+FUA<W1E<CT]82D*+2`)"0D);6]D M+3YV;VEC95MT72YM86EN+F9A9&5V;VP],#L*+2`)"6)R96%K.PHM(`EC87-E M(#!X,3H@+RH@<&%S="!N;W1E(&]F9B`J+PHM+0D)9F]R("AT/3`[=#QM9%]S M;F=C:&X[="LK*0HM*PD)9F]R("AT/3`[=#Q.54U63TE#15,H;6]D*3MT*RLI M"BT@"0D):68@*&UO9"T^=F]I8V5;=%TN;6%S=&5R/3UA*2!["BT@"0D)"6UO M9"T^=F]I8V5;=%TN;6%I;BYK97EO9F9\/4M%65]/1D8["BT@"0D)"6EF("@H M(2AM;V0M/G9O:6-E6W1=+G9E;G8N9FQG("8@149?3TXI*7Q\"BU`0"`M,C(V M,RPW("LR,C8U+#<@0$`*+2`)"0E]"BT@"0EB<F5A:SL*+2`)8V%S92`P>#(Z M("\J('!A<W0@;F]T92!F861E("HO"BTM"0EF;W(@*'0],#MT/&UD7W-N9V-H M;CMT*RLI"BTK"0EF;W(@*'0],#MT/$Y5359/24-%4RAM;V0I.W0K*RD*+2`) M"0EI9B`H;6]D+3YV;VEC95MT72YM87-T97(]/6$I"BT@"0D)"6UO9"T^=F]I M8V5;=%TN;6%I;BYK97EO9F9\/4M%65]&041%.PHM(`D)8G)E86L["BU`0"`M M,C,Q."PW("LR,S(P+#<@0$`*+2`)4T%-4$Q%("IS.PHM(`HM(`EM;V0M/G1O M=&%L8VAN/6UO9"T^<F5A;&-H;CTP.PHM+0EF;W(@*&-H86YN96P],#MC:&%N M;F5L/&UD7W-N9V-H;CMC:&%N;F5L*RLI('L*+2L)9F]R("AC:&%N;F5L/3`[ M8VAA;FYE;#Q.54U63TE#15,H;6]D*3MC:&%N;F5L*RLI('L*+2`)"6%O=70] M)FUO9"T^=F]I8V5;8VAA;FYE;%T["BT@"0EI/6%O=70M/FUA:6XN:3L*+2`) M"7,]86]U="T^;6%I;BYS.PHM0$`@+3(W,S8L-R`K,C<S."PW($!`"BT@"0D) M:68@*&$M/F1C="$]1$-47T]&1BD@>PHM(`D)"0EI;G0@=#L*+2`*+2T)"0D) M9F]R("AT/3`[=#QM9%]S;F=C:&X[="LK*0HM*PD)"0EF;W(@*'0],#MT/$Y5 M359/24-%4RAM;V0I.W0K*RD*+2`)"0D)"6EF("@H(59O:6-E7U-T;W!P961? M:6YT97)N86PH="DI)B8*+2`)"0D)"2`@("AM;V0M/G9O:6-E6W1=+FUA<W1E M<F-H;CT]8VAA;FYE;"DF)@HM(`D)"0D)("`@*&$M/FUA:6XN<V%M<&QE/3UM M;V0M/G9O:6-E6W1=+FUA:6XN<V%M<&QE*2D@>PHM0$`@+3(Y-S@L-B`K,CDX M,"PQ,2!`0`HM(`EI9B`H(2AM;V0M/G9O:6-E/2A-4%]63TE#12HI7VUM7V-A M;&QO8RAM9%]S;F=C:&XL<VEZ96]F*$U07U9/24-%*2DI*0HM(`D)<F5T=7)N M(#$["BT@"BTK"2\J(&UO9"T^;G5M=F]I8V5S('=A<R!U<V5D(&1U<FEN9R!L M;V%D:6YG('1O(&-L86UP(&UD7W-N9V-H;BX*+2L)("`@069T97(@;&]A9&EN M9R!I="=S('5S960@=&\@<F5M96UB97(@:&]W(&)I9R!M;V0M/G9O:6-E(&ES M+@HM*PDJ+PHM*PEM;V0M/FYU;79O:6-E<R`](&UD7W-N9V-H;CL*+2L*+2`) M4&QA>65R7TEN:71?:6YT97)N86PH;6]D*3L*+2`)<F5T=7)N(#`["BT@?0HM M0$`@+3,P.#8L-R`K,S`Y,RPW($!`"BT@"0EP9BT^<&%T8G)K/3`["BT@"0EP M9BT^=F)T:6-K/7!F+3YS;F=S<&0["BT@"BTM"0EF;W(@*'0],#MT/&UD7W-N M9V-H;CMT*RLI('L*+2L)"69O<B`H=#TP.W0\3E5-5D])0T53*'!F*3MT*RLI M('L*+2`)"0E6;VEC95]3=&]P7VEN=&5R;F%L*'0I.PHM(`D)"7!F+3YV;VEC M95MT72YM86EN+FD]3E5,3#L*+2`)"0EP9BT^=F]I8V5;=%TN;6%I;BYS/4Y5 M3$P["BU`0"`M,S$Q,2PW("LS,3$X+#<@0$`*+2`)"7!F+3YP871B<FL],#L* M+2`)"7!F+3YV8G1I8VL]<&8M/G-N9W-P9#L*+2`*+2T)"69O<B`H=#TP.W0\ M;61?<VYG8VAN.W0K*RD@>PHM*PD)9F]R("AT/3`[=#Q.54U63TE#15,H<&8I M.W0K*RD@>PHM(`D)"59O:6-E7U-T;W!?:6YT97)N86PH="D["BT@"0D)<&8M M/G9O:6-E6W1=+FUA:6XN:3U.54Q,.PHM(`D)"7!F+3YV;VEC95MT72YM86EN M+G,]3E5,3#L*+4!`("TS,3,X+#<@*S,Q-#4L-R!`0`HM(`D)<&8M/G-N9W!O M<SUP;W,["BT@"0EP9BT^=F)T:6-K/7!F+3YS;F=S<&0["BT@"BTM"0EF;W(@ M*'0],#MT/&UD7W-N9V-H;CMT*RLI('L*+2L)"69O<B`H=#TP.W0\3E5-5D]) M0T53*'!F*3MT*RLI('L*+2`)"0E6;VEC95]3=&]P7VEN=&5R;F%L*'0I.PHM M(`D)"7!F+3YV;VEC95MT72YM86EN+FD]3E5,3#L*+2`)"0EP9BT^=F]I8V5; M=%TN;6%I;BYS/4Y53$P["F1I9F8@+4YA=7(@+W5S<B]P;W)T<R]A=61I;R]L M:6)M:6MM;V0O9FEL97,O<&%T8V@M;F=V;VQU;64@+VAO;64O:'-N+W!O<G1S M+VQI8FUI:VUO9"]F:6QE<R]P871C:"UN9W9O;'5M90HM+2T@+W5S<B]P;W)T M<R]A=61I;R]L:6)M:6MM;V0O9FEL97,O<&%T8V@M;F=V;VQU;64),C`Q-"TP M,2TR,B`Q.#HT,#HT-"XP,#`P,#`P,#`@*S`Q,#`**RLK("]H;VUE+VAS;B]P M;W)T<R]L:6)M:6MM;V0O9FEL97,O<&%T8V@M;F=V;VQU;64),3DW,"TP,2TP M,2`P,3HP,#HP,"XP,#`P,#`P,#`@*S`Q,#`*0$`@+3$L,3(@*S`L,"!`0`HM M9&EF9B`M<G4@<&QA>65R8V]D92]M<&QA>65R+F,@;&EB;6EK;6]D+3,N,2XQ M,B]P;&%Y97)C;V1E+VUP;&%Y97(N8PHM+2TM('!L87EE<F-O9&4O;7!L87EE M<BYC"3(P,#DM,3`M,#4@,#`Z,3DZ-3DN,#`P,#`P,#`P("TP-S`P"BTK*RL@ M<&QA>65R8V]D92]M<&QA>65R+F,),C`P.2TQ,"TP-2`P,#HT-#HS-2XP,#`P M,#`P,#`@+3`W,#`*+4!`("TS,#$Y+#<@*S,P,3DL-R!`0`HM('L*+2`)3554 M15A?3$]#2RAV87)S*3L*+2`):68@*'!F*0HM+0D)<&8M/G9O;'5M93TH=F]L M=6UE/#`I/S`Z*'9O;'5M93XQ,C@I/S$R.#IV;VQU;64["BTK"0EP9BT^=F]L M=6UE/7!F+3YI;FET=F]L=6UE/2AV;VQU;64\,"D_,#HH=F]L=6UE/C$R."D_ M,3(X.G9O;'5M93L*+2`)355415A?54Y,3T-+*'9A<G,I.PHM('T*+2`*9&EF M9B`M3F%U<B`O=7-R+W!O<G1S+V%U9&EO+VQI8FUI:VUO9"]P:V<M<&QI<W0@ M+VAO;64O:'-N+W!O<G1S+VQI8FUI:VUO9"]P:V<M<&QI<W0*+2TM("]U<W(O M<&]R=',O875D:6\O;&EB;6EK;6]D+W!K9RUP;&ES=`DR,#$T+3`R+3`V(#`P M.C`Q.C`R+C`P,#`P,#`P,"`K,#$P,`HK*RL@+VAO;64O:'-N+W!O<G1S+VQI M8FUI:VUO9"]P:V<M<&QI<W0),C`Q-"TP,BTQ,R`Q-3HP-SHT-"XP,#`P,#`P M,#`@*S`Q,#`*0$`@+30L-B`K-"PU($!`"B!L:6(O;&EB;6EK;6]D+FQA"B!L M:6(O;&EB;6EK;6]D+G-O"B!L:6(O;&EB;6EK;6]D+G-O+C(*+6QI8B]L:6)M M:6MM;V0N<V\N,BXP+C0*+6UA;B]M86XQ+VQI8FUI:VUO9"UC;VYF:6<N,2YG M>@H@<VAA<F4O86-L;V-A;"]L:6)M:6MM;V0N;30**VUA;B]M86XQ+VQI8FUI 1:VUO9"UC;VYF:6<N,2YG>@H` ` end
added stage support
Thanks for the updated patch. I noticed two small things: - There has been a mikmod update to 3.1.16 - lib/pkgconfig/libmikmod.pc was a stage orphan Attached revision of your patch resolves these. Can you please review? (Also, I have not tested esd yet.) Best regards Riggs
how do you check for stage orphans? on my system i used " make check-orphans" and result is: ====> Items missing from pkg-plist (check-orphans) info/dir file you mentioned is not listed =
On 19 February 2014 13:11, Radim Kolar <hsn@sendmail.cz> wrote: > how do you check for stage orphans? on my system i used " make > check-orphans" and result is: > > ====> Items missing from pkg-plist (check-orphans) > info/dir > > file you mentioned is not listed Is this based on your version of the patch (for 3.1.15) or mine (3.1.16)? make check-orphans is good. You can set DEVELOPER=yes in make.conf, then some extra test stages are performed during build (including check-orphans). I simply built your version in poudriere and it showed the stage orphans after the build. Best regards Riggs
Submitter has tested the revised version (3.1.6). Excerpt from pm see below: ---------- Forwarded message ---------- From: Radim Kolar <hsn@sendmail.cz> Date: 20 February 2014 10:10 Subject: RE: ports/184753: [PATCH] audio/libmikmod: update to 3.1.15 To: Thomas Zander <riggs@freebsd.org> > But apart from that, we really should update to the latest version > 3.1.16. Did you get the chance to test my version? i tested your version too and it works without problems.
State Changed From-To: feedback->open Submitter has approved.
State Changed From-To: open->feedback Ask for maintainer approval.
Author: riggs Date: Sat Mar 8 07:42:51 2014 New Revision: 347451 URL: http://svnweb.freebsd.org/changeset/ports/347451 QAT: https://qat.redports.org/buildarchive/r347451/ Log: - Update to upstream version 3.1.16 - Add LICENSE - Add OPTION for esound - General cleanups & petting portlint (USES, autotools handling) - Update WWW in pkg-descr PR: ports/184753 Submitted by: RK <hsn@sendmail.cz> Reviewed by: submitter (RK <hsn@sendmail.cz>) Approved by: thierry (mentor), maintainer timeout Added: head/audio/libmikmod/files/patch-Makefile.in (contents, props changed) Deleted: head/audio/libmikmod/files/patch-64bit-fix head/audio/libmikmod/files/patch-CVE-2009-0179 head/audio/libmikmod/files/patch-exitcrash head/audio/libmikmod/files/patch-libmikmod__Makefile.in head/audio/libmikmod/files/patch-md_sngchn head/audio/libmikmod/files/patch-ngvolume Modified: head/audio/libmikmod/Makefile head/audio/libmikmod/distinfo head/audio/libmikmod/pkg-descr head/audio/libmikmod/pkg-plist Modified: head/audio/libmikmod/Makefile ============================================================================== --- head/audio/libmikmod/Makefile Sat Mar 8 07:42:15 2014 (r347450) +++ head/audio/libmikmod/Makefile Sat Mar 8 07:42:51 2014 (r347451) @@ -2,23 +2,34 @@ # $FreeBSD$ PORTNAME= libmikmod -PORTVERSION= 3.1.12 -PORTREVISION= 2 +PORTVERSION= 3.1.16 CATEGORIES= audio -MASTER_SITES= SF/mikmod/libmikmod%20%28source%29/${PORTVERSION}/ +MASTER_SITES= SF/mikmod/${PORTNAME}/${PORTVERSION}/ MAINTAINER= neuroworker@gmail.com COMMENT= MikMod Sound Library +LICENSE= LGPL21 + +USE_AUTOTOOLS= libtool WANT_GNOME= yes -USES= gmake libtool +USE_GNOME= lthack +USES= gmake pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" -CONFIGURE_ARGS= --disable-esd USE_LDCONFIG= yes INFO= mikmod +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound +CONFIGURE_ARGS+= --enable-esd +.else +CONFIGURE_ARGS+= --disable-esd +.endif + post-extract: @${RM} -f ${WRKSRC}/docs/mikmod.info-* @@ -31,4 +42,4 @@ post-patch: -e 's|-lc_r|${PTHREAD_LIBS:S/"//g}|g' \ ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/audio/libmikmod/distinfo ============================================================================== --- head/audio/libmikmod/distinfo Sat Mar 8 07:42:15 2014 (r347450) +++ head/audio/libmikmod/distinfo Sat Mar 8 07:42:51 2014 (r347451) @@ -1,2 +1,2 @@ -SHA256 (libmikmod-3.1.12.tar.gz) = 891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32 -SIZE (libmikmod-3.1.12.tar.gz) = 618011 +SHA256 (libmikmod-3.1.16.tar.gz) = b9e6c5064e1ba13ee7ad4f873421e794758c6cb9884a571c928e5637a0b02dd3 +SIZE (libmikmod-3.1.16.tar.gz) = 1011780 Added: head/audio/libmikmod/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libmikmod/files/patch-Makefile.in Sat Mar 8 07:42:51 2014 (r347451) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2013-12-30 19:37:12.000000000 +0100 ++++ Makefile.in 2014-03-01 19:49:25.164244987 +0100 +@@ -348,7 +348,7 @@ + + m4datadir = $(datadir)/aclocal + m4data_DATA = libmikmod.m4 +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = libmikmod.pc + ACLOCAL_AMFLAGS = -I m4 + Modified: head/audio/libmikmod/pkg-descr ============================================================================== --- head/audio/libmikmod/pkg-descr Sat Mar 8 07:42:15 2014 (r347450) +++ head/audio/libmikmod/pkg-descr Sat Mar 8 07:42:51 2014 (r347451) @@ -3,4 +3,4 @@ libmikmod is a portable sound library fo It is able to play the IT, XM, S3M, MTM, 669, STM, ULT, FAR, MED, AMF, DSM, IMF, GDM, STX, OKT and of course MOD module formats. -WWW: http://mikmod.raphnet.net +WWW: http://mikmod.sourceforge.net/ Modified: head/audio/libmikmod/pkg-plist ============================================================================== --- head/audio/libmikmod/pkg-plist Sat Mar 8 07:42:15 2014 (r347450) +++ head/audio/libmikmod/pkg-plist Sat Mar 8 07:42:51 2014 (r347451) @@ -4,6 +4,6 @@ lib/libmikmod.a lib/libmikmod.la lib/libmikmod.so lib/libmikmod.so.2 -lib/libmikmod.so.2.0.4 -man/man1/libmikmod-config.1.gz +libdata/pkgconfig/libmikmod.pc share/aclocal/libmikmod.m4 +man/man1/libmikmod-config.1.gz _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed New upstream version of port prepared, reviewed, and committed. Thanks!