January 2011 - macports-changes - lists.macosforge.org

[75279] trunk/dports/audio/phonon/Portfile
by michaelld＠macports.org 19 Jan '11

19 Jan '11

Revision: 75279 http://trac.macports.org/changeset/75279 Author: michaelld(a)macports.org Date: 2011-01-19 08:51:10 -0800 (Wed, 19 Jan 2011) Log Message: ----------- phonon: Fixes ticket #27968: 'find' on 10.4 does not understand "-depth" but does understand "-maxdepth", so use that instead since it works with all 'find' versions from 10.4 to date. Modified Paths: -------------- trunk/dports/audio/phonon/Portfile Modified: trunk/dports/audio/phonon/Portfile =================================================================== --- trunk/dports/audio/phonon/Portfile 2011-01-19 16:45:31 UTC (rev 75278) +++ trunk/dports/audio/phonon/Portfile 2011-01-19 16:51:10 UTC (rev 75279) @@ -72,11 +72,11 @@ # create the 'headers.pri' and 'phonon' files set public_headers [exec find ${worksrcpath}/phonon \ - -name "*.h" -depth 1 | \ + -name "*.h" -maxdepth 1 -mindepth 1 | \ sed -e "s@${worksrcpath}/@@g" | \ grep -v "_p"] set private_headers [exec find ${worksrcpath}/phonon \ - -name "*.h" -depth 1 | \ + -name "*.h" -maxdepth 1 -mindepth 1 | \ sed -e "s@${worksrcpath}/@@g" | \ grep "_p"] set class_headers [exec find ${worksrcpath}/includes/phonon \

1 0

[75278] trunk/dports/math/octave-devel
by michaelld＠macports.org 19 Jan '11

19 Jan '11

Revision: 75278 http://trac.macports.org/changeset/75278 Author: michaelld(a)macports.org Date: 2011-01-19 08:45:31 -0800 (Wed, 19 Jan 2011) Log Message: ----------- octave-devel: disable use of FLTK for now; fix 'configure' script to honor this disabling correctly. Modified Paths: -------------- trunk/dports/math/octave-devel/Portfile trunk/dports/math/octave-devel/files/patch-configure.diff Modified: trunk/dports/math/octave-devel/Portfile =================================================================== --- trunk/dports/math/octave-devel/Portfile 2011-01-19 16:38:42 UTC (rev 75277) +++ trunk/dports/math/octave-devel/Portfile 2011-01-19 16:45:31 UTC (rev 75278) @@ -103,13 +103,15 @@ ### completion. # octave uses a number of other ports to create sources from template: # perl, gawk, gsed, flex, bison, texinfo. python is not used if perl -# is available, so clear it out. +# is available, so clear it out. FLTK doesn't work as of 1.3.x-r7794, +# so disable it entirely (via "no" here and a configure patch). configure.perl ${prefix}/bin/perl configure.python ' ' configure.awk ${prefix}/bin/gawk configure.env-append SED="${prefix}/bin/gsed" \ TEXI2DVI="${prefix}/bin/texi2dvi" \ - TEXI2PDF="${prefix}/bin/texi2pdf" + TEXI2PDF="${prefix}/bin/texi2pdf" \ + FLTK_CONFIG=no ### parallel build is supposed to work now # use_parallel_build no @@ -166,13 +168,18 @@ configure.objcflags-append -g3 -O0 } -variant fltk description {Include FLTK option} { - depends_lib-append port:fltk-devel -} +#variant fltk description {Include FLTK option} { +# depends_lib-append port:fltk-devel +# post-patch + # fix use of #include Fl -> FL +# reinplace "/include/s,Fl/,FL/,g" +# ${worksrcpath}/src/DLD-FUNCTIONS/fltk_backend.cc +# } +#} -if {![variant_isset fltk]} { - configure.env-append FLTK_CONFIG= -} +#if {![variant_isset fltk]} { +# configure.env-append FLTK_CONFIG=no +#} livecheck.type regex livecheck.url http://www.gnu.org/software/octave/news.html Modified: trunk/dports/math/octave-devel/files/patch-configure.diff =================================================================== --- trunk/dports/math/octave-devel/files/patch-configure.diff 2011-01-19 16:38:42 UTC (rev 75277) +++ trunk/dports/math/octave-devel/files/patch-configure.diff 2011-01-19 16:45:31 UTC (rev 75278) @@ -1,6 +1,36 @@ ---- configure_orig 2010-08-01 12:16:40.000000000 -0400 -+++ configure 2010-08-16 22:45:16.000000000 -0400 -@@ -30759,11 +30759,29 @@ +--- configure.orig 2011-01-15 04:08:46.000000000 -0500 ++++ configure 2011-01-19 10:06:38.000000000 -0500 +@@ -32346,6 +32346,21 @@ + + ## fltk (www.fltk.org) + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fltk..." >&5 ++$as_echo_n "checking for fltk... " >&6; } ++ ++# Check whether FLTK_CONFIG is set and equal to "no" ++use_fltk="auto detect" ++if test "${FLTK_CONFIG+set}" = set ; then ++ if test "${FLTK_CONFIG}" = "no" ; then ++ use_fltk="disabled" ++ fi ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${use_fltk}" >&5 ++$as_echo "${use_fltk}" >&6; } ++ ++if test "${use_fltk}" != "disabled"; then + + # Check whether --with-fltk-prefix was given. + if test "${with_fltk_prefix+set}" = set; then : +@@ -32422,6 +32437,7 @@ + $as_echo "no" >&6; } + fi + ++fi + + + warn_fltk_config="" +@@ -32432,11 +32448,29 @@ else FLTK_CFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`" FLTK_LDFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`"

