From f1be2f49d68bb309574d28b8006b3efdead46f4f Mon Sep 17 00:00:00 2001 From: landry Date: Thu, 30 Oct 2008 22:38:10 +0000 Subject: [PATCH] Update kazehakase to the just-released 0.5.6. Now that we have www/webkit in ports, split it into MULTI_PACKAGES : -main has the common infrastructure files (and the binary), -gecko provides gecko engine support, -webkit provides webkit engine support. To ease updates, -gecko has the same pkgname as previous package. -webkit support is still a bit experimental, and provided for webdevelopers who want to write and test cross-engine websites. With help and ok ajacoutot@ --- www/kazehakase/Makefile | 72 +++++++++++++------ www/kazehakase/distinfo | 10 +-- www/kazehakase/patches/patch-configure | 87 +++++++++++++++++++++-- www/kazehakase/pkg/{DESCR => DESCR-gecko} | 5 +- www/kazehakase/pkg/DESCR-main | 10 +++ www/kazehakase/pkg/DESCR-webkit | 10 +++ www/kazehakase/pkg/PFRAG.shared | 3 - www/kazehakase/pkg/PLIST-gecko | 5 ++ www/kazehakase/pkg/{PLIST => PLIST-main} | 9 ++- www/kazehakase/pkg/PLIST-webkit | 4 ++ 10 files changed, 174 insertions(+), 41 deletions(-) rename www/kazehakase/pkg/{DESCR => DESCR-gecko} (59%) create mode 100644 www/kazehakase/pkg/DESCR-main create mode 100644 www/kazehakase/pkg/DESCR-webkit delete mode 100644 www/kazehakase/pkg/PFRAG.shared create mode 100644 www/kazehakase/pkg/PLIST-gecko rename www/kazehakase/pkg/{PLIST => PLIST-main} (94%) create mode 100644 www/kazehakase/pkg/PLIST-webkit diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index cd2776817ca..2a5254a856e 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -1,12 +1,19 @@ -# $OpenBSD: Makefile,v 1.3 2008/06/08 16:05:23 landry Exp $ +# $OpenBSD: Makefile,v 1.4 2008/10/30 22:38:10 landry Exp $ -COMMENT= lightweight gecko-based web browser +COMMENT-main= common files for kazehakase +COMMENT-gecko= lightweight gecko-based web browser +COMMENT-webkit= kazehakase webkit backend CATEGORIES= www SHARED_LIBS= kazehakase 0.0 #.1.0 +SHARED_ONLY= Yes -DISTNAME= kazehakase-0.5.4 -MASTER_SITES= http://osdn.dl.sourceforge.jp/kazehakase/30219/ +VERSION= 0.5.6 +DISTNAME= kazehakase-${VERSION} +PKGNAME-main= kazehakase-common-${VERSION} +PKGNAME-gecko= ${DISTNAME} +PKGNAME-webkit= kazehakase-webkit-${VERSION} +MASTER_SITES= http://osdn.dl.sourceforge.jp/kazehakase/33533/ #doesn't work #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/} @@ -19,33 +26,52 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +MULTI_PACKAGES= -main -gecko -webkit + MODULES= devel/gettext \ textproc/intltool -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --with-gecko-engine=xulrunner \ - --disable-hyper-estraier \ - --without-ruby \ - --without-rgettext +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --with-gecko-engine=xulrunner \ + --disable-hyper-estraier \ + --without-ruby \ + --without-rgettext -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib/xulrunner" -USE_LIBTOOL= Yes +CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib/xulrunner" +USE_LIBTOOL = Yes -FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples +FAKE_FLAGS = sysconfdir=${TRUEPREFIX}/share/examples -BUILD_DEPENDS= :xulrunner-devel->=1.8:devel/xulrunner,-devel +BUILD_DEPENDS-gecko = :xulrunner-devel->=1.8:devel/xulrunner,-devel -RUN_DEPENDS= ::devel/desktop-file-utils +RUN_DEPENDS-main = ${RUN_DEPENDS} \ + ::devel/desktop-file-utils +RUN_DEPENDS-webkit = ${RUN_DEPENDS} \ + ::${BUILD_PKGPATH},-common +RUN_DEPENDS-gecko = ${RUN_DEPENDS} \ + ::${BUILD_PKGPATH},-common -LIB_DEPENDS= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \ - xulrunner/xpcom:xulrunner->=1.8:devel/xulrunner \ - gnutls.>=13::security/gnutls +LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 -WANTLIB= ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \ - Xrandr Xrender Xcomposite Xdamage c expat fontconfig \ - freetype m pthread gpg-error gcrypt z png cairo \ - atk-1.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ - pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread \ - glitz nspr4 plc4 plds4 pcre pixman-1 +LIB_DEPENDS-main = ${LIB_DEPENDS} \ + gnutls::security/gnutls + +LIB_DEPENDS-gecko = ${LIB_DEPENDS-common} \ + lib/kazehakase/kazehakase::www/kazehakase,-main \ + xulrunner/xpcom:xulrunner->=1.8:devel/xulrunner + +LIB_DEPENDS-webkit = ${LIB_DEPENDS} \ + webkit-1.0::www/webkit + +WANTLIB = ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \ + Xrandr Xrender Xcomposite Xdamage expat fontconfig \ + freetype m z png cairo iconv intl atk-1.0 glib-2.0 \ + gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 \ + pangocairo-1.0 pangoft2-1.0 glitz pcre pixman-1 + +WANTLIB-main = ${WANTLIB} c gcrypt gpg-error pthread +WANTLIB-gecko = ${WANTLIB} nspr4 plc4 plds4 gcrypt gpg-error +WANTLIB-webkit = ${WANTLIB} Xt crypto curl icudata icui18n icuuc idn \ + jpeg pthread sqlite3 ssl xml2 xslt .include diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo index 2fb647fa7dd..23c031b17f6 100644 --- a/www/kazehakase/distinfo +++ b/www/kazehakase/distinfo @@ -1,5 +1,5 @@ -MD5 (kazehakase-0.5.4.tar.gz) = dfivud30STw6H7TrOKBE3w== -RMD160 (kazehakase-0.5.4.tar.gz) = hfQaOV4B1rEcPCTz2MpXa+IF0wg= -SHA1 (kazehakase-0.5.4.tar.gz) = DtsInIrz7AS/GiyboQcJannYwBQ= -SHA256 (kazehakase-0.5.4.tar.gz) = zmrmGDLYMkKymHIb5i/PphoEbYwWoAwtIkyRafrlFBY= -SIZE (kazehakase-0.5.4.tar.gz) = 1403194 +MD5 (kazehakase-0.5.6.tar.gz) = uIJXqhDdU/1dOcYn+PlYkA== +RMD160 (kazehakase-0.5.6.tar.gz) = SExuIIi20UkbBS6EVYS4IORHOYM= +SHA1 (kazehakase-0.5.6.tar.gz) = oR4T0FliiE9vTpTrghXoXEhHlgw= +SHA256 (kazehakase-0.5.6.tar.gz) = +3QHlS7lAxpmMY38fpxO5r/+JbaCQ1TOAqj7VAzL+So= +SIZE (kazehakase-0.5.6.tar.gz) = 1405935 diff --git a/www/kazehakase/patches/patch-configure b/www/kazehakase/patches/patch-configure index 22aaeecdede..84a60918176 100644 --- a/www/kazehakase/patches/patch-configure +++ b/www/kazehakase/patches/patch-configure @@ -1,7 +1,86 @@ -$OpenBSD: patch-configure,v 1.3 2008/06/08 16:05:23 landry Exp $ ---- configure.orig Sat Mar 29 09:20:56 2008 -+++ configure Wed Apr 2 17:12:20 2008 -@@ -31100,13 +31100,7 @@ done +$OpenBSD: patch-configure,v 1.4 2008/10/30 22:38:10 landry Exp $ +--- configure.orig Tue Oct 28 16:09:40 2008 ++++ configure Thu Oct 30 22:43:13 2008 +@@ -29071,78 +29071,6 @@ fi + + + anthy_exists=no +- +-pkg_failed=no +-{ echo "$as_me:$LINENO: checking for ANTHY" >&5 +-echo $ECHO_N "checking for ANTHY... $ECHO_C" >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$ANTHY_CFLAGS"; then +- pkg_cv_ANTHY_CFLAGS="$ANTHY_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"anthy\"") >&5 +- ($PKG_CONFIG --exists --print-errors "anthy") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_ANTHY_CFLAGS=`$PKG_CONFIG --cflags "anthy" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$ANTHY_LIBS"; then +- pkg_cv_ANTHY_LIBS="$ANTHY_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"anthy\"") >&5 +- ($PKG_CONFIG --exists --print-errors "anthy") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_ANTHY_LIBS=`$PKG_CONFIG --libs "anthy" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- ANTHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "anthy"` +- else +- ANTHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "anthy"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$ANTHY_PKG_ERRORS" >&5 +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- anthy_exists=no +-elif test $pkg_failed = untried; then +- anthy_exists=no +-else +- ANTHY_CFLAGS=$pkg_cv_ANTHY_CFLAGS +- ANTHY_LIBS=$pkg_cv_ANTHY_LIBS +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- anthy_exists=yes +-fi +- + # Extract the first word of "mecab-config", so it can be a program name with args. + set dummy mecab-config; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -31100,13 +31028,7 @@ done sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "rgettext":C) diff --git a/www/kazehakase/pkg/DESCR b/www/kazehakase/pkg/DESCR-gecko similarity index 59% rename from www/kazehakase/pkg/DESCR rename to www/kazehakase/pkg/DESCR-gecko index 6f7f39792de..e7ca1518f80 100644 --- a/www/kazehakase/pkg/DESCR +++ b/www/kazehakase/pkg/DESCR-gecko @@ -1,7 +1,10 @@ -Kazehakase is a web browser using gecko engine, it features: +Kazehakase is a Gtk2-base web browser, it features: +* Gecko or webkit engine support * Tabbed browsing * Session saving * Remote bookmark (e.g. RSS) in menu or sidebar * Variable UI (menus, toolbar etc.) on user level * Customizable mouse gestures * Customizable key accelerator + +This package provides gecko engine support. diff --git a/www/kazehakase/pkg/DESCR-main b/www/kazehakase/pkg/DESCR-main new file mode 100644 index 00000000000..187df2a9e90 --- /dev/null +++ b/www/kazehakase/pkg/DESCR-main @@ -0,0 +1,10 @@ +Kazehakase is a Gtk2-base web browser, it features: +* Gecko or webkit engine support +* Tabbed browsing +* Session saving +* Remote bookmark (e.g. RSS) in menu or sidebar +* Variable UI (menus, toolbar etc.) on user level +* Customizable mouse gestures +* Customizable key accelerator + +This package provides common infrastructure files. diff --git a/www/kazehakase/pkg/DESCR-webkit b/www/kazehakase/pkg/DESCR-webkit new file mode 100644 index 00000000000..c22ce5736bb --- /dev/null +++ b/www/kazehakase/pkg/DESCR-webkit @@ -0,0 +1,10 @@ +Kazehakase is a Gtk2-base web browser, it features: +* Gecko or webkit engine support +* Tabbed browsing +* Session saving +* Remote bookmark (e.g. RSS) in menu or sidebar +* Variable UI (menus, toolbar etc.) on user level +* Customizable mouse gestures +* Customizable key accelerator + +This package provides webkit engine support. diff --git a/www/kazehakase/pkg/PFRAG.shared b/www/kazehakase/pkg/PFRAG.shared deleted file mode 100644 index a488b2575ab..00000000000 --- a/www/kazehakase/pkg/PFRAG.shared +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/01/11 14:47:28 landry Exp $ -lib/kazehakase/embed/gecko.so -@lib lib/kazehakase/libkazehakase.so.${LIBkazehakase_VERSION} diff --git a/www/kazehakase/pkg/PLIST-gecko b/www/kazehakase/pkg/PLIST-gecko new file mode 100644 index 00000000000..4448431c407 --- /dev/null +++ b/www/kazehakase/pkg/PLIST-gecko @@ -0,0 +1,5 @@ +@comment $OpenBSD: PLIST-gecko,v 1.1 2008/10/30 22:38:11 landry Exp $ +lib/kazehakase/embed/ +lib/kazehakase/embed/gecko.a +lib/kazehakase/embed/gecko.la +lib/kazehakase/embed/gecko.so diff --git a/www/kazehakase/pkg/PLIST b/www/kazehakase/pkg/PLIST-main similarity index 94% rename from www/kazehakase/pkg/PLIST rename to www/kazehakase/pkg/PLIST-main index d27667d1c6a..6318c98a6b4 100644 --- a/www/kazehakase/pkg/PLIST +++ b/www/kazehakase/pkg/PLIST-main @@ -1,12 +1,11 @@ -@comment $OpenBSD: PLIST,v 1.3 2008/06/08 16:05:23 landry Exp $ -%%SHARED%% -bin/kazehakase +@comment $OpenBSD: PLIST-main,v 1.1 2008/10/30 22:38:11 landry Exp $ +@conflict kazehakase-<=0.5.4 +@bin bin/kazehakase lib/kazehakase/ lib/kazehakase/embed/ -lib/kazehakase/embed/gecko.a -lib/kazehakase/embed/gecko.la lib/kazehakase/libkazehakase.a lib/kazehakase/libkazehakase.la +@lib lib/kazehakase/libkazehakase.so.${LIBkazehakase_VERSION} lib/kazehakase/search/ @man man/man1/kazehakase.1 share/applications/kazehakase.desktop diff --git a/www/kazehakase/pkg/PLIST-webkit b/www/kazehakase/pkg/PLIST-webkit new file mode 100644 index 00000000000..25ce517a3c6 --- /dev/null +++ b/www/kazehakase/pkg/PLIST-webkit @@ -0,0 +1,4 @@ +@comment $OpenBSD: PLIST-webkit,v 1.1 2008/10/30 22:38:11 landry Exp $ +lib/kazehakase/embed/webkit_gtk.a +lib/kazehakase/embed/webkit_gtk.la +lib/kazehakase/embed/webkit_gtk.so