Attachment #95963 for bug #134479

View | Details | Raw Unified | Return to bug 134479
Collapse All | Expand All

Lines 6-12 Link Here

(-)varkon/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= varkon	8	PORTNAME= varkon
9	PORTVERSION= 1.19C	9	PORTVERSION= 1.19D
10	CATEGORIES= cad	10	CATEGORIES= cad
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}

Lines 1-3 Link Here

(-)varkon/distinfo (-3 / +3 lines)
1	MD5 (varkon/Varkon_sources_1.19C.tar.gz) = 5c9c723c62205f2ba2e289db40f4d467	1	MD5 (varkon/Varkon_sources_1.19D.tar.gz) = 1bbdf0c1b29393aa3bbaaccda43b21bc
2	SHA256 (varkon/Varkon_sources_1.19C.tar.gz) = cb50d6ce486bc71c8ce3ec7b752e764fff34fbf5f02fd392abe77f069987797b	2	SHA256 (varkon/Varkon_sources_1.19D.tar.gz) = f3cdc738bb3a7e532c00d0f03f26a12b13d8e8af2b675ea49822880b8151eaaa
3	SIZE (varkon/Varkon_sources_1.19C.tar.gz) = 3467744	3	SIZE (varkon/Varkon_sources_1.19D.tar.gz) = 3709407




--- IG/src/varkon.c	2008/02/29 11:24:13	93
+++ IG/src/varkon.c	2008/04/29 06:04:18	100
@@ -205,29 +205,32 @@
 /********************************************************/
 
 #ifdef UNIX
-        int main(ac,av)
-        int   ac;     /* arg. count */
-        char *av[];   /* argument vector */
+        int   main(
+        int   ac,     /* arg. count */
+        char *av[])   /* argument vector */
 #endif
 
 #ifdef WIN32
         int WINAPI WinMain(
-        HINSTANCE inst,
-        HINSTANCE prev_instr,
-        LPSTR     args,
-        int       wmode)
+        HINSTANCE  inst,
+        HINSTANCE  prev_instr,
+        LPSTR      args,
+        int        wmode)
 #endif
 
 /*      Main program for xvarkon/VARKON.EXE. Inits the
  *      graphical environment, processes command line
  *      parameters and inits various sub packages like
  *      memory allocation, geometry, debug etc. then
- *      calls the main loop.
+ *      calls the main loop. A logfile is created during
+ *      startup and deleted when the system exits.
  *
  *      (C)microform ab 31/10/95 J. Kjellander
  *
  *      2007-01-05 Major rewrite, J.Kjellander
  *      2007-11-18 2.0, J.Kjellander
+ *      2008-04-28 Logfile to VARKON_TMP, J.Kjellander
+ *      2008-04-28 Default jobdir = $HOME, J.Kjellander
  *
  ******************************************************!*/
 
@@ -255,10 +258,17 @@
      exit(-1);
      }
 /*
-***Open startup_logfile.
+***Open startup_logfile Varkon.LOG. Use VARKON_TMP
+***which should be writable for all users.
 */
-   strcpy(lfname,getenv("VARKON_ROOT"));
-   strcat(lfname,"/varkon.LOG");
+   if ( getenv("VARKON_TMP") == NULL )
+     {
+     printf("VARKON_TMP is not defined !\n");
+     exit(-1);
+     }
+
+   strncpy(lfname,getenv("VARKON_TMP"),V3PTHLEN);
+   strncat(lfname,"/Varkon.LOG",V3STRLEN);
    if ( (startup_logfile=fopen(lfname,"w")) == NULL )
      {
      printf("Can't open startup_logfile %s\n",lfname);
@@ -391,11 +401,11 @@
    fflush(startup_logfile);
 /*
 ***job directory. If a job directory was not specified
-***on the command line use VARKON_ROOT.
+***on the command line use $HOME.
 */
    if ( jobdir[0] == '\0' )
      {
-     strcpy(jobdir,getenv("VARKON_ROOT"));
+     strcpy(jobdir,getenv("HOME"));
      }
 
    if ( jobdir[strlen(jobdir)-1] != '/' ) strcat(jobdir,"/");
@@ -504,8 +514,8 @@
        }
      WPalla("",2);
      WPalla("Something is wrong with your Varkon installation.",1);
