Revision: 98328 http://trac.macports.org//changeset/98328 Author: ryandesign@macports.org Date: 2012-10-02 18:31:44 -0700 (Tue, 02 Oct 2012) Log Message: ----------- cgit: update to 0.9.0.3 using git to 1.7.4; ensure we're UsingTheRightCompiler and -arch flags; add universal variant; use the right web user on Leopard and up Modified Paths: -------------- trunk/dports/www/cgit/Portfile Modified: trunk/dports/www/cgit/Portfile =================================================================== --- trunk/dports/www/cgit/Portfile 2012-10-03 01:19:00 UTC (rev 98327) +++ trunk/dports/www/cgit/Portfile 2012-10-03 01:31:44 UTC (rev 98328) @@ -4,9 +4,8 @@ PortSystem 1.0 name cgit -version 0.8.2.1 -revision 1 -set git-version 1.6.3 +version 0.9.0.3 +set git_version 1.7.4 categories www devel maintainers sfiera openmaintainer description A fast web interface for the git source code management system @@ -20,19 +19,18 @@ CGI-capable web server. use_bzip2 yes -set cgit-dist ${distfiles} -set git-dist [suffix git-${git-version}] -distfiles ${cgit-dist}:cgit ${git-dist}:git +set cgit_distfile ${distfiles} +set git_distname git-${git_version} +set git_distfile [suffix ${git_distname}] +distfiles ${cgit_distfile}:cgit ${git_distfile}:git master_sites ${homepage}snapshot:cgit \ http://www.kernel.org/pub/software/scm/git:git -checksums ${cgit-dist} \ - md5 33e56f0621e53327f89233c7ccb7d8be \ - sha1 1c40de81530a3c0513bc963cc81f14685448f6f9 \ - rmd160 2e83250130aa1d4f087c853567c794b58a24368c \ - ${git-dist} \ - md5 a5e6165506cddd94954277cf81f44b14 \ - sha1 1dab1068d1886828bdb512e9b809bc779de35609 \ - rmd160 b496878b113ae8d13d2eaa1b65e4dd2d8e72834d +checksums ${cgit_distfile} \ + rmd160 a426468889aff48a19849acd01c9660b37cb0c0f \ + sha256 53ccf0c826f91c2184ec29b1b9ab8a6f42e0ef2e6fa9042c3759e2a2dc81baa5 \ + ${git_distfile} \ + rmd160 a064d7a5b2d3fae6171ca91a03082eb46d7bb9b7 \ + sha256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51 depends_lib port:git-core \ port:openssl \ @@ -40,27 +38,41 @@ port:libiconv post-extract { - file delete ${worksrcpath}/git - file rename ${worksrcpath}/../git-${git-version} ${worksrcpath}/git + delete ${worksrcpath}/git + move ${workpath}/${git_distname} ${worksrcpath}/git } post-patch { file copy ${filespath}/cgit.conf ${worksrcpath}/cgit.conf reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cgit.conf - reinplace "s|@GIT_VER@|${git-version}|g" ${worksrcpath}/cgit.conf + reinplace "s|@GIT_VER@|${git_version}|g" ${worksrcpath}/cgit.conf } +set user _www +set group _www + +if {${os.platform} == "darwin" && ${os.major} <= 8} { + set user www + set group www +} + post-destroot { xinstall -m 444 ${worksrcpath}/cgitrc.5.txt ${destroot}${prefix}/etc/cgitrc.sample - xinstall -m 700 -o www -g www -d ${destroot}${prefix}/var/cache/cgit + xinstall -m 700 -o ${user} -g ${group} -d ${destroot}${prefix}/var/cache/cgit destroot.keepdirs ${destroot}${prefix}/var/cache/cgit } use_configure no +variant universal {} configure.ldflags-append -liconv -build.env CFLAGS="${configure.cflags}" LDFLAGS="${configure.ldflags}" -destroot.env CFLAGS="${configure.cflags}" LDFLAGS="${configure.ldflags}" +build.args CC="${configure.cc} [get_canonical_archflags cc]" +build.env CFLAGS="${configure.cflags}" \ + LDFLAGS="${configure.ldflags}" + +eval destroot.args ${build.args} +eval destroot.env ${build.env} + livecheck.type regex livecheck.url ${homepage}log/?h=stable livecheck.regex {>v([0-9.]+)<}