1 0

[75277] trunk/dports/audio/libsdl_mixer-framework/Portfile
by jmr＠macports.org 19 Jan '11

19 Jan '11

Revision: 75277 http://trac.macports.org/changeset/75277 Author: jmr(a)macports.org Date: 2011-01-19 08:38:42 -0800 (Wed, 19 Jan 2011) Log Message: ----------- libsdl_mixer-framework: switch to creating framework the same way as libsdl-framework Modified Paths: -------------- trunk/dports/audio/libsdl_mixer-framework/Portfile Modified: trunk/dports/audio/libsdl_mixer-framework/Portfile =================================================================== --- trunk/dports/audio/libsdl_mixer-framework/Portfile 2011-01-19 16:18:26 UTC (rev 75276) +++ trunk/dports/audio/libsdl_mixer-framework/Portfile 2011-01-19 16:38:42 UTC (rev 75277) @@ -1,59 +1,35 @@ # $Id$ PortSystem 1.0 -PortGroup xcode 1.0 name libsdl_mixer-framework -set my_name SDL_mixer -version 1.2.8 -revision 2 +version 20110119 categories audio devel +platforms darwin +supported_archs noarch maintainers jmr openmaintainer -description Audio mixer library for SDL +description Framework version of libsdl_mixer long_description \ - A sample multi-channel audio mixer library. It supports any number of simultaneously \ - playing channels of 16 bit stereo audio, plus a single channel of music. + ${description} -homepage http://www.libsdl.org/projects/${my_name}/ -master_sites ${homepage}release/ -distname ${my_name}-${version} -dist_subdir [strsed ${name} {/-.*$//}] +homepage http://www.libsdl.org/projects/SDL_mixer/ +distfiles -depends_lib port:libsdl-framework +depends_run port:libsdl-framework port:libsdl_mixer -checksums md5 0b5b91015d0f3bd9597e094ba67c4d65 \ - sha1 7fa56d378f9ca53434f9470aeb2997ad84a348c6 \ - rmd160 f2188b907aa779bb81415ac6726ad7f496357b85 +use_configure no +build {} -post-extract { - system "cd ${worksrcpath} && tar -xzf Xcode.tar.gz" -} +destroot { + set path ${frameworks_dir}/SDL_mixer.framework + xinstall -d ${destroot}${path}/Versions/A/Headers -post-patch { - set pbxproj ${worksrcpath}/${xcode.project}/project.pbxproj + ln -sf ${prefix}/lib/libSDL_mixer.dylib ${destroot}${path}/Versions/A/SDL_mixer + ln -sf Versions/A/SDL_mixer ${destroot}${path}/SDL_mixer - reinplace -E "/(MACOSX_DEPLOYMENT_TARGET|GCC_VERSION|SDKROOT)_ppc =/d" ${pbxproj} - reinplace "s|~/Library/Frameworks|./build/Frameworks|g" ${pbxproj} - reinplace "s|\$(HOME)/Library/Frameworks|${frameworks_dir}|g" ${pbxproj} + ln -sf ${prefix}/include/SDL/SDL_mixer.h ${destroot}${path}/Versions/A/Headers/ + ln -sf Versions/A/Headers ${destroot}${path}/Headers } -xcode.project Xcode/SDL_mixer.xcodeproj -xcode.target Framework -xcode.destroot.type framework - -variant universal {} - -if {! [variant_isset universal]} { - set arch ${os.arch} - if {! [string compare ${arch} powerpc]} { - set arch ppc - } - - xcode.build.settings ARCHS=${arch} - xcode.destroot.settings ARCHS=${arch} -} - -livecheck.type regex -livecheck.url ${homepage} -livecheck.regex ${my_name}-(\\d+(?:\\.\\d+)*) +livecheck.type none

