Index: head/editors/setedit/Makefile =================================================================== --- head/editors/setedit/Makefile (revision 257075) +++ head/editors/setedit/Makefile (revision 257076) @@ -1,181 +1,167 @@ # New ports collection makefile for: setedit # Date created: 29 September 2005 # Whom: Sten Feldman # # $FreeBSD$ 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) LIB_DEPENDS= rhtv.2:${PORTSDIR}/devel/rhtvision HAS_CONFIGURE= yes CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" USE_PERL5_BUILD=yes USE_GMAKE= yes +CFLAGS+= -Wno-write-strings -I${LOCALBASE}/include + MAN1= setedit.1 infview.1 INFO= setedit sdg infview OPTIONS= BZIP2 "Support for bzip2" On \ CALC "Enable internal calculator" On \ CALENDAR "Enable internal calendar" On \ NLS "International support (requires intl)" On \ AALIB "Support for AAlib" Off \ ELECTRIC "Compile with Electric Fence memory debugger" Off WRKSRC= ${WRKDIR}/${PORTNAME} CONFIGURE_ARGS= --prefix=${PREFIX} --without-mp3 .include -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile -.endif - .if defined(WITHOUT_BZIP2) CONFIGURE_ARGS+= --no-bzip2 .else CONFIGURE_ARGS+= --bzip2 .endif .if defined(WITHOUT_CALC) CONFIGURE_ARGS+= --without-calc .endif .if defined(WITHOUT_CALENDAR) CONFIGURE_ARGS+= --without-calendar .endif .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --no-intl .else USE_GETTEXT= yes PLIST_FILES= share/locale/es/LC_MESSAGES/setedit.mo \ share/locale/de/LC_MESSAGES/setedit.mo .endif .if defined(WITH_AALIB) LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib CONFIGURE_ARGS+= --with-aa .else CONFIGURE_ARGS+= --without-aa .endif .if defined(WITH_ELECTRIC) LIB_DEPENDS+= efence.0:${PORTSDIR}/devel/ElectricFence CONFIGURE_ARGS+= --with-efence .endif post-build: @${ECHO_CMD} "Packing documentation..." @cd ${WRKSRC}/doc ; \ ${CP} editor.inf setedit.info ; \ ${CP} sdg.inf sdg.info ; \ ${CP} infeng.inf infview.info ; \ ${CP} editor.txt setedit.txt ; ${GZIP_CMD} setedit.txt ; \ ${CP} infeng.txt infview.txt ; ${GZIP_CMD} infview.txt ; \ ${CP} setedit.man setedit.1 ; \ ${CP} infview.man infview.1 ; \ ${GZIP_CMD} sdg.txt do-install: @${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/eterm/xterm-eterm-tv ${DATADIR}/eterm ${INSTALL_DATA} ${WRKSRC}/cfgfiles/asm51.pmc ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cfgfiles/clippmac.pmc ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cfgfiles/cpmacros.pmc ${DATADIR} ${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}/cfgfiles/simple.tip ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/BTerminus.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/Terminus.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/XFont.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/antique.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/boxround.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/cntdown.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/medieval.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/ocr.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/roman.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/rombios.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/thin.sft ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sdg/txhgen-i.htm ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sdg/txhgen-i.txi ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sdg/txhgen-i.txt ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sdg/html.frt ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sdg/multi.frt ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sdg/tex.frt ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cfgfiles/menubind.smn ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cfgfiles/redmond.smn ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cfgfiles/examples.slp ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cfgfiles/macros.slp ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/cfgfiles/errors.cle ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/doc/readme.1st ${DATADIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${MAN1} ${MANPREFIX}/man/man1 .if !defined(WITHOUT_NLS) ${INSTALL_DATA} ${WRKSRC}/internac/es.mo ${PREFIX}/share/locale/es/LC_MESSAGES/setedit.mo ${INSTALL_DATA} ${WRKSRC}/internac/de.mo ${PREFIX}/share/locale/de/LC_MESSAGES/setedit.mo .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/examples @${MKDIR} ${DOCSDIR}/tag_imgs ${INSTALL_DATA} ${WRKSRC}/distrib/examples/tvrc ${DOCSDIR}/examples ${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} ${INSTALL_DATA} ${WRKSRC}/copying.lgp ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/copying.rh ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/www-site/tags.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/www-site/my_file1.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/www-site/my_file2.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/www-site/my_file3.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/www-site/examples.css ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/readme.1st ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/distrib/linux.faq ${DOCSDIR}/faq.txt ${INSTALL_DATA} ${WRKSRC}/doc/setedit.txt.gz ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/sdg.txt.gz ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/infview.txt.gz ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/setedit.info ${PREFIX}/info ${INSTALL_DATA} ${WRKSRC}/doc/sdg.info ${PREFIX}/info ${INSTALL_DATA} ${WRKSRC}/doc/infview.info ${PREFIX}/info .endif .include Property changes on: head/editors/setedit/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/editors/setedit/distinfo =================================================================== --- head/editors/setedit/distinfo (revision 257075) +++ head/editors/setedit/distinfo (revision 257076) @@ -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 Property changes on: head/editors/setedit/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/editors/setedit/files/patch-Makefile =================================================================== --- head/editors/setedit/files/patch-Makefile (revision 257075) +++ head/editors/setedit/files/patch-Makefile (revision 257076) @@ -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 Property changes on: head/editors/setedit/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/setedit/files/patch-config.pl =================================================================== --- head/editors/setedit/files/patch-config.pl (revision 257075) +++ head/editors/setedit/files/patch-config.pl (revision 257076) @@ -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') { -! $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+)/) - { +@@ -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+)/) + { Property changes on: head/editors/setedit/files/patch-config.pl ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/editors/setedit/files/patch-conflib.pl =================================================================== --- head/editors/setedit/files/patch-conflib.pl (revision 257075) +++ head/editors/setedit/files/patch-conflib.pl (revision 257076) @@ -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; Property changes on: head/editors/setedit/files/patch-conflib.pl ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/setedit/files/patch-editmain.cc =================================================================== --- head/editors/setedit/files/patch-editmain.cc (revision 257075) +++ head/editors/setedit/files/patch-editmain.cc (revision 257076) @@ -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(); +- } + } + + Property changes on: head/editors/setedit/files/patch-editmain.cc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/setedit/pkg-plist =================================================================== --- head/editors/setedit/pkg-plist (revision 257075) +++ head/editors/setedit/pkg-plist (revision 257076) @@ -1,79 +1,82 @@ bin/setedit bin/infview +lib/setedit/holidays.conf %%DATADIR%%/eterm/Setedit/MAIN %%DATADIR%%/eterm/Setedit/Setedit.menu %%DATADIR%%/eterm/readme.txt %%DATADIR%%/eterm/xterm-eterm-tv %%DATADIR%%/asm51.pmc %%DATADIR%%/clippmac.pmc %%DATADIR%%/cpmacros.pmc %%DATADIR%%/htmlmac.pmc %%DATADIR%%/perlmac.pmc %%DATADIR%%/pmacros.pmc +%%DATADIR%%/vhdl.pmc %%DATADIR%%/wmlmac.pmc %%DATADIR%%/syntaxhl.shl %%DATADIR%%/editor.tip %%DATADIR%%/simple.tip %%DATADIR%%/BTerminus.sft %%DATADIR%%/Terminus.sft %%DATADIR%%/XFont.sft %%DATADIR%%/antique.sft %%DATADIR%%/boxround.sft %%DATADIR%%/cntdown.sft %%DATADIR%%/medieval.sft %%DATADIR%%/ocr.sft %%DATADIR%%/roman.sft %%DATADIR%%/rombios.sft %%DATADIR%%/thin.sft %%DATADIR%%/txhgen-i.htm %%DATADIR%%/txhgen-i.txi %%DATADIR%%/txhgen-i.txt %%DATADIR%%/html.frt %%DATADIR%%/multi.frt %%DATADIR%%/tex.frt %%DATADIR%%/menubind.smn %%DATADIR%%/redmond.smn %%DATADIR%%/examples.slp %%DATADIR%%/macros.slp %%DATADIR%%/errors.cle %%DATADIR%%/readme.1st +@dirrm lib/setedit @dirrm %%DATADIR%%/eterm/Setedit @dirrm %%DATADIR%%/eterm @dirrm %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/examples/tvrc %%PORTDOCS%%%%DOCSDIR%%/examples/examp1.dst %%PORTDOCS%%%%DOCSDIR%%/examples/examp1.epr %%PORTDOCS%%%%DOCSDIR%%/examples/test1.cc %%PORTDOCS%%%%DOCSDIR%%/tag_imgs/a_project.png %%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 %%PORTDOCS%%%%DOCSDIR%%/copyright %%PORTDOCS%%%%DOCSDIR%%/setedit.txt.gz %%PORTDOCS%%%%DOCSDIR%%/sdg.txt.gz %%PORTDOCS%%%%DOCSDIR%%/infview.txt.gz %%PORTDOCS%%%%DOCSDIR%%/copying.dj %%PORTDOCS%%%%DOCSDIR%%/copying.gpl %%PORTDOCS%%%%DOCSDIR%%/copying.lgp %%PORTDOCS%%%%DOCSDIR%%/copying.rh %%PORTDOCS%%%%DOCSDIR%%/tags.html %%PORTDOCS%%%%DOCSDIR%%/my_file1.html %%PORTDOCS%%%%DOCSDIR%%/my_file2.html %%PORTDOCS%%%%DOCSDIR%%/my_file3.html %%PORTDOCS%%%%DOCSDIR%%/examples.css %%PORTDOCS%%%%DOCSDIR%%/readme.1st %%PORTDOCS%%%%DOCSDIR%%/faq.txt %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples %%PORTDOCS%%@dirrm %%DOCSDIR%%/tag_imgs %%PORTDOCS%%@dirrm %%DOCSDIR%% Property changes on: head/editors/setedit/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property