[Midnightbsd-cvs] mports: www/epiphany: update to 2.22.2

crash at midnightbsd.org crash at midnightbsd.org
Sat Jun 7 09:10:04 EDT 2008


Log Message:
-----------
update to 2.22.2

Modified Files:
--------------
    mports/www/epiphany:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.2 -> r1.3)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/epiphany/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/epiphany/pkg-plist -L www/epiphany/pkg-plist -u -r1.2 -r1.3
--- www/epiphany/pkg-plist
+++ www/epiphany/pkg-plist
@@ -1,12 +1,14 @@
 bin/epiphany
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-base-embed.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dbus.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-container.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h
@@ -14,9 +16,11 @@
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-single.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-utils.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extension.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history-item.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-link.h
@@ -30,11 +34,13 @@
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-shell.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h
-include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-tab.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-version.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-utils.h
+include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history-item.h
 include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h
-lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
-lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
+%%GECKO%%lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
+%%GECKO%%lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
 libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
@@ -43,7 +49,6 @@
 %%DOCSDIR%%/EphyCommandManager.html
 %%DOCSDIR%%/EphyEmbed.html
 %%DOCSDIR%%/EphyNodeDb.html
-%%DOCSDIR%%/EphyTab.html
 %%DOCSDIR%%/EphyWindow.html
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
@@ -67,9 +72,10 @@
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
 %%DATADIR%%/about.ini
+%%DATADIR%%/chrome/app-chrome.manifest
 %%DATADIR%%/chrome/branding/brand.dtd
 %%DATADIR%%/chrome/branding/brand.properties
-%%DATADIR%%/chrome/epiphany.manifest
+%%DATADIR%%/chrome/app-chrome.manifest
 %%DATADIR%%/chrome/global/about.xhtml
 %%DATADIR%%/default-prefs.js
 %%DATADIR%%/ephy-xml2ini.xsl
@@ -220,6 +226,7 @@
 share/icons/hicolor/scalable/apps/gnome-web-browser.svg
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
+share/locale/as/LC_MESSAGES/epiphany.mo
 share/locale/az/LC_MESSAGES/epiphany.mo
 share/locale/be/LC_MESSAGES/epiphany.mo
 share/locale/be at latin/LC_MESSAGES/epiphany.mo
@@ -254,6 +261,7 @@
 share/locale/it/LC_MESSAGES/epiphany.mo
 share/locale/ja/LC_MESSAGES/epiphany.mo
 share/locale/ka/LC_MESSAGES/epiphany.mo
+share/locale/kn/LC_MESSAGES/epiphany.mo
 share/locale/ko/LC_MESSAGES/epiphany.mo
 share/locale/ku/LC_MESSAGES/epiphany.mo
 share/locale/li/LC_MESSAGES/epiphany.mo
@@ -292,8 +300,6 @@
 share/locale/tk/LC_MESSAGES/epiphany.mo
 share/locale/tr/LC_MESSAGES/epiphany.mo
 share/locale/uk/LC_MESSAGES/epiphany.mo
-share/locale/uz/LC_MESSAGES/epiphany.mo
-share/locale/uz at cyrillic/LC_MESSAGES/epiphany.mo
 share/locale/vi/LC_MESSAGES/epiphany.mo
 share/locale/wa/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
@@ -318,6 +324,9 @@
 share/omf/epiphany/epiphany-uk.omf
 share/pygtk/2.0/defs/epiphany.defs
 @dirrm share/omf/epiphany
+ at dirrmtry share/icons/LowContrastLargePrint/48x48/apps
+ at dirrmtry share/icons/LowContrastLargePrint/48x48
+ at dirrmtry share/icons/LowContrastLargePrint
 @dirrm share/gnome/help/epiphany/uk/figures
 @dirrm share/gnome/help/epiphany/uk
 @dirrm share/gnome/help/epiphany/sv/figures
@@ -353,38 +362,39 @@
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
- at dirrm %%DATADIR%%/icons/hicolor/scalable/status
- at dirrm %%DATADIR%%/icons/hicolor/scalable/actions
- at dirrm %%DATADIR%%/icons/hicolor/scalable
- at dirrm %%DATADIR%%/icons/hicolor/48x48/status
- at dirrm %%DATADIR%%/icons/hicolor/48x48
- at dirrm %%DATADIR%%/icons/hicolor/32x32/status
- at dirrm %%DATADIR%%/icons/hicolor/32x32/actions
- at dirrm %%DATADIR%%/icons/hicolor/32x32
- at dirrm %%DATADIR%%/icons/hicolor/24x24/status
- at dirrm %%DATADIR%%/icons/hicolor/24x24/places
- at dirrm %%DATADIR%%/icons/hicolor/24x24/actions
- at dirrm %%DATADIR%%/icons/hicolor/24x24
- at dirrm %%DATADIR%%/icons/hicolor/22x22/status
- at dirrm %%DATADIR%%/icons/hicolor/22x22/places
- at dirrm %%DATADIR%%/icons/hicolor/22x22/actions
- at dirrm %%DATADIR%%/icons/hicolor/22x22
- at dirrm %%DATADIR%%/icons/hicolor/16x16/status
- at dirrm %%DATADIR%%/icons/hicolor/16x16/places
- at dirrm %%DATADIR%%/icons/hicolor/16x16/actions
- at dirrm %%DATADIR%%/icons/hicolor/16x16
- at dirrm %%DATADIR%%/icons/hicolor
- at dirrm %%DATADIR%%/icons
+ at dirrmtry %%DATADIR%%/icons/hicolor/scalable/status
+ at dirrmtry %%DATADIR%%/icons/hicolor/scalable/actions
+ at dirrmtry %%DATADIR%%/icons/hicolor/scalable
+ at dirrmtry %%DATADIR%%/icons/hicolor/48x48/status
+ at dirrmtry %%DATADIR%%/icons/hicolor/48x48
+ at dirrmtry %%DATADIR%%/icons/hicolor/32x32/status
+ at dirrmtry %%DATADIR%%/icons/hicolor/32x32/actions
+ at dirrmtry %%DATADIR%%/icons/hicolor/32x32
+ at dirrmtry %%DATADIR%%/icons/hicolor/24x24/status
+ at dirrmtry %%DATADIR%%/icons/hicolor/24x24/places
+ at dirrmtry %%DATADIR%%/icons/hicolor/24x24/actions
+ at dirrmtry %%DATADIR%%/icons/hicolor/24x24
+ at dirrmtry %%DATADIR%%/icons/hicolor/22x22/status
+ at dirrmtry %%DATADIR%%/icons/hicolor/22x22/places
+ at dirrmtry %%DATADIR%%/icons/hicolor/22x22/actions
+ at dirrmtry %%DATADIR%%/icons/hicolor/22x22
+ at dirrmtry %%DATADIR%%/icons/hicolor/16x16/status
+ at dirrmtry %%DATADIR%%/icons/hicolor/16x16/places
+ at dirrmtry %%DATADIR%%/icons/hicolor/16x16/actions
+ at dirrmtry %%DATADIR%%/icons/hicolor/16x16
+ at dirrmtry %%DATADIR%%/icons/hicolor
+ at dirrmtry %%DATADIR%%/icons
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/chrome/global
 @dirrm %%DATADIR%%/chrome/branding
 @dirrm %%DATADIR%%/chrome
 @dirrm %%DATADIR%%/art
