Bug 204560 - [PATCH] [UPDATE] www/sogo to latest upstream version
Summary: [PATCH] [UPDATE] www/sogo to latest upstream version
Status: Closed Overcome By Events
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Dmitry Marakasov
URL:
Keywords: patch
Depends on: 204559
Blocks:
  Show dependency treegraph
 
Reported: 2015-11-15 15:48 UTC by Martin Waschbüsch
Modified: 2015-11-23 21:22 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (euan)


Attachments
patch to update things to 2.3.2 (97.68 KB, patch)
2015-11-15 16:05 UTC, Martin Waschbüsch
no flags Details | Diff
patch to update things to 2.3.2 (101.89 KB, patch)
2015-11-16 07:03 UTC, Martin Waschbüsch
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Waschbüsch 2015-11-15 15:48:24 UTC
Update www/sogo to latest upstream version.
Comment 1 Martin Waschbüsch 2015-11-15 16:05:20 UTC
Created attachment 163143 [details]
patch to update things to 2.3.2

patch to update things to 2.3.2.
Lots of patches in /files are obsolete now since the compiler warnings have been fixed upstream.
Best to apply patch with the -E flag.
Comment 2 Martin Waschbüsch 2015-11-15 16:06:30 UTC
I think the handbook said something about not submitting a shar of the port in case of an update, but seeing this mess of a patch I wonder if there is a more elegant way to submit the changes?
Comment 3 Dmitry Marakasov freebsd_committer freebsd_triage 2015-11-16 02:20:11 UTC
Plist broken:

===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianForward.wo/SOGoMailMacedonianForward.html
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianForward.wo/SOGoMailMacedonianForward.wod
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianReply.wo/SOGoMailMacedonianReply.html
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianReply.wo/SOGoMailMacedonianReply.wod
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseForward.wo/SOGoMailPortugueseForward.html
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseForward.wo/SOGoMailPortugueseForward.wod
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseReply.wo/SOGoMailPortugueseReply.html
Error: Orphaned: GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseReply.wo/SOGoMailPortugueseReply.wod
Error: Orphaned: GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Macedonian.lproj/Locale
Error: Orphaned: GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Portuguese.lproj/Locale
Error: Orphaned: GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoACLMacedonianAdditionAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoACLMacedonianModificationAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoACLMacedonianRemovalAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoACLPortugueseAdditionAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoACLPortugueseModificationAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoACLPortugueseRemovalAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovenianModificationAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoFolderMacedonianAdditionAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoFolderMacedonianRemovalAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoFolderPortugueseAdditionAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/Templates/SOGoFolderPortugueseRemovalAdvisory.wox
Error: Orphaned: GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/mk.js
Error: Orphaned: GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/pt.js
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
Comment 4 Dmitry Marakasov freebsd_committer freebsd_triage 2015-11-16 02:21:12 UTC
> but seeing this mess of a patch

The patch is absolutely fine. It should be submitted this way.
Comment 5 Martin Waschbüsch 2015-11-16 07:03:59 UTC
Created attachment 163179 [details]
patch to update things to 2.3.2

Fixed orphaned items in plist.
Comment 6 Euan Thoms 2015-11-16 17:22:45 UTC
As port maintainer, I will start making the 2.3.3 port update soon.

I spent a huge amount of time (about 2 weeks solid) submitting upstream patches, both for BSD's and compiler warnings, of which almost all made it upstream before the 2.3.3 release. So, I had to take some time out to catch up on other things.

There were about 250+ patched files in this process. The best news is that only one file now needs a ports patch for devel/sope. Whilst www/sogo still needs a few patches due to a GNUstep-make issue (courtesy of Kurt).

I also have plans to make the ActiveSync option into a slave port. And, just to remind myself again, to add the Apache sample conf to the port.

Please be patient for a nother couple of days. I really looking forward to making the 2.3.3 update, to see the benefits of the above mentioned hard work.
Comment 7 Dmitry Marakasov freebsd_committer freebsd_triage 2015-11-16 18:52:34 UTC
Euan, are you suggesting to not commit this patch? What about devel/sope?
Comment 8 Euan Thoms 2015-11-16 20:30:48 UTC
I haven't had time to look at it yet. But for now, please do not commit anything for www/sogo or devel/sope.

I want to make the update of devel/sope and www/sogo keep in line with what I've been doing upstream. Since I've been building both of them throughout this process with the upstream developers, I'm fairly sure it's an easy upgrade to make. Most of the port patches in "files/" from the last port updates can now be removed.

Also, I'd like to do the slave port. I'm not sure what Martin has done with regards to ActiveSync.

Basically, I've got a roadmap for this port at least until the 2.3.3 release. Whilst I appreciate Martin and anyone elses help and suggestions, I'd like to make the upgrade patch myself. No doubt Martins' work will benefit that task.

I should be able to start making the upgrade patch tomorrow.

NOTE: the upgrade should be to 2.3.3, not 2.3.2, which is the current port version.
Comment 9 Martin Waschbüsch 2015-11-16 20:42:31 UTC
Dimitry, Euan, I am sorry if my (over-)eagerness caused more trouble than it was helpful. I'll just wait for Euan to do his stuff and maybe I can help with testing then.

Martin
Comment 10 Martin Waschbüsch 2015-11-16 20:43:13 UTC
PS: The patch would bring things to 2.3.3. 2.3.2 was a typo on my part.
Comment 11 Euan Thoms 2015-11-16 22:05:49 UTC
(In reply to Martin Waschbüsch from comment #9)

Not problem at all, all help is appreciated. It's just that I would like to see  this one through myself. Besides it's good practice for you, since I noticed you are learning ports development.

I would appreciate some testing once I've come up with my update patch. I like to run it in production for a efw days before it gets committed to other unwary users.

BTW, I'm just working on it now. My email inbox didn't take as long to clear as I first thought.
Comment 12 Euan Thoms 2015-11-17 02:50:02 UTC
I've created a new PR for my 2.3.3 patch. So as to avoid any confussion. Please close this one.

Associated PRs:

devel/sope PR no.: 204617
www/sogo PR no.: 204618
www/sogo-activesync PR no.: 204619
Comment 13 Kurt Jaeger freebsd_committer freebsd_triage 2015-11-23 21:22:52 UTC
PR 204618 will be worked on.