May 2010 - macports-changes - lists.macosforge.org

[67200] trunk/dports
by portindex＠macports.org 01 May '10

01 May '10

Revision: 67200 http://trac.macports.org/changeset/67200 Author: portindex(a)macports.org Date: 2010-05-01 15:47:50 -0700 (Sat, 01 May 2010) Log Message: ----------- Total number of ports parsed: 1 Ports successfully parsed: 1 Ports failed: 0 Up-to-date ports skipped: 6855 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2010-05-01 22:32:41 UTC (rev 67199) +++ trunk/dports/PortIndex 2010-05-01 22:47:50 UTC (rev 67200) @@ -6398,8 +6398,8 @@ variants universal portdir net/wgetpro description {advanced internet file retriever} homepage http://wgetpro.sourceforge.net/ epoch 0 platforms darwin name wgetpro depends_lib {port:gettext port:libiconv} long_description {WGet pro is an advanced version of wget, able to handle the mms protocoll} maintainers mww license unknown categories {net www} version 0.1.3 revision 0 whatmask 944 variants universal portdir net/whatmask description {Easily convert between three common subnet mask notations} homepage http://www.laffeycomputer.com/whatmask.html epoch 0 platforms darwin name whatmask long_description {Notations supported: Name Example --------------------------------- CIDR /24 Netmask 255.255.255.0 Wilcard Bits 0.0.0.255 The above notations are all identical. CIDR notation commonly has a / in of the number (representing the number of bits). Whatmask can accept notations with or without a slash. This notation is used more and more. A lot of popular routers and software supprt this notation. notation is pretty much the standard old-school way of doing it. It is by most systems (Un*x, Win, Mac, etc.). bits are similar to the netmask, but they are the logical not of the. This notation is used by a number of popular routers.} license unknown maintainers freebsdcluster.org:mich categories net version 1.2 revision 0 -whois 374 -variants universal portdir net/whois description {A replacement whois client} homepage http://www.linux.it/~md/software/ epoch 0 platforms darwin depends_lib port:gettext name whois long_description {whois is an improved whois client that follow the delegations from the Verisign whois server.} maintainers ryandesign license unknown categories net version 5.0.2 revision 0 +whois 375 +variants universal portdir net/whois description {A replacement whois client} homepage http://www.linux.it/~md/software/ epoch 0 platforms darwin depends_lib port:gettext name whois long_description {whois is an improved whois client that follows the delegations from the Verisign whois server.} maintainers ryandesign license unknown categories net version 5.0.2 revision 0 wireshark 640 variants {adns gnutls libgcrypt ipv6 lua net_snmp pcre rtp no_ssl no_x11} portdir net/wireshark description {Graphical network analyzer and capture tool} homepage http://wireshark.org/ epoch 0 platforms darwin name wireshark depends_lib {port:bzip2 port:c-ares path:lib/pkgconfig/glib-2.0.pc:glib2 port:gtk2 port:openssl port:libpcap port:zlib port:xorg-inputproto} long_description {A network analyzer that lets you capture and interactively browse Ethernet frames. Packet data can be read from a file, or live from a local network interface.} maintainers darkart.com:opendarwin.org license unknown categories net version 1.2.6 revision 0 wireshark-devel 630 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ)

1 0

[67199] trunk/dports/net/whois/Portfile
by ryandesign＠macports.org 01 May '10

01 May '10

Revision: 67199 http://trac.macports.org/changeset/67199 Author: ryandesign(a)macports.org Date: 2010-05-01 15:32:41 -0700 (Sat, 01 May 2010) Log Message: ----------- whois: fix typo in long description Modified Paths: -------------- trunk/dports/net/whois/Portfile Modified: trunk/dports/net/whois/Portfile =================================================================== --- trunk/dports/net/whois/Portfile 2010-05-01 16:47:53 UTC (rev 67198) +++ trunk/dports/net/whois/Portfile 2010-05-01 22:32:41 UTC (rev 67199) @@ -22,7 +22,7 @@ description A replacement whois client -long_description whois is an improved whois client that follow the \ +long_description whois is an improved whois client that follows the \ delegations from the Verisign whois server. master_sites http://ftp.debian.org/debian/pool/main/w/${name}/