-     WPalla("This startup log is stored as varkon.LOG on your Varkon",1);
-     WPalla("installation root directory and can be a good help to",1);
+     WPalla("This startup log is stored as Varkon.LOG in your Varkon",1);
+     WPalla("temp directory and can be a good help to",1);
      WPalla("understand what the problem is.",2);
      WPalla("If you need help, you can contact the Varkon developers",1);
      WPalla("through the development site:",2);
@@ -530,7 +540,7 @@
   }
 
 /********************************************************/
-/*!******************************************************/
+/********************************************************/
 
  static short process_cmdline(
         int   argc,
@@ -741,7 +751,7 @@
 }
 
 /********************************************************/
-/*!******************************************************/
+/********************************************************/
 
         short IGcheck_jobname(char jobnam[])
 




%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.18B.htm
%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19B.htm
%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19C.htm
%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19D.htm
%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_htmdoc.htm
%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_next.htm
%%PORTDOCS%%%%DOCSDIR%%/relnotes/Swheel1.jpg
%%PORTDOCS%%%%DOCSDIR%%/relnotes/Swheel2.jpg
%%PORTDOCS%%%%DOCSDIR%%/relnotes/attributes.jpg

%%PORTDOCS%%%%DOCSDIR%%/GUI/f010.htm
%%PORTDOCS%%%%DOCSDIR%%/GUI/f011.htm
%%PORTDOCS%%%%DOCSDIR%%/GUI/f012.htm
%%PORTDOCS%%%%DOCSDIR%%/GUI/f016.htm
%%PORTDOCS%%%%DOCSDIR%%/GUI/f019.htm
%%PORTDOCS%%%%DOCSDIR%%/GUI/f021.htm
%%PORTDOCS%%%%DOCSDIR%%/GUI/f022.htm

%%PORTDOCS%%%%DOCSDIR%%/MBS/cre_win.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_1p.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_3p.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_usrdef.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_appr.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_comp.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_comparr.htm

%%PORTDOCS%%%%DOCSDIR%%/MBS/outstr.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/pardecl.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/part.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/pca.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/per_view.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/pinc.htm
%%PORTDOCS%%%%DOCSDIR%%/MBS/plot_win.htm

%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont3.gif
%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont4.gif
%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont5.gif
%%PORTDOCS%%%%DOCSDIR%%/MBS/images/Csys_Usrded3.png
%%PORTDOCS%%%%DOCSDIR%%/MBS/images/Splines-new.png
%%PORTDOCS%%%%DOCSDIR%%/MBS/images/coor_sys_1.png
%%PORTDOCS%%%%DOCSDIR%%/MBS/images/coor_sys_2.png

Return to bug 134479

Lines 1-107 Link Here

