diff -u --recursive --new-file pango-vanilla/Portfile pango/Portfile
old
|
new
|
|
6 | 6 | |
7 | 7 | name pango |
8 | 8 | conflicts pango-devel |
9 | | epoch 1 |
10 | | version 1.24.5 |
| 9 | set my_name pango |
| 10 | version 1.28.1 |
11 | 11 | set branch [join [lrange [split ${version} .] 0 1] .] |
12 | 12 | categories x11 |
13 | 13 | maintainers ryandesign |
14 | 14 | license LGPLv2 |
15 | 15 | homepage http://www.pango.org/ |
16 | | master_sites gnome:sources/pango/${branch} |
| 16 | master_sites gnome:sources/${my_name}/${branch} |
17 | 17 | platforms darwin |
| 18 | distname ${my_name}-${version} |
| 19 | dist_subdir ${my_name} |
18 | 20 | use_bzip2 yes |
19 | 21 | use_parallel_build yes |
20 | 22 | |
… |
… |
|
26 | 28 | open-source framework for the layout and rendering \ |
27 | 29 | of internationalized text. |
28 | 30 | |
29 | | checksums \ |
30 | | md5 815416a452e9cccc172fed9862401f37 \ |
31 | | sha1 a5aa40b78546a7ee59f21804b172e5d47ef776ad \ |
32 | | rmd160 7e436752734c55950ad5feced7c7d5c3f040a1b4 |
| 31 | checksums md5 bab5b4eb3fde6b0a5bfe98d25e668741 \ |
| 32 | sha1 2d5907f0ff108cb9c27f69d8e4de564ff3d30221 \ |
| 33 | rmd160 04531a54148a22dfcf7f3060501a0126f701ee18 |
33 | 34 | |
34 | 35 | depends_build \ |
35 | 36 | port:pkgconfig |
… |
… |
|
44 | 45 | lib/libcairo.dylib |
45 | 46 | |
46 | 47 | patchfiles \ |
47 | | patch-which.diff \ |
48 | | patch-ltmain.sh.diff \ |
49 | | patch-configure.diff |
| 48 | patch-ltmain.sh.diff |
50 | 49 | |
51 | 50 | configure.ccache no |
52 | 51 | |
… |
… |
|
57 | 56 | # itself differently depending on whether or not cairo is installed with |
58 | 57 | # the quartz variant. Therefore this variant is necessary to be able to |
59 | 58 | # distinguish whether an installed pango has quartz support or not. |
| 59 | |
| 60 | # pango 1.25.1 and up uses Core Text which is only available on 10.5+. |
| 61 | pre-extract { |
| 62 | if {${os.major} < 9} { |
| 63 | ui_error "${name} ${version} +quartz requires Mac OS X 10.5 or greater." |
| 64 | ui_error "Either don't use the +quartz variant or upgrade your Mac OS X." |
| 65 | ui_error "Concerns about this should be addressed to the Pango mailing list:" |
| 66 | ui_error "http://mail.gnome.org/mailman/listinfo/gtk-i18n-list" |
| 67 | return -code error "incompatible Mac OS X version" |
| 68 | } |
| 69 | } |
60 | 70 | } |
61 | 71 | } |
62 | 72 | |
… |
… |
|
102 | 112 | } |
103 | 113 | } |
104 | 114 | |
105 | | lappend merger_configure_args(ppc64) have_atsui=false |
106 | | lappend merger_configure_args(x86_64) have_atsui=false |
| 115 | lappend merger_configure_env(ppc64) ac_cv_header_Carbon_Carbon_h=no |
| 116 | lappend merger_configure_env(x86_64) ac_cv_header_Carbon_Carbon_h=no |
107 | 117 | |
108 | 118 | configure.cppflags-append \ |
109 | 119 | -no-cpp-precomp |
… |
… |
|
116 | 126 | --enable-static \ |
117 | 127 | --x-include=${prefix}/include --x-lib=${prefix}/lib |
118 | 128 | |
119 | | if {![variant_isset universal] && $build_arch == "x86_64" || $build_arch == "ppc64"} { |
120 | | configure.args-append have_atsui=false |
121 | | } |
122 | | |
123 | 129 | variant no_x11 { |
124 | 130 | depends_lib-delete \ |
125 | 131 | port:Xft2 |
… |
… |
|
152 | 158 | test.target check |
153 | 159 | |
154 | 160 | livecheck.type regex |
155 | | livecheck.url http://ftp.gnome.org/pub/GNOME/sources/${name}/${branch}/?C=M&O=D |
156 | | livecheck.regex ${name}-(\[0-9.\]+)\\.tar |
| 161 | livecheck.url http://ftp.gnome.org/pub/GNOME/sources/${my_name}/${branch}/?C=M&O=D |
| 162 | livecheck.regex ${my_name}-(\[0-9.\]+)\\.tar |
diff -u --recursive --new-file pango-vanilla/files/patch-configure.diff pango/files/patch-configure.diff
old
|
new
|
|
1 | | --- configure.orig 2009-07-21 06:59:52.000000000 +1000 |
2 | | +++ configure 2009-10-22 06:14:52.000000000 +1100 |
3 | | @@ -19806,12 +19806,14 @@ |
4 | | $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; } |
5 | | |
6 | | fi |
7 | | -if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then |
8 | | - have_atsui=true |
9 | | -else |
10 | | - have_atsui=false |
11 | | -fi |
12 | | |
13 | | +if test "x$have_atsui" = "x"; then |
14 | | + if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then |
15 | | + have_atsui=true |
16 | | + else |
17 | | + have_atsui=false |
18 | | + fi |
19 | | +fi |
20 | | |
21 | | |
22 | | # |
diff -u --recursive --new-file pango-vanilla/files/patch-which.diff pango/files/patch-which.diff
old
|
new
|
|
1 | | --- docs/Makefile.in.orig 2009-05-04 15:05:17.000000000 -0500 |
2 | | +++ docs/Makefile.in 2009-05-07 04:08:23.000000000 -0500 |
3 | | @@ -785,7 +785,7 @@ |
4 | | mv -f $${installdir}/$(DOC_MODULE).devhelp \ |
5 | | $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ |
6 | | fi; \ |
7 | | - ! which gtkdoc-rebase >/dev/null 2>&1 || \ |
8 | | + ! test -x "`which gtkdoc-rebase`" || \ |
9 | | gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ |
10 | | fi |
11 | | |
12 | | @@ -815,7 +815,7 @@ |
13 | | -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ |
14 | | -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ |
15 | | cd $(distdir) && rm -f $(DISTCLEANFILES) |
16 | | - ! which gtkdoc-rebase >/dev/null 2>&1 || \ |
17 | | + ! test -x "`which gtkdoc-rebase`" || \ |
18 | | gtkdoc-rebase --online --relative --html-dir=$(distdir)/html |
19 | | |
20 | | .PHONY : dist-hook-local docs |