1 0

[67198] trunk/dports/PortIndex
by portindex＠macports.org 01 May '10

01 May '10

Revision: 67198 http://trac.macports.org/changeset/67198 Author: portindex(a)macports.org Date: 2010-05-01 09:47:53 -0700 (Sat, 01 May 2010) Log Message: ----------- Total number of ports parsed: 1 Ports successfully parsed: 1 Ports failed: 0 Up-to-date ports skipped: 6855 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2010-05-01 16:45:12 UTC (rev 67197) +++ trunk/dports/PortIndex 2010-05-01 16:47:53 UTC (rev 67198) @@ -5183,7 +5183,7 @@ blitz 449 variants universal portdir math/blitz description {A C++ class library for scientific computing} homepage http://www.oonumerics.org/blitz/ epoch 0 platforms darwin name blitz long_description {Blitz++ is a C++ class library for scientific computing which provides performance on par with Fortran 77/90. It uses template techniques to achieve high performance.} license unknown maintainers nomaintainer categories {math devel} version 0.9 revision 0 cadabra 749 -variants {texmacs maintainer_tests no_gui universal} portdir math/cadabra description {A field theory approach to symbolic computer algebra} homepage http://cadabra.phi-sci.com/ epoch 0 platforms darwin depends_lib {port:modglue port:pcre port:gmp port:LiE port:gtkmm port:texlive} name cadabra long_description {Cadabra is a computer algebra system for the manipulation of what could loosely be called tensorial expressions. It is aimed at, though not necessarily restricted to, theoretical high energy physicists. Because of its target audience, the program's interface, storage system and underlying philosophy differ substantially from other computer algebra systems.} maintainers gwright license unknown categories math version 1.23 revision 0 +variants {texmacs maintainer_tests no_gui universal} portdir math/cadabra description {A field theory approach to symbolic computer algebra} homepage http://cadabra.phi-sci.com/ epoch 0 platforms darwin depends_lib {port:modglue port:pcre port:gmp port:LiE port:gtkmm port:texlive} name cadabra long_description {Cadabra is a computer algebra system for the manipulation of what could loosely be called tensorial expressions. It is aimed at, though not necessarily restricted to, theoretical high energy physicists. Because of its target audience, the program's interface, storage system and underlying philosophy differ substantially from other computer algebra systems.} maintainers gwright license unknown categories math version 1.25 revision 0 calc 810 portdir math/calc description {Arbitrary precision calculator} homepage http://www.isthe.com/chongo/tech/comp/calc/ epoch 0 platforms darwin name calc depends_lib {port:readline port:ncurses} license unknown maintainers nomaintainer long_description {Calc is an interactive calculator which provides for easy large numeric calculations, but which also can be easily programmed for difficult or long calculations. It can accept a command line argument, in which case it executes that single command and exits. Otherwise, it enters interactive mode. There are a great number of pre-defined functions. The calculator can calculate transcendental functions, and accept and display numbers in real or exponential format. The calculator also knows about complex numbers.} categories math version 2.12.4.0 revision 0 caml-gsl 472

1 0

[67197] trunk/dports/math/cadabra
by gwright＠macports.org 01 May '10

01 May '10

