Attachment #107079 for bug #147780

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




# $FreeBSD: ports/editors/setedit/Makefile,v 1.8 2010/05/31 01:58:42 ade Exp $

PORTNAME=	setedit
PORTVERSION=	0.5.5
PORTREVISION=	3
CATEGORIES=	editors
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix-devel/${PORTVERSION}%20r1244%20Tarball%20%28Source%29/
DISTNAME=	${PORTNAME}-${PORTVERSION}-4

MAINTAINER=	exile@chamber.ee
COMMENT=	Programmer's editor with a nice Text User Interface (TUI)

USE_PERL5_BUILD=yes
USE_GMAKE=	yes

CFLAGS+=	-Wno-write-strings -I${LOCALBASE}/include

MAN1=		setedit.1 infview.1
INFO=		setedit sdg infview



.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 700042
BROKEN=		Does not compile
.endif

.if defined(WITHOUT_BZIP2)
CONFIGURE_ARGS+=	--no-bzip2
.else

	@${MKDIR} ${DATADIR}
	@${MKDIR} ${DATADIR}/eterm
	@${MKDIR} ${DATADIR}/eterm/Setedit
	@${MKDIR} ${PREFIX}/lib/setedit
	${INSTALL_PROGRAM} ${WRKSRC}/makes/editor.exe ${PREFIX}/bin/setedit
	${INSTALL_PROGRAM} ${WRKSRC}/makes/infview.exe ${PREFIX}/bin/infview
	${INSTALL_DATA} ${WRKSRC}/holidays/holidays.conf ${PREFIX}/lib/setedit
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/Setedit/MAIN ${DATADIR}/eterm/Setedit
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/Setedit/Setedit.menu ${DATADIR}/eterm/Setedit
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/readme.txt ${DATADIR}/eterm

	${INSTALL_DATA} ${WRKSRC}/cfgfiles/htmlmac.pmc ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/perlmac.pmc ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/pmacros.pmc ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/vhdl.pmc ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/wmlmac.pmc ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/syntaxhl.shl ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/cfgfiles/editor.tip ${DATADIR}

	${INSTALL_DATA} ${WRKSRC}/distrib/examples/examp1.dst ${DOCSDIR}/examples
	${INSTALL_DATA} ${WRKSRC}/distrib/examples/examp1.epr ${DOCSDIR}/examples
	${INSTALL_DATA} ${WRKSRC}/distrib/examples/test1.cc ${DOCSDIR}/examples
	(cd ${WRKSRC}/www-site/tag_imgs/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/tag_imgs/)
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/advice_tags.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/class_child1.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/class_list.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/generate_tags.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/jump_symbol.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/project_name.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/project_open.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/sorted.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/symbols_example.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/tag_options.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/tag_options_d.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/this_and_parents.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/this_class.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/w_completion.png ${DOCSDIR}/tag_imgs
	${INSTALL_DATA} ${WRKSRC}/copyrigh ${DOCSDIR}/copyright
	${INSTALL_DATA} ${WRKSRC}/copying.dj ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/copying.gpl ${DOCSDIR}

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (setedit-0.5.4.tar.gz) = fc2f9724f11965fbd11475ff9235eaa0	1	MD5 (setedit-0.5.5-4.tar.gz) = b4a43b2eeb66b718a84656e3744fc169
2	SHA256 (setedit-0.5.4.tar.gz) = ef072febe8fdfefc97bc26e0c28d5458cb27abd47351dcb85af778269a3571ce	2	SHA256 (setedit-0.5.5-4.tar.gz) = 1b0d53a81ae83c42338c6108fa2ab2d8348806769e29ef42c85333f248f797f4
3	SIZE (setedit-0.5.4.tar.gz) = 2284834	3	SIZE (setedit-0.5.5-4.tar.gz) = 2393653




bin/setedit
bin/infview
lib/setedit/holidays.conf
%%DATADIR%%/eterm/Setedit/MAIN
%%DATADIR%%/eterm/Setedit/Setedit.menu
%%DATADIR%%/eterm/readme.txt

%%DATADIR%%/htmlmac.pmc
%%DATADIR%%/perlmac.pmc
%%DATADIR%%/pmacros.pmc
%%DATADIR%%/vhdl.pmc
%%DATADIR%%/wmlmac.pmc
%%DATADIR%%/syntaxhl.shl
%%DATADIR%%/editor.tip

%%DATADIR%%/macros.slp
%%DATADIR%%/errors.cle
%%DATADIR%%/readme.1st
@dirrm lib/setedit
@dirrm %%DATADIR%%/eterm/Setedit
@dirrm %%DATADIR%%/eterm
@dirrm %%DATADIR%%

%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/advice_tags.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/class_child1.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/class_list.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/d_tag_options.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/generate_tags.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/jump_symbol.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/name_project.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/project_open.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/sorted.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/symbols_example.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/tag_options.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/tag_options_d.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/this_and_parents.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/this_class.png
%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/w_completion.png