1 0

[75276] trunk/dports/audio/libsdl_mixer
by jmr＠macports.org 19 Jan '11

19 Jan '11

Revision: 75276 http://trac.macports.org/changeset/75276 Author: jmr(a)macports.org Date: 2011-01-19 08:18:26 -0800 (Wed, 19 Jan 2011) Log Message: ----------- libsdl_mixer: add pkgconfig dep, rev bump to pick up libsdl's endianness fix, remove unnecessary code Modified Paths: -------------- trunk/dports/audio/libsdl_mixer/Portfile Added Paths: ----------- trunk/dports/audio/libsdl_mixer/files/ trunk/dports/audio/libsdl_mixer/files/Makefile.in.diff Modified: trunk/dports/audio/libsdl_mixer/Portfile =================================================================== --- trunk/dports/audio/libsdl_mixer/Portfile 2011-01-19 16:00:08 UTC (rev 75275) +++ trunk/dports/audio/libsdl_mixer/Portfile 2011-01-19 16:18:26 UTC (rev 75276) @@ -5,6 +5,7 @@ name libsdl_mixer set my_name SDL_mixer version 1.2.11 +revision 1 categories audio devel platforms macosx maintainers jmr openmaintainer @@ -23,29 +24,20 @@ sha1 ef5d45160babeb51eafa7e4019cec38324ee1a5d \ rmd160 559355116a1c380edf71879da0dbcf5359f05476 +depends_build port:pkgconfig depends_lib path:lib/pkgconfig/sdl.pc:libsdl \ port:flac \ port:smpeg \ port:libvorbis \ port:libogg +patchfiles Makefile.in.diff + configure.args --with-sdl-prefix=${prefix} \ --disable-sdltest \ --with-smpeg-prefix=${prefix} \ --disable-smpegtest -if {[variant_isset universal]} { - set archflags ${configure.universal_cflags} - configure.args-append CPP=${configure.cpp} -} else { - set archflags ${configure.cc_archflags} -} -configure.cc ${configure.cc} ${archflags} - -post-patch { - reinplace "s|`find_lib\$.*\\.dylib\$|${prefix}/lib/`find_lib\\1|g" ${worksrcpath}/configure -} - post-destroot { set docdir ${prefix}/share/doc/${name}-${version} xinstall -d ${destroot}${docdir} Added: trunk/dports/audio/libsdl_mixer/files/Makefile.in.diff =================================================================== --- trunk/dports/audio/libsdl_mixer/files/Makefile.in.diff (rev 0) +++ trunk/dports/audio/libsdl_mixer/files/Makefile.in.diff 2011-01-19 16:18:26 UTC (rev 75276) @@ -0,0 +1,15 @@ +--- Makefile.in.orig 2009-10-13 10:06:53.000000000 +1100 ++++ Makefile.in 2011-01-20 02:01:27.000000000 +1100 +@@ -75,10 +75,10 @@ + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + + $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) +- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) + + $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) +- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) + + install: all install-hdrs install-lib #install-bin + install-hdrs:

1 0

[75275] trunk/dports/devel/redo/Portfile
by singingwolfboy＠macports.org 19 Jan '11

19 Jan '11