Revision: 67197 http://trac.macports.org/changeset/67197 Author: gwright(a)macports.org Date: 2010-05-01 09:45:12 -0700 (Sat, 01 May 2010) Log Message: ----------- Version bump to 1.25. Modified Paths: -------------- trunk/dports/math/cadabra/Portfile trunk/dports/math/cadabra/files/patch-Makefile.in.diff Modified: trunk/dports/math/cadabra/Portfile =================================================================== --- trunk/dports/math/cadabra/Portfile 2010-05-01 13:47:48 UTC (rev 67196) +++ trunk/dports/math/cadabra/Portfile 2010-05-01 16:45:12 UTC (rev 67197) @@ -3,7 +3,7 @@ PortSystem 1.0 name cadabra -version 1.23 +version 1.25 categories math platforms darwin maintainers gwright @@ -19,9 +19,9 @@ homepage http://cadabra.phi-sci.com/ master_sites ${homepage} -checksums md5 27a96df401e8985adfe8e7d3fcb99b57 \ - sha1 a49117a70beb6132d07467df8f2c38d8a1e5dc19 \ - rmd160 76e6c2656c92cb319e4370f25263714be2fbea5b +checksums md5 45198a26f72461bd6d29fe611ce3543f \ + sha1 c7a6c846fc48b60ad4b8f92c594f5e4408e9d943 \ + rmd160 c6341585d521d350bad09b07a1f41ea25df8bbb9 variant texmacs description { install TeXmacs front end } { depends_run-append port:TeXmacs Modified: trunk/dports/math/cadabra/files/patch-Makefile.in.diff =================================================================== --- trunk/dports/math/cadabra/files/patch-Makefile.in.diff 2010-05-01 13:47:48 UTC (rev 67196) +++ trunk/dports/math/cadabra/files/patch-Makefile.in.diff 2010-05-01 16:45:12 UTC (rev 67197) @@ -2,7 +2,7 @@ +++ Makefile.in 2008-09-02 17:16:36.000000000 -0400 @@ -1,4 +1,5 @@ - export RELEASE=1.23 + export RELEASE=1.25 +export LDFLAGS=@LDFLAGS@ .PHONY: static program_static test fasttest gui gui_static doc

1 0

[67196] trunk/dports/PortIndex
by portindex＠macports.org 01 May '10

01 May '10

Revision: 67196 http://trac.macports.org/changeset/67196 Author: portindex(a)macports.org Date: 2010-05-01 06:47:48 -0700 (Sat, 01 May 2010) Log Message: ----------- Total number of ports parsed: 1 Ports successfully parsed: 1 Ports failed: 0 Up-to-date ports skipped: 6855 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2010-05-01 13:41:25 UTC (rev 67195) +++ trunk/dports/PortIndex 2010-05-01 13:47:48 UTC (rev 67196) @@ -3169,7 +3169,7 @@ gst-python 325 variants universal portdir gnome/gst-python description {This port has been replaced by py25-gst-python.} epoch 0 name gst-python replaced_by py25-gst-python license unknown maintainers nomaintainer long_description {This port has been replaced by py25-gst-python.} categories {gnome python audio} version 0.10.16 revision 1 gstreamer 595 -variants universal depends_build {port:gzip port:m4 path:bin/perl:perl5 port:pkgconfig} portdir gnome/gstreamer description {GStreamer is a development framework for creating multimedia applications.} homepage http://gstreamer.freedesktop.org/ epoch 0 platforms darwin depends_lib {port:bison port:flex port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:libxml2} name gstreamer maintainers {rmsfisher openmaintainer} long_description {GStreamer is the core library. It contains the headers, core library files, and core elements.} license unknown categories gnome version 0.10.28 revision 0 +variants universal depends_build {port:gzip port:m4 path:bin/perl:perl5 port:pkgconfig} portdir gnome/gstreamer description {GStreamer is a development framework for creating multimedia applications.} homepage http://gstreamer.freedesktop.org/ epoch 0 platforms darwin depends_lib {port:bison port:flex port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:libxml2} name gstreamer maintainers {rmsfisher openmaintainer} long_description {GStreamer is the core library. It contains the headers, core library files, and core elements.} license unknown categories gnome version 0.10.29 revision 0 gthumb 571 variants universal depends_build {port:gnome-doc-utils path:bin/perl:perl5 port:pkgconfig} portdir gnome/gthumb description {Image viewer and browser for the gnome desktop.} homepage http://gthumb.sourceforge.net/ epoch 0 platforms darwin depends_lib {port:libgphoto2 port:avahi port:esound port:gnome-keyring port:gnome-vfs port:howl port:libart_lgpl port:libexif port:libgnomeui port:libxslt port:popt} name gthumb maintainers nomaintainer long_description {{Image viewer and browser for the gnome desktop.}} license unknown categories gnome version 2.10.11 revision 0 gtk-doc 659

