August 2008 - macports-changes - lists.macosforge.org

[39656] trunk/dports/x11/winetricks/Portfile
by ryandesign＠macports.org 28 Aug '08

28 Aug '08

Revision: 39656 http://trac.macosforge.org/projects/macports/changeset/39656 Author: ryandesign(a)macports.org Date: 2008-08-27 22:24:46 -0700 (Wed, 27 Aug 2008) Log Message: ----------- winetricks: update to 20080825 (don't pretend we're windows 2000 when installing vcrun2005) Modified Paths: -------------- trunk/dports/x11/winetricks/Portfile Modified: trunk/dports/x11/winetricks/Portfile =================================================================== --- trunk/dports/x11/winetricks/Portfile 2008-08-28 05:19:55 UTC (rev 39655) +++ trunk/dports/x11/winetricks/Portfile 2008-08-28 05:24:46 UTC (rev 39656) @@ -3,7 +3,7 @@ PortSystem 1.0 name winetricks -version 20080823 +version 20080825 categories x11 maintainers ryandesign homepage http://www.kegel.com/wine/ @@ -29,9 +29,9 @@ ${homepage} checksums \ - md5 e692a5c24ce4fb5433812f3af0331243 \ - sha1 38a36ca1a594d748fbe48ace949bc0b76233b42f \ - rmd160 f22285901a5d5a0543cb545efd0a157b2f09d9a1 + md5 050ad94a2b3d9fe5483fbedefdbbc1f7 \ + sha1 21e8976f7172adf18a326bbcf22b63f681a6b1ff \ + rmd160 b8e3ef996a2533373a6d2193cf5e809c58c4008a patchfiles \ patch-x11prefix.diff

1 0

propchange - r39563 svn:log
by ryandesign＠macports.org 28 Aug '08

28 Aug '08

Author: ryandesign(a)macports.org (original author: ryandesign(a)macports.org) Revision: 39563 Property Name: svn:log @@ -1 +1,3 @@ winetricks: put the MacPorts distfiles mirror first, since upstream does not keep separate URLs for the separate versions and otherwise users encounter a checksum error if they try to install the port after the developer has updated the software and before I have updated the port + +This change inadvertently broke the livecheck, which I fixed in r39655.

1 0

propchange - r39655 svn:log
by ryandesign＠macports.org 28 Aug '08

28 Aug '08

Author: ryandesign(a)macports.org (original author: ryandesign(a)macports.org) Revision: 39655 Property Name: svn:log @@ -1 +1 @@ -winetricks: fix livecheck which got broken by r38645 +winetricks: fix livecheck which got broken by r39563

1 0

[39655] trunk/dports/x11/winetricks/Portfile
by ryandesign＠macports.org 28 Aug '08

28 Aug '08

Revision: 39655 http://trac.macosforge.org/projects/macports/changeset/39655 Author: ryandesign(a)macports.org Date: 2008-08-27 22:19:55 -0700 (Wed, 27 Aug 2008) Log Message: ----------- winetricks: fix livecheck which got broken by r38645 Modified Paths: -------------- trunk/dports/x11/winetricks/Portfile Modified: trunk/dports/x11/winetricks/Portfile =================================================================== --- trunk/dports/x11/winetricks/Portfile 2008-08-28 04:32:32 UTC (rev 39654) +++ trunk/dports/x11/winetricks/Portfile 2008-08-28 05:19:55 UTC (rev 39655) @@ -56,5 +56,5 @@ livecheck.check regex -livecheck.url [lindex ${master_sites} 0]${name} +livecheck.url [lindex ${master_sites} 1]${name} livecheck.regex {Winetricks version (\d+)}

1 0

[39654] trunk/dports
by erickt＠macports.org 28 Aug '08

28 Aug '08

