Attachment 107079 Details for Bug 147780 – file.diff

[patch] file.diff

file.diff (text/plain), 17.93 KB, created by Robert Farmer on 2010-06-11 07:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Farmer

Created: 2010-06-11 07:30:02 UTC

Size: 17.93 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/setedit/Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile
>--- Makefile	31 May 2010 01:58:42 -0000	1.8
>+++ Makefile	11 Jun 2010 06:18:48 -0000
>@@ -5,11 +5,10 @@
> # $FreeBSD: ports/editors/setedit/Makefile,v 1.8 2010/05/31 01:58:42 ade Exp $
> 
> PORTNAME=	setedit
>-PORTVERSION=	0.5.4
>-PORTREVISION=	3
>+PORTVERSION=	0.5.5
> CATEGORIES=	editors
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION}
>-DISTNAME=	${PORTNAME}-${PORTVERSION}
>+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)
>@@ -21,6 +20,8 @@
> USE_PERL5_BUILD=yes
> USE_GMAKE=	yes
> 
>+CFLAGS+=	-Wno-write-strings -I${LOCALBASE}/include
>+
> MAN1=		setedit.1 infview.1
> INFO=		setedit sdg infview
> 
>@@ -37,10 +38,6 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 700042
>-BROKEN=		Does not compile
>-.endif
>-
> .if defined(WITHOUT_BZIP2)
> CONFIGURE_ARGS+=	--no-bzip2
> .else
>@@ -91,8 +88,10 @@
> 	@${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
>@@ -103,6 +102,7 @@
> 	${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}
>@@ -143,21 +143,7 @@
> 	${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
>-	${INSTALL_DATA} ${WRKSRC}/www-site/tag_imgs/a_project.png ${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
>+	(cd ${WRKSRC}/www-site/tag_imgs/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/tag_imgs/)
> 	${INSTALL_DATA} ${WRKSRC}/copyrigh ${DOCSDIR}/copyright
> 	${INSTALL_DATA} ${WRKSRC}/copying.dj ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/copying.gpl ${DOCSDIR}
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/editors/setedit/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	22 Jan 2006 08:34:44 -0000	1.2
>+++ distinfo	10 Jun 2010 08:08:20 -0000
>@@ -1,3 +1,3 @@
>-MD5 (setedit-0.5.4.tar.gz) = fc2f9724f11965fbd11475ff9235eaa0
>-SHA256 (setedit-0.5.4.tar.gz) = ef072febe8fdfefc97bc26e0c28d5458cb27abd47351dcb85af778269a3571ce
>-SIZE (setedit-0.5.4.tar.gz) = 2284834
>+MD5 (setedit-0.5.5-4.tar.gz) = b4a43b2eeb66b718a84656e3744fc169
>+SHA256 (setedit-0.5.5-4.tar.gz) = 1b0d53a81ae83c42338c6108fa2ab2d8348806769e29ef42c85333f248f797f4
>+SIZE (setedit-0.5.5-4.tar.gz) = 2393653
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/editors/setedit/pkg-plist,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-plist
>--- pkg-plist	7 Oct 2005 19:39:57 -0000	1.1
>+++ pkg-plist	10 Jun 2010 19:49:47 -0000
>@@ -1,5 +1,6 @@
> bin/setedit
> bin/infview
>+lib/setedit/holidays.conf
> %%DATADIR%%/eterm/Setedit/MAIN
> %%DATADIR%%/eterm/Setedit/Setedit.menu
> %%DATADIR%%/eterm/readme.txt
>@@ -10,6 +11,7 @@
> %%DATADIR%%/htmlmac.pmc
> %%DATADIR%%/perlmac.pmc
> %%DATADIR%%/pmacros.pmc
>+%%DATADIR%%/vhdl.pmc
> %%DATADIR%%/wmlmac.pmc
> %%DATADIR%%/syntaxhl.shl
> %%DATADIR%%/editor.tip
>@@ -37,6 +39,7 @@
> %%DATADIR%%/macros.slp
> %%DATADIR%%/errors.cle
> %%DATADIR%%/readme.1st
>+@dirrm lib/setedit
> @dirrm %%DATADIR%%/eterm/Setedit
> @dirrm %%DATADIR%%/eterm
> @dirrm %%DATADIR%%
>@@ -48,14 +51,14 @@
> %%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/project_name.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
>Index: files/patch-Makefile
>===================================================================
>RCS file: /home/ncvs/ports/editors/setedit/files/patch-Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 patch-Makefile
>--- files/patch-Makefile	27 Oct 2005 11:01:32 -0000	1.1
>+++ files/patch-Makefile	10 Jun 2010 08:18:30 -0000
>@@ -1,21 +1,13 @@
>-*** libmigdb/src/Makefile.orig	Thu Oct 27 12:18:57 2005
>---- libmigdb/src/Makefile	Thu Oct 27 12:19:34 2005
>-***************
>-*** 3,10 ****
>-  
>-  all: libmigdb.a
>-  
>-! CFLAGS=-O2 -Wall -gstabs+3 -I.
>-! CXXFLAGS=-O2 -Wall -gstabs+3
>-  LDLIBS=
>-  
>-  connect.o: mi_gdb.h
>---- 3,10 ----
>-  
>-  all: libmigdb.a
>-  
>-! CFLAGS=-O2 -Wall -I.
>-! CXXFLAGS=-O2 -Wall
>-  LDLIBS=
>-  
>-  connect.o: mi_gdb.h
>+--- 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
>Index: files/patch-config.pl
>===================================================================
>RCS file: /home/ncvs/ports/editors/setedit/files/patch-config.pl,v
>retrieving revision 1.2
>diff -u -r1.2 patch-config.pl
>--- files/patch-config.pl	19 Apr 2008 17:48:22 -0000	1.2
>+++ files/patch-config.pl	10 Jun 2010 08:18:30 -0000
>@@ -1,93 +1,52 @@
>-*** config.pl.orig	Tue Oct 12 22:00:54 2004
>---- config.pl	Thu Oct 27 12:06:23 2005
>-***************
>-*** 169,175 ****
>+--- 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')
>     {
>-!    $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';
>-     if (@conf{'static'} eq 'yes')
>-        { $libs=TVConfigOption('slibs'); }
>-     else
>---- 169,175 ----
>+-    @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');
>     }
>-  elsif ($OS eq 'UNIX')
>+  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 @@
>     {
>-!    $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,464 ****
>-      elsif ($i eq '--debug')
>-        {
>-         $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+)/)
>-           {
>+     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+)/)
>+          {
>Index: files/patch-conflib.pl
>===================================================================
>RCS file: /home/ncvs/ports/editors/setedit/files/patch-conflib.pl,v
>retrieving revision 1.1
>diff -u -r1.1 patch-conflib.pl
>--- files/patch-conflib.pl	27 Oct 2005 11:01:32 -0000	1.1
>+++ files/patch-conflib.pl	10 Jun 2010 08:34:02 -0000
>@@ -1,72 +1,49 @@
>-*** conflib.pl.orig	Wed Oct 26 21:55:24 2005
>---- conflib.pl	Wed Oct 26 21:57:36 2005
>-***************
>-*** 246,252 ****
>-      else
>+--- 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 @@
>        {
>-        if ($OSf eq 'FreeBSD')
>-!         { $prefix='/usr/local'; }
>-        else
>-          { $prefix='/usr'; }
>+        $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');
>        }
>---- 246,252 ----
>-      else
>-       {
>-        if ($OSf eq 'FreeBSD')
>-!         { $prefix=$ENV{'PREFIX'}; }
>-        else
>-          { $prefix='/usr'; }
>-       }
>-***************
>-*** 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'}.=' /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";
>+    }
>+  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;
>Index: files/patch-editmain.cc
>===================================================================
>RCS file: /home/ncvs/ports/editors/setedit/files/patch-editmain.cc,v
>retrieving revision 1.1
>diff -u -r1.1 patch-editmain.cc
>--- files/patch-editmain.cc	7 Oct 2005 19:39:57 -0000	1.1
>+++ files/patch-editmain.cc	10 Jun 2010 08:18:30 -0000
>@@ -1,27 +1,25 @@
>-*** setedit/editmain.cc.orig	Thu Sep 29 15:51:43 2005
>---- setedit/editmain.cc	Thu Sep 29 16:03:36 2005
>-***************
>-*** 2299,2320 ****
>-   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 ----
>+--- 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();
>+-   }
>+ }
>+ 
>+

Actions: View | Diff

Attachments on bug 147780: 107079