1 0

[67195] trunk/dports/gnome/gstreamer/Portfile
by rmsfisher＠macports.org 01 May '10

01 May '10

Revision: 67195 http://trac.macports.org/changeset/67195 Author: rmsfisher(a)macports.org Date: 2010-05-01 06:41:25 -0700 (Sat, 01 May 2010) Log Message: ----------- gnome/gstreamer upgraded version from 0.10.28 to 0.10.29 Modified Paths: -------------- trunk/dports/gnome/gstreamer/Portfile Modified: trunk/dports/gnome/gstreamer/Portfile =================================================================== --- trunk/dports/gnome/gstreamer/Portfile 2010-05-01 13:26:59 UTC (rev 67194) +++ trunk/dports/gnome/gstreamer/Portfile 2010-05-01 13:41:25 UTC (rev 67195) @@ -4,7 +4,7 @@ PortSystem 1.0 name gstreamer -version 0.10.28 +version 0.10.29 description \ GStreamer is a development framework for creating multimedia applications. long_description \ @@ -19,9 +19,9 @@ gnome:sources/gstreamer/[join [lrange [split ${version} .] 0 1] .]/ \ http://gstreamer.freedesktop.org/src/${name}/ -checksums md5 1c7accac718fe211ff91323c27d4ae02 \ - sha1 a1123d60c35c9be1f6f6357176056361f42e896b \ - rmd160 511ef38706447740803912de47c534fd291915cf +checksums md5 c92d6bce4fc65fa9d5a3ad35cdd1a466 \ + sha1 8d218f4b04445a7dc388d6466c10efb8f23d2468 \ + rmd160 c5b71e4f9c3c77305c92c242b44820521c88ee89 depends_build \ port:gzip \

1 0

[67194] trunk/base/src/port1.0/portutil.tcl
by jmr＠macports.org 01 May '10

01 May '10

Revision: 67194 http://trac.macports.org/changeset/67194 Author: jmr(a)macports.org Date: 2010-05-01 06:26:59 -0700 (Sat, 01 May 2010) Log Message: ----------- fix creation of worksymlink in alt prefix Modified Paths: -------------- trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2010-05-01 09:48:48 UTC (rev 67193) +++ trunk/base/src/port1.0/portutil.tcl 2010-05-01 13:26:59 UTC (rev 67194) @@ -1514,24 +1514,14 @@ global workpath worksymlink place_worksymlink name portpath ports_ignore_older ports_dryrun global usealtworkpath altprefix env applications_dir portbuildpath - if {![file isdirectory $workpath] && ![tbool ports_dryrun]} { - file mkdir $workpath - chownAsRoot $portbuildpath - # Create a symlink to the workpath for port authors - if {[tbool place_worksymlink] && ![file isdirectory $worksymlink]} { - ui_debug "Attempting ln -sf $workpath $worksymlink" - ln -sf $workpath $worksymlink - } - } - # de-escalate privileges if MacPorts was started with sudo dropPrivileges - + if {$usealtworkpath} { ui_warn_once "privileges" "MacPorts running without privileges.\ You may be unable to complete certain actions (e.g. install)." - set newsourcepath "$altprefix/$portpath" + set newsourcepath "${altprefix}${portpath}" # copy Portfile (and patch files) if not there already # note to maintainers/devs: the original portfile in /opt/local is ALWAYS the one that will be @@ -1550,6 +1540,16 @@ } } + if {![file isdirectory $workpath] && ![tbool ports_dryrun]} { + file mkdir $workpath + chownAsRoot $portbuildpath + # Create a symlink to the workpath for port authors + if {[tbool place_worksymlink] && ![file isdirectory $worksymlink]} { + ui_debug "Attempting ln -sf $workpath $worksymlink" + ln -sf $workpath $worksymlink + } + } + # flock Portfile set statefile [file join $workpath .macports.${name}.state] if {[file exists $statefile]} {

1 0

[67193] trunk/dports/lang/mzscheme/Portfile
by ryandesign＠macports.org 01 May '10