Revision: 39654 http://trac.macosforge.org/projects/macports/changeset/39654 Author: erickt(a)macports.org Date: 2008-08-27 21:32:32 -0700 (Wed, 27 Aug 2008) Log Message: ----------- Version bump for mercurial to 1.0.2 (see #16308). Modified Paths: -------------- trunk/dports/devel/mercurial/Portfile trunk/dports/lang/python30/Portfile trunk/dports/python/py30-hashlib/Portfile Modified: trunk/dports/devel/mercurial/Portfile =================================================================== --- trunk/dports/devel/mercurial/Portfile 2008-08-27 23:24:01 UTC (rev 39653) +++ trunk/dports/devel/mercurial/Portfile 2008-08-28 04:32:32 UTC (rev 39654) @@ -4,8 +4,7 @@ PortGroup python25 1.0 name mercurial -version 1.0.1 -revision 1 +version 1.0.2 categories devel python maintainers deric(a)macports.org description A fast, lightweight, distributed SCM system written in \ @@ -25,9 +24,9 @@ homepage http://www.selenic.com/mercurial/ master_sites http://www.selenic.com/mercurial/release/ -checksums md5 a4ef7eb2c8818404a459e3be05feff6f \ - sha1 ada3e6d2128283efeefb7b44f9a1e0dfc22d62f1 \ - rmd160 f451ab56660f46a51b4588de966ec0718f38cd7b +checksums md5 32432616f517107e6582721c257cd1f4 \ + sha1 6d5be655276770192b889cee279bdcc0aee977e3 \ + rmd160 0f163d19a12bbe7dcfc45f10cdab07f5b16e7b3a depends_lib-append port:py25-zlib port:py25-hashlib port:py25-bz2 @@ -49,4 +48,13 @@ # copy hgweb.cgi hgwebdir.cgi file copy ${worksrcpath}/hgweb.cgi ${destroot}${prefix}/share/${name}/ file copy ${worksrcpath}/hgwebdir.cgi ${destroot}${prefix}/share/${name}/ + + if {[variant_isset bash_completion]} { + xinstall -d ${destroot}${prefix}/etc/bash_completion.d + copy ${worksrcpath}/contrib/bash_completion ${destroot}${prefix}/etc/bash_completion.d/mercurial + } } + +variant bash_completion description {Install mercurial bash-completion file} { + depends_run-append port:bash-completion +} Modified: trunk/dports/lang/python30/Portfile =================================================================== --- trunk/dports/lang/python30/Portfile 2008-08-27 23:24:01 UTC (rev 39653) +++ trunk/dports/lang/python30/Portfile 2008-08-28 04:32:32 UTC (rev 39654) @@ -3,7 +3,8 @@ PortSystem 1.0 name python30 -version 3.0b3 +version 3.0a3 +revision 5 set major 3 set branch 3.0 categories lang @@ -12,18 +13,18 @@ description An interpreted, object-oriented programming language long_description Python is an interpreted, interactive, object-oriented \ - programming language. This version is a BETA release! + programming language. This version is an ALPHA release! homepage http://www.python.org/ -master_sites ${homepage}/ftp/python/${branch}/ \ - ftp://ftp.python.org/pub/python/${branch}/ \ - ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${branch}/ \ - ftp://ftp.python.jp/pub/python/${branch}/ +master_sites ${homepage}/ftp/python/${version}/ \ + ftp://ftp.python.org/pub/python/${version}/ \ + ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \ + ftp://ftp.python.jp/pub/python/${version}/ distname Python-${version} -use_bzip2 yes +extract.suffix .tgz -checksums md5 91d44362c73dcc423ec51973ed4082fe +checksums md5 ec525b7e7fe4383e8394fab721663252 patchfiles patch-setup.py.diff \ patch-Makefile.pre.in.diff \ Modified: trunk/dports/python/py30-hashlib/Portfile =================================================================== --- trunk/dports/python/py30-hashlib/Portfile 2008-08-27 23:24:01 UTC (rev 39653) +++ trunk/dports/python/py30-hashlib/Portfile 2008-08-28 04:32:32 UTC (rev 39654) @@ -14,7 +14,7 @@ # end group code name py30-hashlib -version 3.0b3 +version 3.0a3 categories python platforms darwin maintainers mww @@ -26,8 +26,8 @@ master_sites http://www.python.org/ftp/python/3.0/ distname Python-${version} dist_subdir python30 -checksums md5 91d44362c73dcc423ec51973ed4082fe -use_bzip2 yes +checksums md5 ec525b7e7fe4383e8394fab721663252 +extract.suffix .tgz depends_lib-append port:openssl

