diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-26 04:52:46 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-09-26 04:52:46 +0800 |
| commit | 45e847b467d31aab421043e3b630390cf635a667 (patch) | |
| tree | b3988c919bad4145fbecd7bfd00e9a3fc2ac89d1 /www/webkit-gtk2 | |
| parent | 377d306e8f3cabec701bdbcac5d1d59d0906d746 (diff) | |
| download | marcuscom-ports-45e847b467d31aab421043e3b630390cf635a667.tar.gz marcuscom-ports-45e847b467d31aab421043e3b630390cf635a667.tar.zst marcuscom-ports-45e847b467d31aab421043e3b630390cf635a667.zip | |
The reinplace was too greedy. Fix it with a patch.
Noticed by: marcus and pointyhat.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13022 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/webkit-gtk2')
| -rw-r--r-- | www/webkit-gtk2/Makefile | 13 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/extra-patch-libtool | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 802ab932c..cae225dd1 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.38 2009/09/23 17:49:59 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.39 2009/09/24 08:58:38 kwm Exp $ # PORTNAME= webkit @@ -41,6 +41,11 @@ CONFIGURE_ARGS= --enable-icon-database \ --enable-svg-fonts MAKEFILE= GNUmakefile +CONFIGURE_ARGS+=--with-unicode-backend=glib +# Select Unicode backend (WARNING: the glib-based +# backend is slow, and incomplete) default=icu +# --with-font-backend=[freetype/pango] + BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", @@ -65,7 +70,7 @@ CONFIGURE_ARGS+=--disable-debug CONFIGURE_ARGS+=--enable-static PLIST_SUB+= STATIC="" .else -CONFIGURE_ARGS+=--enable-static=no +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libtool PLIST_SUB+= STATIC="@comment " .endif @@ -74,9 +79,5 @@ post-patch: ${WRKSRC}/WebCore/plugins/PluginDatabase.cpp @${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' -.if !defined(WITH_STATIC) - @${REINPLACE_CMD} -e 's|build_old_libs=yes|build_old_libs=no|g' \ - ${WRKDIR}/gnome-libtool -.endif .include <bsd.port.post.mk> diff --git a/www/webkit-gtk2/files/extra-patch-libtool b/www/webkit-gtk2/files/extra-patch-libtool new file mode 100644 index 000000000..bb8c49bf9 --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-libtool @@ -0,0 +1,13 @@ +Manual tell our libtool not to build static libs. + +--- ../gnome-libtool.orig 2009-09-25 21:59:02.000000000 +0200 ++++ ../gnome-libtool 2009-09-25 21:59:52.000000000 +0200 +@@ -55,7 +55,7 @@ OBJDUMP=objdump + build_libtool_libs=yes + + # Whether or not to build static libraries. +-build_old_libs=yes ++build_old_libs=no + + # What type of objects to build. + pic_mode=default |