01 May '10

Revision: 67193 http://trac.macports.org/changeset/67193 Author: ryandesign(a)macports.org Date: 2010-05-01 02:48:48 -0700 (Sat, 01 May 2010) Log Message: ----------- mzscheme: fix livecheck Modified Paths: -------------- trunk/dports/lang/mzscheme/Portfile Modified: trunk/dports/lang/mzscheme/Portfile =================================================================== --- trunk/dports/lang/mzscheme/Portfile 2010-05-01 09:47:59 UTC (rev 67192) +++ trunk/dports/lang/mzscheme/Portfile 2010-05-01 09:48:48 UTC (rev 67193) @@ -66,3 +66,7 @@ system "/usr/bin/install_name_tool -change PLT_MzScheme.framework/Versions/${version}_3m/PLT_MzScheme ${frameworks}/PLT_MzScheme.framework/Versions/${version}_3m/PLT_MzScheme ${destroot}${prefix}/bin/mzscheme" } + +livecheck.type regex +livecheck.url http://download.plt-scheme.org/mzscheme/ +livecheck.regex {<b>([0-9.]+)</b>}

1 0

[67192] trunk/dports
by portindex＠macports.org 01 May '10

01 May '10

Revision: 67192 http://trac.macports.org/changeset/67192 Author: portindex(a)macports.org Date: 2010-05-01 02:47:59 -0700 (Sat, 01 May 2010) Log Message: ----------- Total number of ports parsed: 1 Ports successfully parsed: 1 Ports failed: 0 Up-to-date ports skipped: 6855 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2010-05-01 09:29:37 UTC (rev 67191) +++ trunk/dports/PortIndex 2010-05-01 09:47:59 UTC (rev 67192) @@ -5308,8 +5308,8 @@ variants {gmp universal} depends_build path:bin/perl:perl5 portdir math/ntl description {NTL: A Library for doing Number Theory} homepage http://shoup.net/ntl/ epoch 0 platforms darwin name ntl long_description {NTL is a high-performance, portable C++ library providing data structures and algorithms for arbitrary length {integers;} for vectors, matrices, and polynomials over the integers and over finite {fields;} and for arbitrary precision floating point arithmetic.} maintainers fimaluka.org:ralf license unknown categories math version 5.4.2 revision 0 ocamlgsl 421 variants universal portdir math/ocamlgsl description {ocamlgsl is the GNU scientific library for OCaml} homepage http://oandrieu.nerim.net/ocaml/gsl/ epoch 0 platforms darwin name ocamlgsl long_description {This is an interface to GSL (GNU scientific library) for the Objective Caml language. See the gsl port for more details.} license unknown maintainers nomaintainer categories {math science} version 0.6.0 revision 0 -octave 942 -variants {gcc43 gcc44 g95 universal} depends_build {port:gawk port:gsed path:bin/perl:perl5 port:texinfo port:gcc43} portdir math/octave description {a Matlab-like environment for numerical analysis} homepage http://www.gnu.org/software/octave/ epoch 0 platforms darwin depends_lib {port:arpack port:atlas port:curl port:fftw-3 port:fftw-3-single port:ftgl port:ghostscript port:glpk port:GraphicsMagick port:gnuplot port:hdf5-18 port:metis port:ncurses port:pcre port:readline port:qhull port:qrupdate port:SuiteSparse} name octave long_description {Octave provides a convenient command line interface for solving linear and nonlinear problems numerically, using a language that is mostly compatible with Matlab. It is easily extensible and customizable via user-defined functions or using dynamically loaded modules written in e.g. C++, C or Fortran.} maintainers stechert license unknown categories {math science} version 3.2.3 revision 2 +octave 932 +variants {gcc43 gcc44 g95} depends_build {port:gawk port:gsed path:bin/perl:perl5 port:texinfo port:gcc43} portdir math/octave description {a Matlab-like environment for numerical analysis} homepage http://www.gnu.org/software/octave/ epoch 0 platforms darwin depends_lib {port:arpack port:atlas port:curl port:fftw-3 port:fftw-3-single port:ftgl port:ghostscript port:glpk port:GraphicsMagick port:gnuplot port:hdf5-18 port:metis port:ncurses port:pcre port:readline port:qhull port:qrupdate port:SuiteSparse} name octave long_description {Octave provides a convenient command line interface for solving linear and nonlinear problems numerically, using a language that is mostly compatible with Matlab. It is easily extensible and customizable via user-defined functions or using dynamically loaded modules written in e.g. C++, C or Fortran.} maintainers stechert license unknown categories {math science} version 3.2.4 revision 0 octave-ad 341 variants universal portdir math/octave-ad description {Automatic Forward Differentiation} homepage http://octave.sourceforge.net/ epoch 0 platforms darwin name octave-ad depends_lib port:octave long_description {{Automatic Forward Differentiation}} maintainers nomaintainer license unknown categories {math science} version 1.0.6 revision 0 octave-ann 669 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ)