1 0

[39653] trunk/dports/graphics/dcraw/files/Makefile.in
by ryandesign＠macports.org 27 Aug '08

27 Aug '08

Revision: 39653 http://trac.macosforge.org/projects/macports/changeset/39653 Author: ryandesign(a)macports.org Date: 2008-08-27 16:24:01 -0700 (Wed, 27 Aug 2008) Log Message: ----------- dcraw: define and use some variables for programs in the Makefile Modified Paths: -------------- trunk/dports/graphics/dcraw/files/Makefile.in Modified: trunk/dports/graphics/dcraw/files/Makefile.in =================================================================== --- trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 23:13:05 UTC (rev 39652) +++ trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 23:24:01 UTC (rev 39653) @@ -6,6 +6,11 @@ BUILD_DIR = build +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) +INSTALL_DATA = $(INSTALL) -m 644 +MSGFMT = msgfmt + PO_FILES = $(wildcard *.po) MO_FILES = $(patsubst %.po,$(BUILD_DIR)/%.mo,$(PO_FILES)) @@ -15,11 +20,11 @@ $(CC) -o $(BUILD_DIR)/dcraw $(CFLAGS) dcraw.c -ljpeg -llcms -lintl -liconv $(CPPFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(PREFIX)/share/locale/\" $(BUILD_DIR)/%.mo: %.po $(BUILD_DIR) - msgfmt -o $@ $< + $(MSGFMT) -o $@ $< $(BUILD_DIR): mkdir -p $(BUILD_DIR) .PHONY: install install: - install -s -m 755 $(BUILD_DIR)/dcraw $(DESTDIR)$(PREFIX)/bin + $(INSTALL_PROGRAM) -s -m 755 $(BUILD_DIR)/dcraw $(DESTDIR)$(PREFIX)/bin

1 0

[39652] trunk/dports/graphics/dcraw
by ryandesign＠macports.org 27 Aug '08

27 Aug '08

Revision: 39652 http://trac.macosforge.org/projects/macports/changeset/39652 Author: ryandesign(a)macports.org Date: 2008-08-27 16:13:05 -0700 (Wed, 27 Aug 2008) Log Message: ----------- dcraw: build the message catalogs in the Makefile too instead of in the Portfile Modified Paths: -------------- trunk/dports/graphics/dcraw/Portfile trunk/dports/graphics/dcraw/files/Makefile.in Modified: trunk/dports/graphics/dcraw/Portfile =================================================================== --- trunk/dports/graphics/dcraw/Portfile 2008-08-27 22:29:44 UTC (rev 39651) +++ trunk/dports/graphics/dcraw/Portfile 2008-08-27 23:13:05 UTC (rev 39652) @@ -49,14 +49,6 @@ set my_locales {eo ru fr it de pt es zh_TW zh_CN nl pl hu ca cs sv} -post-build { - foreach locale ${my_locales} { - if {[file exist ${worksrcpath}/dcraw_${locale}.po]} { - system "msgfmt -o ${worksrcpath}/build/dcraw_${locale}.mo ${worksrcpath}/dcraw_${locale}.po" - } - } -} - post-destroot { xinstall -m 644 -W ${worksrcpath} dcraw.1 ${destroot}${prefix}/share/man/man1 foreach locale ${my_locales} { Modified: trunk/dports/graphics/dcraw/files/Makefile.in =================================================================== --- trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 22:29:44 UTC (rev 39651) +++ trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 23:13:05 UTC (rev 39652) @@ -6,11 +6,17 @@ BUILD_DIR = build -all: $(BUILD_DIR)/dcraw +PO_FILES = $(wildcard *.po) +MO_FILES = $(patsubst %.po,$(BUILD_DIR)/%.mo,$(PO_FILES)) +all: $(BUILD_DIR)/dcraw $(MO_FILES) + $(BUILD_DIR)/dcraw: $(BUILD_DIR) $(CC) -o $(BUILD_DIR)/dcraw $(CFLAGS) dcraw.c -ljpeg -llcms -lintl -liconv $(CPPFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(PREFIX)/share/locale/\" +$(BUILD_DIR)/%.mo: %.po $(BUILD_DIR) + msgfmt -o $@ $< + $(BUILD_DIR): mkdir -p $(BUILD_DIR)

