From owner-svn-ports-head@freebsd.org Sun Aug 14 09:01:10 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13E2CBB705A; Sun, 14 Aug 2016 09:01:10 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA06519AB; Sun, 14 Aug 2016 09:01:09 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7E9193x019619; Sun, 14 Aug 2016 09:01:09 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7E918rj019616; Sun, 14 Aug 2016 09:01:08 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608140901.u7E918rj019616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Aug 2016 09:01:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420184 - in head/deskutils/cycle: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2016 09:01:10 -0000 Author: amdmi3 Date: Sun Aug 14 09:01:08 2016 New Revision: 420184 URL: https://svnweb.freebsd.org/changeset/ports/420184 Log: - Add NO_ARCH - Regenerate patches with `make makepatch` Modified: head/deskutils/cycle/Makefile head/deskutils/cycle/files/patch-cal_year.py head/deskutils/cycle/files/patch-cycle.py Modified: head/deskutils/cycle/Makefile ============================================================================== --- head/deskutils/cycle/Makefile Sun Aug 14 08:39:38 2016 (r420183) +++ head/deskutils/cycle/Makefile Sun Aug 14 09:01:08 2016 (r420184) @@ -16,6 +16,7 @@ USES= python:run tar:bzip2 USE_WX= 3.0+ WX_COMPS= python NO_BUILD= yes +NO_ARCH= yes post-patch: @${REINPLACE_CMD} -e 's,"msg","${PREFIX}/share/locale",' \ Modified: head/deskutils/cycle/files/patch-cal_year.py ============================================================================== --- head/deskutils/cycle/files/patch-cal_year.py Sun Aug 14 08:39:38 2016 (r420183) +++ head/deskutils/cycle/files/patch-cal_year.py Sun Aug 14 09:01:08 2016 (r420184) @@ -1,6 +1,6 @@ ---- cal_year.py.orig +--- cal_year.py.orig 2005-09-15 03:11:33 UTC +++ cal_year.py -@@ -45,15 +45,20 @@ +@@ -45,15 +45,20 @@ class Month_Cal(wx.calendar.CalendarCtrl wx.calendar.CalendarCtrl.__init__(self, parent, id, dt, pos, size, style) self.SetBackgroundColour(wx.WHITE) self.SetHeaderColours(wx.BLACK,wx.WHITE) @@ -26,7 +26,7 @@ self.d_click=wx.DateTime()#FromDMY(1, 0,2002) def OnLeftDown(self, event): -@@ -80,10 +85,14 @@ +@@ -80,10 +85,14 @@ class Month_Cal(wx.calendar.CalendarCtrl menu.AppendCheckItem(4, _('Note')) menu.Check(4,is_set_mark(d, MARK_NOTE, d.GetYear())) @@ -45,7 +45,7 @@ self.PopupMenu(menu, event.GetPosition()) menu.Destroy() -@@ -139,8 +148,8 @@ +@@ -139,8 +148,8 @@ class Month_Cal(wx.calendar.CalendarCtrl def OnKey(self, event): k=event.GetKeyCode() @@ -56,7 +56,7 @@ pass else: event.Skip() -@@ -337,7 +346,8 @@ +@@ -338,7 +347,8 @@ def min_max(i): last_6=[] for k in range(i,0,-1): @@ -66,7 +66,7 @@ # wx.TimeSpan.Hours(1) - компенсация потери часа на летнем времени if 20 < span <36: # остальное в расчет не берем last_6.append(span) -@@ -367,27 +377,34 @@ +@@ -368,27 +378,34 @@ def calc_fert(year): for d in cycle.begin: i=cycle.begin.index(d) if iyear_e) and (d not in cycle.last): continue -@@ -400,7 +417,8 @@ +@@ -401,7 +418,8 @@ def calc_fert(year): f=f+wx.DateSpan_Day() if d in cycle.last: # calc birthday @@ -118,7 +118,7 @@ if i[] and cycle.tablet[-1]<=d and \ cycle.begin[-1]<=cycle.tablet[-1]: return -@@ -418,15 +437,21 @@ +@@ -419,15 +438,21 @@ def calc_fert(year): # cycle.prog_begin.append(d) add_mark(d, MARK_PROG, year) @@ -156,7 +156,7 @@ if stopyear_e : continue -@@ -448,15 +473,19 @@ +@@ -449,15 +474,19 @@ def calc_tablet(year): for d in cycle.tablet: i=cycle.tablet.index(d) if i[]: for d in cycle.tablet: @@ -193,7 +193,7 @@ s+=" - " if t<=28: s+=_('tablet N ')+str(t) -@@ -532,7 +563,8 @@ +@@ -533,7 +564,8 @@ def info(day): while d<=day: if cycle.tablet<>[] and cycle.tablet[-1]<=d and \ cycle.begin[-1]<=cycle.tablet[-1]: return s @@ -203,7 +203,7 @@ find=2 -@@ -543,10 +575,12 @@ +@@ -544,10 +576,12 @@ def info(day): if d2 in cycle.last: gestation=1 elif find==2: @@ -218,7 +218,7 @@ w=(k-1)/7 s+=" - "+str(k)+_(' day of gestation, ')+str(w) if w == 1: s+=_(' week') -@@ -555,10 +589,13 @@ +@@ -556,10 +590,13 @@ def info(day): if (k-w*7) == 1: s+=_(' day') else: s+=_(' days') else: Modified: head/deskutils/cycle/files/patch-cycle.py ============================================================================== --- head/deskutils/cycle/files/patch-cycle.py Sun Aug 14 08:39:38 2016 (r420183) +++ head/deskutils/cycle/files/patch-cycle.py Sun Aug 14 09:01:08 2016 (r420184) @@ -1,4 +1,4 @@ ---- cycle.py.orig +--- cycle.py.orig 2005-09-15 03:23:46 UTC +++ cycle.py @@ -9,6 +9,9 @@ import os, sys, gettext