1 0

[67191] trunk/dports/math/octave
by ryandesign＠macports.org 01 May '10

01 May '10

Revision: 67191 http://trac.macports.org/changeset/67191 Author: ryandesign(a)macports.org Date: 2010-05-01 02:29:37 -0700 (Sat, 01 May 2010) Log Message: ----------- octave: update to 3.2.4 (see #24304) and disable universal variant because this port uses non-Apple compilers which don't support the -arch flag Modified Paths: -------------- trunk/dports/math/octave/Portfile trunk/dports/math/octave/files/patch-configure-no_x11.diff Modified: trunk/dports/math/octave/Portfile =================================================================== --- trunk/dports/math/octave/Portfile 2010-05-01 08:47:57 UTC (rev 67190) +++ trunk/dports/math/octave/Portfile 2010-05-01 09:29:37 UTC (rev 67191) @@ -4,8 +4,7 @@ PortSystem 1.0 name octave -version 3.2.3 -revision 2 +version 3.2.4 categories math science maintainers stechert platforms darwin @@ -20,10 +19,9 @@ homepage http://www.gnu.org/software/octave/ master_sites ftp://ftp.gnu.org/pub/gnu/octave/ -use_bzip2 no -checksums md5 a3805ed3838c76f4973d1ef7615d5f3c \ - sha1 c4f0125453d7dc4fb0ea16c5941fd2e20c672e5b \ - rmd160 7b4ea71b16d98f898f91f5681b54e4e1d9c73249 +checksums md5 90c39fa9e241ad2e978bcee4682a2ba9 \ + sha1 93b81fc300bc5e27e88b6668ef0622f29898dfd2 \ + rmd160 13b2198db1b8684229d2ba787ebbedd8e50a518c depends_build port:gawk \ port:gsed \ @@ -75,6 +73,7 @@ TEXI2PDF="${prefix}/bin/texi2pdf" use_parallel_build yes +universal_variant no test.run yes test.target check Modified: trunk/dports/math/octave/files/patch-configure-no_x11.diff =================================================================== --- trunk/dports/math/octave/files/patch-configure-no_x11.diff 2010-05-01 08:47:57 UTC (rev 67190) +++ trunk/dports/math/octave/files/patch-configure-no_x11.diff 2010-05-01 09:29:37 UTC (rev 67191) @@ -1,24 +1,11 @@ ---- configure -+++ configure -@@ -7443,9 +7443,9 @@ - echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } +--- configure.orig 2010-01-19 06:47:17.000000000 -0600 ++++ configure 2010-05-01 03:27:01.000000000 -0500 +@@ -6848,7 +6848,7 @@ + $as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi -if test "$have_x"; then +if test "$have_x" == yes; then - cat >>confdefs.h <<\_ACEOF - #define HAVE_X_WINDOWS 1 - _ACEOF + $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h ---- configure.in -+++ configure.in -@@ -255,7 +255,7 @@ - AC_SUBST(DEPEND_EXTRA_SED_PATTERN) - - AC_PATH_X --if test "$have_x"; then -+if test "$have_x" == yes; then - AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11]) - - if test "$x_includes" != "NONE"; then

1 0