1 0

[39651] trunk/dports/graphics/dcraw
by ryandesign＠macports.org 27 Aug '08

27 Aug '08

Revision: 39651 http://trac.macosforge.org/projects/macports/changeset/39651 Author: ryandesign(a)macports.org Date: 2008-08-27 15:29:44 -0700 (Wed, 27 Aug 2008) Log Message: ----------- dcraw: declare the Makefile "install" target to be phony, to avoid conflict with "install" file Modified Paths: -------------- trunk/dports/graphics/dcraw/Portfile trunk/dports/graphics/dcraw/files/Makefile.in Modified: trunk/dports/graphics/dcraw/Portfile =================================================================== --- trunk/dports/graphics/dcraw/Portfile 2008-08-27 22:14:11 UTC (rev 39650) +++ trunk/dports/graphics/dcraw/Portfile 2008-08-27 22:29:44 UTC (rev 39651) @@ -34,8 +34,6 @@ post-extract { xinstall -W ${filespath} Makefile.in ${worksrcpath}/Makefile - # Move "install" script; it conflicts with the destroot phase ("make install") - move ${worksrcpath}/install ${worksrcpath}/install.sh } # configure.cc doesn't get set until the default configure phase runs Modified: trunk/dports/graphics/dcraw/files/Makefile.in =================================================================== --- trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 22:14:11 UTC (rev 39650) +++ trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 22:29:44 UTC (rev 39651) @@ -14,5 +14,6 @@ $(BUILD_DIR): mkdir -p $(BUILD_DIR) +.PHONY: install install: install -s -m 755 $(BUILD_DIR)/dcraw $(DESTDIR)$(PREFIX)/bin

1 0

[39650] trunk/dports/graphics/dcraw
by ryandesign＠macports.org 27 Aug '08

27 Aug '08

Revision: 39650 http://trac.macosforge.org/projects/macports/changeset/39650 Author: ryandesign(a)macports.org Date: 2008-08-27 15:14:11 -0700 (Wed, 27 Aug 2008) Log Message: ----------- dcraw: build the dcraw binary in the build directory too Modified Paths: -------------- trunk/dports/graphics/dcraw/Portfile trunk/dports/graphics/dcraw/files/Makefile.in Modified: trunk/dports/graphics/dcraw/Portfile =================================================================== --- trunk/dports/graphics/dcraw/Portfile 2008-08-27 21:46:39 UTC (rev 39649) +++ trunk/dports/graphics/dcraw/Portfile 2008-08-27 22:14:11 UTC (rev 39650) @@ -34,7 +34,6 @@ post-extract { xinstall -W ${filespath} Makefile.in ${worksrcpath}/Makefile - xinstall -d ${worksrcpath}/build # Move "install" script; it conflicts with the destroot phase ("make install") move ${worksrcpath}/install ${worksrcpath}/install.sh } Modified: trunk/dports/graphics/dcraw/files/Makefile.in =================================================================== --- trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 21:46:39 UTC (rev 39649) +++ trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 22:14:11 UTC (rev 39650) @@ -4,10 +4,15 @@ LDFLAGS = @LDFLAGS@ PREFIX = @PREFIX@ -all: dcraw +BUILD_DIR = build -dcraw: - $(CC) -o dcraw $(CFLAGS) dcraw.c -ljpeg -llcms -lintl -liconv $(CPPFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(PREFIX)/share/locale/\" +all: $(BUILD_DIR)/dcraw +$(BUILD_DIR)/dcraw: $(BUILD_DIR) + $(CC) -o $(BUILD_DIR)/dcraw $(CFLAGS) dcraw.c -ljpeg -llcms -lintl -liconv $(CPPFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(PREFIX)/share/locale/\" + +$(BUILD_DIR): + mkdir -p $(BUILD_DIR) + install: - install -s -m 755 dcraw $(DESTDIR)$(PREFIX)/bin + install -s -m 755 $(BUILD_DIR)/dcraw $(DESTDIR)$(PREFIX)/bin