--- libmigdb/src/Makefile.orig	2004-09-10 11:49:31.000000000 -0700
+++ libmigdb/src/Makefile	2010-06-10 01:14:22.000000000 -0700
@@ -3,8 +3,8 @@
 
 all: libmigdb.a
 
-CFLAGS=-O2 -Wall -gstabs+3 -I.
-CXXFLAGS=-O2 -Wall -gstabs+3
+CFLAGS=-O2 -Wall -I.
+CXXFLAGS=-O2 -Wall
 LDLIBS=
 
 connect.o: mi_gdb.h
  
  all: libmigdb.a
  
! CFLAGS=-O2 -Wall -I.
! CXXFLAGS=-O2 -Wall
  LDLIBS=
  
  connect.o: mi_gdb.h




--- config.pl.orig	2004-10-12 12:00:54.000000000 -0700
+++ config.pl	2010-06-10 01:14:22.000000000 -0700
@@ -169,7 +169,7 @@
   }
 elsif ($OS eq 'UNIX')
   {
-   $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include /usr/local/include /usr/include/g++ /usr/local/include/g++ /usr/lib/gcc-lib /usr/local/lib/gcc-lib';
+   $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include ' . $ENV{'LOCALBASE'} . '/include /usr/include/g++ ' . $ENV{'LOCALBASE'} . '/include/g++ /usr/lib/gcc-lib ' . $ENV{'LOCALBASE'} . '/lib/gcc-lib';
    if (@conf{'static'} eq 'yes')
       { $libs=TVConfigOption('slibs'); }
    else
@@ -456,9 +456,9 @@
     elsif ($i eq '--debug')
       {
        $conf{'XCFLAGS'}=
-       $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math -gstabs+3';
+       $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math';
        $conf{'CFLAGS'}=
-       $conf{'CXXFLAGS'}='-O2 -Wall -Werror -gstabs+3';
+       $conf{'CXXFLAGS'}='-O2 -Wall -Werror';
       }
     elsif ($i eq '--with-mixer')
       {
@@ -783,8 +783,8 @@
    }
  elsif ($OS eq 'UNIX')
    {
-    @dirsI=("$parent/tvision/include",'/usr/include/rhtvision','/usr/local/include/rhtvision');
-    @dirsL=("$parent/tvision/makes",'/usr/lib','/usr/local/lib');
+    @dirsI=("$parent/tvision/include",'/usr/include/rhtvision',$ENV{'LOCALBASE'} . '/include/rhtvision');
+    @dirsL=("$parent/tvision/makes",'/usr/lib',$ENV{'LOCALBASE'} . '/lib');
--- 169,175 ----
    }
  elsif ($OS eq 'Win32')
    {
@@ -1856,7 +1856,7 @@
  return 0;
 }
 ';
- $conf{'X11LibPath'}='/usr/X11R6/lib' unless $conf{'X11LibPath'};
+ $conf{'X11LibPath'}=$ENV{'LOCALBASE'} . '/lib' unless $conf{'X11LibPath'};
  $conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
  $libs=$conf{'X11Lib'};
  $libs=~s/(\S+)/-l$1/g;
@@ -1873,7 +1873,7 @@
    {
     if (!$conf{'X11IncludePath'})
       {
-       $conf{'X11IncludePath'}='/usr/X11R6/include';
+       $conf{'X11IncludePath'}=$ENV{'LOCALBASE'} . '/include';
        $o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
        if ($test=~/OK, (\d+)\.(\d+)/)
          {
        {
         $conf{'XCFLAGS'}=
!        $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math -gstabs+3';
         $conf{'CFLAGS'}=
!        $conf{'CXXFLAGS'}='-O2 -Wall -Werror -gstabs+3';
        }
      elsif ($i eq '--with-mixer')
        {
--- 456,464 ----
      elsif ($i eq '--debug')
        {
         $conf{'XCFLAGS'}=
!        $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math';
         $conf{'CFLAGS'}=
!        $conf{'CXXFLAGS'}='-O2 -Wall -Werror';
        }
      elsif ($i eq '--with-mixer')
        {
***************
*** 783,790 ****
     }
   elsif ($OS eq 'UNIX')
     {
!     @dirsI=("$parent/tvision/include",'/usr/include/rhtvision','/usr/local/include/rhtvision');
!     @dirsL=("$parent/tvision/makes",'/usr/lib','/usr/local/lib');
     }
   elsif ($OS eq 'Win32')
     {
--- 783,790 ----
     }
   elsif ($OS eq 'UNIX')
     {
!     @dirsI=("$parent/tvision/include",'/usr/include/rhtvision',$ENV{'LOCALBASE'} . '/include/rhtvision');
!     @dirsL=("$parent/tvision/makes",'/usr/lib',$ENV{'LOCALBASE'} . '/lib');
     }
   elsif ($OS eq 'Win32')
     {
***************
*** 1856,1862 ****
   return 0;
  }
  ';
!  $conf{'X11LibPath'}='/usr/X11R6/lib' unless $conf{'X11LibPath'};
   $conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
   $libs=$conf{'X11Lib'};
   $libs=~s/(\S+)/-l$1/g;
--- 1856,1862 ----
   return 0;
  }
  ';
!  $conf{'X11LibPath'}=$ENV{'LOCALBASE'} . '/lib' unless $conf{'X11LibPath'};
   $conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
   $libs=$conf{'X11Lib'};
   $libs=~s/(\S+)/-l$1/g;
***************
*** 1873,1879 ****
     {
      if (!$conf{'X11IncludePath'})
        {
!        $conf{'X11IncludePath'}='/usr/X11R6/include';
         $o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
         if ($test=~/OK, (\d+)\.(\d+)/)
           {
--- 1873,1879 ----
     {
      if (!$conf{'X11IncludePath'})
        {
!        $conf{'X11IncludePath'}=$ENV{'LOCALBASE'} . '/include';
         $o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
         if ($test=~/OK, (\d+)\.(\d+)/)
           {




--- conflib.pl.orig	2006-11-22 06:53:21.000000000 -0800
+++ conflib.pl	2010-06-10 01:33:44.000000000 -0700
@@ -246,7 +246,7 @@
     else
      {
       if ($OSf eq 'FreeBSD')
-        { $prefix='/usr/local'; }
+        { $prefix=$ENV{'PREFIX'}; }
       else
         { $prefix='/usr'; }
      }
@@ -575,7 +575,7 @@
        $ret.=' -pipe' if $UsePipe;
        # Looks like that's common and some sysadmins doesn't configure gcc to
        # look there:
-       $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
+       $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
        # gcc 4.x enables -Wpacked this by default.
        $ver=RunRedirect("$GCC -dumpversion");
        $ret.=' -Wno-packed' if $ver>=4;
@@ -607,7 +607,7 @@
     return $ret;
    }
  $ret='';
- $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD');
+ $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD');
  $conf{'LDExtraDirs'}=$ret;
  $ret;
 }
@@ -650,8 +650,8 @@
       {
        $ret='-O2'; # -gstabs+3';
        $ret.=' -pipe' if $UsePipe;
-       $ret.=' -L/usr/local/include' if ($OSf eq 'FreeBSD');
-       $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
+       $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
+       $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
       }
    }
  print "$ret\n";
@@ -1444,7 +1444,7 @@
     die;
    }
  if (($OSf eq 'Darwin') || ($OSf eq 'HP-UX') || ($OSf eq 'Tru64') ||
-     ($OSf eq 'Solaris'))
+     ($OSf eq 'Solaris') || ($OSf eq 'FreeBSD'))
    {
     $conf{'GNU_AR'}='ar';
     $conf{'UseRanLib'}=1;
         # Looks like that's common and some sysadmins doesn't configure gcc to
         # look there:
!        $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
        }
     }
   print "$ret\n";
--- 567,573 ----
         $ret.=' -pipe' if $UsePipe;
         # Looks like that's common and some sysadmins doesn't configure gcc to
         # look there:
!        $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
        }
     }
   print "$ret\n";
***************
*** 596,602 ****
      return $ret;
     }
   $ret='';
!  $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD');
   $conf{'LDExtraDirs'}=$ret;
   $ret;
  }
