aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2007-10-24 23:37:25 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2007-10-24 23:37:25 +0000
commit4acc6fb2a411b291c9c210d82bafe7c62e71c77d (patch)
treebc16420eb52d65511ceb520c00171d219210a473 /www
parent97dfcc1b41c5b4581b1d73128a866beec069c5bf (diff)
downloadports-4acc6fb2a411b291c9c210d82bafe7c62e71c77d.tar.gz
ports-4acc6fb2a411b291c9c210d82bafe7c62e71c77d.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/bluefish/Makefile13
-rw-r--r--www/bluefish/pkg-plist10
-rw-r--r--www/epiphany-extensions/Makefile21
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany-extensions/pkg-plist71
-rw-r--r--www/epiphany/Makefile11
-rw-r--r--www/epiphany/distinfo6
-rw-r--r--www/epiphany/pkg-plist255
-rw-r--r--www/erwn/Makefile2
-rw-r--r--www/erwn/pkg-plist24
-rw-r--r--www/evolution-webcal/Makefile5
-rw-r--r--www/evolution-webcal/distinfo6
-rw-r--r--www/evolution-webcal/pkg-plist6
-rw-r--r--www/galeon/Makefile10
-rw-r--r--www/galeon/pkg-plist153
-rw-r--r--www/gnome-user-share/Makefile4
-rw-r--r--www/gnome-user-share/files/patch-user_share.c12
-rw-r--r--www/gnome-user-share/pkg-plist21
-rw-r--r--www/gnome-web-photo/Makefile5
-rw-r--r--www/gnome-web-photo/pkg-plist6
-rw-r--r--www/gtkhtml/Makefile3
-rw-r--r--www/gtkhtml/files/gtkhtmlConf.sh6
-rw-r--r--www/gtkhtml/files/patch-ad11
-rw-r--r--www/gtkhtml/files/patch-doc::Makefile.in2
-rw-r--r--www/gtkhtml/pkg-plist120
-rw-r--r--www/gtkhtml3/Makefile8
-rw-r--r--www/gtkhtml3/distinfo6
-rw-r--r--www/gtkhtml3/files/patch-src_gtkhtml.c11
-rw-r--r--www/gtkhtml3/pkg-plist63
-rw-r--r--www/gtkhtml38/Makefile6
-rw-r--r--www/gtkhtml38/files/patch-src_gtkhtml.c11
-rw-r--r--www/gtkhtml38/pkg-plist136
-rw-r--r--www/gurlchecker/Makefile2
-rw-r--r--www/gurlchecker/pkg-plist83
-rw-r--r--www/kazehakase/Makefile15
-rw-r--r--www/kazehakase/distinfo6
-rw-r--r--www/kazehakase/pkg-plist101
-rw-r--r--www/nscache/Makefile7
-rw-r--r--www/nscache/pkg-plist2
-rw-r--r--www/opera/Makefile1
-rw-r--r--www/opera/files/patch-install.sh16
-rw-r--r--www/opera/pkg-plist2
-rw-r--r--www/osb-nrcore/Makefile3
-rw-r--r--www/peacock/Makefile2
-rw-r--r--www/peacock/pkg-plist14
-rw-r--r--www/screem-devel/Makefile8
-rw-r--r--www/screem-devel/pkg-plist285
-rw-r--r--www/screem/Makefile8
-rw-r--r--www/screem/pkg-plist285
-rw-r--r--www/syndigator/Makefile7
-rw-r--r--www/syndigator/pkg-plist49
51 files changed, 973 insertions, 953 deletions
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 7d180a9fb107..8c84f2236cb6 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <einekoai@chello.nl>
#
# $FreeBSD$
-# $MCom: ports/www/bluefish/Makefile,v 1.1 2006/09/30 03:21:27 ahze Exp $
+# $MCom: ports/www/bluefish/Makefile,v 1.6 2007/10/11 03:20:30 mezz Exp $
#
PORTNAME= bluefish
PORTVERSION= 1.0.7
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= www editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -28,16 +28,16 @@ RUN_DEPENDS+= tidy:${PORTSDIR}/www/tidy
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_GNOME= gnomehier gtk20 gnomevfs2
+USE_GNOME= gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-freedesktop_org-menu=${PREFIX}/share/gnome/applications \
+CONFIGURE_ARGS= --with-freedesktop_org-menu=${PREFIX}/share/applications \
--with-freedesktop_org-mime=${PREFIX}/share/mime \
--without-gnome2_4-mime \
--without-gnome2_4-appreg \
- --with-icon-path=${PREFIX}/share/gnome/pixmaps
+ --with-icon-path=${PREFIX}/share/pixmaps
# Turns debugging output on
.if defined(WITH_DEBUG)
@@ -62,6 +62,9 @@ pre-everything::
@${ECHO_MSG} "This will reduce the number of warning in the console when running bluefish."
@${ECHO_MSG} ""
+pre-install:
+ @${MKDIR} ${PREIX}/share/mime
+
.include <bsd.port.pre.mk>
.if ${HAVE_GNOME:Mlibgnomeui}!=""
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 8a7b525d9692..4817ee543072 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -22,10 +22,10 @@ bin/bluefish
%%DATADIR%%/icon_r.png
%%DATADIR%%/icon_unknown.png
%%DATADIR%%/icon_xml.png
-share/gnome/applications/bluefish-project.desktop
-share/gnome/applications/bluefish.desktop
-share/gnome/pixmaps/bluefish-icon.png
-share/gnome/pixmaps/gnome-mime-application-bluefish-project.png
+share/applications/bluefish-project.desktop
+share/applications/bluefish.desktop
+share/pixmaps/bluefish-icon.png
+share/pixmaps/gnome-mime-application-bluefish-project.png
share/locale/bg/LC_MESSAGES/bluefish.mo
share/locale/cs/LC_MESSAGES/bluefish.mo
share/locale/da/LC_MESSAGES/bluefish.mo
@@ -54,3 +54,5 @@ share/mime/packages/bluefish.xml
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/mime
+@dirrmtry share/applications
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 6cd0ed6851d9..915de298e6f5 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.88 2007/03/11 20:34:21 mezz Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.101 2007/10/15 22:00:17 mezz Exp $
#
PORTNAME= epiphany-extensions
-PORTVERSION= 2.18.3
-PORTREVISION= 2
+PORTVERSION= 2.20.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,6 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A set of add-ons for the Epiphany web browser
BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany
USE_GETTEXT= yes
@@ -35,12 +35,11 @@ CONFIGURE_ARGS= --with-mozilla=${GECKO}
GCONF_SCHEMAS= smart-bookmarks.schemas
EPHY_EXTENSIONS=all,rss
-EPHY_VERSION= 2.18
+EPHY_VERSION= 2.20
-PLIST_SUB= VERSION="2.18" EPHY_VERSION=${EPHY_VERSION}
+PLIST_SUB= VERSION="2.20" EPHY_VERSION=${EPHY_VERSION}
-OPTIONS= OPENSP "Enable OpenSP SGML support" off \
- ADBLOCK "Enable the adblock extension" on
+OPTIONS= OPENSP "Enable OpenSP SGML support" off
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
@@ -51,14 +50,6 @@ CONFIGURE_ARGS+= --enable-opensp=yes
CONFIGURE_ARGS+= --disable-opensp
.endif
-.if !defined(WITHOUT_ADBLOCK)
-EPHY_EXTENSIONS:= ${EPHY_EXTENSIONS},adblock
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-PLIST_SUB+= ADBLOCK=""
-.else
-PLIST_SUB+= ADBLOCK="@comment "
-.endif
-
.if exists(${LOCALBASE}/share/pygtk/2.0/defs/epiphany.defs)
USE_PYTHON= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 37a96347a87b..44f53585cab1 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-extensions-2.18.3.tar.bz2) = 4e55bedcfe7f2f359043eb14b17e8cc4
-SHA256 (gnome2/epiphany-extensions-2.18.3.tar.bz2) = 50063c8bd5d03f0625c287015f7b4d9fcfd320b7405161d1bab40d27d3368682
-SIZE (gnome2/epiphany-extensions-2.18.3.tar.bz2) = 893264
+MD5 (gnome2/epiphany-extensions-2.20.1.tar.bz2) = cd8a247d81960217df4d7c8edfe9fbf8
+SHA256 (gnome2/epiphany-extensions-2.20.1.tar.bz2) = 35a66aa9151f0cbd492435077f4bef30ecb8728e990e29da3e4a5f275a5875d0
+SIZE (gnome2/epiphany-extensions-2.20.1.tar.bz2) = 908577
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 6b3f2f49c971..f107dc0306ba 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -1,5 +1,5 @@
lib/epiphany/%%VERSION%%/extensions/actions.ephy-extension
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
+lib/epiphany/%%VERSION%%/extensions/adblock.ephy-extension
lib/epiphany/%%VERSION%%/extensions/auto-reload.ephy-extension
lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension
%%PYTHON%%lib/epiphany/%%VERSION%%/extensions/cc-license-viewer.ephy-extension
@@ -20,8 +20,8 @@ lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension
lib/epiphany/%%VERSION%%/extensions/java-console.ephy-extension
lib/epiphany/%%VERSION%%/extensions/libactionsextension.la
lib/epiphany/%%VERSION%%/extensions/libactionsextension.so
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
-%%ADBLOCK%%lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
+lib/epiphany/%%VERSION%%/extensions/libadblockextension.la
+lib/epiphany/%%VERSION%%/extensions/libadblockextension.so
lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.la
lib/epiphany/%%VERSION%%/extensions/libautoreloadextension.so
lib/epiphany/%%VERSION%%/extensions/libautoscrollerextension.la
@@ -61,23 +61,23 @@ lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension
lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension
lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension
lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension
-%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-patterns
-%%ADBLOCK%%share/gnome/epiphany-extensions/adblock-statusbar-icon.svg
-share/gnome/epiphany-extensions/ephy-gestures.xml
-share/gnome/epiphany-extensions/glade/action-properties.glade
-share/gnome/epiphany-extensions/glade/actions-editor.glade
-%%ADBLOCK%%share/gnome/epiphany-extensions/glade/adblock.glade
-share/gnome/epiphany-extensions/glade/error-viewer.glade
-share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade
-share/gnome/epiphany-extensions/glade/page-info.glade
-share/gnome/epiphany-extensions/glade/rss-ui.glade
-share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml
-share/gnome/epiphany-extensions/xml/page-info-context-ui.xml
-share/gnome/epiphany/icons/hicolor/16x16/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/22x22/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/24x24/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/32x32/status/feed-presence.png
-share/gnome/epiphany/icons/hicolor/scalable/status/feed-presence.svg
+%%DATADIR%%/adblock-patterns
+%%DATADIR%%/adblock-statusbar-icon.svg
+%%DATADIR%%/ephy-gestures.xml
+%%DATADIR%%/glade/action-properties.glade
+%%DATADIR%%/glade/actions-editor.glade
+%%DATADIR%%/glade/adblock.glade
+%%DATADIR%%/glade/error-viewer.glade
+%%DATADIR%%/glade/extensions-manager-ui.glade
+%%DATADIR%%/glade/page-info.glade
+%%DATADIR%%/glade/rss-ui.glade
+%%DATADIR%%/xml/epiphany-sidebar-ui.xml
+%%DATADIR%%/xml/page-info-context-ui.xml
+share/epiphany/icons/hicolor/16x16/status/feed-presence.png
+share/epiphany/icons/hicolor/22x22/status/feed-presence.png
+share/epiphany/icons/hicolor/24x24/status/feed-presence.png
+share/epiphany/icons/hicolor/32x32/status/feed-presence.png
+share/epiphany/icons/hicolor/scalable/status/feed-presence.svg
share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
@@ -119,14 +119,13 @@ share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source-2.p
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
-share/gnome/omf/epiphany-extensions/epiphany-extensions-C.omf
-share/gnome/omf/epiphany-extensions/epiphany-extensions-sv.omf
share/locale/ar/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/de/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/dz/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -143,6 +142,7 @@ share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nb/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/ne/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
+share/locale/oc/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@@ -162,15 +162,30 @@ share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-@dirrm share/gnome/omf/epiphany-extensions
+share/omf/epiphany-extensions/epiphany-extensions-C.omf
+share/omf/epiphany-extensions/epiphany-extensions-sv.omf
+@dirrm share/omf/epiphany-extensions
@dirrm share/gnome/help/epiphany-extensions/sv/figures
@dirrm share/gnome/help/epiphany-extensions/sv
@dirrm share/gnome/help/epiphany-extensions/C/figures
@dirrm share/gnome/help/epiphany-extensions/C
@dirrm share/gnome/help/epiphany-extensions
-@dirrm share/gnome/epiphany-extensions/xml
-@dirrm share/gnome/epiphany-extensions/glade
-@dirrm share/gnome/epiphany-extensions
+@dirrmtry share/epiphany/icons/hicolor/scalable/status
+@dirrmtry share/epiphany/icons/hicolor/scalable
+@dirrmtry share/epiphany/icons/hicolor/32x32/status
+@dirrmtry share/epiphany/icons/hicolor/32x32
+@dirrmtry share/epiphany/icons/hicolor/24x24/status
+@dirrmtry share/epiphany/icons/hicolor/24x24
+@dirrmtry share/epiphany/icons/hicolor/22x22/status
+@dirrmtry share/epiphany/icons/hicolor/22x22
+@dirrmtry share/epiphany/icons/hicolor/16x16/status
+@dirrmtry share/epiphany/icons/hicolor/16x16
+@dirrmtry share/epiphany/icons/hicolor
+@dirrmtry share/epiphany/icons
+@dirrmtry share/epiphany
+@dirrm %%DATADIR%%/xml
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
@dirrmtry lib/epiphany/%%VERSION%%/extensions
@dirrmtry lib/epiphany/%%VERSION%%/plugins
@dirrmtry lib/epiphany/%%VERSION%%
@@ -179,3 +194,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 7ec7bb1671b6..ec7ecb1170d5 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.141 2007/03/11 20:12:27 mezz Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.155 2007/10/15 21:47:21 mezz Exp $
#
PORTNAME= epiphany
-PORTVERSION= 2.18.3
+PORTVERSION= 2.20.1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,8 @@ COMMENT= An extremely lightweight and simple web browser for GNOME 2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/themes/LowContrast/index.theme:${PORTSDIR}/x11-themes/gnome-themes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -32,7 +33,7 @@ WANT_GNOME= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
-CONFIGURE_ARGS= --with-mozilla=${GECKO}
+CONFIGURE_ARGS= --with-gecko=${GECKO}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -77,8 +78,6 @@ post-patch:
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
- @${REINPLACE_CMD} -e 's|[$$](datadir)/pygtk/2.0/defs|${LOCALBASE}/share/pygtk/2.0/defs|' \
- ${WRKSRC}/src/Makefile.in
post-install:
${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 99dd06ba7946..8a567de151f5 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.18.3.tar.bz2) = 2e77f3f0651a27cac29224e82c3cc793
-SHA256 (gnome2/epiphany-2.18.3.tar.bz2) = ccceb15371782b2cfed2f7e4c078336dd20a0d864d9c1e31b28518aa5a25e6de
-SIZE (gnome2/epiphany-2.18.3.tar.bz2) = 4772883
+MD5 (gnome2/epiphany-2.20.1.tar.bz2) = bacb5c7f1a421f6d5adbec35d4cab3ea
+SHA256 (gnome2/epiphany-2.20.1.tar.bz2) = 2a1d9b9e928dd2cb7c3778d1990d5a42ae1b49b4d5e70d0bf86584a52d45bff1
+SIZE (gnome2/epiphany-2.20.1.tar.bz2) = 4878092
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index e6a3e1970474..42fa196eac82 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -37,84 +37,66 @@ lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
share/aclocal/epiphany.m4
+share/applications/bme.desktop
+share/applications/epiphany.desktop
share/dbus-1/services/org.gnome.Epiphany.service
-%%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-EphyExtensionsManager.html
-%%DOCSDIR%%/epiphany-EphyGlade.html
-%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
-%%DOCSDIR%%/epiphany-ephy-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
-%%DOCSDIR%%/epiphany.devhelp
-%%DOCSDIR%%/epiphany.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-share/gnome/applications/bme.desktop
-share/gnome/applications/epiphany.desktop
-share/gnome/epiphany/about.ini
-share/gnome/epiphany/chrome/branding/brand.dtd
-share/gnome/epiphany/chrome/branding/brand.properties
-share/gnome/epiphany/chrome/epiphany.manifest
-share/gnome/epiphany/chrome/global/about.xhtml
-share/gnome/epiphany/default-prefs.js
-share/gnome/epiphany/ephy-xml2ini.xsl
-share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
-share/gnome/epiphany/epiphany-bookmarks-html.xsl
-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
-share/gnome/epiphany/epiphany-ui.xml
-share/gnome/epiphany/epiphany.xhtml
-share/gnome/epiphany/glade/certificate-dialogs.glade
-share/gnome/epiphany/glade/epiphany.glade
-share/gnome/epiphany/glade/form-signing-dialog.glade
-share/gnome/epiphany/glade/prefs-dialog.glade
-share/gnome/epiphany/glade/print.glade
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/download.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/16x16/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/download.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/22x22/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/download.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/24x24/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/download.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/32x32/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/download.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/history-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/location-entry.svg
-share/gnome/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
-share/gnome/epiphany/mime-types-permissions.xml
+%%DATADIR%%/about.ini
+%%DATADIR%%/chrome/branding/brand.dtd
+%%DATADIR%%/chrome/branding/brand.properties
+%%DATADIR%%/chrome/epiphany.manifest
+%%DATADIR%%/chrome/global/about.xhtml
+%%DATADIR%%/default-prefs.js
+%%DATADIR%%/ephy-xml2ini.xsl
+%%DATADIR%%/epiphany-bookmark-editor-ui.xml
+%%DATADIR%%/epiphany-bookmarks-html.xsl
+%%DATADIR%%/epiphany-bookmarksbar.xml
+%%DATADIR%%/epiphany-fs-toolbar.xml
+%%DATADIR%%/epiphany-history-window-ui.xml
+%%DATADIR%%/epiphany-toolbar.xml
+%%DATADIR%%/epiphany-ui.xml
+%%DATADIR%%/epiphany.xhtml
+%%DATADIR%%/glade/certificate-dialogs.glade
+%%DATADIR%%/glade/epiphany.glade
+%%DATADIR%%/glade/form-signing-dialog.glade
+%%DATADIR%%/glade/prefs-dialog.glade
+%%DATADIR%%/glade/print.glade
+%%DATADIR%%/icons/hicolor/16x16/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/16x16/actions/history-view.png
+%%DATADIR%%/icons/hicolor/16x16/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/16x16/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/16x16/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/22x22/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/22x22/actions/history-view.png
+%%DATADIR%%/icons/hicolor/22x22/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/22x22/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/22x22/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/24x24/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/24x24/actions/history-view.png
+%%DATADIR%%/icons/hicolor/24x24/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/24x24/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/24x24/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/32x32/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/32x32/actions/history-view.png
+%%DATADIR%%/icons/hicolor/32x32/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/32x32/actions/location-entry.svg
+%%DATADIR%%/icons/hicolor/32x32/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/scalable/actions/bookmark-view.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/history-view.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/location-entry.svg
+%%DATADIR%%/icons/hicolor/scalable/status/popup-hidden.svg
+%%DATADIR%%/mime-types-permissions.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
@@ -126,6 +108,11 @@ share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
+share/gnome/help/epiphany/ca/epiphany.xml
+share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
share/gnome/help/epiphany/de/epiphany.xml
share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -176,6 +163,11 @@ share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
+share/gnome/help/epiphany/oc/epiphany.xml
+share/gnome/help/epiphany/oc/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-screenshot.png
share/gnome/help/epiphany/ru/epiphany.xml
share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -191,22 +183,15 @@ share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.pn
share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gnome/omf/epiphany/epiphany-C.omf
-share/gnome/omf/epiphany/epiphany-bg.omf
-share/gnome/omf/epiphany/epiphany-de.omf
-share/gnome/omf/epiphany/epiphany-el.omf
-share/gnome/omf/epiphany/epiphany-en_GB.omf
-share/gnome/omf/epiphany/epiphany-es.omf
-share/gnome/omf/epiphany/epiphany-eu.omf
-share/gnome/omf/epiphany/epiphany-fi.omf
-share/gnome/omf/epiphany/epiphany-fr.omf
-share/gnome/omf/epiphany/epiphany-it.omf
-share/gnome/omf/epiphany/epiphany-ja.omf
-share/gnome/omf/epiphany/epiphany-nl.omf
-share/gnome/omf/epiphany/epiphany-ru.omf
-share/gnome/omf/epiphany/epiphany-sv.omf
-share/gnome/omf/epiphany/epiphany-uk.omf
+share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/hicolor/16x16/apps/gnome-web-browser.png
+share/icons/hicolor/22x22/apps/gnome-web-browser.png
+share/icons/hicolor/24x24/apps/gnome-web-browser.png
+share/icons/hicolor/32x32/apps/gnome-web-browser.png
share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
+share/icons/hicolor/scalable/apps/gnome-web-browser.svg
share/locale/am/LC_MESSAGES/epiphany.mo
share/locale/ar/LC_MESSAGES/epiphany.mo
share/locale/az/LC_MESSAGES/epiphany.mo
@@ -267,6 +252,7 @@ share/locale/pt_BR/LC_MESSAGES/epiphany.mo
share/locale/ro/LC_MESSAGES/epiphany.mo
share/locale/ru/LC_MESSAGES/epiphany.mo
share/locale/rw/LC_MESSAGES/epiphany.mo
+share/locale/si/LC_MESSAGES/epiphany.mo
share/locale/sk/LC_MESSAGES/epiphany.mo
share/locale/sl/LC_MESSAGES/epiphany.mo
share/locale/sq/LC_MESSAGES/epiphany.mo
@@ -284,14 +270,33 @@ share/locale/wa/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
-@dirrm share/gnome/omf/epiphany
+share/omf/epiphany/epiphany-C.omf
+share/omf/epiphany/epiphany-bg.omf
+share/omf/epiphany/epiphany-ca.omf
+share/omf/epiphany/epiphany-de.omf
+share/omf/epiphany/epiphany-el.omf
+share/omf/epiphany/epiphany-en_GB.omf
+share/omf/epiphany/epiphany-es.omf
+share/omf/epiphany/epiphany-eu.omf
+share/omf/epiphany/epiphany-fi.omf
+share/omf/epiphany/epiphany-fr.omf
+share/omf/epiphany/epiphany-it.omf
+share/omf/epiphany/epiphany-ja.omf
+share/omf/epiphany/epiphany-nl.omf
+share/omf/epiphany/epiphany-oc.omf
+share/omf/epiphany/epiphany-ru.omf
+share/omf/epiphany/epiphany-sv.omf
+share/omf/epiphany/epiphany-uk.omf
+share/pygtk/2.0/defs/epiphany.defs
+@dirrm share/omf/epiphany
@dirrm share/gnome/help/epiphany/uk/figures
@dirrm share/gnome/help/epiphany/uk
@dirrm share/gnome/help/epiphany/sv/figures
@dirrm share/gnome/help/epiphany/sv
@dirrm share/gnome/help/epiphany/ru/figures
@dirrm share/gnome/help/epiphany/ru
+@dirrm share/gnome/help/epiphany/oc/figures
+@dirrm share/gnome/help/epiphany/oc
@dirrm share/gnome/help/epiphany/nl/figures
@dirrm share/gnome/help/epiphany/nl
@dirrm share/gnome/help/epiphany/ja/figures
@@ -312,38 +317,45 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm share/gnome/help/epiphany/el
@dirrm share/gnome/help/epiphany/de/figures
@dirrm share/gnome/help/epiphany/de
+@dirrm share/gnome/help/epiphany/ca/figures
+@dirrm share/gnome/help/epiphany/ca
@dirrm share/gnome/help/epiphany/bg/figures
@dirrm share/gnome/help/epiphany/bg
@dirrm share/gnome/help/epiphany/C/figures
@dirrm share/gnome/help/epiphany/C
@dirrm share/gnome/help/epiphany
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/status
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/actions
-@dirrm share/gnome/epiphany/icons/hicolor/scalable
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/status
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/actions
-@dirrm share/gnome/epiphany/icons/hicolor/32x32
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/status
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/actions
-@dirrm share/gnome/epiphany/icons/hicolor/24x24
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/status
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/actions
-@dirrm share/gnome/epiphany/icons/hicolor/22x22
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/status
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/actions
-@dirrm share/gnome/epiphany/icons/hicolor/16x16
-@dirrm share/gnome/epiphany/icons/hicolor
-@dirrm share/gnome/epiphany/icons
-@dirrm share/gnome/epiphany/glade
-@dirrm share/gnome/epiphany/chrome/global
-@dirrm share/gnome/epiphany/chrome/branding
-@dirrm share/gnome/epiphany/chrome
-@dirrm share/gnome/epiphany/art
-@dirrm share/gnome/epiphany
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48/status
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24/places
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22/places
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16/places
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/chrome/global
+@dirrm %%DATADIR%%/chrome/branding
+@dirrm %%DATADIR%%/chrome
+@dirrm %%DATADIR%%/art
+@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%
-@dirrmtry lib/epiphany
+@dirrm lib/epiphany/%%EPHY_VERSION%%/plugins
+@dirrm lib/epiphany/%%EPHY_VERSION%%
+@dirrm lib/epiphany
@dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
@dirrm include/epiphany/%%EPHY_VERSION%%
@dirrm include/epiphany
@@ -353,6 +365,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@@ -369,3 +383,4 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/applications
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 47032f0678b7..8ddaff916e1b 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= erwn
PORTVERSION= 0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www editors
MASTER_SITES= http://lisas.de/erwin/
DISTNAME= erwin-${PORTVERSION}
diff --git a/www/erwn/pkg-plist b/www/erwn/pkg-plist
index d97e67ffb47c..6ea2bd7b1534 100644
--- a/www/erwn/pkg-plist
+++ b/www/erwn/pkg-plist
@@ -1,15 +1,15 @@
bin/erwin
-share/gnome/erwin/bold.svg
-share/gnome/erwin/bold1.svg
-share/gnome/erwin/erwin-highlighting.xml
-share/gnome/erwin/h1.svg
-share/gnome/erwin/h11.svg
-share/gnome/erwin/h2.svg
-share/gnome/erwin/h22.svg
-share/gnome/erwin/h3.svg
-share/gnome/erwin/h33.svg
-share/gnome/erwin/small.svg
-share/gnome/pixmaps/erwin.xpm
-@dirrm share/gnome/erwin
+share/erwin/bold.svg
+share/erwin/bold1.svg
+share/erwin/erwin-highlighting.xml
+share/erwin/h1.svg
+share/erwin/h11.svg
+share/erwin/h2.svg
+share/erwin/h22.svg
+share/erwin/h3.svg
+share/erwin/h33.svg
+share/erwin/small.svg
+share/pixmaps/erwin.xpm
+@dirrm share/erwin
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile
index ee02ac1c1abe..105f4fc1eadf 100644
--- a/www/evolution-webcal/Makefile
+++ b/www/evolution-webcal/Makefile
@@ -3,12 +3,11 @@
# Whom: Koop Mast <kwm@rainbow-runner.nl>
#
# $FreeBSD$
-# $MCom: ports/www/evolution-webcal/Makefile,v 1.46 2007/03/13 20:47:20 mezz Exp $
+# $MCom: ports/www/evolution-webcal/Makefile,v 1.50 2007/09/16 16:52:22 ahze Exp $
#
PORTNAME= webcal
-PORTVERSION= 2.10.0
-PORTREVISION= 2
+PORTVERSION= 2.12.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo
index 1e808f3dd7a0..882d3aec8b85 100644
--- a/www/evolution-webcal/distinfo
+++ b/www/evolution-webcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-webcal-2.10.0.tar.bz2) = a29004e6e1ad977845ed7c68963c8925
-SHA256 (evolution-webcal-2.10.0.tar.bz2) = 4017850f067d1b08f7b76b94988978f8f63ecfc8d201c910ea5d6119097add15
-SIZE (evolution-webcal-2.10.0.tar.bz2) = 163306
+MD5 (evolution-webcal-2.12.0.tar.bz2) = 21e77fa081decb87ce641f3a77245864
+SHA256 (evolution-webcal-2.12.0.tar.bz2) = f8445c3d93af4f8f4f325c5eb3fa94093f9eb299171a0983056d069e9658fc00
+SIZE (evolution-webcal-2.12.0.tar.bz2) = 193553
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index faa941663b8f..82f6d353b2fe 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -41,6 +41,7 @@ share/locale/ms/LC_MESSAGES/evolution-webcal.mo
share/locale/nb/LC_MESSAGES/evolution-webcal.mo
share/locale/ne/LC_MESSAGES/evolution-webcal.mo
share/locale/nl/LC_MESSAGES/evolution-webcal.mo
+share/locale/oc/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
@@ -49,6 +50,7 @@ share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo
share/locale/ro/LC_MESSAGES/evolution-webcal.mo
share/locale/ru/LC_MESSAGES/evolution-webcal.mo
share/locale/rw/LC_MESSAGES/evolution-webcal.mo
+share/locale/si/LC_MESSAGES/evolution-webcal.mo
share/locale/sk/LC_MESSAGES/evolution-webcal.mo
share/locale/sl/LC_MESSAGES/evolution-webcal.mo
share/locale/sq/LC_MESSAGES/evolution-webcal.mo
@@ -74,8 +76,12 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/ky/LC_MESSAGES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 31b77a68cec4..0e2335912772 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/galeon/Makefile,v 1.9 2006/07/27 18:09:47 mezz Exp $
+# $MCom: ports/www/galeon/Makefile,v 1.14 2007/10/08 19:42:51 mezz Exp $
#
PORTNAME= galeon
PORTVERSION= 2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -29,14 +29,14 @@ USE_GMAKE= yes
USE_GETTEXT= yes
CONFIGURE_ARGS= --enable-nautilus-view=no \
--with-mozilla=${GECKO}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
MAN1= galeon.1
GCONF_SCHEMAS= galeon.schemas
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
# Galeon does not build correctly in -CURRENT if -Werror is passed
# to the compiler.
@@ -54,7 +54,7 @@ post-patch:
's|malloc\.h|stdlib.h|g'
@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
- @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${X11BASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins:${X11BASE}/lib/browser_linux_plugins|' \
+ @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins|' \
${WRKSRC}/mozilla/mozilla-embed-shell.cpp
.include <bsd.port.post.mk>
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index c2136ee67bb4..127a1bd68cd6 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -3,72 +3,72 @@ bin/galeon-config-tool
etc/sound/events/galeon.soundlist
libdata/bonobo/servers/GNOME_Galeon_Automation.server
libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
-share/gnome/applications/galeon.desktop
-share/gnome/galeon/FAQ.html
-share/gnome/galeon/about_logo.png
-share/gnome/galeon/autoscroll.xpm
-share/gnome/galeon/bookmarks-editor-small.glade
-share/gnome/galeon/bookmarks-editor.glade
-share/gnome/galeon/bookmarks.glade
-share/gnome/galeon/bug.png
-share/gnome/galeon/certificate-dialogs.glade
-share/gnome/galeon/chrome/branding/brand.dtd
-share/gnome/galeon/chrome/branding/brand.properties
-share/gnome/galeon/chrome/galeon.manifest
-share/gnome/galeon/chrome/global/about.xhtml
-share/gnome/galeon/debian.png
-share/gnome/galeon/default-bookmarks.xbel
-share/gnome/galeon/default-prefs.js
-share/gnome/galeon/fetch_favicon.xpm
-share/gnome/galeon/freshmeat.png
-share/gnome/galeon/galeon-bookmark-alias-mark.png
-share/gnome/galeon/galeon-default.png
-share/gnome/galeon/galeon-download.png
-share/gnome/galeon/galeon-egg-ui-toolbar.xml
-share/gnome/galeon/galeon-egg-ui.xml
-share/gnome/galeon/galeon-entry.png
-share/gnome/galeon/galeon-filter.png
-share/gnome/galeon/galeon-folder.png
-share/gnome/galeon/galeon-history.png
-share/gnome/galeon/galeon-insecure.png
-share/gnome/galeon/galeon-popup-blocked.png
-share/gnome/galeon/galeon-prefs-fonts.png
-share/gnome/galeon/galeon-prefs-general.png
-share/gnome/galeon/galeon-prefs-language.png
-share/gnome/galeon/galeon-prefs-mouse.png
-share/gnome/galeon/galeon-prefs-network.png
-share/gnome/galeon/galeon-prefs-privacy.png
-share/gnome/galeon/galeon-prefs-tabs.png
-share/gnome/galeon/galeon-prefs-web-content.png
-share/gnome/galeon/galeon-secure.png
-share/gnome/galeon/galeon-separator.png
-share/gnome/galeon/galeon-tab-loading.gif
-share/gnome/galeon/galeon.glade
-share/gnome/galeon/galeon.png
-share/gnome/galeon/gnu.png
-share/gnome/galeon/google.png
-share/gnome/galeon/google_groups.png
-share/gnome/galeon/google_images.png
-share/gnome/galeon/hand-open.png
-share/gnome/galeon/imdb_movies.png
-share/gnome/galeon/logo.png
-share/gnome/galeon/myportal.css
-share/gnome/galeon/new_alias.xpm
-share/gnome/galeon/new_alias_small.xpm
-share/gnome/galeon/new_folder.xpm
-share/gnome/galeon/new_folder_small.xpm
-share/gnome/galeon/new_item.xpm
-share/gnome/galeon/new_item_small.xpm
-share/gnome/galeon/new_separator.xpm
-share/gnome/galeon/new_separator_small.xpm
-share/gnome/galeon/prefs-dialog.glade
-share/gnome/galeon/print.glade
-share/gnome/galeon/rpm.png
-share/gnome/galeon/slack.png
-share/gnome/galeon/smart-bm-fold.png
-share/gnome/galeon/smart-bm-unfold.png
-share/gnome/galeon/stocks.png
-share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
+share/applications/galeon.desktop
+share/galeon/FAQ.html
+share/galeon/about_logo.png
+share/galeon/autoscroll.xpm
+share/galeon/bookmarks-editor-small.glade
+share/galeon/bookmarks-editor.glade
+share/galeon/bookmarks.glade
+share/galeon/bug.png
+share/galeon/certificate-dialogs.glade
+share/galeon/chrome/branding/brand.dtd
+share/galeon/chrome/branding/brand.properties
+share/galeon/chrome/galeon.manifest
+share/galeon/chrome/global/about.xhtml
+share/galeon/debian.png
+share/galeon/default-bookmarks.xbel
+share/galeon/default-prefs.js
+share/galeon/fetch_favicon.xpm
+share/galeon/freshmeat.png
+share/galeon/galeon-bookmark-alias-mark.png
+share/galeon/galeon-default.png
+share/galeon/galeon-download.png
+share/galeon/galeon-egg-ui-toolbar.xml
+share/galeon/galeon-egg-ui.xml
+share/galeon/galeon-entry.png
+share/galeon/galeon-filter.png
+share/galeon/galeon-folder.png
+share/galeon/galeon-history.png
+share/galeon/galeon-insecure.png
+share/galeon/galeon-popup-blocked.png
+share/galeon/galeon-prefs-fonts.png
+share/galeon/galeon-prefs-general.png
+share/galeon/galeon-prefs-language.png
+share/galeon/galeon-prefs-mouse.png
+share/galeon/galeon-prefs-network.png
+share/galeon/galeon-prefs-privacy.png
+share/galeon/galeon-prefs-tabs.png
+share/galeon/galeon-prefs-web-content.png
+share/galeon/galeon-secure.png
+share/galeon/galeon-separator.png
+share/galeon/galeon-tab-loading.gif
+share/galeon/galeon.glade
+share/galeon/galeon.png
+share/galeon/gnu.png
+share/galeon/google.png
+share/galeon/google_groups.png
+share/galeon/google_images.png
+share/galeon/hand-open.png
+share/galeon/imdb_movies.png
+share/galeon/logo.png
+share/galeon/myportal.css
+share/galeon/new_alias.xpm
+share/galeon/new_alias_small.xpm
+share/galeon/new_folder.xpm
+share/galeon/new_folder_small.xpm
+share/galeon/new_item.xpm
+share/galeon/new_item_small.xpm
+share/galeon/new_separator.xpm
+share/galeon/new_separator_small.xpm
+share/galeon/prefs-dialog.glade
+share/galeon/print.glade
+share/galeon/rpm.png
+share/galeon/slack.png
+share/galeon/smart-bm-fold.png
+share/galeon/smart-bm-unfold.png
+share/galeon/stocks.png
+share/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
share/gnome/help/galeon/C/apx-authors.xml
share/gnome/help/galeon/C/apx-bugs.xml
share/gnome/help/galeon/C/apx-command-line.xml
@@ -159,10 +159,10 @@ share/gnome/help/galeon/es/other-tools.xml
share/gnome/help/galeon/es/plugins.xml
share/gnome/help/galeon/es/preface.xml
share/gnome/help/galeon/es/preferences.xml
-share/gnome/omf/galeon/galeon-C.omf
-share/gnome/omf/galeon/galeon-es.omf
-share/gnome/pixmaps/galeon.png
-share/gnome/sounds/galeon/clicked.wav
+share/omf/galeon/galeon-C.omf
+share/omf/galeon/galeon-es.omf
+share/pixmaps/galeon.png
+share/sounds/galeon/clicked.wav
share/locale/am/LC_MESSAGES/galeon-2.0.mo
share/locale/az/LC_MESSAGES/galeon-2.0.mo
share/locale/be/LC_MESSAGES/galeon-2.0.mo
@@ -217,20 +217,21 @@ share/locale/wa/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_HK/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrm share/gnome/sounds/galeon
-@dirrm share/gnome/omf/galeon
+@dirrm share/sounds/galeon
+@dirrm share/omf/galeon
@dirrm share/gnome/help/galeon/es/figures
@dirrm share/gnome/help/galeon/es
@dirrm share/gnome/help/galeon/C/figures
@dirrm share/gnome/help/galeon/C
@dirrm share/gnome/help/galeon
-@dirrm share/gnome/galeon/chrome/global
-@dirrm share/gnome/galeon/chrome/branding
-@dirrm share/gnome/galeon/chrome
-@dirrm share/gnome/galeon
+@dirrm share/galeon/chrome/global
+@dirrm share/galeon/chrome/branding
+@dirrm share/galeon/chrome
+@dirrm share/galeon
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 6dff469968db..4fa187f73b50 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/www/gnome-user-share/Makefile,v 1.5 2007/05/19 21:36:26 marcus Exp $
PORTNAME= gnome-user-share
PORTVERSION= 0.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11
diff --git a/www/gnome-user-share/files/patch-user_share.c b/www/gnome-user-share/files/patch-user_share.c
deleted file mode 100644
index 352588ade5ac..000000000000
--- a/www/gnome-user-share/files/patch-user_share.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- user_share.c.orig Tue Nov 8 10:41:50 2005
-+++ user_share.c Thu Nov 10 13:38:07 2005
-@@ -252,8 +252,8 @@ howl_input (GIOChannel *io_channel,
- gpointer callback_data)
- {
- sw_discovery session;
-- session = callback_data;
- sw_salt salt;
-+ session = callback_data;
-
- if (sw_discovery_salt (session, &salt) == SW_OKAY) {
- sw_salt_lock (salt);
diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist
index 218573008460..f2908b82a8fc 100644
--- a/www/gnome-user-share/pkg-plist
+++ b/www/gnome-user-share/pkg-plist
@@ -1,11 +1,11 @@
bin/gnome-file-share-properties
libexec/gnome-user-share
-share/gnome/applications/gnome-user-share-properties.desktop
-share/gnome/gnome-user-share/dav_groupfile
-share/gnome/gnome-user-share/dav_user.conf
-share/gnome/gnome-user-share/dav_user_2.0.conf
-share/gnome/gnome-user-share/dav_user_2.2.conf
-share/gnome/gnome-user-share/file-share-properties.glade
+share/applications/gnome-user-share-properties.desktop
+share/gnome-user-share/dav_groupfile
+share/gnome-user-share/dav_user.conf
+share/gnome-user-share/dav_user_2.0.conf
+share/gnome-user-share/dav_user_2.2.conf
+share/gnome-user-share/file-share-properties.glade
share/locale/ar/LC_MESSAGES/gnome-user-share.mo
share/locale/bg/LC_MESSAGES/gnome-user-share.mo
share/locale/ca/LC_MESSAGES/gnome-user-share.mo
@@ -38,6 +38,9 @@ share/locale/sv/LC_MESSAGES/gnome-user-share.mo
share/locale/uk/LC_MESSAGES/gnome-user-share.mo
share/locale/vi/LC_MESSAGES/gnome-user-share.mo
share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo
-@dirrm share/locale/dz/LC_MESSAGES
-@dirrm share/locale/dz
-@dirrm share/gnome/gnome-user-share
+@dirrm share/gnome-user-share
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/applications
diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile
index aa8336d5d467..f236d96b8f47 100644
--- a/www/gnome-web-photo/Makefile
+++ b/www/gnome-web-photo/Makefile
@@ -3,12 +3,13 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gnome-web-photo/Makefile,v 1.3 2006/08/20 01:51:48 mezz Exp $
+# $MCom: ports/www/gnome-web-photo/Makefile,v 1.5 2007/08/07 03:27:32 mezz Exp $
+#
#
PORTNAME= gnome-web-photo
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
diff --git a/www/gnome-web-photo/pkg-plist b/www/gnome-web-photo/pkg-plist
index 816a430a88e0..5e0f7dedbbaf 100644
--- a/www/gnome-web-photo/pkg-plist
+++ b/www/gnome-web-photo/pkg-plist
@@ -1,6 +1,6 @@
bin/gnome-web-photo
bin/gnome-web-print
bin/gnome-web-thumbnail
-share/gnome/gnome-web-photo/prefs.js
-share/gnome/gnome-web-photo/style.css
-@dirrm share/gnome/gnome-web-photo
+share/gnome-web-photo/prefs.js
+share/gnome-web-photo/style.css
+@dirrm share/gnome-web-photo
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 1561810ba991..14f2f22ad71c 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.1.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
@@ -40,7 +40,6 @@ LIB_DEPENDS+= soup.6:${PORTSDIR}/devel/soup
post-configure:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g ; \
s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \
> ${WRKSRC}/gtkhtmlConf.sh
diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh
index 4dc806a68c1b..12cee8fa1e2d 100644
--- a/www/gtkhtml/files/gtkhtmlConf.sh
+++ b/www/gtkhtml/files/gtkhtmlConf.sh
@@ -1,5 +1,5 @@
GTKHTML_LIBDIR="-L%%PREFIX%%/lib"
-GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
-GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
-GTKHTML_DATADIR="%%PREFIX%%/share/gnome"
+GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm"
+GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF"
+GTKHTML_DATADIR="%%PREFIX%%/share"
MODULE_VERSION="%%VERSION%%"
diff --git a/www/gtkhtml/files/patch-ad b/www/gtkhtml/files/patch-ad
deleted file mode 100644
index 863d79c3bdf9..000000000000
--- a/www/gtkhtml/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig Wed Sep 4 20:00:35 2002
-+++ src/gtkhtml.c Wed Sep 18 21:40:55 2002
-@@ -4353,7 +4353,7 @@
- {
- gchar *rcfile;
-
-- rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
-+ rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
- (from_share ? "" : "/.gnome/"), name, NULL);
-
- if (g_file_test (rcfile, G_FILE_TEST_ISFILE))
diff --git a/www/gtkhtml/files/patch-doc::Makefile.in b/www/gtkhtml/files/patch-doc::Makefile.in
index 575490af80ea..cc08c2029ff4 100644
--- a/www/gtkhtml/files/patch-doc::Makefile.in
+++ b/www/gtkhtml/files/patch-doc::Makefile.in
@@ -7,7 +7,7 @@ $FreeBSD$
CFLAGS = @CFLAGS@ $(EXTRA_GNOME_CFLAGS)
LDFLAGS = @LDFLAGS@ $(EXTRA_GNOME_LIBS)
--HTML_DIR = $(datadir)/html
+-HTML_DIR = $(datadir)/gnome/html
+HTML_DIR = $(prefix)/share/doc/gtkhtml
TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
diff --git a/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index 4eae08527c73..946cd317d4c3 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -97,71 +97,69 @@ lib/libgtkhtml-1.1.la
lib/libgtkhtml-1.1.so
lib/libgtkhtml-1.1.so.3
libdata/pkgconfig/gtkhtml-1.1.pc
+share/control-center/Documents/gtkhtml-properties.desktop
%%DOCSDIR%%/gtkhtml-decl.txt
%%DOCSDIR%%/gtkhtml-sections.txt
%%DOCSDIR%%/gtkhtml.hierarchy
%%DOCSDIR%%/gtkhtml.sgml
%%DOCSDIR%%/gtkhtml.types
share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
-share/gnome/control-center/Documents/gtkhtml-properties.desktop
-share/gnome/gtkhtml-1.1/Editor.idl
-share/gnome/gtkhtml-1.1/gtkhtml-capplet.glade
-share/gnome/gtkhtml-1.1/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-1.1/icons/16_copy.png
-share/gnome/gtkhtml-1.1/icons/16_cut.png
-share/gnome/gtkhtml-1.1/icons/16_paste.png
-share/gnome/gtkhtml-1.1/icons/24_copy.png
-share/gnome/gtkhtml-1.1/icons/24_cut.png
-share/gnome/gtkhtml-1.1/icons/24_paste.png
-share/gnome/gtkhtml-1.1/icons/bulb.png
-share/gnome/gtkhtml-1.1/icons/empty_image.png
-share/gnome/gtkhtml-1.1/icons/flowers.png
-share/gnome/gtkhtml-1.1/icons/html-viewer.png
-share/gnome/gtkhtml-1.1/icons/insert-image-16.png
-share/gnome/gtkhtml-1.1/icons/insert-image-24.png
-share/gnome/gtkhtml-1.1/icons/insert-link-16.png
-share/gnome/gtkhtml-1.1/icons/insert-link-24.png
-share/gnome/gtkhtml-1.1/icons/insert-object-16.png
-share/gnome/gtkhtml-1.1/icons/insert-object-24.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-16.png
-share/gnome/gtkhtml-1.1/icons/insert-rule-24.png
-share/gnome/gtkhtml-1.1/icons/insert-table-16.png
-share/gnome/gtkhtml-1.1/icons/insert-table-24.png
-share/gnome/gtkhtml-1.1/icons/paper.png
-share/gnome/gtkhtml-1.1/icons/properties-16.png
-share/gnome/gtkhtml-1.1/icons/rect.png
-share/gnome/gtkhtml-1.1/icons/redo-16.png
-share/gnome/gtkhtml-1.1/icons/redo-24.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-center.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-left.png
-share/gnome/gtkhtml-1.1/icons/rule-blue-right.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-1.1/icons/search-16.png
-share/gnome/gtkhtml-1.1/icons/search-24.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-16.png
-share/gnome/gtkhtml-1.1/icons/search-and-replace-24.png
-share/gnome/gtkhtml-1.1/icons/smiley-1.png
-share/gnome/gtkhtml-1.1/icons/smiley-10.png
-share/gnome/gtkhtml-1.1/icons/smiley-11.png
-share/gnome/gtkhtml-1.1/icons/smiley-2.png
-share/gnome/gtkhtml-1.1/icons/smiley-3.png
-share/gnome/gtkhtml-1.1/icons/smiley-4.png
-share/gnome/gtkhtml-1.1/icons/smiley-5.png
-share/gnome/gtkhtml-1.1/icons/smiley-6.png
-share/gnome/gtkhtml-1.1/icons/smiley-8.png
-share/gnome/gtkhtml-1.1/icons/smiley-9.png
-share/gnome/gtkhtml-1.1/icons/texture.png
-share/gnome/gtkhtml-1.1/icons/transparent.png
-share/gnome/gtkhtml-1.1/icons/undo-16.png
-share/gnome/gtkhtml-1.1/icons/undo-24.png
-share/gnome/gtkhtml-1.1/keybindingsrc.emacs
-share/gnome/gtkhtml-1.1/keybindingsrc.ms
-share/gnome/gtkhtml-1.1/keybindingsrc.xemacs
-share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
-share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
share/gnome/ui/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-1.1/Editor.idl
+share/gtkhtml-1.1/gtkhtml-capplet.glade
+share/gtkhtml-1.1/gtkhtml-editor-properties.glade
+share/gtkhtml-1.1/icons/16_copy.png
+share/gtkhtml-1.1/icons/16_cut.png
+share/gtkhtml-1.1/icons/16_paste.png
+share/gtkhtml-1.1/icons/24_copy.png
+share/gtkhtml-1.1/icons/24_cut.png
+share/gtkhtml-1.1/icons/24_paste.png
+share/gtkhtml-1.1/icons/bulb.png
+share/gtkhtml-1.1/icons/empty_image.png
+share/gtkhtml-1.1/icons/flowers.png
+share/gtkhtml-1.1/icons/html-viewer.png
+share/gtkhtml-1.1/icons/insert-image-16.png
+share/gtkhtml-1.1/icons/insert-image-24.png
+share/gtkhtml-1.1/icons/insert-link-16.png
+share/gtkhtml-1.1/icons/insert-link-24.png
+share/gtkhtml-1.1/icons/insert-object-16.png
+share/gtkhtml-1.1/icons/insert-object-24.png
+share/gtkhtml-1.1/icons/insert-rule-16.png
+share/gtkhtml-1.1/icons/insert-rule-24.png
+share/gtkhtml-1.1/icons/insert-table-16.png
+share/gtkhtml-1.1/icons/insert-table-24.png
+share/gtkhtml-1.1/icons/paper.png
+share/gtkhtml-1.1/icons/properties-16.png
+share/gtkhtml-1.1/icons/rect.png
+share/gtkhtml-1.1/icons/redo-16.png
+share/gtkhtml-1.1/icons/redo-24.png
+share/gtkhtml-1.1/icons/rule-blue-center.png
+share/gtkhtml-1.1/icons/rule-blue-left.png
+share/gtkhtml-1.1/icons/rule-blue-right.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-center.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-left.png
+share/gtkhtml-1.1/icons/rule-yellow-flowers-right.png
+share/gtkhtml-1.1/icons/search-16.png
+share/gtkhtml-1.1/icons/search-24.png
+share/gtkhtml-1.1/icons/search-and-replace-16.png
+share/gtkhtml-1.1/icons/search-and-replace-24.png
+share/gtkhtml-1.1/icons/smiley-1.png
+share/gtkhtml-1.1/icons/smiley-10.png
+share/gtkhtml-1.1/icons/smiley-11.png
+share/gtkhtml-1.1/icons/smiley-2.png
+share/gtkhtml-1.1/icons/smiley-3.png
+share/gtkhtml-1.1/icons/smiley-4.png
+share/gtkhtml-1.1/icons/smiley-5.png
+share/gtkhtml-1.1/icons/smiley-6.png
+share/gtkhtml-1.1/icons/smiley-8.png
+share/gtkhtml-1.1/icons/smiley-9.png
+share/gtkhtml-1.1/icons/texture.png
+share/gtkhtml-1.1/icons/transparent.png
+share/gtkhtml-1.1/icons/undo-16.png
+share/gtkhtml-1.1/icons/undo-24.png
+share/gtkhtml-1.1/keybindingsrc.emacs
+share/gtkhtml-1.1/keybindingsrc.ms
+share/gtkhtml-1.1/keybindingsrc.xemacs
share/locale/az/LC_MESSAGES/gtkhtml.mo
share/locale/ca/LC_MESSAGES/gtkhtml.mo
share/locale/cs/LC_MESSAGES/gtkhtml.mo
@@ -196,8 +194,10 @@ share/locale/uk/LC_MESSAGES/gtkhtml.mo
share/locale/vi/LC_MESSAGES/gtkhtml.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo
-@dirrm share/gnome/gtkhtml-1.1/icons
-@dirrm share/gnome/gtkhtml-1.1
+share/oaf/GNOME_GtkHTML_EBrowser.oaf
+share/oaf/GNOME_GtkHTML_Editor.oaf
+@dirrm share/gtkhtml-1.1/icons
+@dirrm share/gtkhtml-1.1
@dirrm %%DOCSDIR%%/gtkhtml
@dirrm %%DOCSDIR%%
@dirrm include/gtkhtml-1.1/gtkhtml
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 9ab551e8c227..6024520b6ed4 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $
+# $MCom: ports/www/gtkhtml3/Makefile,v 1.113 2007/10/15 14:28:31 ahze Exp $
#
PORTNAME= gtkhtml3
-PORTVERSION= 3.14.3
+PORTVERSION= 3.16.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,4 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PLIST_SUB= VERSION="3.14"
+post-patch:
+ @${REINPLACE_CMD} -e 's|@INTLTOOL_LIBDIR@|${LOCALBASE}/libdata|' \
+ ${WRKSRC}/intltool-merge.in
+
.include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 69a4c791ecc4..8c3bdb5b5032 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.14.3.tar.bz2) = 7c028f07e0eb061b0a895ac514265cf1
-SHA256 (gnome2/gtkhtml-3.14.3.tar.bz2) = 6419265c9766de668bd553742d915df095bdab2737a4583f63e67242d3903832
-SIZE (gnome2/gtkhtml-3.14.3.tar.bz2) = 1283748
+MD5 (gnome2/gtkhtml-3.16.1.tar.bz2) = 71d2d115e3629a634e115b8c0b0fd5b5
+SHA256 (gnome2/gtkhtml-3.16.1.tar.bz2) = 47ab5cd171ba4c0932fc108d4ec45dc6a7bd3afd8ac9801e1d12c40c2c071b72
+SIZE (gnome2/gtkhtml-3.16.1.tar.bz2) = 1303349
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035220..000000000000
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- add_bindings (klass);
- gtk_html_accessibility_init ();
-
-- filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+ filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- gtk_rc_parse (filename);
- g_free (filename);
- html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 2f85980f058e..a084714f5c45 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -17,33 +17,34 @@ lib/libgtkhtml-%%VERSION%%.so
lib/libgtkhtml-%%VERSION%%.so.19
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/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/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.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/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/gtkhtml-%%VERSION%%/Editor.idl
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/keybindingsrc.emacs
share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/as/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
@@ -89,6 +90,7 @@ share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -97,6 +99,7 @@ share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/si/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
@@ -112,8 +115,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_HK/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 share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
@dirrmtry lib/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%
@@ -121,8 +124,12 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -133,3 +140,5 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@dirrmtry share/locale/dz
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index f4005761d7ef..c34c002a4c56 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,10 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/www/gtkhtml38/Makefile,v 1.104 2007/05/30 19:19:29 mezz Exp $
#
PORTNAME= gtkhtml3
PORTVERSION= 3.12.3
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,8 +27,8 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_XLIB= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui \
- libgnomeprintui ltverhack
+USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack \
+ libgnomeprintui
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035220..000000000000
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- add_bindings (klass);
- gtk_html_accessibility_init ();
-
-- filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+ filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- gtk_rc_parse (filename);
- g_free (filename);
- html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 6fe3280fb1a8..f37b8166d4eb 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -17,72 +17,72 @@ lib/libgtkhtml-%%VERSION%%.so
lib/libgtkhtml-%%VERSION%%.so.15
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-11.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.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/gtkhtml-%%VERSION%%/Editor.idl
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/icons/16_copy.png
+share/gtkhtml-%%VERSION%%/icons/16_cut.png
+share/gtkhtml-%%VERSION%%/icons/16_paste.png
+share/gtkhtml-%%VERSION%%/icons/24_copy.png
+share/gtkhtml-%%VERSION%%/icons/24_cut.png
+share/gtkhtml-%%VERSION%%/icons/24_paste.png
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/font-tt-16.png
+share/gtkhtml-%%VERSION%%/icons/font-tt-24.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/insert-image-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-image-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-link-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-link-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-object-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-object-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-rule-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-rule-24.png
+share/gtkhtml-%%VERSION%%/icons/insert-table-16.png
+share/gtkhtml-%%VERSION%%/icons/insert-table-24.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/properties-16.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/redo-16.png
+share/gtkhtml-%%VERSION%%/icons/redo-24.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/search-16.png
+share/gtkhtml-%%VERSION%%/icons/search-24.png
+share/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
+share/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
+share/gtkhtml-%%VERSION%%/icons/smiley-1.png
+share/gtkhtml-%%VERSION%%/icons/smiley-10.png
+share/gtkhtml-%%VERSION%%/icons/smiley-11.png
+share/gtkhtml-%%VERSION%%/icons/smiley-12.png
+share/gtkhtml-%%VERSION%%/icons/smiley-2.png
+share/gtkhtml-%%VERSION%%/icons/smiley-3.png
+share/gtkhtml-%%VERSION%%/icons/smiley-4.png
+share/gtkhtml-%%VERSION%%/icons/smiley-5.png
+share/gtkhtml-%%VERSION%%/icons/smiley-6.png
+share/gtkhtml-%%VERSION%%/icons/smiley-8.png
+share/gtkhtml-%%VERSION%%/icons/smiley-9.png
+share/gtkhtml-%%VERSION%%/icons/table-column-16.png
+share/gtkhtml-%%VERSION%%/icons/table-row-16.png
+share/gtkhtml-%%VERSION%%/icons/table-table-16.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/icons/undo-16.png
+share/gtkhtml-%%VERSION%%/icons/undo-24.png
+share/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
@@ -153,8 +153,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_HK/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 share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
@dirrmtry lib/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
@dirrm include/libgtkhtml-%%VERSION%%
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index 74579a1958ac..d3a9b02fd862 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gurlchecker
PORTVERSION= 0.10.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www gnome
MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
MASTER_SITE_SUBDIR= 547
diff --git a/www/gurlchecker/pkg-plist b/www/gurlchecker/pkg-plist
index 549ca04415de..503a491d651a 100644
--- a/www/gurlchecker/pkg-plist
+++ b/www/gurlchecker/pkg-plist
@@ -1,42 +1,42 @@
bin/gurlchecker
-share/gnome/applications/gurlchecker.desktop
-share/gnome/gurlchecker/stylesheets/uc_html.xsl
-share/gnome/gurlchecker/ui/empty_icon.png
-share/gnome/gurlchecker/ui/gurlchecker.glade
-share/gnome/gurlchecker/ui/gurlchecker.png
-share/gnome/gurlchecker/ui/gurlchecker_icon.png
-share/gnome/gurlchecker/ui/link_status_bad.png
-share/gnome/gurlchecker/ui/link_status_file_error.png
-share/gnome/gurlchecker/ui/link_status_good.png
-share/gnome/gurlchecker/ui/link_status_ignored.png
-share/gnome/gurlchecker/ui/link_status_mail_bad.png
-share/gnome/gurlchecker/ui/link_status_mail_good.png
-share/gnome/gurlchecker/ui/link_status_malformed.png
-share/gnome/gurlchecker/ui/link_status_nodata.png
-share/gnome/gurlchecker/ui/link_status_restricted.png
-share/gnome/gurlchecker/ui/link_status_timeout.png
-share/gnome/gurlchecker/ui/link_type_css.png
-share/gnome/gurlchecker/ui/link_type_css_ssl.png
-share/gnome/gurlchecker/ui/link_type_folder.png
-share/gnome/gurlchecker/ui/link_type_frame.png
-share/gnome/gurlchecker/ui/link_type_frame_ssl.png
-share/gnome/gurlchecker/ui/link_type_href.png
-share/gnome/gurlchecker/ui/link_type_href_ftp.png
-share/gnome/gurlchecker/ui/link_type_href_local.png
-share/gnome/gurlchecker/ui/link_type_href_ssl.png
-share/gnome/gurlchecker/ui/link_type_image.png
-share/gnome/gurlchecker/ui/link_type_image_local.png
-share/gnome/gurlchecker/ui/link_type_image_ssl.png
-share/gnome/gurlchecker/ui/link_type_mail.png
-share/gnome/gurlchecker/ui/link_type_unknown.png
-share/gnome/gurlchecker/ui/menu_new_bookmarks_file.png
-share/gnome/gurlchecker/ui/menu_new_local_file.png
-share/gnome/gurlchecker/ui/menu_new_web_site.png
-share/gnome/gurlchecker/ui/menu_protocol_ftp.png
-share/gnome/gurlchecker/ui/menu_protocol_https.png
-share/gnome/gurlchecker/ui/security_alert.png
-share/gnome/gurlchecker/ui/w3c_alert.png
-share/gnome/pixmaps/gurlchecker.png
+share/applications/gurlchecker.desktop
+share/gurlchecker/stylesheets/uc_html.xsl
+share/gurlchecker/ui/empty_icon.png
+share/gurlchecker/ui/gurlchecker.glade
+share/gurlchecker/ui/gurlchecker.png
+share/gurlchecker/ui/gurlchecker_icon.png
+share/gurlchecker/ui/link_status_bad.png
+share/gurlchecker/ui/link_status_file_error.png
+share/gurlchecker/ui/link_status_good.png
+share/gurlchecker/ui/link_status_ignored.png
+share/gurlchecker/ui/link_status_mail_bad.png
+share/gurlchecker/ui/link_status_mail_good.png
+share/gurlchecker/ui/link_status_malformed.png
+share/gurlchecker/ui/link_status_nodata.png
+share/gurlchecker/ui/link_status_restricted.png
+share/gurlchecker/ui/link_status_timeout.png
+share/gurlchecker/ui/link_type_css.png
+share/gurlchecker/ui/link_type_css_ssl.png
+share/gurlchecker/ui/link_type_folder.png
+share/gurlchecker/ui/link_type_frame.png
+share/gurlchecker/ui/link_type_frame_ssl.png
+share/gurlchecker/ui/link_type_href.png
+share/gurlchecker/ui/link_type_href_ftp.png
+share/gurlchecker/ui/link_type_href_local.png
+share/gurlchecker/ui/link_type_href_ssl.png
+share/gurlchecker/ui/link_type_image.png
+share/gurlchecker/ui/link_type_image_local.png
+share/gurlchecker/ui/link_type_image_ssl.png
+share/gurlchecker/ui/link_type_mail.png
+share/gurlchecker/ui/link_type_unknown.png
+share/gurlchecker/ui/menu_new_bookmarks_file.png
+share/gurlchecker/ui/menu_new_local_file.png
+share/gurlchecker/ui/menu_new_web_site.png
+share/gurlchecker/ui/menu_protocol_ftp.png
+share/gurlchecker/ui/menu_protocol_https.png
+share/gurlchecker/ui/security_alert.png
+share/gurlchecker/ui/w3c_alert.png
+share/pixmaps/gurlchecker.png
%%NLS%%share/locale/da/LC_MESSAGES/gurlchecker.mo
%%NLS%%share/locale/de/LC_MESSAGES/gurlchecker.mo
%%NLS%%share/locale/eo/LC_MESSAGES/gurlchecker.mo
@@ -45,6 +45,7 @@ share/gnome/pixmaps/gurlchecker.png
%%NLS%%share/locale/it/LC_MESSAGES/gurlchecker.mo
%%NLS%%share/locale/ja/LC_MESSAGES/gurlchecker.mo
%%NLS%%share/locale/sk/LC_MESSAGES/gurlchecker.mo
-@dirrm share/gnome/gurlchecker/ui
-@dirrm share/gnome/gurlchecker/stylesheets
-@dirrm share/gnome/gurlchecker
+@dirrm share/gurlchecker/ui
+@dirrm share/gurlchecker/stylesheets
+@dirrm share/gurlchecker
+@dirrmtry share/applications
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index b5040d2737b0..c32b57e9278e 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,15 +3,14 @@
# Whom: michael johnson <ahze@ahze.net>
#
# $FreeBSD$
-# $MCom: ports/www/kazehakase/Makefile,v 1.4 2006/03/10 02:09:53 ahze Exp $
+# $MCom: ports/www/kazehakase/Makefile,v 1.9 2007/10/24 16:17:14 ahze Exp $
#
PORTNAME= kazehakase
-PORTVERSION= 0.4.5
-PORTREVISION= 2
+PORTVERSION= 0.4.9
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/24791
+MASTER_SITE_SUBDIR= ${PORTNAME}/27353
MAINTAINER= ahze@FreeBSD.org
COMMENT= Kazehakase is a browser with gecko engine like Epiphany or Galeon
@@ -37,13 +36,13 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
.endif
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
# !!! gtk-webcore higly experimental right now and not very stable !!!
# See https://mail.gna.org/public/kazehakase-devel/2004-10/msg00001.html
# on how to use gtk-webcore with kazehakase. and yes you still have to
# have mozilla even if you don't use it in kazehakase.
-.if defined(WITH_GTKWEBCORE)
+.if defined(WITH_GTKWEBCORE) || exists(${LOCALBASE}/libnrcit.a)
LIB_DEPENDS+= nrcit.0:${PORTSDIR}/www/osb-nrcit
CONFIGURE_ARGS+=--enable-gtk-webcore
.endif
@@ -89,4 +88,8 @@ post-patch:
@${ECHO_MSG} "create_thumbnail=true" >> ${WRKSRC}/etc/kzrc
.endif
+pre-install:
+ @${REINPLACE_CMD} -e 's|localen|locale|' \
+ ${WRKSRC}/po/Makefile
+
.include <bsd.port.post.mk>
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index e9a39c451918..50c9e6d8d2df 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,3 @@
-MD5 (kazehakase-0.4.5.tar.gz) = 2171f02d58a575e148436c7102686afb
-SHA256 (kazehakase-0.4.5.tar.gz) = 87ad1345e1d6df6ffdb1b43af92cfd87a16eade7de4060c5ce2fabd4d37bf99a
-SIZE (kazehakase-0.4.5.tar.gz) = 1445140
+MD5 (kazehakase-0.4.9.tar.gz) = 6259322e4fb6ed18a5f23ceda97f7ceb
+SHA256 (kazehakase-0.4.9.tar.gz) = b6b04776c058a88efd888bb61140e3a80658ac51e7f6151dc5c4f2edc644c326
+SIZE (kazehakase-0.4.9.tar.gz) = 1364165
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index a8bf98b2d615..cd41b8e8fcfb 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -11,66 +11,67 @@ etc/kazehakase/proxyrc
etc/kazehakase/smartbookmarks.xml
lib/kazehakase/libkazehakase.la
lib/kazehakase/libkazehakase.so
-lib/kazehakase/libkazehakase.so.0
+lib/kazehakase/libkazehakase.so.1
lib/kazehakase/embed/gecko.la
lib/kazehakase/embed/gecko.so
lib/kazehakase/search/hyper-estraier.la
lib/kazehakase/search/hyper-estraier.so
-share/gnome/applications/kazehakase.desktop
-share/gnome/kazehakase/icons/autoscroll.xpm
-share/gnome/kazehakase/icons/kz-anchor.png
-share/gnome/kazehakase/icons/kz-book-search.png
-share/gnome/kazehakase/icons/kz-bookmark.png
-share/gnome/kazehakase/icons/kz-closebackward.png
-share/gnome/kazehakase/icons/kz-closeforward.png
-share/gnome/kazehakase/icons/kz-closewindow.png
-share/gnome/kazehakase/icons/kz-copyimagelocation.png
-share/gnome/kazehakase/icons/kz-copyurl.png
-share/gnome/kazehakase/icons/kz-epiphany.png
-share/gnome/kazehakase/icons/kz-firefox.png
-share/gnome/kazehakase/icons/kz-folder-open.png
-share/gnome/kazehakase/icons/kz-folder-search.png
-share/gnome/kazehakase/icons/kz-folder.png
-share/gnome/kazehakase/icons/kz-font-decrease.png
-share/gnome/kazehakase/icons/kz-font-increase.png
-share/gnome/kazehakase/icons/kz-galeon.png
-share/gnome/kazehakase/icons/kz-google.png
-share/gnome/kazehakase/icons/kz-gray.png
-share/gnome/kazehakase/icons/kz-green.png
-share/gnome/kazehakase/icons/kz-history.png
-share/gnome/kazehakase/icons/kz-konqueror.png
-share/gnome/kazehakase/icons/kz-logo-bg.png
-share/gnome/kazehakase/icons/kz-logo.png
-share/gnome/kazehakase/icons/kz-mozilla.png
-share/gnome/kazehakase/icons/kz-netscape.png
-share/gnome/kazehakase/icons/kz-newwindow.png
-share/gnome/kazehakase/icons/kz-openimagewindow.png
-share/gnome/kazehakase/icons/kz-openlinkwindow.png
-share/gnome/kazehakase/icons/kz-openselectedlink.png
-share/gnome/kazehakase/icons/kz-red.png
-share/gnome/kazehakase/icons/kz-remote-bookmark.png
-share/gnome/kazehakase/icons/kz-rss-feed.png
-share/gnome/kazehakase/icons/kz-savelink.png
-share/gnome/kazehakase/icons/kz-scrap-bookmark.png
-share/gnome/kazehakase/icons/kz-search.png
-share/gnome/kazehakase/icons/kz-select-all.png
-share/gnome/kazehakase/icons/kz-separator.png
-share/gnome/kazehakase/icons/kz-smart-bookmark.png
-share/gnome/kazehakase/icons/kz-tab-next.png
-share/gnome/kazehakase/icons/kz-tab-prev.png
-share/gnome/kazehakase/icons/kz-view-source.png
-share/gnome/kazehakase/icons/kz-yellow.png
-share/gnome/kazehakase/kz-no-thumbnail.png
-share/gnome/kazehakase/search-result.css
-share/gnome/pixmaps/kazehakase-icon.png
+share/applications/kazehakase.desktop
+share/kazehakase/icons/autoscroll.xpm
+share/kazehakase/icons/kz-anchor.png
+share/kazehakase/icons/kz-book-search.png
+share/kazehakase/icons/kz-bookmark.png
+share/kazehakase/icons/kz-closebackward.png
+share/kazehakase/icons/kz-closeforward.png
+share/kazehakase/icons/kz-closewindow.png
+share/kazehakase/icons/kz-copyimagelocation.png
+share/kazehakase/icons/kz-copyurl.png
+share/kazehakase/icons/kz-epiphany.png
+share/kazehakase/icons/kz-firefox.png
+share/kazehakase/icons/kz-folder-open.png
+share/kazehakase/icons/kz-folder-search.png
+share/kazehakase/icons/kz-folder.png
+share/kazehakase/icons/kz-font-decrease.png
+share/kazehakase/icons/kz-font-increase.png
+share/kazehakase/icons/kz-galeon.png
+share/kazehakase/icons/kz-google.png
+share/kazehakase/icons/kz-gray.png
+share/kazehakase/icons/kz-green.png
+share/kazehakase/icons/kz-history.png
+share/kazehakase/icons/kz-konqueror.png
+share/kazehakase/icons/kz-logo-bg.png
+share/kazehakase/icons/kz-logo.png
+share/kazehakase/icons/kz-mozilla.png
+share/kazehakase/icons/kz-netscape.png
+share/kazehakase/icons/kz-newwindow.png
+share/kazehakase/icons/kz-openimagewindow.png
+share/kazehakase/icons/kz-openlinkwindow.png
+share/kazehakase/icons/kz-openselectedlink.png
+share/kazehakase/icons/kz-red.png
+share/kazehakase/icons/kz-remote-bookmark.png
+share/kazehakase/icons/kz-rss-feed.png
+share/kazehakase/icons/kz-savelink.png
+share/kazehakase/icons/kz-scrap-bookmark.png
+share/kazehakase/icons/kz-search.png
+share/kazehakase/icons/kz-select-all.png
+share/kazehakase/icons/kz-separator.png
+share/kazehakase/icons/kz-smart-bookmark.png
+share/kazehakase/icons/kz-tab-next.png
+share/kazehakase/icons/kz-tab-prev.png
+share/kazehakase/icons/kz-view-source.png
+share/kazehakase/icons/kz-yellow.png
+share/kazehakase/kz-no-thumbnail.png
+share/kazehakase/search-result.css
+share/pixmaps/kazehakase-icon.png
share/locale/cs/LC_MESSAGES/kazehakase.mo
share/locale/fr/LC_MESSAGES/kazehakase.mo
share/locale/ja/LC_MESSAGES/kazehakase.mo
share/locale/ru/LC_MESSAGES/kazehakase.mo
-@dirrm share/gnome/kazehakase/icons
-@dirrm share/gnome/kazehakase
+@dirrm share/kazehakase/icons
+@dirrm share/kazehakase
@dirrm lib/kazehakase/search
@dirrm lib/kazehakase/embed
@dirrm lib/kazehakase
@dirrm etc/kazehakase/mozilla
@dirrm etc/kazehakase
+@dirrmtry share/applications
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index c54a19bf173e..a477753eb135 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -3,11 +3,12 @@
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/nscache/Makefile,v 1.1 2006/10/04 11:49:18 ahze Exp $
+# $MCom: ports/www/nscache/Makefile,v 1.3 2007/08/07 03:35:07 mezz Exp $
+#
PORTNAME= nscache
PORTVERSION= 0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.idata.sk/~ondrej/sw/
@@ -34,6 +35,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/nscache.desktop \
${PREFIX}/share/gnome/apps/Internet
${INSTALL_DATA} ${WRKSRC}/nscache.xpm \
- ${PREFIX}/share/gnome/pixmaps
+ ${PREFIX}/share/pixmaps
.include <bsd.port.mk>
diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist
index c67f02bef6d8..140802e44d32 100644
--- a/www/nscache/pkg-plist
+++ b/www/nscache/pkg-plist
@@ -8,4 +8,4 @@ share/locale/pt_BR/LC_MESSAGES/nscache.mo
share/locale/sk/LC_MESSAGES/nscache.mo
share/locale/tr/LC_MESSAGES/nscache.mo
share/gnome/apps/Internet/nscache.desktop
-share/gnome/pixmaps/nscache.xpm
+share/pixmaps/nscache.xpm
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 8a00fd4ee5c7..73d406a92ef4 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -7,6 +7,7 @@
PORTNAME= opera
PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
diff --git a/www/opera/files/patch-install.sh b/www/opera/files/patch-install.sh
index cf440a0ee89b..8e3c5761f316 100644
--- a/www/opera/files/patch-install.sh
+++ b/www/opera/files/patch-install.sh
@@ -169,8 +169,8 @@
- then
- # /opt/gnome icon
- if test ! -d /opt/gnome/share/pixmaps/
-+ # %%LOCALBASE%%/share/gnome icon
-+ if test ! -d %%LOCALBASE%%/share/gnome/pixmaps/;
++ # %%LOCALBASE%%/share icon
++ if test ! -d %%LOCALBASE%%/share/pixmaps/;
then
- if test -w /opt/gnome/share
+ if test -w %%LOCALBASE%%/share/gnome;
@@ -178,17 +178,17 @@
- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
- chmod $chmodv 755 /opt/gnome/share/pixmaps
- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/gnome/pixmaps/
-+ chmod $chmodv 755 %%LOCALBASE%%/share/gnome/pixmaps
-+ cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/gnome/pixmaps/opera.xpm
++ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
++ chmod $chmodv 755 %%LOCALBASE%%/share/pixmaps
++ cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/pixmaps/opera.xpm
fi
- elif test -w /opt/gnome/share/pixmaps
- then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+ elif test -w %%LOCALBASE%%/share/gnome/pixmaps
-+ then cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/gnome/pixmaps/opera.xpm
++ elif test -w %%LOCALBASE%%/share/pixmaps
++ then cp $cpv $share_dir/images/opera.xpm %%LOCALBASE%%/share/pixmaps/opera.xpm
fi
- # end /opt/gnome icon
-+ # end %%LOCALBASE%%/share/gnome icon
++ # end %%LOCALBASE%%/share icon
- # /opt/gnome link
- if test -d /opt/gnome/share/gnome/apps/
diff --git a/www/opera/pkg-plist b/www/opera/pkg-plist
index 97bd407f185c..ba5fa09b8898 100644
--- a/www/opera/pkg-plist
+++ b/www/opera/pkg-plist
@@ -87,7 +87,7 @@ bin/opera
%%SYMHACK%%%%DATADIR%%/symhack.so
%%GNOME%%share/gnome/apps/Internet/opera.desktop
-%%GNOME%%share/gnome/pixmaps/opera.xpm
+%%GNOME%%share/pixmaps/opera.xpm
@dirrm %%DATADIR%%/styles/user
@dirrm %%DATADIR%%/styles/images
@dirrm %%DATADIR%%/styles
diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile
index b50b45371e26..6f109ade88b3 100644
--- a/www/osb-nrcore/Makefile
+++ b/www/osb-nrcore/Makefile
@@ -33,6 +33,7 @@ BROKEN= Does not compile on alpha
post-patch:
@${REINPLACE_CMD} -e '/test/s|==|=|g ; \
s|-nostdinc++||g ; \
- s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure
+ s|-nodefaultlibs -lgcc -lc||g; \
+ s|-D.*_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index e6591a1cee0d..3aea44850626 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= peacock
PORTVERSION= 1.9.1
-PORTREVISION= 10
+PORTREVISION= 12
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/www/peacock/pkg-plist b/www/peacock/pkg-plist
index cf58da995534..474a4cfc2483 100644
--- a/www/peacock/pkg-plist
+++ b/www/peacock/pkg-plist
@@ -1,8 +1,8 @@
bin/peacock-2
-share/gnome/peacock-2/glade/dialogs.glade
-share/gnome/peacock-2/pixmaps/peacock-logo.png
-share/gnome/peacock-2/ui/peacock-ui.xml
-@dirrm share/gnome/peacock-2/ui
-@dirrm share/gnome/peacock-2/pixmaps
-@dirrm share/gnome/peacock-2/glade
-@dirrm share/gnome/peacock-2
+share/peacock-2/glade/dialogs.glade
+share/peacock-2/pixmaps/peacock-logo.png
+share/peacock-2/ui/peacock-ui.xml
+@dirrm share/peacock-2/ui
+@dirrm share/peacock-2/pixmaps
+@dirrm share/peacock-2/glade
+@dirrm share/peacock-2
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index c12b979f75cf..38dc023426b1 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screem
PORTVERSION= 0.16.1
-PORTREVISION= 5
+PORTREVISION= 7
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -45,10 +45,10 @@ CONFIGURE_ARGS+= --enable-enchant
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|$${DATADIRNAME}/$${PACKAGE}|$${DATADIRNAME}/gnome/$${PACKAGE}|g ; \
- s|-DGNOME_DISABLE_DEPRECATED||g ; \
+ @${REINPLACE_CMD} -e 's|-DGNOME_DISABLE_DEPRECATED||g ; \
s|-DGNOMEUI_DISABLE_DEPRECATED||g ; \
s|-DGTK_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' ${WRKSRC}/tests/Makefile.in
+ @${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' \
+ ${WRKSRC}/tests/Makefile.in
.include <bsd.port.mk>
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index b78d729b40d9..8c3d349f4e8c 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -25,8 +25,8 @@ lib/screem/plugins/tableWizard.so
lib/screem/plugins/uploadWizard.la
lib/screem/plugins/uploadWizard.so
libdata/pkgconfig/screem-plugin.pc
-share/gnome/application-registry/screem.applications
-share/gnome/applications/screem.desktop
+share/application-registry/screem.applications
+share/applications/screem.desktop
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/help/screem/C/figures/color-wizard.png
share/gnome/help/screem/C/figures/css-wizard1.png
@@ -75,125 +75,125 @@ 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/omf/screem/screem-C.omf
-share/gnome/pixmaps/screem/splash/splash.png
-share/gnome/pixmaps/screem.png
-share/gnome/screem/doctypes.xml
-share/gnome/screem/dtd/HTMLlat1.ent
-share/gnome/screem/dtd/HTMLspecial.ent
-share/gnome/screem/dtd/HTMLsymbols.ent
-share/gnome/screem/dtd/catalog
-share/gnome/screem/dtd/gtkuimanager.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
-share/gnome/screem/dtd/screem-doctypes.dtd
-share/gnome/screem/dtd/screem-tagtree-config.dtd
-share/gnome/screem/dtd/screem-tagtree.dtd
-share/gnome/screem/dtd/xhtml-lat1.ent
-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/entityWizard.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
-share/gnome/screem/glade/uploadwizard.glade
-share/gnome/screem/helpers/Tidy/TidyHTML.desktop
-share/gnome/screem/helpers/Tidy/TidyXML.desktop
-share/gnome/screem/helpers/browsers/epiphany.desktop
-share/gnome/screem/helpers/browsers/konqueror.desktop
-share/gnome/screem/helpers/browsers/opera.desktop
-share/gnome/screem/helpers/browsers-remote/epiphany.desktop
-share/gnome/screem/helpers/browsers-remote/konqueror.desktop
-share/gnome/screem/helpers/browsers-remote/opera.desktop
-share/gnome/screem/hints/screem_hints.txt
-share/gnome/screem/hints/screem_hints_fr.txt
-share/gnome/screem/hints/screem_hints_pt_BR.txt
-share/gnome/screem/hints/screem_hints_sv.txt
-share/gnome/screem/pixmaps/add-link-16.png
-share/gnome/screem/pixmaps/add-link-24.png
-share/gnome/screem/pixmaps/add_column-16.png
-share/gnome/screem/pixmaps/add_column-24.png
-share/gnome/screem/pixmaps/add_row-16.png
-share/gnome/screem/pixmaps/add_row-24.png
-share/gnome/screem/pixmaps/bookmarks-open.png
-share/gnome/screem/pixmaps/bookmarks-preferences.png
-share/gnome/screem/pixmaps/browser.xpm
-share/gnome/screem/pixmaps/button.xpm
-share/gnome/screem/pixmaps/caption.xpm
-share/gnome/screem/pixmaps/checkbutton.xpm
-share/gnome/screem/pixmaps/cvs-add-16.png
-share/gnome/screem/pixmaps/cvs-add-24.png
-share/gnome/screem/pixmaps/cvs-add.png
-share/gnome/screem/pixmaps/cvs-checkout-16.png
-share/gnome/screem/pixmaps/cvs-checkout-24.png
-share/gnome/screem/pixmaps/cvs-checkout.png
-share/gnome/screem/pixmaps/cvs-commit-16.png
-share/gnome/screem/pixmaps/cvs-commit-24.png
-share/gnome/screem/pixmaps/cvs-remove-16.png
-share/gnome/screem/pixmaps/cvs-remove-24.png
-share/gnome/screem/pixmaps/cvs-remove.png
-share/gnome/screem/pixmaps/cvs-update-16.png
-share/gnome/screem/pixmaps/cvs-update-24.png
-share/gnome/screem/pixmaps/cvs-update.png
-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
-share/gnome/screem/pixmaps/paragraphs.png
-share/gnome/screem/pixmaps/pre.xpm
-share/gnome/screem/pixmaps/radiobutton.xpm
-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
-share/gnome/screem/pixmaps/td.xpm
-share/gnome/screem/pixmaps/text.xpm
-share/gnome/screem/pixmaps/th.xpm
-share/gnome/screem/pixmaps/todo.png
-share/gnome/screem/pixmaps/tr.xpm
-share/gnome/screem/resources/Images/made.png
-share/gnome/screem/resources/Javascript/linktitle.js
-share/gnome/screem/resources/Javascript/preload.js
-share/gnome/screem/resources/Javascript/rollover.js
-share/gnome/screem/resources/Templates/template.html
-share/gnome/screem/tagtrees/apache.tagtree
-share/gnome/screem/tagtrees/cfml.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-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
-share/gnome/screem/ui/screem-window-toolbar.xml
+share/omf/screem/screem-C.omf
+share/pixmaps/screem/splash/splash.png
+share/pixmaps/screem.png
+share/screem/doctypes.xml
+share/screem/dtd/HTMLlat1.ent
+share/screem/dtd/HTMLspecial.ent
+share/screem/dtd/HTMLsymbols.ent
+share/screem/dtd/catalog
+share/screem/dtd/gtkuimanager.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
+share/screem/dtd/screem-doctypes.dtd
+share/screem/dtd/screem-tagtree-config.dtd
+share/screem/dtd/screem-tagtree.dtd
+share/screem/dtd/xhtml-lat1.ent
+share/screem/dtd/xhtml-special.ent
+share/screem/dtd/xhtml-symbol.ent
+share/screem/features.xml
+share/screem/glade/css-wizard.glade
+share/screem/glade/entityWizard.glade
+share/screem/glade/linkwizard.glade
+share/screem/glade/object-wizard.glade
+share/screem/glade/screem.glade
+share/screem/glade/ssiwizard.glade
+share/screem/glade/tablewizard.glade
+share/screem/glade/uploadwizard.glade
+share/screem/helpers/Tidy/TidyHTML.desktop
+share/screem/helpers/Tidy/TidyXML.desktop
+share/screem/helpers/browsers/epiphany.desktop
+share/screem/helpers/browsers/konqueror.desktop
+share/screem/helpers/browsers/opera.desktop
+share/screem/helpers/browsers-remote/epiphany.desktop
+share/screem/helpers/browsers-remote/konqueror.desktop
+share/screem/helpers/browsers-remote/opera.desktop
+share/screem/hints/screem_hints.txt
+share/screem/hints/screem_hints_fr.txt
+share/screem/hints/screem_hints_pt_BR.txt
+share/screem/hints/screem_hints_sv.txt
+share/screem/pixmaps/add-link-16.png
+share/screem/pixmaps/add-link-24.png
+share/screem/pixmaps/add_column-16.png
+share/screem/pixmaps/add_column-24.png
+share/screem/pixmaps/add_row-16.png
+share/screem/pixmaps/add_row-24.png
+share/screem/pixmaps/bookmarks-open.png
+share/screem/pixmaps/bookmarks-preferences.png
+share/screem/pixmaps/browser.xpm
+share/screem/pixmaps/button.xpm
+share/screem/pixmaps/caption.xpm
+share/screem/pixmaps/checkbutton.xpm
+share/screem/pixmaps/cvs-add-16.png
+share/screem/pixmaps/cvs-add-24.png
+share/screem/pixmaps/cvs-add.png
+share/screem/pixmaps/cvs-checkout-16.png
+share/screem/pixmaps/cvs-checkout-24.png
+share/screem/pixmaps/cvs-checkout.png
+share/screem/pixmaps/cvs-commit-16.png
+share/screem/pixmaps/cvs-commit-24.png
+share/screem/pixmaps/cvs-remove-16.png
+share/screem/pixmaps/cvs-remove-24.png
+share/screem/pixmaps/cvs-remove.png
+share/screem/pixmaps/cvs-update-16.png
+share/screem/pixmaps/cvs-update-24.png
+share/screem/pixmaps/cvs-update.png
+share/screem/pixmaps/entry.xpm
+share/screem/pixmaps/fixed.xpm
+share/screem/pixmaps/gallery.xpm
+share/screem/pixmaps/gnome-fileentry.xpm
+share/screem/pixmaps/hand-open.png
+share/screem/pixmaps/insert-symbol-16.png
+share/screem/pixmaps/insert-symbol-24.png
+share/screem/pixmaps/optionmenu.xpm
+share/screem/pixmaps/paragraphs.png
+share/screem/pixmaps/pre.xpm
+share/screem/pixmaps/radiobutton.xpm
+share/screem/pixmaps/resources.png
+share/screem/pixmaps/screem_site.png
+share/screem/pixmaps/site_preview.png
+share/screem/pixmaps/site_structure-48.png
+share/screem/pixmaps/stock-close-12.png
+share/screem/pixmaps/stock-menu-left-12.png
+share/screem/pixmaps/stock-menu-right-12.png
+share/screem/pixmaps/stock_connect.png
+share/screem/pixmaps/stock_disconnect.png
+share/screem/pixmaps/stock_insert_image-16.png
+share/screem/pixmaps/stock_insert_image.png
+share/screem/pixmaps/stock_insert_object-16.png
+share/screem/pixmaps/stock_insert_object.png
+share/screem/pixmaps/stock_insert_table-16.png
+share/screem/pixmaps/sub.xpm
+share/screem/pixmaps/sup.xpm
+share/screem/pixmaps/td.xpm
+share/screem/pixmaps/text.xpm
+share/screem/pixmaps/th.xpm
+share/screem/pixmaps/todo.png
+share/screem/pixmaps/tr.xpm
+share/screem/resources/Images/made.png
+share/screem/resources/Javascript/linktitle.js
+share/screem/resources/Javascript/preload.js
+share/screem/resources/Javascript/rollover.js
+share/screem/resources/Templates/template.html
+share/screem/tagtrees/apache.tagtree
+share/screem/tagtrees/cfml.tagtree
+share/screem/tagtrees/css.tagtree
+share/screem/tagtrees/funcref_php.tagtree
+share/screem/tagtrees/funcref_python.tagtree
+share/screem/tagtrees/html.tagtree
+share/screem/tagtrees/javascript.tagtree
+share/screem/tagtrees/teixlite.tagtree
+share/screem/ui/layout
+share/screem/ui/screem-editable-toolbars.xml
+share/screem/ui/screem-tag-tree-bar.xml
+share/screem/ui/screem-window-menu.xml
+share/screem/ui/screem-window-popups.xml
+share/screem/ui/screem-window-toolbar.xml
share/locale/az/LC_MESSAGES/screem.mo
share/locale/cs/LC_MESSAGES/screem.mo
share/locale/da/LC_MESSAGES/screem.mo
@@ -217,27 +217,27 @@ share/locale/uk/LC_MESSAGES/screem.mo
share/locale/vi/LC_MESSAGES/screem.mo
share/locale/zh_CN/LC_MESSAGES/screem.mo
share/mime/packages/screem.xml
-@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/helpers/browsers-remote
-@dirrm share/gnome/screem/helpers/browsers
-@dirrm share/gnome/screem/helpers/Tidy
-@dirrm share/gnome/screem/helpers
-@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 share/screem/ui
+@dirrm share/screem/tagtrees
+@dirrm share/screem/resources/Templates
+@dirrm share/screem/resources/PHP3
+@dirrm share/screem/resources/Javascript
+@dirrm share/screem/resources/Images
+@dirrm share/screem/resources/HTML
+@dirrm share/screem/resources/Applets
+@dirrm share/screem/resources
+@dirrm share/screem/pixmaps
+@dirrm share/screem/hints
+@dirrm share/screem/helpers/browsers-remote
+@dirrm share/screem/helpers/browsers
+@dirrm share/screem/helpers/Tidy
+@dirrm share/screem/helpers
+@dirrm share/screem/glade
+@dirrm share/screem/dtd
+@dirrm share/screem
+@dirrm share/pixmaps/screem/splash
+@dirrm share/pixmaps/screem
+@dirrm share/omf/screem
@dirrm share/gnome/help/screem/C/figures
@dirrm share/gnome/help/screem/C
@dirrm share/gnome/help/screem
@@ -249,3 +249,4 @@ share/mime/packages/screem.xml
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/www/screem/Makefile b/www/screem/Makefile
index c12b979f75cf..38dc023426b1 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screem
PORTVERSION= 0.16.1
-PORTREVISION= 5
+PORTREVISION= 7
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -45,10 +45,10 @@ CONFIGURE_ARGS+= --enable-enchant
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|$${DATADIRNAME}/$${PACKAGE}|$${DATADIRNAME}/gnome/$${PACKAGE}|g ; \
- s|-DGNOME_DISABLE_DEPRECATED||g ; \
+ @${REINPLACE_CMD} -e 's|-DGNOME_DISABLE_DEPRECATED||g ; \
s|-DGNOMEUI_DISABLE_DEPRECATED||g ; \
s|-DGTK_DISABLE_DEPRECATED||g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' ${WRKSRC}/tests/Makefile.in
+ @${REINPLACE_CMD} -e 's|\&\& make|\&\& $$(MAKE)|g' \
+ ${WRKSRC}/tests/Makefile.in
.include <bsd.port.mk>
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index b78d729b40d9..8c3d349f4e8c 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -25,8 +25,8 @@ lib/screem/plugins/tableWizard.so
lib/screem/plugins/uploadWizard.la
lib/screem/plugins/uploadWizard.so
libdata/pkgconfig/screem-plugin.pc
-share/gnome/application-registry/screem.applications
-share/gnome/applications/screem.desktop
+share/application-registry/screem.applications
+share/applications/screem.desktop
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/help/screem/C/figures/color-wizard.png
share/gnome/help/screem/C/figures/css-wizard1.png
@@ -75,125 +75,125 @@ 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/omf/screem/screem-C.omf
-share/gnome/pixmaps/screem/splash/splash.png
-share/gnome/pixmaps/screem.png
-share/gnome/screem/doctypes.xml
-share/gnome/screem/dtd/HTMLlat1.ent
-share/gnome/screem/dtd/HTMLspecial.ent
-share/gnome/screem/dtd/HTMLsymbols.ent
-share/gnome/screem/dtd/catalog
-share/gnome/screem/dtd/gtkuimanager.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
-share/gnome/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
-share/gnome/screem/dtd/screem-doctypes.dtd
-share/gnome/screem/dtd/screem-tagtree-config.dtd
-share/gnome/screem/dtd/screem-tagtree.dtd
-share/gnome/screem/dtd/xhtml-lat1.ent
-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/entityWizard.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
-share/gnome/screem/glade/uploadwizard.glade
-share/gnome/screem/helpers/Tidy/TidyHTML.desktop
-share/gnome/screem/helpers/Tidy/TidyXML.desktop
-share/gnome/screem/helpers/browsers/epiphany.desktop
-share/gnome/screem/helpers/browsers/konqueror.desktop
-share/gnome/screem/helpers/browsers/opera.desktop
-share/gnome/screem/helpers/browsers-remote/epiphany.desktop
-share/gnome/screem/helpers/browsers-remote/konqueror.desktop
-share/gnome/screem/helpers/browsers-remote/opera.desktop
-share/gnome/screem/hints/screem_hints.txt
-share/gnome/screem/hints/screem_hints_fr.txt
-share/gnome/screem/hints/screem_hints_pt_BR.txt
-share/gnome/screem/hints/screem_hints_sv.txt
-share/gnome/screem/pixmaps/add-link-16.png
-share/gnome/screem/pixmaps/add-link-24.png
-share/gnome/screem/pixmaps/add_column-16.png
-share/gnome/screem/pixmaps/add_column-24.png
-share/gnome/screem/pixmaps/add_row-16.png
-share/gnome/screem/pixmaps/add_row-24.png
-share/gnome/screem/pixmaps/bookmarks-open.png
-share/gnome/screem/pixmaps/bookmarks-preferences.png
-share/gnome/screem/pixmaps/browser.xpm
-share/gnome/screem/pixmaps/button.xpm
-share/gnome/screem/pixmaps/caption.xpm
-share/gnome/screem/pixmaps/checkbutton.xpm
-share/gnome/screem/pixmaps/cvs-add-16.png
-share/gnome/screem/pixmaps/cvs-add-24.png
-share/gnome/screem/pixmaps/cvs-add.png
-share/gnome/screem/pixmaps/cvs-checkout-16.png
-share/gnome/screem/pixmaps/cvs-checkout-24.png
-share/gnome/screem/pixmaps/cvs-checkout.png
-share/gnome/screem/pixmaps/cvs-commit-16.png
-share/gnome/screem/pixmaps/cvs-commit-24.png
-share/gnome/screem/pixmaps/cvs-remove-16.png
-share/gnome/screem/pixmaps/cvs-remove-24.png
-share/gnome/screem/pixmaps/cvs-remove.png
-share/gnome/screem/pixmaps/cvs-update-16.png
-share/gnome/screem/pixmaps/cvs-update-24.png
-share/gnome/screem/pixmaps/cvs-update.png
-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
-share/gnome/screem/pixmaps/paragraphs.png
-share/gnome/screem/pixmaps/pre.xpm
-share/gnome/screem/pixmaps/radiobutton.xpm
-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
-share/gnome/screem/pixmaps/td.xpm
-share/gnome/screem/pixmaps/text.xpm
-share/gnome/screem/pixmaps/th.xpm
-share/gnome/screem/pixmaps/todo.png
-share/gnome/screem/pixmaps/tr.xpm
-share/gnome/screem/resources/Images/made.png
-share/gnome/screem/resources/Javascript/linktitle.js
-share/gnome/screem/resources/Javascript/preload.js
-share/gnome/screem/resources/Javascript/rollover.js
-share/gnome/screem/resources/Templates/template.html
-share/gnome/screem/tagtrees/apache.tagtree
-share/gnome/screem/tagtrees/cfml.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-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
-share/gnome/screem/ui/screem-window-toolbar.xml
+share/omf/screem/screem-C.omf
+share/pixmaps/screem/splash/splash.png
+share/pixmaps/screem.png
+share/screem/doctypes.xml
+share/screem/dtd/HTMLlat1.ent
+share/screem/dtd/HTMLspecial.ent
+share/screem/dtd/HTMLsymbols.ent
+share/screem/dtd/catalog
+share/screem/dtd/gtkuimanager.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
+share/screem/dtd/http%3A%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
+share/screem/dtd/screem-doctypes.dtd
+share/screem/dtd/screem-tagtree-config.dtd
+share/screem/dtd/screem-tagtree.dtd
+share/screem/dtd/xhtml-lat1.ent
+share/screem/dtd/xhtml-special.ent
+share/screem/dtd/xhtml-symbol.ent
+share/screem/features.xml
+share/screem/glade/css-wizard.glade
+share/screem/glade/entityWizard.glade
+share/screem/glade/linkwizard.glade
+share/screem/glade/object-wizard.glade
+share/screem/glade/screem.glade
+share/screem/glade/ssiwizard.glade
+share/screem/glade/tablewizard.glade
+share/screem/glade/uploadwizard.glade
+share/screem/helpers/Tidy/TidyHTML.desktop
+share/screem/helpers/Tidy/TidyXML.desktop
+share/screem/helpers/browsers/epiphany.desktop
+share/screem/helpers/browsers/konqueror.desktop
+share/screem/helpers/browsers/opera.desktop
+share/screem/helpers/browsers-remote/epiphany.desktop
+share/screem/helpers/browsers-remote/konqueror.desktop
+share/screem/helpers/browsers-remote/opera.desktop
+share/screem/hints/screem_hints.txt
+share/screem/hints/screem_hints_fr.txt
+share/screem/hints/screem_hints_pt_BR.txt
+share/screem/hints/screem_hints_sv.txt
+share/screem/pixmaps/add-link-16.png
+share/screem/pixmaps/add-link-24.png
+share/screem/pixmaps/add_column-16.png
+share/screem/pixmaps/add_column-24.png
+share/screem/pixmaps/add_row-16.png
+share/screem/pixmaps/add_row-24.png
+share/screem/pixmaps/bookmarks-open.png
+share/screem/pixmaps/bookmarks-preferences.png
+share/screem/pixmaps/browser.xpm
+share/screem/pixmaps/button.xpm
+share/screem/pixmaps/caption.xpm
+share/screem/pixmaps/checkbutton.xpm
+share/screem/pixmaps/cvs-add-16.png
+share/screem/pixmaps/cvs-add-24.png
+share/screem/pixmaps/cvs-add.png
+share/screem/pixmaps/cvs-checkout-16.png
+share/screem/pixmaps/cvs-checkout-24.png
+share/screem/pixmaps/cvs-checkout.png
+share/screem/pixmaps/cvs-commit-16.png
+share/screem/pixmaps/cvs-commit-24.png
+share/screem/pixmaps/cvs-remove-16.png
+share/screem/pixmaps/cvs-remove-24.png
+share/screem/pixmaps/cvs-remove.png
+share/screem/pixmaps/cvs-update-16.png
+share/screem/pixmaps/cvs-update-24.png
+share/screem/pixmaps/cvs-update.png
+share/screem/pixmaps/entry.xpm
+share/screem/pixmaps/fixed.xpm
+share/screem/pixmaps/gallery.xpm
+share/screem/pixmaps/gnome-fileentry.xpm
+share/screem/pixmaps/hand-open.png
+share/screem/pixmaps/insert-symbol-16.png
+share/screem/pixmaps/insert-symbol-24.png
+share/screem/pixmaps/optionmenu.xpm
+share/screem/pixmaps/paragraphs.png
+share/screem/pixmaps/pre.xpm
+share/screem/pixmaps/radiobutton.xpm
+share/screem/pixmaps/resources.png
+share/screem/pixmaps/screem_site.png
+share/screem/pixmaps/site_preview.png
+share/screem/pixmaps/site_structure-48.png
+share/screem/pixmaps/stock-close-12.png
+share/screem/pixmaps/stock-menu-left-12.png
+share/screem/pixmaps/stock-menu-right-12.png
+share/screem/pixmaps/stock_connect.png
+share/screem/pixmaps/stock_disconnect.png
+share/screem/pixmaps/stock_insert_image-16.png
+share/screem/pixmaps/stock_insert_image.png
+share/screem/pixmaps/stock_insert_object-16.png
+share/screem/pixmaps/stock_insert_object.png
+share/screem/pixmaps/stock_insert_table-16.png
+share/screem/pixmaps/sub.xpm
+share/screem/pixmaps/sup.xpm
+share/screem/pixmaps/td.xpm
+share/screem/pixmaps/text.xpm
+share/screem/pixmaps/th.xpm
+share/screem/pixmaps/todo.png
+share/screem/pixmaps/tr.xpm
+share/screem/resources/Images/made.png
+share/screem/resources/Javascript/linktitle.js
+share/screem/resources/Javascript/preload.js
+share/screem/resources/Javascript/rollover.js
+share/screem/resources/Templates/template.html
+share/screem/tagtrees/apache.tagtree
+share/screem/tagtrees/cfml.tagtree
+share/screem/tagtrees/css.tagtree
+share/screem/tagtrees/funcref_php.tagtree
+share/screem/tagtrees/funcref_python.tagtree
+share/screem/tagtrees/html.tagtree
+share/screem/tagtrees/javascript.tagtree
+share/screem/tagtrees/teixlite.tagtree
+share/screem/ui/layout
+share/screem/ui/screem-editable-toolbars.xml
+share/screem/ui/screem-tag-tree-bar.xml
+share/screem/ui/screem-window-menu.xml
+share/screem/ui/screem-window-popups.xml
+share/screem/ui/screem-window-toolbar.xml
share/locale/az/LC_MESSAGES/screem.mo
share/locale/cs/LC_MESSAGES/screem.mo
share/locale/da/LC_MESSAGES/screem.mo
@@ -217,27 +217,27 @@ share/locale/uk/LC_MESSAGES/screem.mo
share/locale/vi/LC_MESSAGES/screem.mo
share/locale/zh_CN/LC_MESSAGES/screem.mo
share/mime/packages/screem.xml
-@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/helpers/browsers-remote
-@dirrm share/gnome/screem/helpers/browsers
-@dirrm share/gnome/screem/helpers/Tidy
-@dirrm share/gnome/screem/helpers
-@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 share/screem/ui
+@dirrm share/screem/tagtrees
+@dirrm share/screem/resources/Templates
+@dirrm share/screem/resources/PHP3
+@dirrm share/screem/resources/Javascript
+@dirrm share/screem/resources/Images
+@dirrm share/screem/resources/HTML
+@dirrm share/screem/resources/Applets
+@dirrm share/screem/resources
+@dirrm share/screem/pixmaps
+@dirrm share/screem/hints
+@dirrm share/screem/helpers/browsers-remote
+@dirrm share/screem/helpers/browsers
+@dirrm share/screem/helpers/Tidy
+@dirrm share/screem/helpers
+@dirrm share/screem/glade
+@dirrm share/screem/dtd
+@dirrm share/screem
+@dirrm share/pixmaps/screem/splash
+@dirrm share/pixmaps/screem
+@dirrm share/omf/screem
@dirrm share/gnome/help/screem/C/figures
@dirrm share/gnome/help/screem/C
@dirrm share/gnome/help/screem
@@ -249,3 +249,4 @@ share/mime/packages/screem.xml
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/applications
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index f69b5fdbaa6b..8b7ea7902122 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -4,11 +4,12 @@
# Whom: ijliao
#
# $FreeBSD$
-# $MCom: ports/www/syndigator/Makefile,v 1.1 2006/09/30 18:31:24 ahze Exp $
+# $MCom: ports/www/syndigator/Makefile,v 1.4 2007/09/09 22:45:27 mezz Exp $
+#
PORTNAME= syndigator
PORTVERSION= 0.15.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -31,7 +32,7 @@ USE_GNOME= gnomehier
USE_PERL5= yes
NO_BUILD= yes
-GNOMEDIR= ${PREFIX}/share/gnome
+GNOMEDIR= ${PREFIX}/share
post-patch:
@${PERL} -pi -e 's|./lib|${PREFIX}/${SITE_PERL_REL}/${PORTNAME}|g' \
diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist
index 447333940db7..862159f14578 100644
--- a/www/syndigator/pkg-plist
+++ b/www/syndigator/pkg-plist
@@ -49,30 +49,30 @@ bin/syndigator
%%SITE_PERL%%/syndigator/RSSReader/Parser.pm
%%SITE_PERL%%/syndigator/RSSReader/UI/Preferences.pm
%%SITE_PERL%%/syndigator/RSSReader.pm
-share/gnome/applications/syndigator.desktop
-share/gnome/pixmaps/syndigator.png
-share/gnome/pixmaps/syndigator/closed.png
-share/gnome/pixmaps/syndigator/comment-gs.png
-share/gnome/pixmaps/syndigator/comment.png
-share/gnome/pixmaps/syndigator/fetches_failed.png
-share/gnome/pixmaps/syndigator/fetches_failed_16.png
-share/gnome/pixmaps/syndigator/item-gtk2.png
-share/gnome/pixmaps/syndigator/item-notify-gtk2.png
-share/gnome/pixmaps/syndigator/item-notify.xpm
-share/gnome/pixmaps/syndigator/item.xpm
-share/gnome/pixmaps/syndigator/logo-124x22.xpm
-share/gnome/pixmaps/syndigator/logo-simple.gif
-share/gnome/pixmaps/syndigator/logo-simple.xpm
-share/gnome/pixmaps/syndigator/not_to_keep.xpm
-share/gnome/pixmaps/syndigator/offline.png
-share/gnome/pixmaps/syndigator/online.png
-share/gnome/pixmaps/syndigator/opened.png
-share/gnome/pixmaps/syndigator/post-comment.png
-share/gnome/pixmaps/syndigator/to_keep.png
-share/gnome/pixmaps/syndigator/tokeep-gtk2.png
-share/gnome/pixmaps/syndigator/trayicon-notify.gif
-share/gnome/pixmaps/syndigator/trayicon.gif
-@dirrm share/gnome/pixmaps/syndigator
+share/applications/syndigator.desktop
+share/pixmaps/syndigator.png
+share/pixmaps/syndigator/closed.png
+share/pixmaps/syndigator/comment-gs.png
+share/pixmaps/syndigator/comment.png
+share/pixmaps/syndigator/fetches_failed.png
+share/pixmaps/syndigator/fetches_failed_16.png
+share/pixmaps/syndigator/item-gtk2.png
+share/pixmaps/syndigator/item-notify-gtk2.png
+share/pixmaps/syndigator/item-notify.xpm
+share/pixmaps/syndigator/item.xpm
+share/pixmaps/syndigator/logo-124x22.xpm
+share/pixmaps/syndigator/logo-simple.gif
+share/pixmaps/syndigator/logo-simple.xpm
+share/pixmaps/syndigator/not_to_keep.xpm
+share/pixmaps/syndigator/offline.png
+share/pixmaps/syndigator/online.png
+share/pixmaps/syndigator/opened.png
+share/pixmaps/syndigator/post-comment.png
+share/pixmaps/syndigator/to_keep.png
+share/pixmaps/syndigator/tokeep-gtk2.png
+share/pixmaps/syndigator/trayicon-notify.gif
+share/pixmaps/syndigator/trayicon.gif
+@dirrm share/pixmaps/syndigator
@dirrm %%SITE_PERL%%/syndigator/RSSReader/UI
@dirrm %%SITE_PERL%%/syndigator/RSSReader/Parser
@dirrm %%SITE_PERL%%/syndigator/RSSReader/Importer
@@ -88,3 +88,4 @@ share/gnome/pixmaps/syndigator/trayicon.gif
@dirrmtry %%SITE_PERL%%
@dirrmtry lib/perl5/site_perl
@dirrmtry lib/perl5
+@dirrmtry share/applications