- at dirrm %%DATADIR%%
+ at dirrmtry %%DATADIR%%
 @dirrm %%DOCSDIR%%
- at dirrm lib/epiphany/%%EPHY_VERSION%%/plugins
- at dirrm lib/epiphany/%%EPHY_VERSION%%
- at dirrm lib/epiphany
+ at dirrmtry share/applications
+ at dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
+ at dirrmtry lib/epiphany/%%EPHY_VERSION%%
+ at dirrmtry lib/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%
 @dirrm include/epiphany
@@ -392,8 +402,6 @@
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/uz at cyrillic/LC_MESSAGES
- at dirrmtry share/locale/uz at cyrillic
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
@@ -416,4 +424,5 @@
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be at latin/LC_MESSAGES
 @dirrmtry share/locale/be at latin
- at dirrmtry share/applications
+ at dirrmtry share/locale/as/LC_MESSAGES
+ at dirrmtry share/locale/as
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/epiphany/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L www/epiphany/Makefile -L www/epiphany/Makefile -u -r1.3 -r1.4
--- www/epiphany/Makefile
+++ www/epiphany/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.2
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +18,8 @@
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+                notify.1:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
     		${LOCALBASE}/share/themes/LowContrast/index.theme:${PORTSDIR}/x11-themes/gnome-themes
 
@@ -26,18 +27,15 @@
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_PYTHON=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GECKO=	firefox seamonkey firefox15<->firefox xulrunner
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--with-gecko=${GECKO}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}"  \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS} " 
 
 GCONF_SCHEMAS=	epiphany-lockdown.schemas epiphany.schemas \
 		epiphany-fonts.schemas epiphany-pango.schemas
@@ -55,8 +53,24 @@
 .endif
 
 .include <bsd.port.pre.mk>
+
+.if defined(EPHY_SLAVE) && ${EPHY_SLAVE}=="webkit"
+LIB_DEPENDS+=	WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+=	--with-engine=webkit
+EXTRA_CFLAGS+=	`pkg-config --cflags WebKitGtk` 
+-I${LOCALBASE}/include/WebKit/webkit
+EXTRA_LIBS+=	`pkg-config --libs WebKitGtk`
+CONFLICTS=	epiphany-[1-9]*
+PLIST_SUB+=	GECKO="@comment "
+.else
+USE_GECKO+=	firefox xulrunner
+CONFIGURE_ARGS+=	--with-gecko=${GECKO} \
+			--with-engine=mozilla
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-#.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+CONFLICTS=	epiphany-webkit-[1-9]*
+PLIST_SUB+=	GECKO=""
+.endif
+
 
 NO_WERROR=	yes
 # allow build with more warnings enabled
@@ -81,6 +95,7 @@
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|WebKitGdk|WebKitGtk|' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
@@ -88,6 +103,7 @@
 	@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
 		${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
 
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
 		${PREFIX}/etc/gconf/schemas
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/epiphany/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/epiphany/distinfo -L www/epiphany/distinfo -u -r1.2 -r1.3
--- www/epiphany/distinfo
+++ www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.20.3.tar.bz2) = df2861b3e91bef6d365f50187b6170cb
-SHA256 (gnome2/epiphany-2.20.3.tar.bz2) = a76268f0b842b9f9f2545717273062aeba84351208110064da55f3fe5277a9ca
-SIZE (gnome2/epiphany-2.20.3.tar.bz2) = 4945544
+MD5 (gnome2/epiphany-2.22.2.tar.bz2) = f90dc0a01dae58dfa393b17bce717d3c
+SHA256 (gnome2/epiphany-2.22.2.tar.bz2) = be9c9a5bf83f9862dd84c8c31b6a82d11e466812b800bb94f2ba6c12cb0df2d0
+SIZE (gnome2/epiphany-2.22.2.tar.bz2) = 5183641


More information about the Midnightbsd-cvs mailing list