--- 596,602 ----
      return $ret;
     }
   $ret='';
!  $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD');
   $conf{'LDExtraDirs'}=$ret;
   $ret;
  }
***************
*** 639,646 ****
        {
         $ret='-O2'; # -gstabs+3';
         $ret.=' -pipe' if $UsePipe;
!        $ret.=' -L/usr/local/include' if ($OSf eq 'FreeBSD');
!        $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
        }
     }
   print "$ret\n";
--- 639,646 ----
        {
         $ret='-O2'; # -gstabs+3';
         $ret.=' -pipe' if $UsePipe;
!        $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
!        $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
        }
     }
   print "$ret\n";




--- setedit/editmain.cc.orig	2004-10-18 09:38:28.000000000 -0700
+++ setedit/editmain.cc	2010-06-10 01:14:22.000000000 -0700
@@ -2299,22 +2299,6 @@
  else
     if (Clock)
        KillClock();
-
- if (UseScreenSaver && TScreen::useScreenSaver())
-   {
-    int seconds=inIdleTime/clockResolution;
-    if (seconds==screenSaverTimeMouse)
-      {
-       MouseEventType me;
-       TMouse::getEvent(me);
-       TRect r=deskTop->getExtent();
-       if (me.where.x==r.b.x-1 && me.where.y==0)
-          screenSaver();
-      }
-    else
-    if (seconds>=screenSaverTime)
-       screenSaver();
-   }
 }
 

  
--- 2299,2304 ----

Return to bug 147780

Lines 5-15 Link Here