(-)varkon/files/patch-IG+src+varkon.c (-107 lines)
1	--- IG/src/varkon.c 2008/02/29 11:24:13 93
2	+++ IG/src/varkon.c 2008/04/29 06:04:18 100
3	@@ -205,29 +205,32 @@
4	/********************************************************/
5
6	#ifdef UNIX
7	- int main(ac,av)
8	- int ac; /* arg. count */
9	- char av[]; / argument vector */
10	+ int main(
11	+ int ac, /* arg. count */
12	+ char av[]) / argument vector */
13	#endif
14
15	#ifdef WIN32
16	int WINAPI WinMain(
17	- HINSTANCE inst,
18	- HINSTANCE prev_instr,
19	- LPSTR args,
20	- int wmode)
21	+ HINSTANCE inst,
22	+ HINSTANCE prev_instr,
23	+ LPSTR args,
24	+ int wmode)
25	#endif
26
27	/* Main program for xvarkon/VARKON.EXE. Inits the
28	* graphical environment, processes command line
29	* parameters and inits various sub packages like
30	* memory allocation, geometry, debug etc. then
31	- * calls the main loop.
32	+ * calls the main loop. A logfile is created during
33	+ * startup and deleted when the system exits.
34	*
35	* (C)microform ab 31/10/95 J. Kjellander
36	*
37	* 2007-01-05 Major rewrite, J.Kjellander
38	* 2007-11-18 2.0, J.Kjellander
39	+ * 2008-04-28 Logfile to VARKON_TMP, J.Kjellander
40	+ * 2008-04-28 Default jobdir = $HOME, J.Kjellander
41	*
42	*****************************************************!/
43
44	@@ -255,10 +258,17 @@
45	exit(-1);
46	}
47	/*
48	-***Open startup_logfile.
49	+***Open startup_logfile Varkon.LOG. Use VARKON_TMP
50	+***which should be writable for all users.
51	*/
52	- strcpy(lfname,getenv("VARKON_ROOT"));
53	- strcat(lfname,"/varkon.LOG");
54	+ if ( getenv("VARKON_TMP") == NULL )
55	+ {
56	+ printf("VARKON_TMP is not defined !\n");
57	+ exit(-1);
58	+ }
59	+
60	+ strncpy(lfname,getenv("VARKON_TMP"),V3PTHLEN);
61	+ strncat(lfname,"/Varkon.LOG",V3STRLEN);
62	if ( (startup_logfile=fopen(lfname,"w")) == NULL )
63	{
64	printf("Can't open startup_logfile %s\n",lfname);
65	@@ -391,11 +401,11 @@
66	fflush(startup_logfile);
67	/*
68	***job directory. If a job directory was not specified
69	-***on the command line use VARKON_ROOT.
70	+***on the command line use $HOME.
71	*/
72	if ( jobdir[0] == '\0' )
73	{
74	- strcpy(jobdir,getenv("VARKON_ROOT"));
75	+ strcpy(jobdir,getenv("HOME"));
76	}
77
78	if ( jobdir[strlen(jobdir)-1] != '/' ) strcat(jobdir,"/");
79	@@ -504,8 +514,8 @@
80	}
81	WPalla("",2);
82	WPalla("Something is wrong with your Varkon installation.",1);
83	- WPalla("This startup log is stored as varkon.LOG on your Varkon",1);
84	- WPalla("installation root directory and can be a good help to",1);
85	+ WPalla("This startup log is stored as Varkon.LOG in your Varkon",1);
86	+ WPalla("temp directory and can be a good help to",1);
87	WPalla("understand what the problem is.",2);
88	WPalla("If you need help, you can contact the Varkon developers",1);
89	WPalla("through the development site:",2);
90	@@ -530,7 +540,7 @@
91	}
92
93	/********************************************************/
94	-/!*****************************************************/
95	+/********************************************************/
96
97	static short process_cmdline(
98	int argc,
99	@@ -741,7 +751,7 @@
100	}
101
102	/********************************************************/
103	-/!*****************************************************/
104	+/********************************************************/
105
106	short IGcheck_jobname(char jobnam[])
107

Lines 262-268 Link Here

(-)varkon/pkg-plist (+6 lines)
262	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.18B.htm	262	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.18B.htm
263	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19B.htm	263	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19B.htm
264	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19C.htm	264	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19C.htm
		265	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_1.19D.htm
265	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_htmdoc.htm	266	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_htmdoc.htm
		267	%%PORTDOCS%%%%DOCSDIR%%/relnotes/rn_next.htm