Revision: 75275 http://trac.macports.org/changeset/75275 Author: singingwolfboy(a)macports.org Date: 2011-01-19 08:00:08 -0800 (Wed, 19 Jan 2011) Log Message: ----------- redo: version bump, and indicate that tests can run Modified Paths: -------------- trunk/dports/devel/redo/Portfile Modified: trunk/dports/devel/redo/Portfile =================================================================== --- trunk/dports/devel/redo/Portfile 2011-01-19 14:54:55 UTC (rev 75274) +++ trunk/dports/devel/redo/Portfile 2011-01-19 16:00:08 UTC (rev 75275) @@ -3,7 +3,7 @@ PortSystem 1.0 name redo -version 0.04 +version 0.05 revision 1 categories devel maintainers singingwolfboy @@ -42,6 +42,7 @@ eval reinplace "s|#!/usr/|#!${prefix}/|" [glob ${worksrcpath}/*] } build.cmd ${worksrcpath}/${name} +test.run yes destroot.destdir "" destroot.env-append DESTDIR=${destroot} PREFIX=${prefix} depends_lib bin:python:python_select

1 0

[75274] trunk/dports/science/flann
by mmoll＠macports.org 19 Jan '11

19 Jan '11

Revision: 75274 http://trac.macports.org/changeset/75274 Author: mmoll(a)macports.org Date: 2011-01-19 06:54:55 -0800 (Wed, 19 Jan 2011) Log Message: ----------- science/flann: bump version to 1.6.7 Modified Paths: -------------- trunk/dports/science/flann/Portfile Removed Paths: ------------- trunk/dports/science/flann/files/ Modified: trunk/dports/science/flann/Portfile =================================================================== --- trunk/dports/science/flann/Portfile 2011-01-19 14:41:53 UTC (rev 75273) +++ trunk/dports/science/flann/Portfile 2011-01-19 14:54:55 UTC (rev 75274) @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup cmake 1.0 name flann -version 1.6.6 +version 1.6.7 categories science devel maintainers mmoll description Fast Library for Approximate Nearest Neighbors @@ -20,10 +20,9 @@ distname ${name}-${version}-src use_zip yes extract.mkdir yes -checksums md5 9f162b8090610e0a91a3262a04bac0cf \ - sha1 d14a359f9d07e6b1ea84968d6d658afd2a13f89a \ - rmd160 28c9d11f7d9eaaf0cce86dbceb03cf0b6cb2a7ca -patchfiles patch-flann-1.6.6.diff +checksums md5 326a199e4222cc4d0c78a9e29077d27f \ + sha1 71539e95a679ce9da31f7554b16b5fa81862bf48 \ + rmd160 f10dbc91924e26647ab641df9a8f0bf81748c6e0 depends_lib port:hdf5-18 # MPI support is automatically enabled if hdf5-18 is installed with the +openmpi variant configure.args-append ${distname} -DBUILD_MATLAB_BINDINGS=OFF -DUSE_MPI=OFF \

1 0

[75273] trunk/dports/perl/p5-nkf/Portfile
by takanori＠macports.org 19 Jan '11

19 Jan '11

Revision: 75273 http://trac.macports.org/changeset/75273 Author: takanori(a)macports.org Date: 2011-01-19 06:41:53 -0800 (Wed, 19 Jan 2011) Log Message: ----------- p5-nkf: worksrcdir should be declared at the top of the block too Modified Paths: -------------- trunk/dports/perl/p5-nkf/Portfile Modified: trunk/dports/perl/p5-nkf/Portfile =================================================================== --- trunk/dports/perl/p5-nkf/Portfile 2011-01-19 14:35:44 UTC (rev 75272) +++ trunk/dports/perl/p5-nkf/Portfile 2011-01-19 14:41:53 UTC (rev 75273) @@ -23,7 +23,12 @@ nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch checksums rmd160 06e0dbda6e90502ab4bafe4d44a9d05beed248c5 +worksrcdir ${distname}/NKF.mod + patch.pre_args -p1 +pre-patch { + worksrcdir ${distname} +} post-patch { worksrcdir ${distname}/NKF.mod }

1 0

[75272] trunk/dports/devel/libsdl_image/Portfile
by jmr＠macports.org 19 Jan '11