(-)Makefile (-23 / +9 lines)
5	# $FreeBSD: ports/editors/setedit/Makefile,v 1.8 2010/05/31 01:58:42 ade Exp $	5	# $FreeBSD: ports/editors/setedit/Makefile,v 1.8 2010/05/31 01:58:42 ade Exp $
6		6
7	PORTNAME= setedit	7	PORTNAME= setedit
8	PORTVERSION= 0.5.4	8	PORTVERSION= 0.5.5
9	PORTREVISION= 3
10	CATEGORIES= editors	9	CATEGORIES= editors
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION}	10	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unix-devel/${PORTVERSION}%20r1244%20Tarball%20%28Source%29/
12	DISTNAME= ${PORTNAME}-${PORTVERSION}	11	DISTNAME= ${PORTNAME}-${PORTVERSION}-4
13		12
14	MAINTAINER= exile@chamber.ee	13	MAINTAINER= exile@chamber.ee
15	COMMENT= Programmer's editor with a nice Text User Interface (TUI)	14	COMMENT= Programmer's editor with a nice Text User Interface (TUI)
Lines 21-26 Link Here
21	USE_PERL5_BUILD=yes	20	USE_PERL5_BUILD=yes
22	USE_GMAKE= yes	21	USE_GMAKE= yes
23		22
		23	CFLAGS+= -Wno-write-strings -I${LOCALBASE}/include
		24
24	MAN1= setedit.1 infview.1	25	MAN1= setedit.1 infview.1
25	INFO= setedit sdg infview	26	INFO= setedit sdg infview
26		27
Lines 37-46 Link Here
37		38
38	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
39		40
40	.if ${OSVERSION} >= 700042
41	BROKEN= Does not compile
42	.endif
43
44	.if defined(WITHOUT_BZIP2)	41	.if defined(WITHOUT_BZIP2)
45	CONFIGURE_ARGS+= --no-bzip2	42	CONFIGURE_ARGS+= --no-bzip2
46	.else	43	.else
Lines 91-98 Link Here
91	@${MKDIR} ${DATADIR}	88	@${MKDIR} ${DATADIR}
92	@${MKDIR} ${DATADIR}/eterm	89	@${MKDIR} ${DATADIR}/eterm
93	@${MKDIR} ${DATADIR}/eterm/Setedit	90	@${MKDIR} ${DATADIR}/eterm/Setedit
		91	@${MKDIR} ${PREFIX}/lib/setedit
94	${INSTALL_PROGRAM} ${WRKSRC}/makes/editor.exe ${PREFIX}/bin/setedit	92	${INSTALL_PROGRAM} ${WRKSRC}/makes/editor.exe ${PREFIX}/bin/setedit
95	${INSTALL_PROGRAM} ${WRKSRC}/makes/infview.exe ${PREFIX}/bin/infview	93	${INSTALL_PROGRAM} ${WRKSRC}/makes/infview.exe ${PREFIX}/bin/infview
		94	${INSTALL_DATA} ${WRKSRC}/holidays/holidays.conf ${PREFIX}/lib/setedit
96	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/Setedit/MAIN ${DATADIR}/eterm/Setedit	95	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/Setedit/MAIN ${DATADIR}/eterm/Setedit
97	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/Setedit/Setedit.menu ${DATADIR}/eterm/Setedit	96	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/Setedit/Setedit.menu ${DATADIR}/eterm/Setedit
98	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/readme.txt ${DATADIR}/eterm	97	${INSTALL_DATA} ${WRKSRC}/cfgfiles/eterm/readme.txt ${DATADIR}/eterm
Lines 103-108 Link Here
103	${INSTALL_DATA} ${WRKSRC}/cfgfiles/htmlmac.pmc ${DATADIR}	102	${INSTALL_DATA} ${WRKSRC}/cfgfiles/htmlmac.pmc ${DATADIR}
104	${INSTALL_DATA} ${WRKSRC}/cfgfiles/perlmac.pmc ${DATADIR}	103	${INSTALL_DATA} ${WRKSRC}/cfgfiles/perlmac.pmc ${DATADIR}
105	${INSTALL_DATA} ${WRKSRC}/cfgfiles/pmacros.pmc ${DATADIR}	104	${INSTALL_DATA} ${WRKSRC}/cfgfiles/pmacros.pmc ${DATADIR}
		105	${INSTALL_DATA} ${WRKSRC}/cfgfiles/vhdl.pmc ${DATADIR}