266	%%PORTDOCS%%%%DOCSDIR%%/relnotes/Swheel1.jpg	268	%%PORTDOCS%%%%DOCSDIR%%/relnotes/Swheel1.jpg
267	%%PORTDOCS%%%%DOCSDIR%%/relnotes/Swheel2.jpg	269	%%PORTDOCS%%%%DOCSDIR%%/relnotes/Swheel2.jpg
268	%%PORTDOCS%%%%DOCSDIR%%/relnotes/attributes.jpg	270	%%PORTDOCS%%%%DOCSDIR%%/relnotes/attributes.jpg
Lines 324-329 Link Here
324	%%PORTDOCS%%%%DOCSDIR%%/GUI/f010.htm	326	%%PORTDOCS%%%%DOCSDIR%%/GUI/f010.htm
325	%%PORTDOCS%%%%DOCSDIR%%/GUI/f011.htm	327	%%PORTDOCS%%%%DOCSDIR%%/GUI/f011.htm
326	%%PORTDOCS%%%%DOCSDIR%%/GUI/f012.htm	328	%%PORTDOCS%%%%DOCSDIR%%/GUI/f012.htm
		329	%%PORTDOCS%%%%DOCSDIR%%/GUI/f016.htm
327	%%PORTDOCS%%%%DOCSDIR%%/GUI/f019.htm	330	%%PORTDOCS%%%%DOCSDIR%%/GUI/f019.htm
328	%%PORTDOCS%%%%DOCSDIR%%/GUI/f021.htm	331	%%PORTDOCS%%%%DOCSDIR%%/GUI/f021.htm
329	%%PORTDOCS%%%%DOCSDIR%%/GUI/f022.htm	332	%%PORTDOCS%%%%DOCSDIR%%/GUI/f022.htm
Lines 591-596 Link Here
591	%%PORTDOCS%%%%DOCSDIR%%/MBS/cre_win.htm	594	%%PORTDOCS%%%%DOCSDIR%%/MBS/cre_win.htm
592	%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_1p.htm	595	%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_1p.htm
593	%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_3p.htm	596	%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_3p.htm
		597	%%PORTDOCS%%%%DOCSDIR%%/MBS/csys_usrdef.htm
594	%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_appr.htm	598	%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_appr.htm
595	%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_comp.htm	599	%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_comp.htm
596	%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_comparr.htm	600	%%PORTDOCS%%%%DOCSDIR%%/MBS/cur_comparr.htm
Lines 759-764 Link Here
759	%%PORTDOCS%%%%DOCSDIR%%/MBS/outstr.htm	763	%%PORTDOCS%%%%DOCSDIR%%/MBS/outstr.htm
760	%%PORTDOCS%%%%DOCSDIR%%/MBS/pardecl.htm	764	%%PORTDOCS%%%%DOCSDIR%%/MBS/pardecl.htm
761	%%PORTDOCS%%%%DOCSDIR%%/MBS/part.htm	765	%%PORTDOCS%%%%DOCSDIR%%/MBS/part.htm
		766	%%PORTDOCS%%%%DOCSDIR%%/MBS/pca.htm
762	%%PORTDOCS%%%%DOCSDIR%%/MBS/per_view.htm	767	%%PORTDOCS%%%%DOCSDIR%%/MBS/per_view.htm
763	%%PORTDOCS%%%%DOCSDIR%%/MBS/pinc.htm	768	%%PORTDOCS%%%%DOCSDIR%%/MBS/pinc.htm
764	%%PORTDOCS%%%%DOCSDIR%%/MBS/plot_win.htm	769	%%PORTDOCS%%%%DOCSDIR%%/MBS/plot_win.htm
Lines 892-897 Link Here
892	%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont3.gif	897	%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont3.gif
893	%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont4.gif	898	%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont4.gif
894	%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont5.gif	899	%%PORTDOCS%%%%DOCSDIR%%/MBS/tfont5.gif
		900	%%PORTDOCS%%%%DOCSDIR%%/MBS/images/Csys_Usrded3.png
895	%%PORTDOCS%%%%DOCSDIR%%/MBS/images/Splines-new.png	901	%%PORTDOCS%%%%DOCSDIR%%/MBS/images/Splines-new.png
896	%%PORTDOCS%%%%DOCSDIR%%/MBS/images/coor_sys_1.png	902	%%PORTDOCS%%%%DOCSDIR%%/MBS/images/coor_sys_1.png
897	%%PORTDOCS%%%%DOCSDIR%%/MBS/images/coor_sys_2.png	903	%%PORTDOCS%%%%DOCSDIR%%/MBS/images/coor_sys_2.png