diff options
Diffstat (limited to 'www')
50 files changed, 998 insertions, 1548 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index b7a10ade7905..815f6f168152 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -6,11 +6,10 @@ # PORTNAME= epiphany -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.4.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.4 PKGNAMESUFFIX= -extensions DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,8 +25,6 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany \ MOZILLA= mozilla HEADERS_SUFX= -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.7" - .if !defined(WITH_MOZILLA) MOZILLA= mozilla HEADERS_SUFX= @@ -35,7 +32,6 @@ HEADERS_SUFX= .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= mozilla-devel HEADERS_SUFX= -devel -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a2" .else MOZILLA= mozilla HEADERS_SUFX= @@ -49,8 +45,9 @@ USE_LIBTOOL_VER=15 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --with-extensions="all" \ - ${MOZ_CONFIGURE_ARGS} +CONFIGURE_ARGS= --with-extensions="all" + +PLIST_SUB= VERSION="1.4" .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_OPENSP @@ -66,7 +63,7 @@ WITH_OPENSP= yes .if defined(WITH_OPENSP) CONFIGURE_ARGS+= --enable-opensp=yes .else -CONFIGURE_ARGS+= --enable-opensp=no +CONFIGURE_ARGS+= --disable-opensp .endif pre-everything:: @@ -81,6 +78,11 @@ pre-everything:: @${ECHO_MSG} "" post-patch: - @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ + s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g; \ + s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g; \ + s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 914d6098ba1c..b1833f468326 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/epiphany-extensions-1.0.tar.bz2) = 8be057ef7a37b10bdd3a3cc1df818f3a -SIZE (gnome2/epiphany-extensions-1.0.tar.bz2) = 392615 +MD5 (gnome2/epiphany-extensions-1.4.2.tar.bz2) = da502f0f0ba3c572b2aa2108b38281af +SIZE (gnome2/epiphany-extensions-1.4.2.tar.bz2) = 457118 diff --git a/www/epiphany-extensions/files/patch-configure b/www/epiphany-extensions/files/patch-configure index 3d1a72f41af7..2611517cb8d4 100644 --- a/www/epiphany-extensions/files/patch-configure +++ b/www/epiphany-extensions/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Mon Feb 2 01:47:03 2004 -+++ configure Mon Feb 2 01:47:33 2004 +--- configure.orig Wed Jul 7 14:09:38 2004 ++++ configure Wed Jul 7 14:10:16 2004 @@ -22050,6 +22050,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10,4 +10,4 @@ + HAVE_OPENSP_FALSE= fi - + diff --git a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp deleted file mode 100644 index ffc2b645db0f..000000000000 --- a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- extensions/popup-blocker/mozilla/mozilla-helpers.cpp.orig Mon Mar 15 17:07:05 2004 -+++ extensions/popup-blocker/mozilla/mozilla-helpers.cpp Mon Jul 19 20:33:33 2004 -@@ -65,12 +65,16 @@ - nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface (domWindow, &rv)); - NS_ENSURE_SUCCESS (rv, NULL); - -+#if MOZILLA_SNAPSHOT < 18 - nsCOMPtr<nsIChromeEventHandler> chromeHandler; - rv = piWin->GetChromeEventHandler (getter_AddRefs (chromeHandler)); - NS_ENSURE_SUCCESS (rv, NULL); -+#endif - - nsCOMPtr<nsIDOMEventReceiver> eventReceiver; -+#if MOZILLA_SNAPSHOT < 18 - eventReceiver = do_QueryInterface (chromeHandler, &rv); -+#endif - NS_ENSURE_SUCCESS (rv, NULL); - - nsCOMPtr<nsIDOMEventTarget> target; -@@ -181,7 +185,11 @@ - g_free (script); - - PRBool isUndefined; -+#if MOZILLA_SNAPSHOT < 18 - nsAutoString ret; -+#else -+ nsAString *ret; -+#endif - context->EvaluateString (aScript, nsnull, nsnull, nsnull, 0, - nsnull, ret, &isUndefined); - diff --git a/www/epiphany-extensions/files/patch-extensions_smart-bookmarks_mozilla_Makefile.in b/www/epiphany-extensions/files/patch-extensions_smart-bookmarks_mozilla_Makefile.in new file mode 100644 index 000000000000..f155cba320cb --- /dev/null +++ b/www/epiphany-extensions/files/patch-extensions_smart-bookmarks_mozilla_Makefile.in @@ -0,0 +1,10 @@ +--- extensions/smart-bookmarks/mozilla/Makefile.in.orig Mon Sep 13 18:11:00 2004 ++++ extensions/smart-bookmarks/mozilla/Makefile.in Mon Sep 13 18:12:30 2004 +@@ -218,6 +218,7 @@ + -I$(MOZILLA_INCLUDE_ROOT)/content \ + -I$(MOZILLA_INCLUDE_ROOT)/docshell \ + -I$(MOZILLA_INCLUDE_ROOT)/dom \ ++ -I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \ + -I$(MOZILLA_INCLUDE_ROOT)/xpcom \ + -I$(MOZILLA_INCLUDE_ROOT) \ + $(EPIPHANY_DEPENDENCY_CFLAGS) \ diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index 4416b5296e6b..694b55312ee1 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -1,55 +1,72 @@ -lib/epiphany/extensions/libcertificatesextension.a -lib/epiphany/extensions/libcertificatesextension.so -lib/epiphany/extensions/libcertificatesextension.so.0 -lib/epiphany/extensions/libdashboardextension.a -lib/epiphany/extensions/libdashboardextension.so -lib/epiphany/extensions/libdashboardextension.so.0 -lib/epiphany/extensions/liberrorviewerextension.a -lib/epiphany/extensions/liberrorviewerextension.so -lib/epiphany/extensions/liberrorviewerextension.so.0 -lib/epiphany/extensions/libgesturesextension.a -lib/epiphany/extensions/libgesturesextension.so -lib/epiphany/extensions/libgesturesextension.so.0 -lib/epiphany/extensions/libpopupblockerextension.a -lib/epiphany/extensions/libpopupblockerextension.so -lib/epiphany/extensions/libpopupblockerextension.so.0 -lib/epiphany/extensions/libtabsmenuextension.a -lib/epiphany/extensions/libtabsmenuextension.so -lib/epiphany/extensions/libtabsmenuextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.a +lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so +lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libdashboardextension.a +lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so +lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so.0 +lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.a +lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so +lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libgesturesextension.a +lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so +lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.a +lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so +lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.a +lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so +lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libsidebarextension.a +lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so +lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.a +lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so +lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.a +lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so +lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.a +lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so +lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so.0 share/gnome/epiphany-extensions/ephy-gestures.xml share/gnome/epiphany-extensions/glade/error-viewer.glade -share/gnome/epiphany-extensions/icons/popup-blocker.svg -share/locale/bg/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/ca/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/cs/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/da/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/de/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/el/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/es/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/fr/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/hr/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/hu/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/it/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/ja/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/lt/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/nl/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/no/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pa/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pl/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pt/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/ru/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sk/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sq/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sr/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/sv/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/uk/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/wa/LC_MESSAGES/epiphany-extensions-1.0.mo -share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-1.0.mo -@dirrm share/gnome/epiphany-extensions/icons +share/gnome/epiphany-extensions/glade/page-info.glade +share/gnome/epiphany-extensions/glade/smart-bookmarks.glade +share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml +share/gnome/epiphany-extensions/xml/page-info-context-ui.xml +share/locale/bg/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/wa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +@dirrm share/gnome/epiphany-extensions/xml @dirrm share/gnome/epiphany-extensions/glade @dirrm share/gnome/epiphany-extensions -@dirrm lib/epiphany/extensions -@dirrm lib/epiphany +@dirrm lib/epiphany-%%VERSION%%/extensions +@dirrm lib/epiphany-%%VERSION%% diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index cebc7e3d8fe4..76797e5c5255 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -6,10 +6,10 @@ # PORTNAME= epiphany -PORTVERSION= 1.2.8 +PORTVERSION= 1.4.4 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -36,8 +36,7 @@ HEADERS_SUFX= USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui -WANT_GNOME= yes +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui desktopfileutils USE_LIBTOOL_VER=15 USE_GMAKE= yes USE_REINPLACE= yes @@ -46,26 +45,13 @@ CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUF CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas + FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1 PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_GNOME -.undef WITHOUT_ALL -WITH_GNOME= yes -.endif - .include <bsd.port.pre.mk> -.if ${HAVE_GNOME:Mnautilus2}!="" -USE_GNOME+= nautilus2 -CONFIGURE_ARGS+= --enable-nautilus-view -PLIST_SUB+= NAUTILUS="" -.else -CONFIGURE_ARGS+= --enable-nautilus-view=no -PLIST_SUB+= NAUTILUS="@comment " -.endif - .if ${OSVERSION} > 500000 # Galeon does not build correctly in -CURRENT if -Werror is passed # to the compiler. @@ -85,21 +71,29 @@ pre-everything:: @${ECHO_MSG} "" post-patch: - @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ - s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \ + s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g ; \ + s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \ + s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \ + ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' post-configure: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g ; \ s|%%MOZILLA%%|${MOZILLA}|g ; \ - s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/epiphany + s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' <${FILESDIR}/epiphany \ + > ${WRKDIR}/epiphany pre-install: @-${X11BASE}/bin/gconftool-2 --shutdown +post-install: + @${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin + ${INSTALL_SCRIPT} ${WRKDIR}/epiphany ${PREFIX}/bin + .include <bsd.port.post.mk> diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 8224bfd17032..2006f639245d 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/epiphany-1.2.8.tar.bz2) = 19d80db940f722b890dd439038743f83 -SIZE (gnome2/epiphany-1.2.8.tar.bz2) = 2979211 +MD5 (gnome2/epiphany-1.4.4.tar.bz2) = 2d29074c577dd42706c923df21a9a5bf +SIZE (gnome2/epiphany-1.4.4.tar.bz2) = 3355896 diff --git a/www/epiphany/files/epiphany b/www/epiphany/files/epiphany new file mode 100644 index 000000000000..504fd02402ce --- /dev/null +++ b/www/epiphany/files/epiphany @@ -0,0 +1,27 @@ +#!/bin/sh + +dist_bin=`dirname $0` + +MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% + +if [ -z "$MOZ_PLUGIN_PATH" ]; then + MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins + export MOZ_PLUGIN_PATH +fi + +if [ -n "$LD_LIBRARY_PATH" ]; then + LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH +else + LD_LIBRARY_PATH=$MOZILLA_HOME +fi +export LD_LIBRARY_PATH + +MOZILLA_FIVE_HOME=$MOZILLA_HOME +export MOZILLA_FIVE_HOME + +if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then + LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1 + export LD_PRELOAD +fi + +exec "%%PREFIX%%/bin/epiphany-bin" "$@" diff --git a/www/epiphany/files/patch-embed_mozilla_Makefile.in b/www/epiphany/files/patch-embed_mozilla_Makefile.in new file mode 100644 index 000000000000..d9be4935d30d --- /dev/null +++ b/www/epiphany/files/patch-embed_mozilla_Makefile.in @@ -0,0 +1,18 @@ +--- embed/mozilla/Makefile.in.orig Tue Jul 6 18:36:11 2004 ++++ embed/mozilla/Makefile.in Tue Jul 6 18:38:39 2004 +@@ -218,6 +218,7 @@ + -I$(MOZILLA_INCLUDE_ROOT)/docshell \ + -I$(MOZILLA_INCLUDE_ROOT)/dom \ + -I$(MOZILLA_INCLUDE_ROOT)/exthandler \ ++ -I$(MOZILLA_INCLUDE_ROOT)/find \ + -I$(MOZILLA_INCLUDE_ROOT)/gfx \ + -I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \ + -I$(MOZILLA_INCLUDE_ROOT)/history \ +@@ -228,6 +229,7 @@ + -I$(MOZILLA_INCLUDE_ROOT)/nkcache \ + -I$(MOZILLA_INCLUDE_ROOT)/pipboot \ + -I$(MOZILLA_INCLUDE_ROOT)/pipnss \ ++ -I$(MOZILLA_INCLUDE_ROOT)/pref \ + -I$(MOZILLA_INCLUDE_ROOT)/shistory \ + -I$(MOZILLA_INCLUDE_ROOT)/uriloader \ + -I$(MOZILLA_INCLUDE_ROOT)/uconv \ diff --git a/www/epiphany/files/patch-src_epiphany.in b/www/epiphany/files/patch-src_epiphany.in deleted file mode 100644 index 23583b77fe82..000000000000 --- a/www/epiphany/files/patch-src_epiphany.in +++ /dev/null @@ -1,22 +0,0 @@ ---- src/epiphany.in.orig Sat Dec 20 14:35:58 2003 -+++ src/epiphany.in Sun Dec 28 16:44:41 2003 -@@ -5,7 +5,7 @@ - MOZILLA_HOME=@MOZILLA_HOME@ - - if [ -z "$MOZ_PLUGIN_PATH" ]; then -- MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:/usr/libexec/plugins/mozilla -+ MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins - export MOZ_PLUGIN_PATH - fi - -@@ -28,4 +28,9 @@ - MOZILLA_FIVE_HOME=$MOZILLA_HOME - export MOZILLA_FIVE_HOME - --exec "$dist_bin/epiphany-bin" "$@" -+if [ -f %%FLASHPLAYER%% ]; then -+ LD_PRELOAD=%%FLASHPLAYER%% -+ export LD_PRELOAD -+fi -+ -+exec "%%PREFIX%%/bin/epiphany-bin" "$@" diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index a33679b30382..62dc792f7ea7 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -1,16 +1,11 @@ bin/epiphany bin/epiphany-bin -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/epiphany-lockdown.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/epiphany-lockdown.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/epiphany-lockdown.schemas > /dev/null || /usr/bin/true -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/epiphany.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/epiphany.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/epiphany.schemas > /dev/null || /usr/bin/true 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-dialog.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 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h @@ -30,14 +25,21 @@ include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-statusbar.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-tab.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-window.h libdata/bonobo/servers/GNOME_Epiphany_Automation.server -%%NAUTILUS%%libdata/bonobo/servers/GNOME_Epiphany_NautilusView.server -libdata/pkgconfig/epiphany-1.2.pc +libdata/pkgconfig/epiphany-1.4.pc +%%DOCSDIR%%/EphyCommandManager.html +%%DOCSDIR%%/EphyEmbed.html +%%DOCSDIR%%/EphyNodeDb.html +%%DOCSDIR%%/EphyTab.html +%%DOCSDIR%%/EphyWindow.html %%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/epiphany-EphyEmbedFactory.html +%%DOCSDIR%%/epiphany-EphyEmbedPersist.html +%%DOCSDIR%%/epiphany-EphyEmbedSingle.html +%%DOCSDIR%%/epiphany-EphyGlade.html +%%DOCSDIR%%/epiphany-EphyPermissionManager.html %%DOCSDIR%%/epiphany-ephy-cookie-manager.html -%%DOCSDIR%%/epiphany-ephy-embed-factory.html -%%DOCSDIR%%/epiphany-ephy-embed-single.html %%DOCSDIR%%/epiphany-ephy-password-manager.html -%%DOCSDIR%%/epiphany-ephy-permission-manager.html %%DOCSDIR%%/epiphany-ephy-session.html %%DOCSDIR%%/epiphany-ephy-shell.html %%DOCSDIR%%/epiphany.devhelp @@ -46,21 +48,25 @@ libdata/pkgconfig/epiphany-1.2.pc %%DOCSDIR%%/index.sgml %%DOCSDIR%%/left.png %%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css %%DOCSDIR%%/up.png share/gnome/application-registry/epiphany.applications share/gnome/applications/bme.desktop share/gnome/applications/epiphany.desktop +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/epiphany/art/epiphany-bookmarks.png +share/gnome/epiphany/art/epiphany-close-tab.png share/gnome/epiphany/art/epiphany-download.png share/gnome/epiphany/art/epiphany-entry.png share/gnome/epiphany/art/epiphany-history.png +share/gnome/epiphany/art/epiphany-popup-hidden.png share/gnome/epiphany/art/epiphany-secure.png -share/gnome/epiphany/art/epiphany-tab-loading.gif share/gnome/epiphany/art/epiphany-unsecure.png share/gnome/epiphany/art/hand-open.png share/gnome/epiphany/conspiracy.xhtml share/gnome/epiphany/default-prefs.js share/gnome/epiphany/epiphany-bookmark-editor-ui.xml +share/gnome/epiphany/epiphany-bookmarksbar.xml share/gnome/epiphany/epiphany-fs-toolbar.xml share/gnome/epiphany/epiphany-history-window-ui.xml share/gnome/epiphany/epiphany-toolbar.xml @@ -71,7 +77,6 @@ share/gnome/epiphany/glade/epiphany.glade share/gnome/epiphany/glade/prefs-dialog.glade share/gnome/epiphany/glade/print.glade share/gnome/epiphany/mime-types-permissions.xml -share/gnome/epiphany/nautilus-epiphany-view.xml share/gnome/help/epiphany/C/epiphany.xml share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png @@ -88,19 +93,28 @@ share/gnome/help/epiphany/eu/epiphany.xml share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/eu/figures/ephy-screenshot.png share/gnome/help/epiphany/eu/legal.xml +share/gnome/help/epiphany/ja/epiphany.xml +share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png +share/gnome/help/epiphany/ja/figures/ephy-screenshot.png +share/gnome/help/epiphany/ja/legal.xml share/gnome/omf/epiphany/epiphany-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/epiphany/epiphany-es.omf @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-es.omf 2>/dev/null || /usr/bin/true share/gnome/omf/epiphany/epiphany-eu.omf @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/epiphany/epiphany-ja.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-ja.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/epiphany-bookmarks.png share/locale/am/LC_MESSAGES/epiphany.mo -share/locale/az/LC_MESSAGES/epiphany.mo share/locale/ar/LC_MESSAGES/epiphany.mo +share/locale/az/LC_MESSAGES/epiphany.mo share/locale/be/LC_MESSAGES/epiphany.mo share/locale/bg/LC_MESSAGES/epiphany.mo share/locale/bn/LC_MESSAGES/epiphany.mo +share/locale/bs/LC_MESSAGES/epiphany.mo share/locale/ca/LC_MESSAGES/epiphany.mo share/locale/cs/LC_MESSAGES/epiphany.mo share/locale/cy/LC_MESSAGES/epiphany.mo @@ -130,11 +144,14 @@ share/locale/li/LC_MESSAGES/epiphany.mo share/locale/lt/LC_MESSAGES/epiphany.mo share/locale/mi/LC_MESSAGES/epiphany.mo share/locale/mk/LC_MESSAGES/epiphany.mo +share/locale/ml/LC_MESSAGES/epiphany.mo share/locale/mn/LC_MESSAGES/epiphany.mo share/locale/ms/LC_MESSAGES/epiphany.mo +share/locale/nb/LC_MESSAGES/epiphany.mo +share/locale/ne/LC_MESSAGES/epiphany.mo share/locale/nl/LC_MESSAGES/epiphany.mo -share/locale/no/LC_MESSAGES/epiphany.mo share/locale/nn/LC_MESSAGES/epiphany.mo +share/locale/no/LC_MESSAGES/epiphany.mo share/locale/pa/LC_MESSAGES/epiphany.mo share/locale/pl/LC_MESSAGES/epiphany.mo share/locale/pt/LC_MESSAGES/epiphany.mo @@ -157,6 +174,8 @@ share/locale/wa/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/omf/epiphany +@dirrm share/gnome/help/epiphany/ja/figures +@dirrm share/gnome/help/epiphany/ja @dirrm share/gnome/help/epiphany/eu/figures @dirrm share/gnome/help/epiphany/eu @dirrm share/gnome/help/epiphany/es/figures @@ -171,5 +190,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm include/epiphany-%%EPHY_VERSION%%/epiphany @dirrm include/epiphany-%%EPHY_VERSION%% @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-es.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-ja.omf 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile new file mode 100644 index 000000000000..ea49c09561d4 --- /dev/null +++ b/www/evolution-webcal/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: evolution-webcal +# Date created: Mon Apr 26 18:08:00 CEST 2004 +# Whom: Koop Mast <kwm@rainbow-runner.nl> +# +# $FreeBSD$ +# + +PORTNAME= webcal +PORTVERSION= 2.0.1 +CATEGORIES= www gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.0 +PKGNAMEPREFIX= evolution- +DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Webcal(endar) handler for gnome + +USE_X_PREFIX= yes +USE_BZIP2= yes +USE_GMAKE= yes +USE_PERL= yes +USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver libgnomeui +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= evolution-webcal.schemas + +.include <bsd.port.mk> diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo new file mode 100644 index 000000000000..c9ed8d4cf804 --- /dev/null +++ b/www/evolution-webcal/distinfo @@ -0,0 +1,2 @@ +MD5 (evolution-webcal-2.0.1.tar.bz2) = a29be3b55e6def3b56ffa3c48b349b40 +SIZE (evolution-webcal-2.0.1.tar.bz2) = 144969 diff --git a/www/evolution-webcal/pkg-descr b/www/evolution-webcal/pkg-descr new file mode 100644 index 000000000000..ab2f04e9d662 --- /dev/null +++ b/www/evolution-webcal/pkg-descr @@ -0,0 +1,7 @@ +Evolution Webcal installs a GNOME URL Handler for "webcal:". +This will pop up a subscription dialog when you point your web browser at it. +The calendars will automaticaly appear in Evolution 1.5.x if it is running, +or will show up the next time you start Evolution. + +It also works for non-GNOME applications. These applications need to set +there URL handler to be "gnome-open". diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist new file mode 100644 index 000000000000..f841cb7faa8e --- /dev/null +++ b/www/evolution-webcal/pkg-plist @@ -0,0 +1,45 @@ +libexec/evolution-webcal +share/gnome/application-registry/evolution-webcal.applications +share/locale/ar/LC_MESSAGES/evolution-webcal.mo +share/locale/az/LC_MESSAGES/evolution-webcal.mo +share/locale/bg/LC_MESSAGES/evolution-webcal.mo +share/locale/bn/LC_MESSAGES/evolution-webcal.mo +share/locale/bs/LC_MESSAGES/evolution-webcal.mo +share/locale/ca/LC_MESSAGES/evolution-webcal.mo +share/locale/cs/LC_MESSAGES/evolution-webcal.mo +share/locale/cy/LC_MESSAGES/evolution-webcal.mo +share/locale/da/LC_MESSAGES/evolution-webcal.mo +share/locale/de/LC_MESSAGES/evolution-webcal.mo +share/locale/el/LC_MESSAGES/evolution-webcal.mo +share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo +share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo +share/locale/es/LC_MESSAGES/evolution-webcal.mo +share/locale/eu/LC_MESSAGES/evolution-webcal.mo +share/locale/fi/LC_MESSAGES/evolution-webcal.mo +share/locale/fr/LC_MESSAGES/evolution-webcal.mo +share/locale/gu/LC_MESSAGES/evolution-webcal.mo +share/locale/hi/LC_MESSAGES/evolution-webcal.mo +share/locale/hu/LC_MESSAGES/evolution-webcal.mo +share/locale/it/LC_MESSAGES/evolution-webcal.mo +share/locale/ja/LC_MESSAGES/evolution-webcal.mo +share/locale/ko/LC_MESSAGES/evolution-webcal.mo +share/locale/ms/LC_MESSAGES/evolution-webcal.mo +share/locale/nb/LC_MESSAGES/evolution-webcal.mo +share/locale/nl/LC_MESSAGES/evolution-webcal.mo +share/locale/no/LC_MESSAGES/evolution-webcal.mo +share/locale/or/LC_MESSAGES/evolution-webcal.mo +share/locale/pa/LC_MESSAGES/evolution-webcal.mo +share/locale/pl/LC_MESSAGES/evolution-webcal.mo +share/locale/pt/LC_MESSAGES/evolution-webcal.mo +share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo +share/locale/ru/LC_MESSAGES/evolution-webcal.mo +share/locale/sq/LC_MESSAGES/evolution-webcal.mo +share/locale/sr/LC_MESSAGES/evolution-webcal.mo +share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo +share/locale/sv/LC_MESSAGES/evolution-webcal.mo +share/locale/ta/LC_MESSAGES/evolution-webcal.mo +share/locale/tr/LC_MESSAGES/evolution-webcal.mo +share/locale/uk/LC_MESSAGES/evolution-webcal.mo +share/locale/vi/LC_MESSAGES/evolution-webcal.mo +share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo +share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 915051e023f3..b9afe8083bf4 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -6,26 +6,27 @@ # PORTNAME= gtkhtml3 -PORTVERSION= 3.0.10 -PORTREVISION= 1 +PORTVERSION= 3.2.3 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.2 DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.0.0:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gal2 gail +USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= VERSION="3.1" .include <bsd.port.mk> diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 045fb89e752c..d9435284ee39 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtkhtml-3.0.10.tar.bz2) = b05b8551f7803f32ecfcf505a6310f3f -SIZE (gnome2/gtkhtml-3.0.10.tar.bz2) = 1074973 +MD5 (gnome2/gtkhtml-3.2.3.tar.bz2) = fe7aa0259a4cd7c99280c076711f8f80 +SIZE (gnome2/gtkhtml-3.2.3.tar.bz2) = 1304520 diff --git a/www/gtkhtml3/files/patch-ltmain.sh b/www/gtkhtml3/files/patch-ltmain.sh deleted file mode 100644 index 1c2fba5d533f..000000000000 --- a/www/gtkhtml3/files/patch-ltmain.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c index 1747affa3007..902c39e8ecb1 100644 --- a/www/gtkhtml3/files/patch-src_gtkhtml.c +++ b/www/gtkhtml3/files/patch-src_gtkhtml.c @@ -1,11 +1,11 @@ ---- src/gtkhtml.c.orig Wed Apr 16 01:52:24 2003 -+++ src/gtkhtml.c Wed Apr 16 01:52:35 2003 -@@ -2677,7 +2677,7 @@ +--- src/gtkhtml.c.orig Mon Aug 2 11:21:24 2004 ++++ src/gtkhtml.c Tue Aug 3 15:19:41 2004 +@@ -2955,7 +2955,7 @@ add_bindings (klass); gtk_html_accessibility_init (); -- gtk_rc_parse (PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); -+ gtk_rc_parse (PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); +- gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); ++ gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs"); read_key_theme (html_class); gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme", diff --git a/www/gtkhtml3/pkg-descr b/www/gtkhtml3/pkg-descr index 618f9c253d3b..38451dc0178d 100644 --- a/www/gtkhtml3/pkg-descr +++ b/www/gtkhtml3/pkg-descr @@ -1,5 +1,3 @@ -This is GtkHTML, a lightweight HTML rendering/printing/editing engine. -It was originally based on KHTMLW, but is now being developed -independently. +GtkHTML is a lightweight HTML rendering, printing, and editing engine. WWW: http://www.ximian.com/ diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 573bde598d33..a6ecb1a29789 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -1,194 +1,213 @@ -include/libgtkhtml-3.0/gtkhtml/gtkhtml-compat.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-embedded.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-enums.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-keybinding.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-private.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-properties.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-search.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-stream.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-types.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmldebug.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmlfontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlanchor.h -include/libgtkhtml-3.0/gtkhtml/htmlbutton.h -include/libgtkhtml-3.0/gtkhtml/htmlcheckbox.h -include/libgtkhtml-3.0/gtkhtml/htmlclue.h -include/libgtkhtml-3.0/gtkhtml/htmlcluealigned.h -include/libgtkhtml-3.0/gtkhtml/htmlclueflow.h -include/libgtkhtml-3.0/gtkhtml/htmlclueh.h -include/libgtkhtml-3.0/gtkhtml/htmlcluev.h -include/libgtkhtml-3.0/gtkhtml/htmlcolor.h -include/libgtkhtml-3.0/gtkhtml/htmlcolorset.h -include/libgtkhtml-3.0/gtkhtml/htmlcursor.h -include/libgtkhtml-3.0/gtkhtml/htmldrawqueue.h -include/libgtkhtml-3.0/gtkhtml/htmlembedded.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-clueflowstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cursor.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cut-and-paste.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-fontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-images.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-movement.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-rule.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-selection-updater.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-table.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-tablecell.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-text.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-print.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-save.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-search.h -include/libgtkhtml-3.0/gtkhtml/htmlengine.h -include/libgtkhtml-3.0/gtkhtml/htmlentity.h -include/libgtkhtml-3.0/gtkhtml/htmlenums.h -include/libgtkhtml-3.0/gtkhtml/htmlenumutils.h -include/libgtkhtml-3.0/gtkhtml/htmlfontmanager.h -include/libgtkhtml-3.0/gtkhtml/htmlform.h -include/libgtkhtml-3.0/gtkhtml/htmlframe.h -include/libgtkhtml-3.0/gtkhtml/htmlframeset.h -include/libgtkhtml-3.0/gtkhtml/htmlgdkpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlhidden.h -include/libgtkhtml-3.0/gtkhtml/htmliframe.h -include/libgtkhtml-3.0/gtkhtml/htmlimage.h -include/libgtkhtml-3.0/gtkhtml/htmlimageinput.h -include/libgtkhtml-3.0/gtkhtml/htmlinterval.h -include/libgtkhtml-3.0/gtkhtml/htmllinktext.h -include/libgtkhtml-3.0/gtkhtml/htmllist.h -include/libgtkhtml-3.0/gtkhtml/htmlmap.h -include/libgtkhtml-3.0/gtkhtml/htmlmarshal.h -include/libgtkhtml-3.0/gtkhtml/htmlobject.h -include/libgtkhtml-3.0/gtkhtml/htmlpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlplainpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlprinter.h -include/libgtkhtml-3.0/gtkhtml/htmlradio.h -include/libgtkhtml-3.0/gtkhtml/htmlreplace.h -include/libgtkhtml-3.0/gtkhtml/htmlrule.h -include/libgtkhtml-3.0/gtkhtml/htmlsearch.h -include/libgtkhtml-3.0/gtkhtml/htmlselect.h -include/libgtkhtml-3.0/gtkhtml/htmlselection.h -include/libgtkhtml-3.0/gtkhtml/htmlsettings.h -include/libgtkhtml-3.0/gtkhtml/htmlshape.h -include/libgtkhtml-3.0/gtkhtml/htmlstack.h -include/libgtkhtml-3.0/gtkhtml/htmlstringtokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmlstyle.h -include/libgtkhtml-3.0/gtkhtml/htmltable.h -include/libgtkhtml-3.0/gtkhtml/htmltablecell.h -include/libgtkhtml-3.0/gtkhtml/htmltablepriv.h -include/libgtkhtml-3.0/gtkhtml/htmltext.h -include/libgtkhtml-3.0/gtkhtml/htmltextarea.h -include/libgtkhtml-3.0/gtkhtml/htmltextinput.h -include/libgtkhtml-3.0/gtkhtml/htmltextslave.h -include/libgtkhtml-3.0/gtkhtml/htmltokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmltype.h -include/libgtkhtml-3.0/gtkhtml/htmltypes.h -include/libgtkhtml-3.0/gtkhtml/htmlundo-action.h -include/libgtkhtml-3.0/gtkhtml/htmlundo.h -lib/gtkhtml/libgnome-gtkhtml-editor-3.0.so -lib/libgtkhtml-3.0.a -lib/libgtkhtml-3.0.so -lib/libgtkhtml-3.0.so.4 -libdata/bonobo/servers/GNOME_GtkHTML_Editor.server -libdata/pkgconfig/libgtkhtml-3.0.pc -share/gnome/gtkhtml-3.0/Editor.idl -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor-emacs.xml -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor.xml -share/gnome/gtkhtml-3.0/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-3.0/icons/16_copy.png -share/gnome/gtkhtml-3.0/icons/16_cut.png -share/gnome/gtkhtml-3.0/icons/16_paste.png -share/gnome/gtkhtml-3.0/icons/24_copy.png -share/gnome/gtkhtml-3.0/icons/24_cut.png -share/gnome/gtkhtml-3.0/icons/24_paste.png -share/gnome/gtkhtml-3.0/icons/bulb.png -share/gnome/gtkhtml-3.0/icons/empty_image.png -share/gnome/gtkhtml-3.0/icons/flowers.png -share/gnome/gtkhtml-3.0/icons/font-tt-16.png -share/gnome/gtkhtml-3.0/icons/font-tt-24.png -share/gnome/gtkhtml-3.0/icons/html-viewer.png -share/gnome/gtkhtml-3.0/icons/info_bulb.png -share/gnome/gtkhtml-3.0/icons/insert-image-16.png -share/gnome/gtkhtml-3.0/icons/insert-image-24.png -share/gnome/gtkhtml-3.0/icons/insert-link-16.png -share/gnome/gtkhtml-3.0/icons/insert-link-24.png -share/gnome/gtkhtml-3.0/icons/insert-object-16.png -share/gnome/gtkhtml-3.0/icons/insert-object-24.png -share/gnome/gtkhtml-3.0/icons/insert-rule-16.png -share/gnome/gtkhtml-3.0/icons/insert-rule-24.png -share/gnome/gtkhtml-3.0/icons/insert-table-16.png -share/gnome/gtkhtml-3.0/icons/insert-table-24.png -share/gnome/gtkhtml-3.0/icons/paper.png -share/gnome/gtkhtml-3.0/icons/properties-16.png -share/gnome/gtkhtml-3.0/icons/rect.png -share/gnome/gtkhtml-3.0/icons/redo-16.png -share/gnome/gtkhtml-3.0/icons/redo-24.png -share/gnome/gtkhtml-3.0/icons/rule-blue-center.png -share/gnome/gtkhtml-3.0/icons/rule-blue-left.png -share/gnome/gtkhtml-3.0/icons/rule-blue-right.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-center.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-left.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-3.0/icons/search-16.png -share/gnome/gtkhtml-3.0/icons/search-24.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-16.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-24.png -share/gnome/gtkhtml-3.0/icons/smiley-1.png -share/gnome/gtkhtml-3.0/icons/smiley-10.png -share/gnome/gtkhtml-3.0/icons/smiley-11.png -share/gnome/gtkhtml-3.0/icons/smiley-2.png -share/gnome/gtkhtml-3.0/icons/smiley-3.png -share/gnome/gtkhtml-3.0/icons/smiley-4.png -share/gnome/gtkhtml-3.0/icons/smiley-5.png -share/gnome/gtkhtml-3.0/icons/smiley-6.png -share/gnome/gtkhtml-3.0/icons/smiley-8.png -share/gnome/gtkhtml-3.0/icons/smiley-9.png -share/gnome/gtkhtml-3.0/icons/texture.png -share/gnome/gtkhtml-3.0/icons/transparent.png -share/gnome/gtkhtml-3.0/icons/undo-16.png -share/gnome/gtkhtml-3.0/icons/undo-24.png -share/gnome/gtkhtml-3.0/keybindingsrc.emacs -share/locale/am/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ar/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/az/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/be/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ca/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/cs/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/da/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/de/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/el/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/es/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/et/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/eu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/gl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/he/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/it/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ja/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ko/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ms/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/no/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt_BR/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ru/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/tr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/uk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/vi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_CN/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_TW/LC_MESSAGES/gtkhtml-3.0.mo -@dirrm share/gnome/gtkhtml-3.0/icons -@dirrm share/gnome/gtkhtml-3.0 +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h +lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.a +lib/libgtkhtml-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.so.11 +libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server +libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc +share/gnome/gtkhtml-%%VERSION%%/Editor.idl +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml +share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade +share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png +share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png +share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/rect.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/texture.png +share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png +share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs +share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +@dirrm share/gnome/gtkhtml-%%VERSION%%/icons +@dirrm share/gnome/gtkhtml-%%VERSION%% @dirrm lib/gtkhtml -@dirrm include/libgtkhtml-3.0/gtkhtml -@dirrm include/libgtkhtml-3.0 +@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml +@dirrm include/libgtkhtml-%%VERSION%% diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 915051e023f3..b9afe8083bf4 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -6,26 +6,27 @@ # PORTNAME= gtkhtml3 -PORTVERSION= 3.0.10 -PORTREVISION= 1 +PORTVERSION= 3.2.3 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.2 DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.0.0:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gal2 gail +USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= VERSION="3.1" .include <bsd.port.mk> diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo index 045fb89e752c..d9435284ee39 100644 --- a/www/gtkhtml38/distinfo +++ b/www/gtkhtml38/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtkhtml-3.0.10.tar.bz2) = b05b8551f7803f32ecfcf505a6310f3f -SIZE (gnome2/gtkhtml-3.0.10.tar.bz2) = 1074973 +MD5 (gnome2/gtkhtml-3.2.3.tar.bz2) = fe7aa0259a4cd7c99280c076711f8f80 +SIZE (gnome2/gtkhtml-3.2.3.tar.bz2) = 1304520 diff --git a/www/gtkhtml38/files/patch-ltmain.sh b/www/gtkhtml38/files/patch-ltmain.sh deleted file mode 100644 index 1c2fba5d533f..000000000000 --- a/www/gtkhtml38/files/patch-ltmain.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c index 1747affa3007..902c39e8ecb1 100644 --- a/www/gtkhtml38/files/patch-src_gtkhtml.c +++ b/www/gtkhtml38/files/patch-src_gtkhtml.c @@ -1,11 +1,11 @@ ---- src/gtkhtml.c.orig Wed Apr 16 01:52:24 2003 -+++ src/gtkhtml.c Wed Apr 16 01:52:35 2003 -@@ -2677,7 +2677,7 @@ +--- src/gtkhtml.c.orig Mon Aug 2 11:21:24 2004 ++++ src/gtkhtml.c Tue Aug 3 15:19:41 2004 +@@ -2955,7 +2955,7 @@ add_bindings (klass); gtk_html_accessibility_init (); -- gtk_rc_parse (PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); -+ gtk_rc_parse (PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs"); +- gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); ++ gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs"); html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs"); read_key_theme (html_class); gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme", diff --git a/www/gtkhtml38/pkg-descr b/www/gtkhtml38/pkg-descr index 618f9c253d3b..38451dc0178d 100644 --- a/www/gtkhtml38/pkg-descr +++ b/www/gtkhtml38/pkg-descr @@ -1,5 +1,3 @@ -This is GtkHTML, a lightweight HTML rendering/printing/editing engine. -It was originally based on KHTMLW, but is now being developed -independently. +GtkHTML is a lightweight HTML rendering, printing, and editing engine. WWW: http://www.ximian.com/ diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist index 573bde598d33..a6ecb1a29789 100644 --- a/www/gtkhtml38/pkg-plist +++ b/www/gtkhtml38/pkg-plist @@ -1,194 +1,213 @@ -include/libgtkhtml-3.0/gtkhtml/gtkhtml-compat.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-embedded.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-enums.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-keybinding.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-private.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-properties.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-search.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-stream.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml-types.h -include/libgtkhtml-3.0/gtkhtml/gtkhtml.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmldebug.h -include/libgtkhtml-3.0/gtkhtml/gtkhtmlfontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlanchor.h -include/libgtkhtml-3.0/gtkhtml/htmlbutton.h -include/libgtkhtml-3.0/gtkhtml/htmlcheckbox.h -include/libgtkhtml-3.0/gtkhtml/htmlclue.h -include/libgtkhtml-3.0/gtkhtml/htmlcluealigned.h -include/libgtkhtml-3.0/gtkhtml/htmlclueflow.h -include/libgtkhtml-3.0/gtkhtml/htmlclueh.h -include/libgtkhtml-3.0/gtkhtml/htmlcluev.h -include/libgtkhtml-3.0/gtkhtml/htmlcolor.h -include/libgtkhtml-3.0/gtkhtml/htmlcolorset.h -include/libgtkhtml-3.0/gtkhtml/htmlcursor.h -include/libgtkhtml-3.0/gtkhtml/htmldrawqueue.h -include/libgtkhtml-3.0/gtkhtml/htmlembedded.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-clueflowstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cursor.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-cut-and-paste.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-fontstyle.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-images.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-movement.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-rule.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-selection-updater.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-table.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-tablecell.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit-text.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-edit.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-print.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-save.h -include/libgtkhtml-3.0/gtkhtml/htmlengine-search.h -include/libgtkhtml-3.0/gtkhtml/htmlengine.h -include/libgtkhtml-3.0/gtkhtml/htmlentity.h -include/libgtkhtml-3.0/gtkhtml/htmlenums.h -include/libgtkhtml-3.0/gtkhtml/htmlenumutils.h -include/libgtkhtml-3.0/gtkhtml/htmlfontmanager.h -include/libgtkhtml-3.0/gtkhtml/htmlform.h -include/libgtkhtml-3.0/gtkhtml/htmlframe.h -include/libgtkhtml-3.0/gtkhtml/htmlframeset.h -include/libgtkhtml-3.0/gtkhtml/htmlgdkpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlhidden.h -include/libgtkhtml-3.0/gtkhtml/htmliframe.h -include/libgtkhtml-3.0/gtkhtml/htmlimage.h -include/libgtkhtml-3.0/gtkhtml/htmlimageinput.h -include/libgtkhtml-3.0/gtkhtml/htmlinterval.h -include/libgtkhtml-3.0/gtkhtml/htmllinktext.h -include/libgtkhtml-3.0/gtkhtml/htmllist.h -include/libgtkhtml-3.0/gtkhtml/htmlmap.h -include/libgtkhtml-3.0/gtkhtml/htmlmarshal.h -include/libgtkhtml-3.0/gtkhtml/htmlobject.h -include/libgtkhtml-3.0/gtkhtml/htmlpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlplainpainter.h -include/libgtkhtml-3.0/gtkhtml/htmlprinter.h -include/libgtkhtml-3.0/gtkhtml/htmlradio.h -include/libgtkhtml-3.0/gtkhtml/htmlreplace.h -include/libgtkhtml-3.0/gtkhtml/htmlrule.h -include/libgtkhtml-3.0/gtkhtml/htmlsearch.h -include/libgtkhtml-3.0/gtkhtml/htmlselect.h -include/libgtkhtml-3.0/gtkhtml/htmlselection.h -include/libgtkhtml-3.0/gtkhtml/htmlsettings.h -include/libgtkhtml-3.0/gtkhtml/htmlshape.h -include/libgtkhtml-3.0/gtkhtml/htmlstack.h -include/libgtkhtml-3.0/gtkhtml/htmlstringtokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmlstyle.h -include/libgtkhtml-3.0/gtkhtml/htmltable.h -include/libgtkhtml-3.0/gtkhtml/htmltablecell.h -include/libgtkhtml-3.0/gtkhtml/htmltablepriv.h -include/libgtkhtml-3.0/gtkhtml/htmltext.h -include/libgtkhtml-3.0/gtkhtml/htmltextarea.h -include/libgtkhtml-3.0/gtkhtml/htmltextinput.h -include/libgtkhtml-3.0/gtkhtml/htmltextslave.h -include/libgtkhtml-3.0/gtkhtml/htmltokenizer.h -include/libgtkhtml-3.0/gtkhtml/htmltype.h -include/libgtkhtml-3.0/gtkhtml/htmltypes.h -include/libgtkhtml-3.0/gtkhtml/htmlundo-action.h -include/libgtkhtml-3.0/gtkhtml/htmlundo.h -lib/gtkhtml/libgnome-gtkhtml-editor-3.0.so -lib/libgtkhtml-3.0.a -lib/libgtkhtml-3.0.so -lib/libgtkhtml-3.0.so.4 -libdata/bonobo/servers/GNOME_GtkHTML_Editor.server -libdata/pkgconfig/libgtkhtml-3.0.pc -share/gnome/gtkhtml-3.0/Editor.idl -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor-emacs.xml -share/gnome/gtkhtml-3.0/GNOME_GtkHTML_Editor.xml -share/gnome/gtkhtml-3.0/gtkhtml-editor-properties.glade -share/gnome/gtkhtml-3.0/icons/16_copy.png -share/gnome/gtkhtml-3.0/icons/16_cut.png -share/gnome/gtkhtml-3.0/icons/16_paste.png -share/gnome/gtkhtml-3.0/icons/24_copy.png -share/gnome/gtkhtml-3.0/icons/24_cut.png -share/gnome/gtkhtml-3.0/icons/24_paste.png -share/gnome/gtkhtml-3.0/icons/bulb.png -share/gnome/gtkhtml-3.0/icons/empty_image.png -share/gnome/gtkhtml-3.0/icons/flowers.png -share/gnome/gtkhtml-3.0/icons/font-tt-16.png -share/gnome/gtkhtml-3.0/icons/font-tt-24.png -share/gnome/gtkhtml-3.0/icons/html-viewer.png -share/gnome/gtkhtml-3.0/icons/info_bulb.png -share/gnome/gtkhtml-3.0/icons/insert-image-16.png -share/gnome/gtkhtml-3.0/icons/insert-image-24.png -share/gnome/gtkhtml-3.0/icons/insert-link-16.png -share/gnome/gtkhtml-3.0/icons/insert-link-24.png -share/gnome/gtkhtml-3.0/icons/insert-object-16.png -share/gnome/gtkhtml-3.0/icons/insert-object-24.png -share/gnome/gtkhtml-3.0/icons/insert-rule-16.png -share/gnome/gtkhtml-3.0/icons/insert-rule-24.png -share/gnome/gtkhtml-3.0/icons/insert-table-16.png -share/gnome/gtkhtml-3.0/icons/insert-table-24.png -share/gnome/gtkhtml-3.0/icons/paper.png -share/gnome/gtkhtml-3.0/icons/properties-16.png -share/gnome/gtkhtml-3.0/icons/rect.png -share/gnome/gtkhtml-3.0/icons/redo-16.png -share/gnome/gtkhtml-3.0/icons/redo-24.png -share/gnome/gtkhtml-3.0/icons/rule-blue-center.png -share/gnome/gtkhtml-3.0/icons/rule-blue-left.png -share/gnome/gtkhtml-3.0/icons/rule-blue-right.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-center.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-left.png -share/gnome/gtkhtml-3.0/icons/rule-yellow-flowers-right.png -share/gnome/gtkhtml-3.0/icons/search-16.png -share/gnome/gtkhtml-3.0/icons/search-24.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-16.png -share/gnome/gtkhtml-3.0/icons/search-and-replace-24.png -share/gnome/gtkhtml-3.0/icons/smiley-1.png -share/gnome/gtkhtml-3.0/icons/smiley-10.png -share/gnome/gtkhtml-3.0/icons/smiley-11.png -share/gnome/gtkhtml-3.0/icons/smiley-2.png -share/gnome/gtkhtml-3.0/icons/smiley-3.png -share/gnome/gtkhtml-3.0/icons/smiley-4.png -share/gnome/gtkhtml-3.0/icons/smiley-5.png -share/gnome/gtkhtml-3.0/icons/smiley-6.png -share/gnome/gtkhtml-3.0/icons/smiley-8.png -share/gnome/gtkhtml-3.0/icons/smiley-9.png -share/gnome/gtkhtml-3.0/icons/texture.png -share/gnome/gtkhtml-3.0/icons/transparent.png -share/gnome/gtkhtml-3.0/icons/undo-16.png -share/gnome/gtkhtml-3.0/icons/undo-24.png -share/gnome/gtkhtml-3.0/keybindingsrc.emacs -share/locale/am/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ar/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/az/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/be/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ca/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/cs/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/da/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/de/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/el/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/es/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/et/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/eu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/fr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/gl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/he/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/hu/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/it/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ja/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ko/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/lv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ms/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/nn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/no/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/pt_BR/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/ru/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sl/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sr@Latn/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/sv/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/tr/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/uk/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/vi/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_CN/LC_MESSAGES/gtkhtml-3.0.mo -share/locale/zh_TW/LC_MESSAGES/gtkhtml-3.0.mo -@dirrm share/gnome/gtkhtml-3.0/icons -@dirrm share/gnome/gtkhtml-3.0 +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h +include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h +include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h +lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.a +lib/libgtkhtml-%%VERSION%%.so +lib/libgtkhtml-%%VERSION%%.so.11 +libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server +libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc +share/gnome/gtkhtml-%%VERSION%%/Editor.idl +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml +share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml +share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade +share/gnome/gtkhtml-%%VERSION%%/icons/16_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/16_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_copy.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_cut.png +share/gnome/gtkhtml-%%VERSION%%/icons/24_paste.png +share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png +share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/font-tt-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png +share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-image-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-link-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-object-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-rule-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/insert-table-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/paper.png +share/gnome/gtkhtml-%%VERSION%%/icons/properties-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/rect.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/redo-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png +share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-5.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-6.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-8.png +share/gnome/gtkhtml-%%VERSION%%/icons/smiley-9.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-column-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-row-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/table-table-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/texture.png +share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-16.png +share/gnome/gtkhtml-%%VERSION%%/icons/undo-24.png +share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs +share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/gu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +@dirrm share/gnome/gtkhtml-%%VERSION%%/icons +@dirrm share/gnome/gtkhtml-%%VERSION%% @dirrm lib/gtkhtml -@dirrm include/libgtkhtml-3.0/gtkhtml -@dirrm include/libgtkhtml-3.0 +@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml +@dirrm include/libgtkhtml-%%VERSION%% diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index b1cbccda3b57..1e9585a83744 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -6,15 +6,16 @@ # PORTNAME?= mozilla -PORTVERSION= 1.7.2 -PORTREVISION?= 5 +PORTVERSION= 1.7.3 +PORTREVISION?= 2 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION}/src \ - marcus/:local -DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} + adamw/:local +DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ + libart_lgpl${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser @@ -250,8 +251,8 @@ post-patch: @${REINPLACE_CMD} -E -e 's|libfreetype\.so\.[0-9]+|${FREETYPE_LIB}|g' \ ${WRKSRC}/modules/libpref/src/init/all.js @for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \ - s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \ + ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \ + s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ done @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \ @@ -270,7 +271,7 @@ post-build: ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} pre-install: - ${RM} -rf ${PLIST} ${FAKEDIR} + ${RM} -rf ${FAKEDIR} ${PLIST} ${TOUCH} -f ${PLIST} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install @@ -300,9 +301,9 @@ pre-install: ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \ + ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done - cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ + cd ${FAKEDIR}/include/mozilla && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} @@ -335,12 +336,12 @@ do-install: ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc; \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \ + ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done -${RM} -fr ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/include/${MOZILLA} ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} - cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \ + cd ${FAKEDIR}/include/mozilla && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} post-install: diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index cb0a4d9cefdd..090bcb860698 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,2 +1,4 @@ -MD5 (mozilla-source-1.7.2.tar.bz2) = 262987cfcb793bab9fb1aebb21c527ce -SIZE (mozilla-source-1.7.2.tar.bz2) = 34438800 +MD5 (mozilla-source-1.7.3.tar.bz2) = 15cb68da1d58f055f871b77ff655df77 +SIZE (mozilla-source-1.7.3.tar.bz2) = 29716200 +MD5 (libart_lgpl.tar.bz2) = d681e7528aa30b6c615e571a54db2242 +SIZE (libart_lgpl.tar.bz2) = 103000 diff --git a/www/mozilla/files/patch-245066,226669 b/www/mozilla/files/patch-245066,226669 deleted file mode 100644 index 00254916f224..000000000000 --- a/www/mozilla/files/patch-245066,226669 +++ /dev/null @@ -1,228 +0,0 @@ -Index: mozilla/mailnews/local/src/nsPop3Protocol.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/local/src/nsPop3Protocol.cpp,v -retrieving revision 1.214.2.1 -retrieving revision 1.214.2.1.2.1 -diff -u -r1.214.2.1 -r1.214.2.1.2.1 ---- mailnews/local/src/nsPop3Protocol.cpp 27 May 2004 14:54:03 -0000 1.214.2.1 -+++ mailnews/local/src/nsPop3Protocol.cpp 27 Aug 2004 13:15:42 -0000 1.214.2.1.2.1 -@@ -61,7 +61,6 @@ - #include "nsISignatureVerifier.h" - - #define EXTRA_SAFETY_SPACE 3096 --#define kLargeNumberOfMessages 50000 - - static PRLogModuleInfo *POP3LOGMODULE = nsnull; - -@@ -1791,11 +1790,11 @@ - - - m_pop3ConData->msg_info = (Pop3MsgInfo *) -- PR_CALLOC(sizeof(Pop3MsgInfo) * -- (m_pop3ConData->number_of_messages < kLargeNumberOfMessages ? m_pop3ConData->number_of_messages : kLargeNumberOfMessages)); -+ PR_CALLOC(sizeof(Pop3MsgInfo) * m_pop3ConData->number_of_messages); - if (!m_pop3ConData->msg_info) - return(MK_OUT_OF_MEMORY); - m_pop3ConData->next_state_after_response = POP3_GET_LIST; -+ m_listpos = 0; - return SendData(m_url, "LIST"CRLF); - } - -@@ -1837,6 +1836,9 @@ - */ - if(!PL_strcmp(line, ".")) - { -+ // limit the list if fewer entries than given in STAT response -+ if(m_listpos < m_pop3ConData->number_of_messages) -+ m_pop3ConData->number_of_messages = m_listpos; - m_pop3ConData->next_state = POP3_SEND_UIDL_LIST; - m_pop3ConData->pause_for_read = PR_FALSE; - PR_Free(line); -@@ -1848,24 +1850,15 @@ - if (token) - { - msg_num = atol(token); -+ m_listpos++; - -- if(msg_num <= m_pop3ConData->number_of_messages && msg_num > 0) -+ if(m_listpos <= m_pop3ConData->number_of_messages && m_listpos > 0) - { - token = nsCRT::strtok(newStr, " ", &newStr); - if (token) -- m_pop3ConData->msg_info[msg_num-1].size = atol(token); -- -- if (msg_num >= kLargeNumberOfMessages && msg_num < m_pop3ConData->number_of_messages) - { -- m_pop3ConData->msg_info = (Pop3MsgInfo *) //allocate space for next entry -- PR_REALLOC(m_pop3ConData->msg_info, sizeof(Pop3MsgInfo) * (msg_num + 1)); -- if (!m_pop3ConData->msg_info) -- { -- m_pop3ConData->number_of_messages = msg_num; //so that we don't try to free not allocated entries! -- return(MK_OUT_OF_MEMORY); -- } -- m_pop3ConData->msg_info[msg_num].size = 0; //initialize -- m_pop3ConData->msg_info[msg_num].uidl = nsnull; -+ m_pop3ConData->msg_info[m_listpos-1].size = atol(token); -+ m_pop3ConData->msg_info[m_listpos-1].msgnum = msg_num; - } - } - } -@@ -2101,6 +2094,7 @@ - { - m_pop3ConData->next_state_after_response = POP3_GET_XTND_XLST_MSGID; - m_pop3ConData->pause_for_read = PR_TRUE; -+ m_listpos = 0; - return SendData(m_url, "XTND XLST Message-Id" CRLF); - } - else -@@ -2166,6 +2160,9 @@ - */ - if(!PL_strcmp(line, ".")) - { -+ // limit the list if fewer entries than given in STAT response -+ if(m_listpos < m_pop3ConData->number_of_messages) -+ m_pop3ConData->number_of_messages = m_listpos; - m_pop3ConData->next_state = POP3_GET_MSG; - m_pop3ConData->pause_for_read = PR_FALSE; - PR_Free(line); -@@ -2177,7 +2174,9 @@ - if (token) - { - msg_num = atol(token); -- if(msg_num <= m_pop3ConData->number_of_messages && msg_num > 0) -+ m_listpos++; -+ -+ if(m_listpos <= m_pop3ConData->number_of_messages && m_listpos > 0) - { - /* char *eatMessageIdToken = nsCRT::strtok(newStr, " ", &newStr); */ - char *uidl = nsCRT::strtok(newStr, " ", &newStr);/* not really a uidl but a unique token -km */ -@@ -2189,8 +2188,17 @@ - there, I have no idea; must be a server bug. Or something. */ - uidl = ""; - -- m_pop3ConData->msg_info[msg_num-1].uidl = PL_strdup(uidl); -- if (!m_pop3ConData->msg_info[msg_num-1].uidl) -+ // seeking right entry, but try the one that should it be first -+ PRInt32 i; -+ if(m_pop3ConData->msg_info[m_listpos - 1].msgnum == msg_num) -+ i = m_listpos - 1; -+ else -+ for(i = 0; m_pop3ConData->msg_info[i].msgnum != msg_num && -+ i <= m_pop3ConData->number_of_messages; i++) -+ ; -+ -+ m_pop3ConData->msg_info[i].uidl = PL_strdup(uidl); -+ if (!m_pop3ConData->msg_info[i].uidl) - { - PR_Free(line); - return MK_OUT_OF_MEMORY; -@@ -2209,6 +2217,7 @@ - { - m_pop3ConData->next_state_after_response = POP3_GET_UIDL_LIST; - m_pop3ConData->pause_for_read = PR_TRUE; -+ m_listpos = 0; - return SendData(m_url,"UIDL" CRLF); - } - else -@@ -2264,6 +2273,9 @@ - */ - if(!PL_strcmp(line, ".")) - { -+ // limit the list if fewer entries than given in STAT response -+ if(m_listpos < m_pop3ConData->number_of_messages) -+ m_pop3ConData->number_of_messages = m_listpos; - m_pop3ConData->next_state = POP3_GET_MSG; - m_pop3ConData->pause_for_read = PR_FALSE; - PR_Free(line); -@@ -2275,7 +2287,9 @@ - if (token) - { - msg_num = atol(token); -- if(msg_num <= m_pop3ConData->number_of_messages && msg_num > 0) -+ m_listpos++; -+ -+ if(m_listpos <= m_pop3ConData->number_of_messages && m_listpos > 0) - { - char *uidl = nsCRT::strtok(newStr, " ", &newStr); - -@@ -2286,8 +2300,17 @@ - there, I have no idea; must be a server bug. Or something. */ - uidl = ""; - -- m_pop3ConData->msg_info[msg_num-1].uidl = PL_strdup(uidl); -- if (!m_pop3ConData->msg_info[msg_num-1].uidl) -+ // seeking right entry, but try the one that should it be first -+ PRInt32 i; -+ if(m_pop3ConData->msg_info[m_listpos - 1].msgnum == msg_num) -+ i = m_listpos - 1; -+ else -+ for(i = 0; m_pop3ConData->msg_info[i].msgnum != msg_num && -+ i <= m_pop3ConData->number_of_messages; i++) -+ ; -+ -+ m_pop3ConData->msg_info[i].uidl = PL_strdup(uidl); -+ if (!m_pop3ConData->msg_info[i].uidl) - { - PR_Free(line); - return MK_OUT_OF_MEMORY; -@@ -2603,7 +2626,7 @@ - PRInt32 nsPop3Protocol::SendTop() - { - char * cmd = PR_smprintf( "TOP %ld 20" CRLF, -- m_pop3ConData->last_accessed_msg+1); -+ m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - PRInt32 status = -1; - if (cmd) - { -@@ -2624,7 +2647,7 @@ - */ - PRInt32 nsPop3Protocol::SendXsender() - { -- char * cmd = PR_smprintf("XSENDER %ld" CRLF, m_pop3ConData->last_accessed_msg+1); -+ char * cmd = PR_smprintf("XSENDER %ld" CRLF, m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - PRInt32 status = -1; - if (cmd) - { -@@ -2662,7 +2685,7 @@ - nsPop3Protocol::SendRetr() - { - -- char * cmd = PR_smprintf("RETR %ld" CRLF, m_pop3ConData->last_accessed_msg+1); -+ char * cmd = PR_smprintf("RETR %ld" CRLF, m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - PRInt32 status = -1; - if (cmd) - { -@@ -3071,8 +3094,8 @@ - { - /* increment the last accessed message since we have now read it - */ -+ char * cmd = PR_smprintf("DELE %ld" CRLF, m_pop3ConData->msg_info[m_pop3ConData->last_accessed_msg].msgnum); - m_pop3ConData->last_accessed_msg++; -- char * cmd = PR_smprintf("DELE %ld" CRLF, m_pop3ConData->last_accessed_msg); - PRInt32 status = -1; - if (cmd) - { -Index: mozilla/mailnews/local/src/nsPop3Protocol.h -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/local/src/nsPop3Protocol.h,v -retrieving revision 1.63 -retrieving revision 1.63.10.1 -diff -u -r1.63 -r1.63.10.1 ---- mailnews/local/src/nsPop3Protocol.h 8 Mar 2004 19:50:30 -0000 1.63 -+++ mailnews/local/src/nsPop3Protocol.h 27 Aug 2004 13:15:42 -0000 1.63.10.1 -@@ -191,6 +191,7 @@ - } Pop3UidlHost; - - typedef struct Pop3MsgInfo { -+ PRInt32 msgnum; - PRInt32 size; - char* uidl; - } Pop3MsgInfo; -@@ -350,6 +351,7 @@ - void BackupAuthFlags(); - void RestoreAuthFlags(); - PRInt32 m_origAuthFlags; -+ PRInt32 m_listpos; - - ////////////////////////////////////////////////////////////////////////////////////////// - // Begin Pop3 protocol state handlers diff --git a/www/mozilla/files/patch-250862 b/www/mozilla/files/patch-250862 deleted file mode 100644 index 05423dc84195..000000000000 --- a/www/mozilla/files/patch-250862 +++ /dev/null @@ -1,22 +0,0 @@ -Index: mozilla/xpfe/communicator/resources/content/contentAreaDD.js -=================================================================== -RCS file: /cvsroot/mozilla/xpfe/communicator/resources/content/contentAreaDD.js,v -retrieving revision 1.32 -retrieving revision 1.32.88.1 -diff -u -r1.32 -r1.32.88.1 ---- xpfe/communicator/resources/content/contentAreaDD.js 10 Jul 2002 01:23:50 -0000 1.32 -+++ xpfe/communicator/resources/content/contentAreaDD.js 27 Aug 2004 01:13:39 -0000 1.32.88.1 -@@ -53,8 +53,11 @@ - { - var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType); - -- // valid urls don't contain spaces ' '; if we have a space it isn't a valid url so bail out -- if (!url || !url.length || url.indexOf(" ", 0) != -1) -+ // valid urls don't contain spaces ' '; if we have a space it -+ // isn't a valid url, or if it's a javascript: or data: url, -+ // bail out -+ if (!url || !url.length || url.indexOf(" ", 0) != -1 || -+ /^\s*(javascript|data):/.test(url)) - return; - - switch (document.firstChild.getAttribute('windowtype')) { diff --git a/www/mozilla/files/patch-255067 b/www/mozilla/files/patch-255067 deleted file mode 100644 index cddf17ca8328..000000000000 --- a/www/mozilla/files/patch-255067 +++ /dev/null @@ -1,60 +0,0 @@ -Index: mozilla/gfx/src/shared/gfxImageFrame.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/shared/gfxImageFrame.cpp,v -retrieving revision 1.26 -retrieving revision 1.26.12.1 -diff -u -r1.26 -r1.26.12.1 ---- gfx/src/shared/gfxImageFrame.cpp 16 Jan 2004 23:28:48 -0000 1.26 -+++ gfx/src/shared/gfxImageFrame.cpp 27 Aug 2004 11:02:58 -0000 1.26.12.1 -@@ -72,6 +72,13 @@ - return NS_ERROR_FAILURE; - } - -+ /* reject over-wide or over-tall images */ -+ const PRInt32 k64KLimit = 0x0000FFFF; -+ if ( aWidth > k64KLimit || aHeight > k64KLimit ){ -+ NS_ERROR("image too big"); -+ return NS_ERROR_FAILURE; -+ } -+ - nsresult rv; - - mOffset.MoveTo(aX, aY); -Index: mozilla/gfx/src/windows/nsImageWin.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/windows/nsImageWin.cpp,v -retrieving revision 3.130.2.1 -retrieving revision 3.130.2.1.6.1 -diff -u -r3.130.2.1 -r3.130.2.1.6.1 ---- gfx/src/windows/nsImageWin.cpp 11 May 2004 21:53:49 -0000 3.130.2.1 -+++ gfx/src/windows/nsImageWin.cpp 27 Aug 2004 11:02:58 -0000 3.130.2.1.6.1 -@@ -131,6 +131,10 @@ - return NS_ERROR_UNEXPECTED; - } - -+ // limit images to 64k pixels on a side (~55 feet on a 100dpi monitor) -+ const PRInt32 k64KLimit = 0x0000FFFF; -+ if (aWidth > k64KLimit || aHeight > k64KLimit) -+ return NS_ERROR_FAILURE; - - if (mNumPaletteColors >= 0){ - // If we have a palette -Index: mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp -=================================================================== -RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,v -retrieving revision 1.24.2.1 -retrieving revision 1.24.2.1.6.1 -diff -u -r1.24.2.1 -r1.24.2.1.6.1 ---- modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 13 May 2004 22:27:35 -0000 1.24.2.1 -+++ modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 27 Aug 2004 11:02:58 -0000 1.24.2.1.6.1 -@@ -274,7 +274,9 @@ - CalcBitShift(); - } - // BMPs with negative width are invalid -- if (mBIH.width < 0) -+ // Reject extremely wide images to keep the math sane -+ const PRInt32 k64KWidth = 0x0000FFFF; -+ if (mBIH.width < 0 || mBIH.width > k64KWidth) - return NS_ERROR_FAILURE; - - PRUint32 real_height = (mBIH.height > 0) ? mBIH.height : -mBIH.height; diff --git a/www/mozilla/files/patch-256316 b/www/mozilla/files/patch-256316 deleted file mode 100644 index 147d15e5303d..000000000000 --- a/www/mozilla/files/patch-256316 +++ /dev/null @@ -1,18 +0,0 @@ -Index: mozilla/netwerk/dns/src/nsIDNService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/dns/src/nsIDNService.cpp,v -retrieving revision 1.18 -retrieving revision 1.18.10.1 -diff -u -r1.18 -r1.18.10.1 ---- netwerk/dns/src/nsIDNService.cpp 3 Apr 2004 07:32:18 -0000 1.18 -+++ netwerk/dns/src/nsIDNService.cpp 27 Aug 2004 11:23:21 -0000 1.18.10.1 -@@ -242,6 +242,9 @@ - - NS_IMETHODIMP nsIDNService::Normalize(const nsACString & input, nsACString & output) - { -+ // protect against bogus input -+ NS_ENSURE_TRUE(IsUTF8(input), NS_ERROR_UNEXPECTED); -+ - nsAutoString outUTF16; - nsresult rv = stringPrep(NS_ConvertUTF8toUTF16(input), outUTF16); - if (NS_SUCCEEDED(rv)) diff --git a/www/mozilla/files/patch-257314 b/www/mozilla/files/patch-257314 deleted file mode 100644 index 8bcc707b9dd9..000000000000 --- a/www/mozilla/files/patch-257314 +++ /dev/null @@ -1,31 +0,0 @@ -Index: nsVCardObj.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsVCardObj.cpp,v -retrieving revision 1.2 -retrieving revision 1.2.24.1 -diff -u -r1.2 -r1.2.24.1 ---- mailnews/addrbook/src/nsVCardObj.cpp 14 Sep 2003 21:45:58 -0000 1.2 -+++ mailnews/addrbook/src/nsVCardObj.cpp 31 Aug 2004 07:44:25 -0000 1.2.24.1 -@@ -1344,16 +1344,13 @@ - - static void writeGroup(OFile *fp, VObject *o) - { -- char buf1[256]; -- char buf2[256]; -- PL_strcpy(buf1,NAME_OF(o)); -- while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { -- PL_strcpy(buf2,STRINGZ_VALUE_OF(o)); -- PL_strcat(buf2,"."); -- PL_strcat(buf2,buf1); -- PL_strcpy(buf1,buf2); -+ nsCAutoString buf(NAME_OF(o)); -+ -+ while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { -+ buf.Insert(NS_LITERAL_CSTRING("."), 0); -+ buf.Insert(STRINGZ_VALUE_OF(o), 0); - } -- appendsOFile(fp,buf1); -+ appendsOFile(fp, buf.get()); - } - - static int inList(const char **list, const char *s) diff --git a/www/mozilla/files/patch-258005 b/www/mozilla/files/patch-258005 deleted file mode 100644 index fc20d4b596cf..000000000000 --- a/www/mozilla/files/patch-258005 +++ /dev/null @@ -1,278 +0,0 @@ -Index: nsMsgCompUtils.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp,v -retrieving revision 1.161 -retrieving revision 1.161.10.1 -diff -u -r1.161 -r1.161.10.1 ---- mailnews/compose/src/nsMsgCompUtils.cpp 12 Mar 2004 07:23:38 -0000 1.161 -+++ mailnews/compose/src/nsMsgCompUtils.cpp 8 Sep 2004 19:27:53 -0000 1.161.10.1 -@@ -821,16 +821,7 @@ - nsresult rv; - nsCOMPtr<nsIPref> prefs(do_GetService(kPrefCID, &rv)); - -- PRInt32 buffer_size = 2048 + (real_name ? 2*PL_strlen(real_name) : 0) + (base_url ? 2*PL_strlen(base_url) : 0) + -- (type_param ? PL_strlen(type_param) : 0) + (encoding ? PL_strlen(encoding) : 0) + -- (description ? PL_strlen(description) : 0) + (x_mac_type ? PL_strlen(x_mac_type) : 0) + -- (x_mac_creator ? PL_strlen(x_mac_creator) : 0) + (attachmentCharset ? PL_strlen(attachmentCharset) : 0) + -- (bodyCharset ? PL_strlen(bodyCharset) : 0) + (content_id ? PL_strlen(content_id) : 0); -- char *buffer = (char *) PR_Malloc (buffer_size); -- char *buffer_tail = buffer; -- -- if (! buffer) -- return 0; /* NS_ERROR_OUT_OF_MEMORY */ -+ nsCString buf(""); - - NS_ASSERTION (encoding, "null encoding"); - -@@ -874,14 +865,13 @@ - } - } - -- PUSH_STRING ("Content-Type: "); -- PUSH_STRING (type); -- -+ buf.Append("Content-Type: "); -+ buf.Append(type); - if (type_param && *type_param) - { - if (*type_param != ';') -- PUSH_STRING("; "); -- PUSH_STRING(type_param); -+ buf.Append("; "); -+ buf.Append(type_param); - } - - if (mime_type_needs_charset (type)) -@@ -918,8 +908,8 @@ - (PL_strcasecmp(encoding, ENCODING_BASE64) != 0)) && - (*charset_label)) - { -- PUSH_STRING ("; charset="); -- PUSH_STRING (charset_label); -+ buf.Append("; charset="); -+ buf.Append(charset_label); - } - } - -@@ -930,7 +920,7 @@ - if(type && !PL_strcasecmp(type, "text/plain")) - { - if(UseFormatFlowed(bodyCharset)) -- PUSH_STRING ("; format=flowed"); -+ buf.Append("; format=flowed"); - // else - // { - // Don't add a markup. Could use -@@ -942,59 +932,59 @@ - } - - if (x_mac_type && *x_mac_type) { -- PUSH_STRING ("; x-mac-type=\""); -- PUSH_STRING (x_mac_type); -- PUSH_STRING ("\""); -+ buf.Append("; x-mac-type=\""); -+ buf.Append(x_mac_type); -+ buf.Append("\""); - } - - if (x_mac_creator && *x_mac_creator) { -- PUSH_STRING ("; x-mac-creator=\""); -- PUSH_STRING (x_mac_creator); -- PUSH_STRING ("\""); -+ buf.Append("; x-mac-creator=\""); -+ buf.Append(x_mac_creator); -+ buf.Append("\""); - } - - #ifdef EMIT_NAME_IN_CONTENT_TYPE - if (encodedRealName && *encodedRealName) { - if (parmFolding == 0 || parmFolding == 1) { -- PUSH_STRING (";\r\n name=\""); -- PUSH_STRING (encodedRealName); -- PUSH_STRING ("\""); -+ buf.Append(";\r\n name=\""); -+ buf.Append(encodedRealName); -+ buf.Append("\""); - } - else // if (parmFolding == 2) - { - char *rfc2231Parm = RFC2231ParmFolding("name", charset.get(), - nsMsgI18NGetAcceptLanguage(), encodedRealName); - if (rfc2231Parm) { -- PUSH_STRING(";\r\n "); -- PUSH_STRING(rfc2231Parm); -+ buf.Append(";\r\n "); -+ buf.Append(rfc2231Parm); - PR_Free(rfc2231Parm); - } - } - } - #endif /* EMIT_NAME_IN_CONTENT_TYPE */ -+ buf.Append(CRLF); - -- PUSH_NEWLINE (); -+ buf.Append("Content-Transfer-Encoding: "); -+ buf.Append(encoding); - -- PUSH_STRING ("Content-Transfer-Encoding: "); -- PUSH_STRING (encoding); -- PUSH_NEWLINE (); -+ buf.Append(CRLF); - - if (description && *description) { - char *s = mime_fix_header (description); - if (s) { -- PUSH_STRING ("Content-Description: "); -- PUSH_STRING (s); -- PUSH_NEWLINE (); -+ buf.Append("Content-Description: "); -+ buf.Append(s); -+ buf.Append(CRLF); - PR_Free(s); - } - } - - if ( (content_id) && (*content_id) ) - { -- PUSH_STRING ("Content-ID: <"); -- PUSH_STRING (content_id); -- PUSH_STRING (">"); -- PUSH_NEWLINE (); -+ buf.Append("Content-ID: <"); -+ buf.Append(content_id); -+ buf.Append(">"); -+ buf.Append(CRLF); - } - - if (encodedRealName && *encodedRealName) { -@@ -1004,15 +994,15 @@ - rv = prefs->GetIntPref("mail.content_disposition_type", &pref_content_disposition); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get mail.content_disposition_type"); - -- PUSH_STRING ("Content-Disposition: "); -+ buf.Append("Content-Disposition: "); - - if (pref_content_disposition == 1) -- PUSH_STRING ("attachment"); -+ buf.Append("attachment"); - else - if (pref_content_disposition == 2 && - (!PL_strcasecmp(type, TEXT_PLAIN) || - (period && !PL_strcasecmp(period, ".txt")))) -- PUSH_STRING("attachment"); -+ buf.Append("attachment"); - - /* If this document is an anonymous binary file or a vcard, - then always show it as an attachment, never inline. */ -@@ -1020,23 +1010,23 @@ - if (!PL_strcasecmp(type, APPLICATION_OCTET_STREAM) || - !PL_strcasecmp(type, TEXT_VCARD) || - !PL_strcasecmp(type, APPLICATION_DIRECTORY)) /* text/x-vcard synonym */ -- PUSH_STRING ("attachment"); -+ buf.Append("attachment"); - else -- PUSH_STRING ("inline"); -+ buf.Append("inline"); - - if (parmFolding == 0 || parmFolding == 1) { -- PUSH_STRING (";\r\n filename=\""); -- PUSH_STRING (encodedRealName); -- PUSH_STRING ("\"" CRLF); -+ buf.Append(";\r\n filename=\""); -+ buf.Append(encodedRealName); -+ buf.Append("\"" CRLF); - } - else // if (parmFolding == 2) - { - char *rfc2231Parm = RFC2231ParmFolding("filename", charset.get(), - nsMsgI18NGetAcceptLanguage(), encodedRealName); - if (rfc2231Parm) { -- PUSH_STRING(";\r\n "); -- PUSH_STRING(rfc2231Parm); -- PUSH_NEWLINE (); -+ buf.Append(";\r\n "); -+ buf.Append(rfc2231Parm); -+ buf.Append(CRLF); - PR_Free(rfc2231Parm); - } - } -@@ -1045,7 +1035,7 @@ - if (type && - (!PL_strcasecmp (type, MESSAGE_RFC822) || - !PL_strcasecmp (type, MESSAGE_NEWS))) -- PUSH_STRING ("Content-Disposition: inline" CRLF); -+ buf.Append("Content-Disposition: inline" CRLF); - - #ifdef GENERATE_CONTENT_BASE - /* If this is an HTML document, and we know the URL it originally -@@ -1079,9 +1069,9 @@ - prefs->GetBoolPref("mail.use_content_location_on_send", &useContentLocation); - - if (useContentLocation) -- PUSH_STRING ("Content-Location: \""); -+ buf.Append("Content-Location: \""); - else -- PUSH_STRING ("Content-Base: \""); -+ buf.Append("Content-Base: \""); - /* rhp - Pref for Content-Location usage */ - - /* rhp: this is to work with the Content-Location stuff */ -@@ -1089,34 +1079,34 @@ - - while (*s != 0 && *s != '#') - { -- const char *ot = buffer_tail; -- -+ PRUint32 ot=buf.Length(); -+ char tmp[]="\x00\x00"; - /* URLs must be wrapped at 40 characters or less. */ - if (col >= 38) { -- PUSH_STRING(CRLF "\t"); -+ buf.Append(CRLF "\t"); - col = 0; - } - - if (*s == ' ') -- PUSH_STRING("%20"); -+ buf.Append("%20"); - else if (*s == '\t') -- PUSH_STRING("%09"); -+ buf.Append("%09"); - else if (*s == '\n') -- PUSH_STRING("%0A"); -+ buf.Append("%0A"); - else if (*s == '\r') -- PUSH_STRING("%0D"); -+ buf.Append("%0D"); - else { -- *buffer_tail++ = *s; -- *buffer_tail = '\0'; -+ tmp[0]=*s; -+ buf.Append(tmp); - } - s++; -- col += (buffer_tail - ot); -+ col += (buf.Length() - ot); - } -- PUSH_STRING ("\"" CRLF); -+ buf.Append("\"" CRLF); - - /* rhp: this is to try to get around this fun problem with Content-Location */ - if (!useContentLocation) { -- PUSH_STRING ("Content-Location: \""); -+ buf.Append("Content-Location: \""); - s = base_url; - col = 0; - useContentLocation = PR_TRUE; -@@ -1130,10 +1120,9 @@ - #endif /* GENERATE_CONTENT_BASE */ - - /* realloc it smaller... */ -- buffer = (char*) PR_REALLOC (buffer, buffer_tail - buffer + 1); - - PR_FREEIF(encodedRealName); -- return buffer; -+ return PL_strdup(buf.get()); - } - - static PRBool isValidHost( const char* host ) diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index 6a2989c2e2ee..c6b03ef99d67 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -6,8 +6,8 @@ # PORTNAME= screem -PORTVERSION= 0.10.2 -CATEGORIES= www editors gnome +PORTVERSION= 0.12.0 +CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,18 +15,22 @@ MAINTAINER= coop9211@uidaho.edu COMMENT= Nice GNOME/GTK-based HTML editor LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ - croco.3:${PORTSDIR}/textproc/libcroco + croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco \ + dbus-1.0:${PORTSDIR}/devel/dbus USE_GMAKE= yes USE_REINPLACE= yes USE_X_PREFIX= yes USE_XPM= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \ - gtksourceview lthack intlhack -USE_INC_LIBTOOL_VER=13 -INSTALLS_SHLIB= yes + gtksourceview intlhack +USE_LIBTOOL_VER=15 -.ifndef WITHOUT_OPENSSL +GCONF_SCHEMAS= screem.schemas + +CROCO_VERSION= 0.6 + +.if !defined(WITHOUT_OPENSSL) USE_OPENSSL= yes CONFIGURE_ARGS+= --with-ssl .endif @@ -39,8 +43,17 @@ CONFIGURE_ARGS+= --without-included-neon post-patch: @${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/| ; \ + s|$$(datadir)/mime$$|${PREFIX}/share/mime|' \ + ${WRKSRC}/data/mime/Makefile.in \ + ${WRKSRC}/data/tagtrees/Makefile.in post-configure: @${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h +# HACK: This allows test builds into a temporary directory, but in the REAL world, +# gconf would have created this directory. +pre-install: + @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults + .include <bsd.port.mk> diff --git a/www/screem-devel/distinfo b/www/screem-devel/distinfo index 983b017c2c07..2cd82d29274c 100644 --- a/www/screem-devel/distinfo +++ b/www/screem-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (screem-0.10.2.tar.gz) = a58c72555a6cecf34c2e2f6d9fda0288 -SIZE (screem-0.10.2.tar.gz) = 2350572 +MD5 (screem-0.12.0.tar.gz) = 549077fca6a94e7a7051f33fc1d51e4a +SIZE (screem-0.12.0.tar.gz) = 4172719 diff --git a/www/screem-devel/files/patch-libegg::toolbar::eggtoolbar.c b/www/screem-devel/files/patch-libegg::toolbar::eggtoolbar.c deleted file mode 100644 index 84d7b815805b..000000000000 --- a/www/screem-devel/files/patch-libegg::toolbar::eggtoolbar.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libegg/toolbar/eggtoolbar.c.orig Thu Aug 12 10:09:55 2004 -+++ libegg/toolbar/eggtoolbar.c Thu Aug 12 10:11:54 2004 -@@ -2534,7 +2534,7 @@ - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2551,7 +2551,7 @@ - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/www/screem-devel/files/patch-ltmain.sh b/www/screem-devel/files/patch-ltmain.sh deleted file mode 100644 index 3bd995ac82f9..000000000000 --- a/www/screem-devel/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Mar 30 22:36:08 2004 -+++ ltmain.sh Tue Mar 30 22:39:04 2004 -@@ -1360,7 +1360,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1370,8 +1370,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3110,6 +3118,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5712,10 +5723,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in b/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in index 51b06f5f654b..5ce8e16b5326 100644 --- a/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in +++ b/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in @@ -1,22 +1,22 @@ ---- plugins/uploadWizard/Makefile.in.orig Tue Mar 30 22:42:31 2004 -+++ plugins/uploadWizard/Makefile.in Tue Mar 30 22:43:33 2004 -@@ -267,8 +267,8 @@ - localdriver.c +--- plugins/uploadWizard/Makefile.in.orig Wed Nov 3 03:18:43 2004 ++++ plugins/uploadWizard/Makefile.in Wed Nov 3 03:20:17 2004 +@@ -277,8 +277,8 @@ + vfsdriver.c -uploadWizard_la_LDFLAGS = -avoid-version -module $(NEON_CFLAGS) -uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) +uploadWizard_la_LDFLAGS = -avoid-version -module -+uploadWizard_la_LIBADD = ++uploadWizard_la_LIBADD = config_h = $(top_builddir)/config.h obj_ext = o -@@ -279,7 +279,7 @@ +@@ -289,7 +289,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(plugins_exec_LTLIBRARIES) -uploadWizard_la_DEPENDENCIES = $(neon_dir)/*.lo -+uploadWizard_la_DEPENDENCIES = - am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h rpmatch.c \ - fnmatch.c fnmatch.h common.c common.h davdriver.c fileset.c \ - fileset.h frontend.h ftp.c ftp.h ftpdriver.c i18n.h protocol.h \ ++uploadWizard_la_DEPENDENCIES = + am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h fnmatch.c \ + fnmatch.h common.c common.h fileset.c fileset.h frontend.h \ + ftp.c ftp.h ftpdriver.c i18n.h protocol.h rcfile.c rcfile.h \ diff --git a/www/screem-devel/pkg-descr b/www/screem-devel/pkg-descr index b586f6d09b23..b601941fa4de 100644 --- a/www/screem-devel/pkg-descr +++ b/www/screem-devel/pkg-descr @@ -2,7 +2,7 @@ SCREEM (Site CReating and Editing EnvironMent) is a VERY nice GUI-based HTML editor, much like bluefish. It even imports bluefish functions from your bluefish installation! -SCREEM makes a rather ideal GUI HTML editor, especially for +SCREEM makes a rather ideal GUI HTML editor, especially for Unixheads who like using CVS to manage source trees, as SCREEM has functional CVS interaction. diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist index 3363683c65d9..ae424d011918 100644 --- a/www/screem-devel/pkg-plist +++ b/www/screem-devel/pkg-plist @@ -1,7 +1,4 @@ bin/screem -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/screem.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true lib/screem/plugins/colourWizard.so lib/screem/plugins/cssWizard.so lib/screem/plugins/css_wizard.so @@ -9,16 +6,73 @@ lib/screem/plugins/entityWizard.so lib/screem/plugins/formWizard.so lib/screem/plugins/imageWizard.so lib/screem/plugins/linkWizard.so +lib/screem/plugins/object_wizard.so lib/screem/plugins/ssiWizard.so lib/screem/plugins/tableWizard.so lib/screem/plugins/uploadWizard.so share/gnome/application-registry/screem.applications +share/gnome/applications/mimeinfo.cache share/gnome/applications/screem.desktop -share/gnome/help/screem/C/figures/dummy.png +share/gnome/help/screem/C/figures/color-wizard.png +share/gnome/help/screem/C/figures/css-wizard1.png +share/gnome/help/screem/C/figures/css-wizard2.png +share/gnome/help/screem/C/figures/editor-autocomplete1.png +share/gnome/help/screem/C/figures/editor-context-menu.png +share/gnome/help/screem/C/figures/editor-error.png +share/gnome/help/screem/C/figures/editor-inline-tagging.png +share/gnome/help/screem/C/figures/editor-pasting.png +share/gnome/help/screem/C/figures/editor-tooltips.png +share/gnome/help/screem/C/figures/editor.png +share/gnome/help/screem/C/figures/entity-wizard.png +share/gnome/help/screem/C/figures/form-wizard.png +share/gnome/help/screem/C/figures/image-wizard.png +share/gnome/help/screem/C/figures/link-wizard1.png +share/gnome/help/screem/C/figures/link-wizard2.png +share/gnome/help/screem/C/figures/newblankdoc.png +share/gnome/help/screem/C/figures/newdoc.png +share/gnome/help/screem/C/figures/newsite1.png +share/gnome/help/screem/C/figures/newsite2.png +share/gnome/help/screem/C/figures/object-wizard.png +share/gnome/help/screem/C/figures/opensite1.png +share/gnome/help/screem/C/figures/opensite2.png +share/gnome/help/screem/C/figures/opensitelocation.png +share/gnome/help/screem/C/figures/prefs-browsers.png +share/gnome/help/screem/C/figures/prefs-doctypes.png +share/gnome/help/screem/C/figures/prefs-editor.png +share/gnome/help/screem/C/figures/prefs-fonts-colors.png +share/gnome/help/screem/C/figures/prefs-misc.png +share/gnome/help/screem/C/figures/prefs-tag-trees.png +share/gnome/help/screem/C/figures/preview.png +share/gnome/help/screem/C/figures/sidebar-attributes1.png +share/gnome/help/screem/C/figures/sidebar-attributes2.png +share/gnome/help/screem/C/figures/sidebar-attributes3.png +share/gnome/help/screem/C/figures/sidebar-errors.png +share/gnome/help/screem/C/figures/sidebar-files1.png +share/gnome/help/screem/C/figures/sidebar-files2.png +share/gnome/help/screem/C/figures/sidebar-messages.png +share/gnome/help/screem/C/figures/sidebar-resources1.png +share/gnome/help/screem/C/figures/sidebar-resources2.png +share/gnome/help/screem/C/figures/sidebar-resources3.png +share/gnome/help/screem/C/figures/sidebar-symbols.png +share/gnome/help/screem/C/figures/sidebar-tree.png +share/gnome/help/screem/C/figures/ssi-wizard.png +share/gnome/help/screem/C/figures/table-wizard.png +share/gnome/help/screem/C/figures/tree.png share/gnome/help/screem/C/legal.xml share/gnome/help/screem/C/screem.xml share/gnome/mime-info/screem.keys -share/gnome/mime-info/screem.mime +share/mime/application/vnd.wap.wmlc.xml +share/mime/application/vnd.wap.wmlscriptc.xml +share/mime/application/x-screem-tag-tree.xml +share/mime/application/x-screem.xml +share/mime/application/xhtml+xml.xml +share/mime/image/vnd.wap.wbmp.xml +share/mime/packages/screem.xml +share/mime/text/html.xml +share/mime/text/vnd.wap.wml.xml +share/mime/text/vnd.wap.wmlscript.xml +share/mime/text/x-component.xml +share/mime/text/x-javascript.xml share/gnome/omf/screem/screem-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/screem.png @@ -40,10 +94,10 @@ share/gnome/screem/dtd/xhtml-special.ent share/gnome/screem/dtd/xhtml-symbol.ent share/gnome/screem/features.xml share/gnome/screem/glade/css-wizard.glade -share/gnome/screem/glade/css.glade share/gnome/screem/glade/entityWizard.glade share/gnome/screem/glade/imageWizard.glade share/gnome/screem/glade/linkwizard.glade +share/gnome/screem/glade/object-wizard.glade share/gnome/screem/glade/screem.glade share/gnome/screem/glade/ssiwizard.glade share/gnome/screem/glade/tablewizard.glade @@ -82,6 +136,7 @@ share/gnome/screem/pixmaps/entry.xpm share/gnome/screem/pixmaps/fixed.xpm share/gnome/screem/pixmaps/gallery.xpm share/gnome/screem/pixmaps/gnome-fileentry.xpm +share/gnome/screem/pixmaps/hand-open.png share/gnome/screem/pixmaps/insert-symbol-16.png share/gnome/screem/pixmaps/insert-symbol-24.png share/gnome/screem/pixmaps/optionmenu.xpm @@ -92,10 +147,15 @@ share/gnome/screem/pixmaps/resources.png share/gnome/screem/pixmaps/screem_site.png share/gnome/screem/pixmaps/site_preview.png share/gnome/screem/pixmaps/site_structure-48.png +share/gnome/screem/pixmaps/stock-close-12.png +share/gnome/screem/pixmaps/stock-menu-left-12.png +share/gnome/screem/pixmaps/stock-menu-right-12.png share/gnome/screem/pixmaps/stock_connect.png share/gnome/screem/pixmaps/stock_disconnect.png share/gnome/screem/pixmaps/stock_insert_image-16.png share/gnome/screem/pixmaps/stock_insert_image.png +share/gnome/screem/pixmaps/stock_insert_object-16.png +share/gnome/screem/pixmaps/stock_insert_object.png share/gnome/screem/pixmaps/stock_insert_table-16.png share/gnome/screem/pixmaps/sub.xpm share/gnome/screem/pixmaps/sup.xpm @@ -112,10 +172,12 @@ share/gnome/screem/resources/Templates/template.html share/gnome/screem/tagtrees/apache.tagtree share/gnome/screem/tagtrees/css.tagtree share/gnome/screem/tagtrees/funcref_php.tagtree +share/gnome/screem/tagtrees/funcref_python.tagtree share/gnome/screem/tagtrees/html.tagtree share/gnome/screem/tagtrees/javascript.tagtree +share/gnome/screem/tagtrees/teixlite.tagtree share/gnome/screem/ui/layout -share/gnome/screem/ui/screem-css-window-ui.xml +share/gnome/screem/ui/screem-editable-toolbars.xml share/gnome/screem/ui/screem-tag-tree-bar.xml share/gnome/screem/ui/screem-window-menu.xml share/gnome/screem/ui/screem-window-popups.xml @@ -141,26 +203,28 @@ share/locale/tr/LC_MESSAGES/screem.mo share/locale/uk/LC_MESSAGES/screem.mo share/locale/vi/LC_MESSAGES/screem.mo share/locale/zh_CN/LC_MESSAGES/screem.mo -@dirrm share/gnome/screem/ui -@dirrm share/gnome/screem/tagtrees -@dirrm share/gnome/screem/resources/Templates -@dirrm share/gnome/screem/resources/PHP3 -@dirrm share/gnome/screem/resources/Javascript -@dirrm share/gnome/screem/resources/Images -@dirrm share/gnome/screem/resources/HTML -@dirrm share/gnome/screem/resources/Applets -@dirrm share/gnome/screem/resources -@dirrm share/gnome/screem/pixmaps -@dirrm share/gnome/screem/hints -@dirrm share/gnome/screem/glade -@dirrm share/gnome/screem/dtd -@dirrm share/gnome/screem -@dirrm share/gnome/pixmaps/screem/splash -@dirrm share/gnome/pixmaps/screem -@dirrm share/gnome/omf/screem +@dirrm lib/screem/plugins +@dirrm lib/screem @dirrm share/gnome/help/screem/C/figures @dirrm share/gnome/help/screem/C @dirrm share/gnome/help/screem -@dirrm lib/screem/plugins -@dirrm lib/screem +@dirrm share/gnome/omf/screem +@dirrm share/gnome/pixmaps/screem/splash +@dirrm share/gnome/pixmaps/screem +@dirrm share/gnome/screem/dtd +@dirrm share/gnome/screem/glade +@dirrm share/gnome/screem/hints +@dirrm share/gnome/screem/pixmaps +@dirrm share/gnome/screem/resources/Applets +@dirrm share/gnome/screem/resources/HTML +@dirrm share/gnome/screem/resources/Images +@dirrm share/gnome/screem/resources/Javascript +@dirrm share/gnome/screem/resources/PHP3 +@dirrm share/gnome/screem/resources/Templates +@dirrm share/gnome/screem/resources +@dirrm share/gnome/screem/tagtrees +@dirrm share/gnome/screem/ui +@dirrm share/gnome/screem @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true +@exec update-mime-database %D/share/mime +@unexec update-mime-database %D/share/mime diff --git a/www/screem/Makefile b/www/screem/Makefile index 6a2989c2e2ee..c6b03ef99d67 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -6,8 +6,8 @@ # PORTNAME= screem -PORTVERSION= 0.10.2 -CATEGORIES= www editors gnome +PORTVERSION= 0.12.0 +CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,18 +15,22 @@ MAINTAINER= coop9211@uidaho.edu COMMENT= Nice GNOME/GTK-based HTML editor LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ - croco.3:${PORTSDIR}/textproc/libcroco + croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco \ + dbus-1.0:${PORTSDIR}/devel/dbus USE_GMAKE= yes USE_REINPLACE= yes USE_X_PREFIX= yes USE_XPM= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \ - gtksourceview lthack intlhack -USE_INC_LIBTOOL_VER=13 -INSTALLS_SHLIB= yes + gtksourceview intlhack +USE_LIBTOOL_VER=15 -.ifndef WITHOUT_OPENSSL +GCONF_SCHEMAS= screem.schemas + +CROCO_VERSION= 0.6 + +.if !defined(WITHOUT_OPENSSL) USE_OPENSSL= yes CONFIGURE_ARGS+= --with-ssl .endif @@ -39,8 +43,17 @@ CONFIGURE_ARGS+= --without-included-neon post-patch: @${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/| ; \ + s|$$(datadir)/mime$$|${PREFIX}/share/mime|' \ + ${WRKSRC}/data/mime/Makefile.in \ + ${WRKSRC}/data/tagtrees/Makefile.in post-configure: @${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h +# HACK: This allows test builds into a temporary directory, but in the REAL world, +# gconf would have created this directory. +pre-install: + @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults + .include <bsd.port.mk> diff --git a/www/screem/distinfo b/www/screem/distinfo index 983b017c2c07..2cd82d29274c 100644 --- a/www/screem/distinfo +++ b/www/screem/distinfo @@ -1,2 +1,2 @@ -MD5 (screem-0.10.2.tar.gz) = a58c72555a6cecf34c2e2f6d9fda0288 -SIZE (screem-0.10.2.tar.gz) = 2350572 +MD5 (screem-0.12.0.tar.gz) = 549077fca6a94e7a7051f33fc1d51e4a +SIZE (screem-0.12.0.tar.gz) = 4172719 diff --git a/www/screem/files/patch-libegg::toolbar::eggtoolbar.c b/www/screem/files/patch-libegg::toolbar::eggtoolbar.c deleted file mode 100644 index 84d7b815805b..000000000000 --- a/www/screem/files/patch-libegg::toolbar::eggtoolbar.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libegg/toolbar/eggtoolbar.c.orig Thu Aug 12 10:09:55 2004 -+++ libegg/toolbar/eggtoolbar.c Thu Aug 12 10:11:54 2004 -@@ -2534,7 +2534,7 @@ - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2551,7 +2551,7 @@ - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/www/screem/files/patch-ltmain.sh b/www/screem/files/patch-ltmain.sh deleted file mode 100644 index 3bd995ac82f9..000000000000 --- a/www/screem/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Mar 30 22:36:08 2004 -+++ ltmain.sh Tue Mar 30 22:39:04 2004 -@@ -1360,7 +1360,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1370,8 +1370,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3110,6 +3118,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5712,10 +5723,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/www/screem/files/patch-plugins::uploadWizard::Makefile.in b/www/screem/files/patch-plugins::uploadWizard::Makefile.in index 51b06f5f654b..5ce8e16b5326 100644 --- a/www/screem/files/patch-plugins::uploadWizard::Makefile.in +++ b/www/screem/files/patch-plugins::uploadWizard::Makefile.in @@ -1,22 +1,22 @@ ---- plugins/uploadWizard/Makefile.in.orig Tue Mar 30 22:42:31 2004 -+++ plugins/uploadWizard/Makefile.in Tue Mar 30 22:43:33 2004 -@@ -267,8 +267,8 @@ - localdriver.c +--- plugins/uploadWizard/Makefile.in.orig Wed Nov 3 03:18:43 2004 ++++ plugins/uploadWizard/Makefile.in Wed Nov 3 03:20:17 2004 +@@ -277,8 +277,8 @@ + vfsdriver.c -uploadWizard_la_LDFLAGS = -avoid-version -module $(NEON_CFLAGS) -uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) +uploadWizard_la_LDFLAGS = -avoid-version -module -+uploadWizard_la_LIBADD = ++uploadWizard_la_LIBADD = config_h = $(top_builddir)/config.h obj_ext = o -@@ -279,7 +279,7 @@ +@@ -289,7 +289,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(plugins_exec_LTLIBRARIES) -uploadWizard_la_DEPENDENCIES = $(neon_dir)/*.lo -+uploadWizard_la_DEPENDENCIES = - am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h rpmatch.c \ - fnmatch.c fnmatch.h common.c common.h davdriver.c fileset.c \ - fileset.h frontend.h ftp.c ftp.h ftpdriver.c i18n.h protocol.h \ ++uploadWizard_la_DEPENDENCIES = + am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h fnmatch.c \ + fnmatch.h common.c common.h fileset.c fileset.h frontend.h \ + ftp.c ftp.h ftpdriver.c i18n.h protocol.h rcfile.c rcfile.h \ diff --git a/www/screem/pkg-descr b/www/screem/pkg-descr index b586f6d09b23..b601941fa4de 100644 --- a/www/screem/pkg-descr +++ b/www/screem/pkg-descr @@ -2,7 +2,7 @@ SCREEM (Site CReating and Editing EnvironMent) is a VERY nice GUI-based HTML editor, much like bluefish. It even imports bluefish functions from your bluefish installation! -SCREEM makes a rather ideal GUI HTML editor, especially for +SCREEM makes a rather ideal GUI HTML editor, especially for Unixheads who like using CVS to manage source trees, as SCREEM has functional CVS interaction. diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist index 3363683c65d9..ae424d011918 100644 --- a/www/screem/pkg-plist +++ b/www/screem/pkg-plist @@ -1,7 +1,4 @@ bin/screem -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/screem.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true lib/screem/plugins/colourWizard.so lib/screem/plugins/cssWizard.so lib/screem/plugins/css_wizard.so @@ -9,16 +6,73 @@ lib/screem/plugins/entityWizard.so lib/screem/plugins/formWizard.so lib/screem/plugins/imageWizard.so lib/screem/plugins/linkWizard.so +lib/screem/plugins/object_wizard.so lib/screem/plugins/ssiWizard.so lib/screem/plugins/tableWizard.so lib/screem/plugins/uploadWizard.so share/gnome/application-registry/screem.applications +share/gnome/applications/mimeinfo.cache share/gnome/applications/screem.desktop -share/gnome/help/screem/C/figures/dummy.png +share/gnome/help/screem/C/figures/color-wizard.png +share/gnome/help/screem/C/figures/css-wizard1.png +share/gnome/help/screem/C/figures/css-wizard2.png +share/gnome/help/screem/C/figures/editor-autocomplete1.png +share/gnome/help/screem/C/figures/editor-context-menu.png +share/gnome/help/screem/C/figures/editor-error.png +share/gnome/help/screem/C/figures/editor-inline-tagging.png +share/gnome/help/screem/C/figures/editor-pasting.png +share/gnome/help/screem/C/figures/editor-tooltips.png +share/gnome/help/screem/C/figures/editor.png +share/gnome/help/screem/C/figures/entity-wizard.png +share/gnome/help/screem/C/figures/form-wizard.png +share/gnome/help/screem/C/figures/image-wizard.png +share/gnome/help/screem/C/figures/link-wizard1.png +share/gnome/help/screem/C/figures/link-wizard2.png +share/gnome/help/screem/C/figures/newblankdoc.png +share/gnome/help/screem/C/figures/newdoc.png +share/gnome/help/screem/C/figures/newsite1.png +share/gnome/help/screem/C/figures/newsite2.png +share/gnome/help/screem/C/figures/object-wizard.png +share/gnome/help/screem/C/figures/opensite1.png +share/gnome/help/screem/C/figures/opensite2.png +share/gnome/help/screem/C/figures/opensitelocation.png +share/gnome/help/screem/C/figures/prefs-browsers.png +share/gnome/help/screem/C/figures/prefs-doctypes.png +share/gnome/help/screem/C/figures/prefs-editor.png +share/gnome/help/screem/C/figures/prefs-fonts-colors.png +share/gnome/help/screem/C/figures/prefs-misc.png +share/gnome/help/screem/C/figures/prefs-tag-trees.png +share/gnome/help/screem/C/figures/preview.png +share/gnome/help/screem/C/figures/sidebar-attributes1.png +share/gnome/help/screem/C/figures/sidebar-attributes2.png +share/gnome/help/screem/C/figures/sidebar-attributes3.png +share/gnome/help/screem/C/figures/sidebar-errors.png +share/gnome/help/screem/C/figures/sidebar-files1.png +share/gnome/help/screem/C/figures/sidebar-files2.png +share/gnome/help/screem/C/figures/sidebar-messages.png +share/gnome/help/screem/C/figures/sidebar-resources1.png +share/gnome/help/screem/C/figures/sidebar-resources2.png +share/gnome/help/screem/C/figures/sidebar-resources3.png +share/gnome/help/screem/C/figures/sidebar-symbols.png +share/gnome/help/screem/C/figures/sidebar-tree.png +share/gnome/help/screem/C/figures/ssi-wizard.png +share/gnome/help/screem/C/figures/table-wizard.png +share/gnome/help/screem/C/figures/tree.png share/gnome/help/screem/C/legal.xml share/gnome/help/screem/C/screem.xml share/gnome/mime-info/screem.keys -share/gnome/mime-info/screem.mime +share/mime/application/vnd.wap.wmlc.xml +share/mime/application/vnd.wap.wmlscriptc.xml +share/mime/application/x-screem-tag-tree.xml +share/mime/application/x-screem.xml +share/mime/application/xhtml+xml.xml +share/mime/image/vnd.wap.wbmp.xml +share/mime/packages/screem.xml +share/mime/text/html.xml +share/mime/text/vnd.wap.wml.xml +share/mime/text/vnd.wap.wmlscript.xml +share/mime/text/x-component.xml +share/mime/text/x-javascript.xml share/gnome/omf/screem/screem-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/screem.png @@ -40,10 +94,10 @@ share/gnome/screem/dtd/xhtml-special.ent share/gnome/screem/dtd/xhtml-symbol.ent share/gnome/screem/features.xml share/gnome/screem/glade/css-wizard.glade -share/gnome/screem/glade/css.glade share/gnome/screem/glade/entityWizard.glade share/gnome/screem/glade/imageWizard.glade share/gnome/screem/glade/linkwizard.glade +share/gnome/screem/glade/object-wizard.glade share/gnome/screem/glade/screem.glade share/gnome/screem/glade/ssiwizard.glade share/gnome/screem/glade/tablewizard.glade @@ -82,6 +136,7 @@ share/gnome/screem/pixmaps/entry.xpm share/gnome/screem/pixmaps/fixed.xpm share/gnome/screem/pixmaps/gallery.xpm share/gnome/screem/pixmaps/gnome-fileentry.xpm +share/gnome/screem/pixmaps/hand-open.png share/gnome/screem/pixmaps/insert-symbol-16.png share/gnome/screem/pixmaps/insert-symbol-24.png share/gnome/screem/pixmaps/optionmenu.xpm @@ -92,10 +147,15 @@ share/gnome/screem/pixmaps/resources.png share/gnome/screem/pixmaps/screem_site.png share/gnome/screem/pixmaps/site_preview.png share/gnome/screem/pixmaps/site_structure-48.png +share/gnome/screem/pixmaps/stock-close-12.png +share/gnome/screem/pixmaps/stock-menu-left-12.png +share/gnome/screem/pixmaps/stock-menu-right-12.png share/gnome/screem/pixmaps/stock_connect.png share/gnome/screem/pixmaps/stock_disconnect.png share/gnome/screem/pixmaps/stock_insert_image-16.png share/gnome/screem/pixmaps/stock_insert_image.png +share/gnome/screem/pixmaps/stock_insert_object-16.png +share/gnome/screem/pixmaps/stock_insert_object.png share/gnome/screem/pixmaps/stock_insert_table-16.png share/gnome/screem/pixmaps/sub.xpm share/gnome/screem/pixmaps/sup.xpm @@ -112,10 +172,12 @@ share/gnome/screem/resources/Templates/template.html share/gnome/screem/tagtrees/apache.tagtree share/gnome/screem/tagtrees/css.tagtree share/gnome/screem/tagtrees/funcref_php.tagtree +share/gnome/screem/tagtrees/funcref_python.tagtree share/gnome/screem/tagtrees/html.tagtree share/gnome/screem/tagtrees/javascript.tagtree +share/gnome/screem/tagtrees/teixlite.tagtree share/gnome/screem/ui/layout -share/gnome/screem/ui/screem-css-window-ui.xml +share/gnome/screem/ui/screem-editable-toolbars.xml share/gnome/screem/ui/screem-tag-tree-bar.xml share/gnome/screem/ui/screem-window-menu.xml share/gnome/screem/ui/screem-window-popups.xml @@ -141,26 +203,28 @@ share/locale/tr/LC_MESSAGES/screem.mo share/locale/uk/LC_MESSAGES/screem.mo share/locale/vi/LC_MESSAGES/screem.mo share/locale/zh_CN/LC_MESSAGES/screem.mo -@dirrm share/gnome/screem/ui -@dirrm share/gnome/screem/tagtrees -@dirrm share/gnome/screem/resources/Templates -@dirrm share/gnome/screem/resources/PHP3 -@dirrm share/gnome/screem/resources/Javascript -@dirrm share/gnome/screem/resources/Images -@dirrm share/gnome/screem/resources/HTML -@dirrm share/gnome/screem/resources/Applets -@dirrm share/gnome/screem/resources -@dirrm share/gnome/screem/pixmaps -@dirrm share/gnome/screem/hints -@dirrm share/gnome/screem/glade -@dirrm share/gnome/screem/dtd -@dirrm share/gnome/screem -@dirrm share/gnome/pixmaps/screem/splash -@dirrm share/gnome/pixmaps/screem -@dirrm share/gnome/omf/screem +@dirrm lib/screem/plugins +@dirrm lib/screem @dirrm share/gnome/help/screem/C/figures @dirrm share/gnome/help/screem/C @dirrm share/gnome/help/screem -@dirrm lib/screem/plugins -@dirrm lib/screem +@dirrm share/gnome/omf/screem +@dirrm share/gnome/pixmaps/screem/splash +@dirrm share/gnome/pixmaps/screem +@dirrm share/gnome/screem/dtd +@dirrm share/gnome/screem/glade +@dirrm share/gnome/screem/hints +@dirrm share/gnome/screem/pixmaps +@dirrm share/gnome/screem/resources/Applets +@dirrm share/gnome/screem/resources/HTML +@dirrm share/gnome/screem/resources/Images +@dirrm share/gnome/screem/resources/Javascript +@dirrm share/gnome/screem/resources/PHP3 +@dirrm share/gnome/screem/resources/Templates +@dirrm share/gnome/screem/resources +@dirrm share/gnome/screem/tagtrees +@dirrm share/gnome/screem/ui +@dirrm share/gnome/screem @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true +@exec update-mime-database %D/share/mime +@unexec update-mime-database %D/share/mime |