106	${INSTALL_DATA} ${WRKSRC}/cfgfiles/wmlmac.pmc ${DATADIR}	106	${INSTALL_DATA} ${WRKSRC}/cfgfiles/wmlmac.pmc ${DATADIR}
107	${INSTALL_DATA} ${WRKSRC}/cfgfiles/syntaxhl.shl ${DATADIR}	107	${INSTALL_DATA} ${WRKSRC}/cfgfiles/syntaxhl.shl ${DATADIR}
108	${INSTALL_DATA} ${WRKSRC}/cfgfiles/editor.tip ${DATADIR}	108	${INSTALL_DATA} ${WRKSRC}/cfgfiles/editor.tip ${DATADIR}
Lines 143-163 Link Here
143	${INSTALL_DATA} ${WRKSRC}/distrib/examples/examp1.dst ${DOCSDIR}/examples	143	${INSTALL_DATA} ${WRKSRC}/distrib/examples/examp1.dst ${DOCSDIR}/examples
144	${INSTALL_DATA} ${WRKSRC}/distrib/examples/examp1.epr ${DOCSDIR}/examples	144	${INSTALL_DATA} ${WRKSRC}/distrib/examples/examp1.epr ${DOCSDIR}/examples
145	${INSTALL_DATA} ${WRKSRC}/distrib/examples/test1.cc ${DOCSDIR}/examples	145	${INSTALL_DATA} ${WRKSRC}/distrib/examples/test1.cc ${DOCSDIR}/examples
146	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/a_project.png ${DOCSDIR}/tag_imgs	146	(cd ${WRKSRC}/www-site/tag_imgs/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/tag_imgs/)
147	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/advice_tags.png ${DOCSDIR}/tag_imgs
148	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/class_child1.png ${DOCSDIR}/tag_imgs
149	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/class_list.png ${DOCSDIR}/tag_imgs
150	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/generate_tags.png ${DOCSDIR}/tag_imgs
151	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/jump_symbol.png ${DOCSDIR}/tag_imgs
152	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/project_name.png ${DOCSDIR}/tag_imgs
153	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/project_open.png ${DOCSDIR}/tag_imgs
154	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/sorted.png ${DOCSDIR}/tag_imgs
155	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/symbols_example.png ${DOCSDIR}/tag_imgs
156	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/tag_options.png ${DOCSDIR}/tag_imgs
157	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/tag_options_d.png ${DOCSDIR}/tag_imgs
158	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/this_and_parents.png ${DOCSDIR}/tag_imgs
159	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/this_class.png ${DOCSDIR}/tag_imgs
160	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/w_completion.png ${DOCSDIR}/tag_imgs
161	${INSTALL_DATA} ${WRKSRC}/copyrigh ${DOCSDIR}/copyright	147	${INSTALL_DATA} ${WRKSRC}/copyrigh ${DOCSDIR}/copyright
162	${INSTALL_DATA} ${WRKSRC}/copying.dj ${DOCSDIR}	148	${INSTALL_DATA} ${WRKSRC}/copying.dj ${DOCSDIR}
163	${INSTALL_DATA} ${WRKSRC}/copying.gpl ${DOCSDIR}	149	${INSTALL_DATA} ${WRKSRC}/copying.gpl ${DOCSDIR}

Lines 1-5 Link Here

(-)pkg-plist (-2 / +5 lines)
1	bin/setedit	1	bin/setedit
2	bin/infview	2	bin/infview
		3	lib/setedit/holidays.conf
3	%%DATADIR%%/eterm/Setedit/MAIN	4	%%DATADIR%%/eterm/Setedit/MAIN
4	%%DATADIR%%/eterm/Setedit/Setedit.menu	5	%%DATADIR%%/eterm/Setedit/Setedit.menu
5	%%DATADIR%%/eterm/readme.txt	6	%%DATADIR%%/eterm/readme.txt
Lines 10-15 Link Here
10	%%DATADIR%%/htmlmac.pmc	11	%%DATADIR%%/htmlmac.pmc
11	%%DATADIR%%/perlmac.pmc	12	%%DATADIR%%/perlmac.pmc
12	%%DATADIR%%/pmacros.pmc	13	%%DATADIR%%/pmacros.pmc
		14	%%DATADIR%%/vhdl.pmc
13	%%DATADIR%%/wmlmac.pmc	15	%%DATADIR%%/wmlmac.pmc
14	%%DATADIR%%/syntaxhl.shl	16	%%DATADIR%%/syntaxhl.shl
15	%%DATADIR%%/editor.tip	17	%%DATADIR%%/editor.tip
Lines 37-42 Link Here
37	%%DATADIR%%/macros.slp	39	%%DATADIR%%/macros.slp
38	%%DATADIR%%/errors.cle	40	%%DATADIR%%/errors.cle
39	%%DATADIR%%/readme.1st	41	%%DATADIR%%/readme.1st
		42	@dirrm lib/setedit
40	@dirrm %%DATADIR%%/eterm/Setedit	43	@dirrm %%DATADIR%%/eterm/Setedit
41	@dirrm %%DATADIR%%/eterm	44	@dirrm %%DATADIR%%/eterm
42	@dirrm %%DATADIR%%	45	@dirrm %%DATADIR%%
Lines 48-61 Link Here
48	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/advice_tags.png	51	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/advice_tags.png
49	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/class_child1.png	52	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/class_child1.png
50	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/class_list.png	53	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/class_list.png
		54	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/d_tag_options.png
