svn commit: r479235 - head/biology/seaview/files

[Tobias Kortkamp]

Author: tobik
Date: Sat Sep  8 09:01:35 2018
New Revision: 479235
URL: https://svnweb.freebsd.org/changeset/ports/479235

Log:
  biology/seaview: Fix build with Clang 6
  
  seaview.cxx:3352:24: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
                  strcat(suggested, "."PDF_OR_PS_EXT);
                                       ^
  
  http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/seaview-4.7,1.log
  
  PR:		230881
  Submitted by:	tobik
  Approved by:	bofh (maintainer timeout, 2 weeks)

Added:
  head/biology/seaview/files/
  head/biology/seaview/files/patch-seaview.cxx   (contents, props changed)
  head/biology/seaview/files/patch-treedraw.cxx   (contents, props changed)
  head/biology/seaview/files/patch-xfmatpt.cxx   (contents, props changed)

Added: head/biology/seaview/files/patch-seaview.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/biology/seaview/files/patch-seaview.cxx	Sat Sep  8 09:01:35 2018	(r479235)
@@ -0,0 +1,34 @@
+--- seaview.cxx.orig	2018-08-25 03:49:10 UTC
++++ seaview.cxx
+@@ -3349,7 +3349,7 @@ else if(reponse == PRINTOUT && view->tot_seqs > 0) {
+ 	if(p != NULL) *p = 0;
+ 	if(printout_black == TEXT_ONLY) strcat(suggested, ".txt");
+ 	else {
+-		strcat(suggested, "."PDF_OR_PS_EXT);
++		strcat(suggested, "." PDF_OR_PS_EXT);
+ 		}
+ if( view->alt_col_rank != NULL ) {
+ 		for(anerr = 0; anerr < view->tot_seqs; anerr++)
+@@ -3459,7 +3459,7 @@ fl_font(FL_HELVETICA, FL_NORMAL_SIZE);
+ 
+ pdf_form = new Fl_Window(415, 90);
+ pdf_form->box(FL_FLAT_BOX);
+-pdf_form->label("Set "PDF_OR_PS" output options");
++pdf_form->label("Set " PDF_OR_PS " output options");
+ 
+ x = 5 + (int)fl_width("block size:"); y = 5; w = 50; h = 25;
+ sizeinput = new Fl_Input(x, y, w, h, "font size:");
+@@ -5048,10 +5048,10 @@ menus->spacing(2);
+     {"Save prot alignmt", 0,file_menu_callback, 0, FL_MENU_INACTIVE},
+     {"Save bootstrap replicates", 0,file_menu_callback, 0, FL_MENU_INACTIVE | FL_MENU_DIVIDER},
+ #if !defined(__APPLE__)
+-    {"Prepare "PDF_OR_PS"", 0, file_menu_callback, 0, 0},
+-    {""PDF_OR_PS" options...", 0, file_menu_callback, 0, FL_MENU_DIVIDER},
++    {"Prepare " PDF_OR_PS "", 0, file_menu_callback, 0, 0},
++    {"" PDF_OR_PS " options...", 0, file_menu_callback, 0, FL_MENU_DIVIDER},
+ #else
+-    {"Prepare "PDF_OR_PS"", 0, file_menu_callback, 0, FL_MENU_DIVIDER},
++    {"Prepare " PDF_OR_PS "", 0, file_menu_callback, 0, FL_MENU_DIVIDER},
+ #endif
+     {"Concatenate", 0,file_menu_callback, 0, FL_MENU_DIVIDER},
+     {"New window", FL_COMMAND | 'n', file_menu_callback, 0, 0},

Added: head/biology/seaview/files/patch-treedraw.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/biology/seaview/files/patch-treedraw.cxx	Sat Sep  8 09:01:35 2018	(r479235)
@@ -0,0 +1,11 @@
+--- treedraw.cxx.orig	2018-08-25 03:51:23 UTC
++++ treedraw.cxx
+@@ -322,7 +322,7 @@ Fl_Window *treedraw(char *trees, SEA_VIEW *view, const
+     {"Save all trees", 0, file_callback, NULL, 0},
+     {"Save patristic distances", 0, patristic_callback, NULL, FL_MENU_DIVIDER},
+     {"Print", FL_COMMAND | 'p', file_callback, NULL, 0},
+-    {"Save as "PDF_OR_PS"", 0, file_callback, NULL, 0},
++    {"Save as " PDF_OR_PS "", 0, file_callback, NULL, 0},
+     {"A4", 0, file_callback, NULL, FL_MENU_RADIO | 0},
+     {"Letter", 0, file_callback, NULL, FL_MENU_RADIO | 0},
+     {"Landscape", 0, file_callback, NULL, FL_MENU_TOGGLE},

Added: head/biology/seaview/files/patch-xfmatpt.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/biology/seaview/files/patch-xfmatpt.cxx	Sat Sep  8 09:01:35 2018	(r479235)
@@ -0,0 +1,20 @@
+--- xfmatpt.cxx.orig	2018-08-25 03:50:10 UTC
++++ xfmatpt.cxx
+@@ -205,7 +205,7 @@ fin += width + 2;
+ compute->callback(compute_proc, fdui);
+ fdui->compute_butt = compute;
+ 
+-Fl_Widget *postscript = cre_button(fin, curr_y, &width, but_height, fontsize, "Write "PDF_OR_PS);
++Fl_Widget *postscript = cre_button(fin, curr_y, &width, but_height, fontsize, "Write " PDF_OR_PS);
+ fin += width;
+ postscript->callback(plot_button_proc, fdui);
+ 
+@@ -870,7 +870,7 @@ if (setjmp(*jbuf) == 0) {
+ #ifndef MICRO
+   matpt->form->hide(); Fl::flush(); // because of strange bug on 32-bit Linux only
+ #endif
+-  fl_message("Dot plot is now in file\n%s\nin "PDF_OR_PS" format", surface->outfname());
++  fl_message("Dot plot is now in file\n%s\nin " PDF_OR_PS " format", surface->outfname());
+   delete surface;
+ #ifndef MICRO
+   matpt->form->show(); Fl::flush();