19 Jan '11

Revision: 75272 http://trac.macports.org/changeset/75272 Author: jmr(a)macports.org Date: 2011-01-19 06:35:44 -0800 (Wed, 19 Jan 2011) Log Message: ----------- libsdl_image: add pkgconfig build dep Modified Paths: -------------- trunk/dports/devel/libsdl_image/Portfile Modified: trunk/dports/devel/libsdl_image/Portfile =================================================================== --- trunk/dports/devel/libsdl_image/Portfile 2011-01-19 14:10:04 UTC (rev 75271) +++ trunk/dports/devel/libsdl_image/Portfile 2011-01-19 14:35:44 UTC (rev 75272) @@ -24,6 +24,7 @@ sha1 6bae71fdfd795c3dbf39f6c7c0cf8b212914ef97 \ rmd160 8133f7f8d488b1c3f69ad80a941289b4508d2901 +depends_build port:pkgconfig depends_lib path:lib/pkgconfig/sdl.pc:libsdl \ port:libpng \ port:jpeg \

1 0

[75271] trunk/dports/devel/libsdl_image-framework/Portfile
by jmr＠macports.org 19 Jan '11

19 Jan '11

Revision: 75271 http://trac.macports.org/changeset/75271 Author: jmr(a)macports.org Date: 2011-01-19 06:10:04 -0800 (Wed, 19 Jan 2011) Log Message: ----------- libsdl_image-framework: switch to creating framework the same way as libsdl-framework Modified Paths: -------------- trunk/dports/devel/libsdl_image-framework/Portfile Modified: trunk/dports/devel/libsdl_image-framework/Portfile =================================================================== --- trunk/dports/devel/libsdl_image-framework/Portfile 2011-01-19 14:02:20 UTC (rev 75270) +++ trunk/dports/devel/libsdl_image-framework/Portfile 2011-01-19 14:10:04 UTC (rev 75271) @@ -1,66 +1,35 @@ # $Id$ PortSystem 1.0 -PortGroup xcode 1.0 name libsdl_image-framework -set my_name SDL_image -version 1.2.7 -revision 3 +version 20110119 categories devel graphics +platforms darwin +supported_archs noarch maintainers jmr openmaintainer -description Add on library for libSDL handling several image formats +description Framework version of libsdl_image long_description \ - This is a simple library to load images of various formats as SDL surfaces. \ - This library supports BMP, PPM, PCX, GIF, JPEG, PNG, TGA, and TIFF formats. + ${description} homepage http://www.libsdl.org/projects/SDL_image/ -master_sites ${homepage}release/ -distname ${my_name}-${version} -dist_subdir [strsed ${name} {/-.*$//}] +distfiles -checksums md5 a729ff61f74f0a45ec7fe36354cf938e \ - sha1 0cffd05e41014651e7114d7fea309c9f37ef2d8a \ - rmd160 d54233077c0a49f075bf11dc1cc2cfe7c0a64efa +depends_run port:libsdl-framework port:libsdl_image -depends_lib port:libpng \ - port:jpeg \ - port:zlib \ - port:libsdl-framework +use_configure no +build {} -xcode.project Xcode/${my_name}.xcodeproj -xcode.target Framework -xcode.destroot.type framework +destroot { + set path ${frameworks_dir}/SDL_image.framework + xinstall -d ${destroot}${path}/Versions/A/Headers -if {! [variant_isset universal]} { - set arch ${build_arch} + ln -sf ${prefix}/lib/libSDL_image.dylib ${destroot}${path}/Versions/A/SDL_image + ln -sf Versions/A/SDL_image ${destroot}${path}/SDL_image - xcode.build.settings ARCHS=${arch} - xcode.destroot.settings ARCHS=${arch} + ln -sf ${prefix}/include/SDL/SDL_image.h ${destroot}${path}/Versions/A/Headers/ + ln -sf Versions/A/Headers ${destroot}${path}/Headers } -post-extract { - system "cd ${worksrcpath} && \ - tar -xvzf Xcode.tar.gz Xcode/{exports/SDL_image.x,Info-Framework__Upgraded_.plist,${my_name}.xcodeproj}" -} - -post-patch { - set pbxproj ${worksrcpath}/${xcode.project}/project.pbxproj - - reinplace -E "/(MACOSX_DEPLOYMENT_TARGET|GCC_VERSION|SDKROOT)_ppc =/d" ${pbxproj} - reinplace "s|~/Library/Frameworks|./build/Frameworks|g" ${pbxproj} - reinplace "s|\$(HOME)/Library/Frameworks|${frameworks_dir}|g" ${pbxproj} - reinplace -E "s|(\t+)/Library/Frameworks|\\1${frameworks_dir}|g" ${pbxproj} - reinplace "s|graphics/include|${prefix}/include|g" ${pbxproj} - reinplace "s|graphics/lib|${prefix}/lib|g" ${pbxproj} -} - -pre-destroot { - xcode.destroot.settings ${xcode.build.settings} -} - -variant universal {} - -livecheck.type regex -livecheck.regex ${my_name}-(\\d+(?:\\.\\d+)*) +livecheck.type none