51	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/generate_tags.png	55	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/generate_tags.png
52	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/jump_symbol.png	56	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/jump_symbol.png
53	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/project_name.png	57	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/name_project.png
54	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/project_open.png	58	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/project_open.png
55	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/sorted.png	59	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/sorted.png
56	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/symbols_example.png	60	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/symbols_example.png
57	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/tag_options.png	61	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/tag_options.png
58	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/tag_options_d.png
59	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/this_and_parents.png	62	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/this_and_parents.png
60	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/this_class.png	63	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/this_class.png
61	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/w_completion.png	64	%%PORTDOCS%%%%DOCSDIR%%/tag_imgs/w_completion.png

Lines 1-21 Link Here

(-)files/patch-Makefile (-21 / +13 lines)
1	*** libmigdb/src/Makefile.orig Thu Oct 27 12:18:57 2005	1	--- libmigdb/src/Makefile.orig 2004-09-10 11:49:31.000000000 -0700
2	--- libmigdb/src/Makefile Thu Oct 27 12:19:34 2005	2	+++ libmigdb/src/Makefile 2010-06-10 01:14:22.000000000 -0700
3	***************	3	@@ -3,8 +3,8 @@
4	* 3,10 **	4
5		5	all: libmigdb.a
6	all: libmigdb.a	6
7		7	-CFLAGS=-O2 -Wall -gstabs+3 -I.
8	! CFLAGS=-O2 -Wall -gstabs+3 -I.	8	-CXXFLAGS=-O2 -Wall -gstabs+3
9	! CXXFLAGS=-O2 -Wall -gstabs+3	9	+CFLAGS=-O2 -Wall -I.
10	LDLIBS=	10	+CXXFLAGS=-O2 -Wall
11		11	LDLIBS=
12	connect.o: mi_gdb.h	12
13	--- 3,10 ----	13	connect.o: mi_gdb.h
14
15	all: libmigdb.a
16
17	! CFLAGS=-O2 -Wall -I.
18	! CXXFLAGS=-O2 -Wall
19	LDLIBS=
20
21	connect.o: mi_gdb.h

Lines 1-93 Link Here

(-)files/patch-config.pl (-88 / +47 lines)
1	*** config.pl.orig Tue Oct 12 22:00:54 2004	1	--- config.pl.orig 2004-10-12 12:00:54.000000000 -0700
2	--- config.pl Thu Oct 27 12:06:23 2005	2	+++ config.pl 2010-06-10 01:14:22.000000000 -0700
3	***************	3	@@ -169,7 +169,7 @@
4	* 169,175 **	4	}
		5	elsif ($OS eq 'UNIX')
		6	{
		7	- $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include /usr/local/include /usr/include/g++ /usr/local/include/g++ /usr/lib/gcc-lib /usr/local/lib/gcc-lib';
		8	+ $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include ' . $ENV{'LOCALBASE'} . '/include /usr/include/g++ ' . $ENV{'LOCALBASE'} . '/include/g++ /usr/lib/gcc-lib ' . $ENV{'LOCALBASE'} . '/lib/gcc-lib';
		9	if (@conf{'static'} eq 'yes')
		10	{ $libs=TVConfigOption('slibs'); }
		11	else
		12	@@ -456,9 +456,9 @@
		13	elsif ($i eq '--debug')
		14	{
		15	$conf{'XCFLAGS'}=
		16	- $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math -gstabs+3';
		17	+ $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math';
		18	$conf{'CFLAGS'}=
		19	- $conf{'CXXFLAGS'}='-O2 -Wall -Werror -gstabs+3';
		20	+ $conf{'CXXFLAGS'}='-O2 -Wall -Werror';
		21	}
		22	elsif ($i eq '--with-mixer')
		23	{
		24	@@ -783,8 +783,8 @@
5	}	25	}
6	elsif ($OS eq 'UNIX')	26	elsif ($OS eq 'UNIX')
7	{	27	{
8	! $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include /usr/local/include /usr/include/g++ /usr/local/include/g++ /usr/lib/gcc-lib /usr/local/lib/gcc-lib';	28	- @dirsI=("$parent/tvision/include",'/usr/include/rhtvision','/usr/local/include/rhtvision');
9	if (@conf{'static'} eq 'yes')	29	- @dirsL=("$parent/tvision/makes",'/usr/lib','/usr/local/lib');
10	{ $libs=TVConfigOption('slibs'); }	30	+ @dirsI=("$parent/tvision/include",'/usr/include/rhtvision',$ENV{'LOCALBASE'} . '/include/rhtvision');
11	else	31	+ @dirsL=("$parent/tvision/makes",'/usr/lib',$ENV{'LOCALBASE'} . '/lib');
12	--- 169,175 ----
13	}	32	}
14	elsif ($OS eq 'UNIX')	33	elsif ($OS eq 'Win32')
		34	{
		35	@@ -1856,7 +1856,7 @@
		36	return 0;
		37	}
		38	';
		39	- $conf{'X11LibPath'}='/usr/X11R6/lib' unless $conf{'X11LibPath'};
		40	+ $conf{'X11LibPath'}=$ENV{'LOCALBASE'} . '/lib' unless $conf{'X11LibPath'};
		41	$conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
		42	$libs=$conf{'X11Lib'};
		43	$libs=~s/(\S+)/-l$1/g;
		44	@@ -1873,7 +1873,7 @@