1 0

[39649] trunk/dports/graphics/dcraw/Portfile
by ryandesign＠macports.org 27 Aug '08

27 Aug '08

Revision: 39649 http://trac.macosforge.org/projects/macports/changeset/39649 Author: ryandesign(a)macports.org Date: 2008-08-27 14:46:39 -0700 (Wed, 27 Aug 2008) Log Message: ----------- dcraw: build the message catalogs in the build phase, not the destroot phase Modified Paths: -------------- trunk/dports/graphics/dcraw/Portfile Modified: trunk/dports/graphics/dcraw/Portfile =================================================================== --- trunk/dports/graphics/dcraw/Portfile 2008-08-27 21:30:42 UTC (rev 39648) +++ trunk/dports/graphics/dcraw/Portfile 2008-08-27 21:46:39 UTC (rev 39649) @@ -34,6 +34,7 @@ post-extract { xinstall -W ${filespath} Makefile.in ${worksrcpath}/Makefile + xinstall -d ${worksrcpath}/build # Move "install" script; it conflicts with the destroot phase ("make install") move ${worksrcpath}/install ${worksrcpath}/install.sh } @@ -49,16 +50,26 @@ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile } +set my_locales {eo ru fr it de pt es zh_TW zh_CN nl pl hu ca cs sv} + +post-build { + foreach locale ${my_locales} { + if {[file exist ${worksrcpath}/dcraw_${locale}.po]} { + system "msgfmt -o ${worksrcpath}/build/dcraw_${locale}.mo ${worksrcpath}/dcraw_${locale}.po" + } + } +} + post-destroot { xinstall -m 644 -W ${worksrcpath} dcraw.1 ${destroot}${prefix}/share/man/man1 - foreach lang {eo ru fr it de pt es zh_TW zh_CN nl pl hu ca cs sv} { - if {[file exist ${worksrcpath}/dcraw_${lang}.1]} { - xinstall -m 755 -d ${destroot}${prefix}/share/man/${lang}/man1 - xinstall -m 644 -W ${worksrcpath} dcraw_${lang}.1 ${destroot}${prefix}/share/man/${lang}/man1/dcraw.1 + foreach locale ${my_locales} { + if {[file exist ${worksrcpath}/dcraw_${locale}.1]} { + xinstall -m 755 -d ${destroot}${prefix}/share/man/${locale}/man1 + xinstall -m 644 -W ${worksrcpath} dcraw_${locale}.1 ${destroot}${prefix}/share/man/${locale}/man1/dcraw.1 } - if {[file exist ${worksrcpath}/dcraw_${lang}.po]} { - xinstall -m 755 -d ${destroot}${prefix}/share/locale/${lang}/LC_MESSAGES - system "msgfmt -o ${destroot}${prefix}/share/locale/${lang}/LC_MESSAGES/dcraw.mo ${worksrcpath}/dcraw_${lang}.po" + if {[file exist ${worksrcpath}/build/dcraw_${locale}.mo]} { + xinstall -m 755 -d ${destroot}${prefix}/share/locale/${locale}/LC_MESSAGES + xinstall -m 644 -W ${worksrcpath}/build dcraw_${locale}.mo ${destroot}${prefix}/share/locale/${locale}/LC_MESSAGES/dcraw.mo } } }

1 0