1 0

[75270] trunk/dports
by takanori＠macports.org 19 Jan '11

19 Jan '11

Revision: 75270 http://trac.macports.org/changeset/75270 Author: takanori(a)macports.org Date: 2011-01-19 06:02:20 -0800 (Wed, 19 Jan 2011) Log Message: ----------- nkf: - Don't use non-ASCII in nkf_test.pl. (nkf-bug:23228) - Fixed broken 'Q-encoded UTF-8' decode function. (nkf-bug:55125) Modified Paths: -------------- trunk/dports/perl/p5-nkf/Portfile trunk/dports/textproc/nkf/Portfile Added Paths: ----------- trunk/dports/perl/p5-nkf/files/ trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch trunk/dports/textproc/nkf/files/ trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch Modified: trunk/dports/perl/p5-nkf/Portfile =================================================================== --- trunk/dports/perl/p5-nkf/Portfile 2011-01-19 13:44:11 UTC (rev 75269) +++ trunk/dports/perl/p5-nkf/Portfile 2011-01-19 14:02:20 UTC (rev 75270) @@ -5,6 +5,7 @@ set nkf_ver 2.1.1 perl5.setup NKF [string range ${nkf_ver} 0 2][string range ${nkf_ver} 4 end] +revision 1 categories-append \ textproc japanese maintainers nifty.com:pelopor takanori openmaintainer @@ -17,9 +18,15 @@ distname nkf-${nkf_ver} dist_subdir nkf distfiles [suffix ${distname}]:nkf +patchfiles nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch \ + nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch \ + nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch checksums rmd160 06e0dbda6e90502ab4bafe4d44a9d05beed248c5 -worksrcdir ${distname}/NKF.mod +patch.pre_args -p1 +post-patch { + worksrcdir ${distname}/NKF.mod +} post-destroot { xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/doc Added: trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch =================================================================== --- trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch (rev 0) +++ trunk/dports/perl/p5-nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch 2011-01-19 14:02:20 UTC (rev 75270) @@ -0,0 +1,26 @@ +From: NARUSE, Yui <naruse(a)users.sourceforge.jp> +Date: Wed, 15 Sep 2010 00:04:17 +0000 (+0900) +Subject: Fix test: test_data/ruby-dev:39722. +X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=bbb280a… + +Fix test: test_data/ruby-dev:39722. + +Don't use non ASCII in nkf_test.pl. +[nkf-bug#23228] +--- + +diff --git a/nkf_test.pl b/nkf_test.pl +index 30b754b..6296f32 100644 +--- a/nkf_test.pl ++++ b/nkf_test.pl +@@ -1003,8 +1003,8 @@ printf "%-40s", "test_data/bugs10904"; + &test("$nkf -Mj",$example{'test_data/bugs10904'},$example{'test_data/bugs10904.ans'}); + + printf "%-40s", "test_data/ruby-dev:39722"; +- &test("$nkf -Mj",<<eom,<<eom); +-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$B$"(B ++ &test("$nkf -MjW",<<eom,<<eom); ++aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\xE3\x81\x82 + eom + =?US-ASCII?Q?aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?= + =?US-ASCII?Q?aaaaaaaaaaaaaaaaa?= =?ISO-2022-JP?B?GyRCJCIbKEI=?= Added: trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch =================================================================== --- trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch (rev 0) +++ trunk/dports/perl/p5-nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch 2011-01-19 14:02:20 UTC (rev 75270) @@ -0,0 +1,23 @@ +From: NARUSE, Yui <naruse(a)users.sourceforge.jp> +Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900) +Subject: Fix: wrong decode function setting [nkf-bug:55125] +X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=d2f185c… + +Fix: wrong decode function setting [nkf-bug:55125] + +Q-encoded UTF-8 was broken. +--- + +diff --git a/nkf.c b/nkf.c +index 6877afe..6b944e1 100644 +--- a/nkf.c ++++ b/nkf.c +@@ -3878,7 +3878,7 @@ static const unsigned char *mime_pattern[] = { + + /* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */ + nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = { +- e_iconv, s_iconv, 0, 0, 0, 0, ++ e_iconv, s_iconv, 0, 0, 0, 0, 0, + #if defined(UTF8_INPUT_ENABLE) + w_iconv, w_iconv, + #endif Added: trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch =================================================================== --- trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch (rev 0) +++ trunk/dports/perl/p5-nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch 2011-01-19 14:02:20 UTC (rev 75270) @@ -0,0 +1,33 @@ +From: NARUSE, Yui <naruse(a)users.sourceforge.jp> +Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900) +Subject: Add test for Q-encoded UTF-8. +X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=fbbf52d… + +Add test for Q-encoded UTF-8. +--- + +diff --git a/nkf_test.pl b/nkf_test.pl +index 6296f32..15b29b3 100644 +--- a/nkf_test.pl ++++ b/nkf_test.pl +@@ -886,6 +886,20 @@ eofeof + + printf "%-40s", "test_data/q-encode-softrap"; + &test("$nkf -jmQ",$example{'test_data/q-encode-softrap'},$example{'test_data/q-encode-softrap.ans'}); ++# test_data/q-encode-utf-8 ++ ++$example{'test_data/q-encode-utf-8'} = <<'eofeof'; ++=?utf-8?Q?=E3=81=82=E3=81=84=E3=81=86=E3=81=88=E3=81=8A?= ++=?utf-8?Q?=E3=81=8B=E3=81=8D=E3=81=8F=E3=81=91=E3=81=93?= ++eofeof ++ ++$example{'test_data/q-encode-utf-8.ans'} = <<"eofeof"; ++\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A ++\xE3\x81\x8B\xE3\x81\x8D\xE3\x81\x8F\xE3\x81\x91\xE3\x81\x93 ++eofeof ++ ++printf "%-40s", "test_data/q-encode-utf-8"; ++ &test("$nkf -w",$example{'test_data/q-encode-utf-8'},$example{'test_data/q-encode-utf-8.ans'}); + # test_data/rot13 + + $example{'test_data/rot13'} = unpack('u',<<'eofeof'); Modified: trunk/dports/textproc/nkf/Portfile =================================================================== --- trunk/dports/textproc/nkf/Portfile 2011-01-19 13:44:11 UTC (rev 75269) +++ trunk/dports/textproc/nkf/Portfile 2011-01-19 14:02:20 UTC (rev 75270) @@ -4,6 +4,7 @@ name nkf version 2.1.1 +revision 1 categories textproc japanese maintainers takanori openmaintainer description Network Kanji code conversion Filter @@ -14,8 +15,13 @@ platforms darwin homepage http://sourceforge.jp/projects/nkf/ master_sites sourceforge_jp:${name}/48945/ +patchfiles nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch \ + nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch \ + nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch checksums rmd160 06e0dbda6e90502ab4bafe4d44a9d05beed248c5 +patch.pre_args -p1 + use_configure no build.target Added: trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch =================================================================== --- trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch (rev 0) +++ trunk/dports/textproc/nkf/files/nkf.git-bbb280a04623e073e447add83c6c9a5309c30fd2.patch 2011-01-19 14:02:20 UTC (rev 75270) @@ -0,0 +1,26 @@ +From: NARUSE, Yui <naruse(a)users.sourceforge.jp> +Date: Wed, 15 Sep 2010 00:04:17 +0000 (+0900) +Subject: Fix test: test_data/ruby-dev:39722. +X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=bbb280a… + +Fix test: test_data/ruby-dev:39722. + +Don't use non ASCII in nkf_test.pl. +[nkf-bug#23228] +--- + +diff --git a/nkf_test.pl b/nkf_test.pl +index 30b754b..6296f32 100644 +--- a/nkf_test.pl ++++ b/nkf_test.pl +@@ -1003,8 +1003,8 @@ printf "%-40s", "test_data/bugs10904"; + &test("$nkf -Mj",$example{'test_data/bugs10904'},$example{'test_data/bugs10904.ans'}); + + printf "%-40s", "test_data/ruby-dev:39722"; +- &test("$nkf -Mj",<<eom,<<eom); +-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$B$"(B ++ &test("$nkf -MjW",<<eom,<<eom); ++aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\xE3\x81\x82 + eom + =?US-ASCII?Q?aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?= + =?US-ASCII?Q?aaaaaaaaaaaaaaaaa?= =?ISO-2022-JP?B?GyRCJCIbKEI=?= Added: trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch =================================================================== --- trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch (rev 0) +++ trunk/dports/textproc/nkf/files/nkf.git-d2f185cc2134b370b49b7a52a5e81b9671ecc43e.patch 2011-01-19 14:02:20 UTC (rev 75270) @@ -0,0 +1,23 @@ +From: NARUSE, Yui <naruse(a)users.sourceforge.jp> +Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900) +Subject: Fix: wrong decode function setting [nkf-bug:55125] +X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=d2f185c… + +Fix: wrong decode function setting [nkf-bug:55125] + +Q-encoded UTF-8 was broken. +--- + +diff --git a/nkf.c b/nkf.c +index 6877afe..6b944e1 100644 +--- a/nkf.c ++++ b/nkf.c +@@ -3878,7 +3878,7 @@ static const unsigned char *mime_pattern[] = { + + /* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */ + nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = { +- e_iconv, s_iconv, 0, 0, 0, 0, ++ e_iconv, s_iconv, 0, 0, 0, 0, 0, + #if defined(UTF8_INPUT_ENABLE) + w_iconv, w_iconv, + #endif Added: trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch =================================================================== --- trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch (rev 0) +++ trunk/dports/textproc/nkf/files/nkf.git-fbbf52db285384e4938bbe7862cae1df80482960_2.patch 2011-01-19 14:02:20 UTC (rev 75270) @@ -0,0 +1,33 @@ +From: NARUSE, Yui <naruse(a)users.sourceforge.jp> +Date: Sat, 8 Jan 2011 11:47:09 +0000 (+0900) +Subject: Add test for Q-encoded UTF-8. +X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=fbbf52d… + +Add test for Q-encoded UTF-8. +--- + +diff --git a/nkf_test.pl b/nkf_test.pl +index 6296f32..15b29b3 100644 +--- a/nkf_test.pl ++++ b/nkf_test.pl +@@ -886,6 +886,20 @@ eofeof + + printf "%-40s", "test_data/q-encode-softrap"; + &test("$nkf -jmQ",$example{'test_data/q-encode-softrap'},$example{'test_data/q-encode-softrap.ans'}); ++# test_data/q-encode-utf-8 ++ ++$example{'test_data/q-encode-utf-8'} = <<'eofeof'; ++=?utf-8?Q?=E3=81=82=E3=81=84=E3=81=86=E3=81=88=E3=81=8A?= ++=?utf-8?Q?=E3=81=8B=E3=81=8D=E3=81=8F=E3=81=91=E3=81=93?= ++eofeof ++ ++$example{'test_data/q-encode-utf-8.ans'} = <<"eofeof"; ++\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86\xE3\x81\x88\xE3\x81\x8A ++\xE3\x81\x8B\xE3\x81\x8D\xE3\x81\x8F\xE3\x81\x91\xE3\x81\x93 ++eofeof ++ ++printf "%-40s", "test_data/q-encode-utf-8"; ++ &test("$nkf -w",$example{'test_data/q-encode-utf-8'},$example{'test_data/q-encode-utf-8.ans'}); + # test_data/rot13 + + $example{'test_data/rot13'} = unpack('u',<<'eofeof');

1 0