15	{	45	{
16	! $MakeDefsRHIDE[0]='RHIDE_STDINC=/usr/include ' . $ENV{'LOCALBASE'} . '/include /usr/include/g++ ' . $ENV{'LOCALBASE'} . '/include/g++ /usr/lib/gcc-lib ' . $ENV{'LOCALBASE'} . '/lib/gcc-lib';	46	if (!$conf{'X11IncludePath'})
17	if (@conf{'static'} eq 'yes')	47	{
18	{ $libs=TVConfigOption('slibs'); }	48	- $conf{'X11IncludePath'}='/usr/X11R6/include';
19	else	49	+ $conf{'X11IncludePath'}=$ENV{'LOCALBASE'} . '/include';
20	***************	50	$o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
21	* 456,464 **	51	if ($test=~/OK, (\d+)\.(\d+)/)
22	elsif ($i eq '--debug')	52	{
23	{
24	$conf{'XCFLAGS'}=
25	! $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math -gstabs+3';
26	$conf{'CFLAGS'}=
27	! $conf{'CXXFLAGS'}='-O2 -Wall -Werror -gstabs+3';
28	}
29	elsif ($i eq '--with-mixer')
30	{
31	--- 456,464 ----
32	elsif ($i eq '--debug')
33	{
34	$conf{'XCFLAGS'}=
35	! $conf{'XCXXFLAGS'}='-O3 -fomit-frame-pointer -ffast-math';
36	$conf{'CFLAGS'}=
37	! $conf{'CXXFLAGS'}='-O2 -Wall -Werror';
38	}
39	elsif ($i eq '--with-mixer')
40	{
41	***************
42	* 783,790 **
43	}
44	elsif ($OS eq 'UNIX')
45	{
46	! @dirsI=("$parent/tvision/include",'/usr/include/rhtvision','/usr/local/include/rhtvision');
47	! @dirsL=("$parent/tvision/makes",'/usr/lib','/usr/local/lib');
48	}
49	elsif ($OS eq 'Win32')
50	{
51	--- 783,790 ----
52	}
53	elsif ($OS eq 'UNIX')
54	{
55	! @dirsI=("$parent/tvision/include",'/usr/include/rhtvision',$ENV{'LOCALBASE'} . '/include/rhtvision');
56	! @dirsL=("$parent/tvision/makes",'/usr/lib',$ENV{'LOCALBASE'} . '/lib');
57	}
58	elsif ($OS eq 'Win32')
59	{
60	***************
61	* 1856,1862 **
62	return 0;
63	}
64	';
65	! $conf{'X11LibPath'}='/usr/X11R6/lib' unless $conf{'X11LibPath'};
66	$conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
67	$libs=$conf{'X11Lib'};
68	$libs=~s/(\S+)/-l$1/g;
69	--- 1856,1862 ----
70	return 0;
71	}
72	';
73	! $conf{'X11LibPath'}=$ENV{'LOCALBASE'} . '/lib' unless $conf{'X11LibPath'};
74	$conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
75	$libs=$conf{'X11Lib'};
76	$libs=~s/(\S+)/-l$1/g;
77	***************
78	* 1873,1879 **
79	{
80	if (!$conf{'X11IncludePath'})
81	{
82	! $conf{'X11IncludePath'}='/usr/X11R6/include';
83	$o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
84	if ($test=~/OK, (\d+)\.(\d+)/)
85	{
86	--- 1873,1879 ----
87	{
88	if (!$conf{'X11IncludePath'})
89	{
90	! $conf{'X11IncludePath'}=$ENV{'LOCALBASE'} . '/include';
91	$o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
92	if ($test=~/OK, (\d+)\.(\d+)/)
93	{

Lines 1-72 Link Here

(-)files/patch-conflib.pl (-70 / +47 lines)
1	*** conflib.pl.orig Wed Oct 26 21:55:24 2005	1	--- conflib.pl.orig 2006-11-22 06:53:21.000000000 -0800
2	--- conflib.pl Wed Oct 26 21:57:36 2005	2	+++ conflib.pl 2010-06-10 01:33:44.000000000 -0700
3	***************	3	@@ -246,7 +246,7 @@
4	* 246,252 **	4	else
5	else	5	{
		6	if ($OSf eq 'FreeBSD')
		7	- { $prefix='/usr/local'; }
		8	+ { $prefix=$ENV{'PREFIX'}; }
		9	else
		10	{ $prefix='/usr'; }
		11	}
		12	@@ -575,7 +575,7 @@
		13	$ret.=' -pipe' if $UsePipe;
		14	# Looks like that's common and some sysadmins doesn't configure gcc to
		15	# look there:
		16	- $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
		17	+ $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
		18	# gcc 4.x enables -Wpacked this by default.
		19	$ver=RunRedirect("$GCC -dumpversion");
		20	$ret.=' -Wno-packed' if $ver>=4;
		21	@@ -607,7 +607,7 @@
		22	return $ret;
		23	}
		24	$ret='';
		25	- $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD');
		26	+ $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD');
		27	$conf{'LDExtraDirs'}=$ret;
		28	$ret;
		29	}
		30	@@ -650,8 +650,8 @@
6	{	31	{
7	if ($OSf eq 'FreeBSD')	32	$ret='-O2'; # -gstabs+3';
8	! { $prefix='/usr/local'; }	33	$ret.=' -pipe' if $UsePipe;
9	else	34	- $ret.=' -L/usr/local/include' if ($OSf eq 'FreeBSD');
10	{ $prefix='/usr'; }	35	- $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
		36	+ $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
		37	+ $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
11	}	38	}
12	--- 246,252 ----	39	}
13	else	40	print "$ret\n";
14	{	41	@@ -1444,7 +1444,7 @@
15	if ($OSf eq 'FreeBSD')	42	die;
16	! { $prefix=$ENV{'PREFIX'}; }	43	}
17	else	44	if (($OSf eq 'Darwin') \|\| ($OSf eq 'HP-UX') \|\| ($OSf eq 'Tru64') \|\|
18	{ $prefix='/usr'; }	45	- ($OSf eq 'Solaris'))
19	}	46	+ ($OSf eq 'Solaris') \|\| ($OSf eq 'FreeBSD'))
20	***************	47	{
21	* 567,573 **	48	$conf{'GNU_AR'}='ar';
22	$ret.=' -pipe' if $UsePipe;	49	$conf{'UseRanLib'}=1;
23	# Looks like that's common and some sysadmins doesn't configure gcc to
24	# look there:
25	! $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
26	}
27	}
28	print "$ret\n";
29	--- 567,573 ----
30	$ret.=' -pipe' if $UsePipe;
31	# Looks like that's common and some sysadmins doesn't configure gcc to
32	# look there:
33	! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
34	}
35	}
36	print "$ret\n";
37	***************
38	* 596,602 **
39	return $ret;
40	}
41	$ret='';
42	! $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD');
43	$conf{'LDExtraDirs'}=$ret;
44	$ret;
45	}
46	--- 596,602 ----
47	return $ret;
48	}
49	$ret='';
50	! $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD');
51	$conf{'LDExtraDirs'}=$ret;
52	$ret;
53	}
54	***************
55	* 639,646 **
56	{
57	$ret='-O2'; # -gstabs+3';
58	$ret.=' -pipe' if $UsePipe;
59	! $ret.=' -L/usr/local/include' if ($OSf eq 'FreeBSD');
60	! $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
61	}
62	}
63	print "$ret\n";
64	--- 639,646 ----
65	{
66	$ret='-O2'; # -gstabs+3';
67	$ret.=' -pipe' if $UsePipe;
68	! $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
69	! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
70	}
71	}
72	print "$ret\n";

Lines 1-27 Link Here

(-)files/patch-editmain.cc (-27 / +25 lines)
1	*** setedit/editmain.cc.orig Thu Sep 29 15:51:43 2005	1	--- setedit/editmain.cc.orig 2004-10-18 09:38:28.000000000 -0700
2	--- setedit/editmain.cc Thu Sep 29 16:03:36 2005	2	+++ setedit/editmain.cc 2010-06-10 01:14:22.000000000 -0700
3	***************	3	@@ -2299,22 +2299,6 @@
4	* 2299,2320 **	4	else
5	else	5	if (Clock)
6	if (Clock)	6	KillClock();
7	KillClock();	7	-
8	-	8	- if (UseScreenSaver && TScreen::useScreenSaver())
9	- if (UseScreenSaver && TScreen::useScreenSaver())	9	- {
10	- {	10	- int seconds=inIdleTime/clockResolution;
11	- int seconds=inIdleTime/clockResolution;	11	- if (seconds==screenSaverTimeMouse)
12	- if (seconds==screenSaverTimeMouse)	12	- {
13	- {	13	- MouseEventType me;
14	- MouseEventType me;	14	- TMouse::getEvent(me);
15	- TMouse::getEvent(me);	15	- TRect r=deskTop->getExtent();
16	- TRect r=deskTop->getExtent();	16	- if (me.where.x==r.b.x-1 && me.where.y==0)
17	- if (me.where.x==r.b.x-1 && me.where.y==0)	17	- screenSaver();
18	- screenSaver();	18	- }
19	- }	19	- else
20	- else	20	- if (seconds>=screenSaverTime)
21	- if (seconds>=screenSaverTime)	21	- screenSaver();
22	- screenSaver();	22	- }
23	- }	23	}
24	}	24
25		25
26
27	--- 2299,2304 ----