summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-01-27 19:40:17 +0000
committerRene Ladan <rene@FreeBSD.org>2020-01-27 19:40:17 +0000
commitb0eec09651960d8c9d8a0981beab512bfb3c21f7 (patch)
tree94e26138c8267621b1b647591febb9f4c2bee2eb
parent56b735e2588de9f5ab64b0122de9f731ea768c0c (diff)
downloadfreebsd-ports-b0eec09651960d8c9d8a0981beab512bfb3c21f7.zip
Remove textproc/gnome-doc-utils.
It is abandonded upstream for years and is Python-2.7-only. Adjust consumers, some only need a rebuild, others have their documentation formerly created by gnome-doc-utils / xml2po removed. Remove gnomedocutils from USE_GNOME Submitted by: rene Approved by: portmgr (mat), gnome (kwm) Differential Revision: https://reviews.freebsd.org/D23381
-rw-r--r--MOVED1
-rw-r--r--Mk/Uses/gnome.mk6
-rw-r--r--audio/mp3splt-gtk/Makefile3
-rw-r--r--audio/mp3splt-gtk/files/patch-configure82
-rw-r--r--audio/mp3splt-gtk/pkg-plist57
-rw-r--r--deskutils/genius/Makefile3
-rw-r--r--deskutils/nemo-extensions/Makefile4
-rw-r--r--deskutils/tomboy/Makefile4
-rw-r--r--devel/glade/Makefile7
-rw-r--r--devel/libdbusmenu/Makefile8
-rw-r--r--games/gbrainy/Makefile5
-rw-r--r--games/gbrainy/files/patch-Makefile.in12
-rw-r--r--games/gbrainy/files/patch-configure64
-rw-r--r--games/gbrainy/pkg-plist420
-rw-r--r--graphics/shotwell/Makefile3
-rw-r--r--multimedia/gnome-subtitles/Makefile4
-rw-r--r--multimedia/gnome-subtitles/files/patch-Makefile.in11
-rw-r--r--multimedia/gnome-subtitles/files/patch-configure62
-rw-r--r--multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_gnome-subtitles.in8
-rw-r--r--multimedia/gnome-subtitles/pkg-plist25
-rw-r--r--net-im/telepathy-logger/Makefile3
-rw-r--r--net/gq/Makefile4
-rw-r--r--net/gq/files/patch-Makefile.in10
-rw-r--r--net/gq/files/patch-configure55
-rw-r--r--net/gq/files/patch-src__state.c6
-rw-r--r--net/gq/files/patch-src_gq-server.c4
-rw-r--r--net/gq/files/patch-src_gq-tab-schema.c4
-rw-r--r--net/gq/pkg-plist6
-rw-r--r--net/twitux/Makefile4
-rw-r--r--net/twitux/files/patch-configure58
-rw-r--r--net/twitux/files/patch-src_twitux-app.c4
-rw-r--r--net/twitux/pkg-plist4
-rw-r--r--science/gchemutils/Makefile4
-rw-r--r--science/gchemutils/files/patch-Makefile.in6
-rw-r--r--science/gchemutils/files/patch-configure62
-rw-r--r--science/gchemutils/files/patch-docs_Makefile.in11
-rw-r--r--science/gchemutils/files/patch-libs_gcr_document.cc10
-rw-r--r--science/gchemutils/files/patch-libs_gcu_spacegroup.cc8
-rw-r--r--science/gchemutils/pkg-plist163
-rw-r--r--security/hotssh/Makefile4
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gconf-editor/files/patch-Makefile.in11
-rw-r--r--sysutils/gconf-editor/files/patch-configure62
-rw-r--r--sysutils/gconf-editor/pkg-plist182
-rw-r--r--sysutils/gnome-schedule/Makefile4
-rw-r--r--sysutils/gnome-schedule/files/patch-Makefile.in11
-rw-r--r--sysutils/gnome-schedule/files/patch-configure62
-rw-r--r--sysutils/gnome-schedule/pkg-plist64
-rw-r--r--sysutils/policykit-gnome/Makefile4
-rw-r--r--sysutils/policykit-gnome/files/patch-Makefile.in6
-rw-r--r--sysutils/policykit-gnome/files/patch-configure58
-rw-r--r--sysutils/policykit-gnome/files/patch-polkit-gnome_polkit-gnome-action.c8
-rw-r--r--sysutils/xvidcap/Makefile5
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/gnome-doc-utils/Makefile33
-rw-r--r--textproc/gnome-doc-utils/distinfo2
-rw-r--r--textproc/gnome-doc-utils/files/patch-tools_gnome-doc-tool.in8
-rw-r--r--textproc/gnome-doc-utils/pkg-descr5
-rw-r--r--textproc/gnome-doc-utils/pkg-plist271
-rw-r--r--x11-wm/muffin/Makefile4
-rw-r--r--x11-wm/muffin/files/patch-configure.ac12
-rw-r--r--x11-wm/muffin/files/patch-src_core_main.c6
-rw-r--r--x11/florence/Makefile7
-rw-r--r--x11/florence/pkg-plist45
-rw-r--r--x11/gsynaptics/Makefile4
-rw-r--r--x11/gsynaptics/files/patch-configure58
66 files changed, 783 insertions, 1373 deletions
diff --git a/MOVED b/MOVED
index a403b28f8482..8dd31aad2052 100644
--- a/MOVED
+++ b/MOVED
@@ -14003,3 +14003,4 @@ x11-wm/obkey||2020-01-27|Has expired: Unmaintained, uses EOLed python27
x11-wm/obmenu||2020-01-27|Has expired: Unmaintained, uses EOLed python27
x11-wm/plwm||2020-01-27|Has expired: Unmaintained, uses EOLed python27
games/vegastrike-data||2020-01-27|Removed
+textproc/gnome-doc-utils||2020-01-27|Abandoned upstream, Python 2.7 only
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index bd39c8719451..28b7b262cf97 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -74,7 +74,7 @@ _USE_GNOME_ALL= intlhack intltool introspection \
# GNOME 2 components
_USE_GNOME_ALL+= atk cairo \
gdkpixbuf2 gconf2 glib20 \
- gnomedocutils gnomesharp20 \
+ gnomesharp20 \
gnomevfs2 gtk-update-icon-cache gtk20 gtkhtml3 \
gtksharp20 gtksourceview2 gvfs libartlgpl2 libbonobo \
libbonoboui libglade2 libgnome \
@@ -335,10 +335,6 @@ gnomemenus3_BUILD_DEPENDS= gnome-menus>=3.2.0:x11/gnome-menus
gnomemenus3_RUN_DEPENDS= gnome-menus>=3.2.0:x11/gnome-menus
gnomemenus3_USE_GNOME_IMPL= glib20
-gnomedocutils_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc:textproc/gnome-doc-utils
-gnomedocutils_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc:textproc/gnome-doc-utils
-gnomedocutils_USE_GNOME_IMPL= libxslt
-
gtksharp10_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc:x11-toolkits/gtk-sharp10
gtksharp10_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc:x11-toolkits/gtk-sharp10
gtksharp10_USE_GNOME_IMPL= gtk20
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index 1e29e67ccbba..f23e5944c5d4 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mp3splt-gtk
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/mp3splt/${PORTNAME}/${PORTVERSION}
@@ -20,7 +21,7 @@ LIB_DEPENDS= libmp3splt.so:audio/libmp3splt \
INSTALLS_OMF= yes
USE_GSTREAMER1= yes
-USE_GNOME= gnomedocutils gtk30
+USE_GNOME= gtk30
GNU_CONFIGURE= yes
USES= desktop-file-utils gmake gnome pkgconfig
diff --git a/audio/mp3splt-gtk/files/patch-configure b/audio/mp3splt-gtk/files/patch-configure
new file mode 100644
index 000000000000..d67c4b35aac8
--- /dev/null
+++ b/audio/mp3splt-gtk/files/patch-configure
@@ -0,0 +1,82 @@
+--- configure.orig 2014-11-09 16:50:32 UTC
++++ configure
+@@ -15153,53 +15153,12 @@ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ fi
+
+
+-gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+-if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+-
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+- if true; then
+- GNOME_TRUE=
+- GNOME_FALSE='#'
+-else
+- GNOME_TRUE='#'
+- GNOME_FALSE=
+-fi
+-
+- if true; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+- gnome="yes"
+
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "gnome-doc-utils not found.
+
+- Install it or configure with \"--disable-gnome\"." "$LINENO" 5
+-fi
+-
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+@@ -15239,25 +15198,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/audio/mp3splt-gtk/pkg-plist b/audio/mp3splt-gtk/pkg-plist
index 13b88e1289ca..669bd3ad4f5f 100644
--- a/audio/mp3splt-gtk/pkg-plist
+++ b/audio/mp3splt-gtk/pkg-plist
@@ -1,55 +1,6 @@
bin/mp3splt-gtk
man/man1/mp3splt-gtk.1.gz
share/applications/mp3splt-gtk.desktop
-share/gnome/help/mp3splt-gtk/C/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/C/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/C/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/C/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/C/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/C/legal.xml
-share/gnome/help/mp3splt-gtk/C/mp3splt-gtk.xml
-share/gnome/help/mp3splt-gtk/cs/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/cs/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/cs/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/cs/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/cs/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/cs/mp3splt-gtk.xml
-share/gnome/help/mp3splt-gtk/de/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/de/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/de/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/de/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/de/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/de/mp3splt-gtk.xml
-share/gnome/help/mp3splt-gtk/en/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/en/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/en/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/en/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/en/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/en/mp3splt-gtk.xml
-share/gnome/help/mp3splt-gtk/es/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/es/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/es/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/es/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/es/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/es/mp3splt-gtk.xml
-share/gnome/help/mp3splt-gtk/es_CL/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/es_CL/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/es_CL/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/es_CL/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/es_CL/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/es_CL/mp3splt-gtk.xml
-share/gnome/help/mp3splt-gtk/fr/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/fr/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/fr/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/fr/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/fr/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/fr/mp3splt-gtk.xml
-share/gnome/help/mp3splt-gtk/ru_RU/figures/FreeDBSearch.png
-share/gnome/help/mp3splt-gtk/ru_RU/figures/Preferences.png
-share/gnome/help/mp3splt-gtk/ru_RU/figures/SplitType.png
-share/gnome/help/mp3splt-gtk/ru_RU/figures/Tracklist.png
-share/gnome/help/mp3splt-gtk/ru_RU/figures/mp3splt-gtk.png
-share/gnome/help/mp3splt-gtk/ru_RU/mp3splt-gtk.xml
%%NLS%%share/locale/cs/LC_MESSAGES/mp3splt-gtk.mo
%%NLS%%share/locale/de_DE/LC_MESSAGES/mp3splt-gtk.mo
%%NLS%%share/locale/es/LC_MESSAGES/mp3splt-gtk.mo
@@ -67,13 +18,5 @@ share/gnome/help/mp3splt-gtk/ru_RU/mp3splt-gtk.xml
%%DATADIR%%/play_inactive.svg
%%DATADIR%%/stop.svg
%%DATADIR%%/stop_inactive.svg
-share/omf/mp3splt-gtk/mp3splt-gtk-C.omf
-share/omf/mp3splt-gtk/mp3splt-gtk-cs.omf
-share/omf/mp3splt-gtk/mp3splt-gtk-de.omf
-share/omf/mp3splt-gtk/mp3splt-gtk-en.omf
-share/omf/mp3splt-gtk/mp3splt-gtk-es.omf
-share/omf/mp3splt-gtk/mp3splt-gtk-es_CL.omf
-share/omf/mp3splt-gtk/mp3splt-gtk-fr.omf
-share/omf/mp3splt-gtk/mp3splt-gtk-ru_RU.omf
share/pixmaps/mp3splt-gtk.png
share/pixmaps/mp3splt-gtk_ico.svg
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 9b8d054df3d3..fd908b9868a5 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -3,6 +3,7 @@
PORTNAME= genius
PORTVERSION= 1.0.24
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME \
http://ftp.5z.com/pub/genius/
@@ -22,7 +23,7 @@ RUN_DEPENDS= rarian-sk-config:textproc/rarian
USES= desktop-file-utils gmake gnome libtool pathfix pkgconfig \
readline shared-mime-info tar:xz xorg
-USE_GNOME= cairo gnomedocutils gnomeprefix gtksourceview2 gnomevfs2 vte intltool
+USE_GNOME= cairo gnomeprefix gtksourceview2 gnomevfs2 vte intltool
USE_XORG= x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-extra-gcc-optimization \
diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile
index 26afea8911e0..935368c519b6 100644
--- a/deskutils/nemo-extensions/Makefile
+++ b/deskutils/nemo-extensions/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nemo-extensions
PORTVERSION= 2.4.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnome
DIST_SUBDIR= gnome3
@@ -33,7 +33,7 @@ USE_GITHUB= yes
GH_ACCOUNT= linuxmint
GH_TAGNAME= 6c8ec3a
-USE_GNOME= gconf2 gnomeprefix gnomedocutils gtksourceview3 intlhack \
+USE_GNOME= gconf2 gnomeprefix gtksourceview3 intlhack \
introspection:build libxml2 pygtk2
USES= autoreconf:build gettext gmake gnome libtool pathfix pkgconfig \
python:2.7 shebangfix
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index a383574bf055..880685ca7bbc 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tomboy
PORTVERSION= 1.15.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-2.0.pc:devel/dbus-sh
mautil:devel/mono-addins
USES= cpe gettext gmake gnome libtool mono pathfix pkgconfig tar:xz
-USE_GNOME= intlhack gnomeprefix gnomedocutils gnomesharp20
+USE_GNOME= intlhack gnomeprefix gnomesharp20
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 1c9cfa22851c..a3a551666cd6 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -3,7 +3,7 @@
PORTNAME= glade
PORTVERSION= 3.22.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -16,14 +16,15 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.GPL
LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPL
-BUILD_DEPENDS= itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool \
+ rarian-sk-config:textproc/rarian
CONFLICTS= glade3-3.*
PORTSCOUT= limitw:1,even
USES= compiler:c11 desktop-file-utils gettext gmake gnome libtool \
localbase:ldflags pathfix pkgconfig tar:xz
-USE_GNOME= cairo gtk30 gnomedocutils intlhack \
+USE_GNOME= cairo gtk30 intlhack \
introspection:build
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/devel/libdbusmenu/Makefile b/devel/libdbusmenu/Makefile
index 71d7c9c2e8a9..c68592b032f5 100644
--- a/devel/libdbusmenu/Makefile
+++ b/devel/libdbusmenu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdbusmenu
PORTVERSION= 16.04.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://launchpadlibrarian.net/243440794/ \
https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
@@ -22,9 +22,9 @@ BUILD_DEPENDS= vapigen:lang/vala \
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib
GNU_CONFIGURE= yes
-USES= compiler gmake gnome libtool pathfix pkgconfig python:run \
- shebangfix xorg
-USE_GNOME= gnomedocutils:build glib20 intltool intlhack libxslt \
+USES= compiler gettext-tools:build,run gmake gnome libtool pathfix \
+ pkgconfig python:run shebangfix xorg
+USE_GNOME= glib20 intltool intlhack libxslt \
introspection:build gtk30
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index b467067ad01c..f5f968d6ed65 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gbrainy
PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= games
MASTER_SITES= http://gent.softcatala.org/jmas/gbrainy/
@@ -17,12 +17,13 @@ BUILD_DEPENDS= mautil:devel/mono-addins \
${LOCALBASE}/bin/bash:shells/bash
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_GNOME= gtksharp20 gnomesharp20 gnomedocutils intltool
USES= gettext gmake gnome mono pathfix pkgconfig shebangfix
+USE_GNOME= gtksharp20 gnomesharp20 intltool
SHEBANG_FILES= src/Clients/Classical/gbrainy.in
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+MAKE_ENV+= MONO_REGISTRY_PATH=${WRKDIR}
INSTALLS_ICONS= yes
diff --git a/games/gbrainy/files/patch-Makefile.in b/games/gbrainy/files/patch-Makefile.in
new file mode 100644
index 000000000000..c48ada591fb4
--- /dev/null
+++ b/games/gbrainy/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig 2013-09-15 18:26:13 UTC
++++ Makefile.in
+@@ -378,8 +378,7 @@ SUBDIRS = \
+ tests \
+ data \
+ tools \
+- po \
+- help
++ po
+
+ CLEANFILES = \
+ intltool-extract \
diff --git a/games/gbrainy/files/patch-configure b/games/gbrainy/files/patch-configure
index e8bf4bd9da6e..91dcd8a1ca9d 100644
--- a/games/gbrainy/files/patch-configure
+++ b/games/gbrainy/files/patch-configure
@@ -1,6 +1,66 @@
---- configure.orig
+--- configure.orig 2013-09-15 18:26:16 UTC
+++ configure
-@@ -13674,8 +13674,8 @@
+@@ -13562,33 +13562,9 @@ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ fi
+
+
+-gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+-if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+@@ -13628,25 +13604,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
+@@ -13674,8 +13640,8 @@ needed_assemblies="Mono.Posix Mono.Cairo Mono.CSharp"
for i in $needed_assemblies; do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i.dll" >&5
$as_echo_n "checking for $i.dll... " >&6; }
diff --git a/games/gbrainy/pkg-plist b/games/gbrainy/pkg-plist
index f4d1e97edade..855aa2177ed3 100644
--- a/games/gbrainy/pkg-plist
+++ b/games/gbrainy/pkg-plist
@@ -31,426 +31,6 @@ share/games/gbrainy/tennis.svg
share/games/gbrainy/themes.xml
share/games/gbrainy/verbal_analogies.xml
share/games/gbrainy/wrong.oga
-share/gnome/help/gbrainy/C/customgame.page
-share/gnome/help/gbrainy/C/difficulty.page
-share/gnome/help/gbrainy/C/export.page
-share/gnome/help/gbrainy/C/figures/all-games.png
-share/gnome/help/gbrainy/C/figures/gbrainy.png
-share/gnome/help/gbrainy/C/figures/logic-games.png
-share/gnome/help/gbrainy/C/figures/math-games.png
-share/gnome/help/gbrainy/C/figures/memory-games.png
-share/gnome/help/gbrainy/C/figures/verbal-games.png
-share/gnome/help/gbrainy/C/gameplay.page
-share/gnome/help/gbrainy/C/gametypes.page
-share/gnome/help/gbrainy/C/history.page
-share/gnome/help/gbrainy/C/index.page
-share/gnome/help/gbrainy/C/legal.xml
-share/gnome/help/gbrainy/C/license.page
-share/gnome/help/gbrainy/C/multiplayer.page
-share/gnome/help/gbrainy/C/newgame.page
-share/gnome/help/gbrainy/C/pause.page
-share/gnome/help/gbrainy/C/score.page
-share/gnome/help/gbrainy/C/times.page
-share/gnome/help/gbrainy/C/tips.page
-share/gnome/help/gbrainy/af/customgame.page
-share/gnome/help/gbrainy/af/difficulty.page
-share/gnome/help/gbrainy/af/export.page
-share/gnome/help/gbrainy/af/figures/all-games.png
-share/gnome/help/gbrainy/af/figures/gbrainy.png
-share/gnome/help/gbrainy/af/figures/logic-games.png
-share/gnome/help/gbrainy/af/figures/math-games.png
-share/gnome/help/gbrainy/af/figures/memory-games.png
-share/gnome/help/gbrainy/af/figures/verbal-games.png
-share/gnome/help/gbrainy/af/gameplay.page
-share/gnome/help/gbrainy/af/gametypes.page
-share/gnome/help/gbrainy/af/history.page
-share/gnome/help/gbrainy/af/index.page
-share/gnome/help/gbrainy/af/legal.xml
-share/gnome/help/gbrainy/af/license.page
-share/gnome/help/gbrainy/af/multiplayer.page
-share/gnome/help/gbrainy/af/newgame.page
-share/gnome/help/gbrainy/af/pause.page
-share/gnome/help/gbrainy/af/score.page
-share/gnome/help/gbrainy/af/times.page
-share/gnome/help/gbrainy/af/tips.page
-share/gnome/help/gbrainy/ca/customgame.page
-share/gnome/help/gbrainy/ca/difficulty.page
-share/gnome/help/gbrainy/ca/export.page
-share/gnome/help/gbrainy/ca/figures/all-games.png
-share/gnome/help/gbrainy/ca/figures/gbrainy.png
-share/gnome/help/gbrainy/ca/figures/logic-games.png
-share/gnome/help/gbrainy/ca/figures/math-games.png
-share/gnome/help/gbrainy/ca/figures/memory-games.png
-share/gnome/help/gbrainy/ca/figures/verbal-games.png
-share/gnome/help/gbrainy/ca/gameplay.page
-share/gnome/help/gbrainy/ca/gametypes.page
-share/gnome/help/gbrainy/ca/history.page
-share/gnome/help/gbrainy/ca/index.page
-share/gnome/help/gbrainy/ca/legal.xml
-share/gnome/help/gbrainy/ca/license.page
-share/gnome/help/gbrainy/ca/multiplayer.page
-share/gnome/help/gbrainy/ca/newgame.page
-share/gnome/help/gbrainy/ca/pause.page
-share/gnome/help/gbrainy/ca/score.page
-share/gnome/help/gbrainy/ca/times.page
-share/gnome/help/gbrainy/ca/tips.page
-share/gnome/help/gbrainy/cs/customgame.page
-share/gnome/help/gbrainy/cs/difficulty.page
-share/gnome/help/gbrainy/cs/export.page
-share/gnome/help/gbrainy/cs/figures/all-games.png
-share/gnome/help/gbrainy/cs/figures/gbrainy.png
-share/gnome/help/gbrainy/cs/figures/logic-games.png
-share/gnome/help/gbrainy/cs/figures/math-games.png
-share/gnome/help/gbrainy/cs/figures/memory-games.png
-share/gnome/help/gbrainy/cs/figures/verbal-games.png
-share/gnome/help/gbrainy/cs/gameplay.page
-share/gnome/help/gbrainy/cs/gametypes.page
-share/gnome/help/gbrainy/cs/history.page
-share/gnome/help/gbrainy/cs/index.page
-share/gnome/help/gbrainy/cs/legal.xml
-share/gnome/help/gbrainy/cs/license.page
-share/gnome/help/gbrainy/cs/multiplayer.page
-share/gnome/help/gbrainy/cs/newgame.page
-share/gnome/help/gbrainy/cs/pause.page
-share/gnome/help/gbrainy/cs/score.page
-share/gnome/help/gbrainy/cs/times.page
-share/gnome/help/gbrainy/cs/tips.page
-share/gnome/help/gbrainy/da/customgame.page
-share/gnome/help/gbrainy/da/difficulty.page
-share/gnome/help/gbrainy/da/export.page
-share/gnome/help/gbrainy/da/figures/all-games.png
-share/gnome/help/gbrainy/da/figures/gbrainy.png
-share/gnome/help/gbrainy/da/figures/logic-games.png
-share/gnome/help/gbrainy/da/figures/math-games.png
-share/gnome/help/gbrainy/da/figures/memory-games.png
-share/gnome/help/gbrainy/da/figures/verbal-games.png
-share/gnome/help/gbrainy/da/gameplay.page
-share/gnome/help/gbrainy/da/gametypes.page
-share/gnome/help/gbrainy/da/history.page
-share/gnome/help/gbrainy/da/index.page
-share/gnome/help/gbrainy/da/legal.xml
-share/gnome/help/gbrainy/da/license.page
-share/gnome/help/gbrainy/da/multiplayer.page
-share/gnome/help/gbrainy/da/newgame.page
-share/gnome/help/gbrainy/da/pause.page
-share/gnome/help/gbrainy/da/score.page
-share/gnome/help/gbrainy/da/times.page
-share/gnome/help/gbrainy/da/tips.page
-share/gnome/help/gbrainy/de/customgame.page
-share/gnome/help/gbrainy/de/difficulty.page
-share/gnome/help/gbrainy/de/export.page
-share/gnome/help/gbrainy/de/figures/all-games.png
-share/gnome/help/gbrainy/de/figures/gbrainy.png
-share/gnome/help/gbrainy/de/figures/logic-games.png
-share/gnome/help/gbrainy/de/figures/math-games.png
-share/gnome/help/gbrainy/de/figures/memory-games.png
-share/gnome/help/gbrainy/de/figures/verbal-games.png
-share/gnome/help/gbrainy/de/gameplay.page
-share/gnome/help/gbrainy/de/gametypes.page
-share/gnome/help/gbrainy/de/history.page
-share/gnome/help/gbrainy/de/index.page
-share/gnome/help/gbrainy/de/legal.xml
-share/gnome/help/gbrainy/de/license.page
-share/gnome/help/gbrainy/de/multiplayer.page
-share/gnome/help/gbrainy/de/newgame.page
-share/gnome/help/gbrainy/de/pause.page
-share/gnome/help/gbrainy/de/score.page
-share/gnome/help/gbrainy/de/times.page
-share/gnome/help/gbrainy/de/tips.page
-share/gnome/help/gbrainy/el/customgame.page
-share/gnome/help/gbrainy/el/difficulty.page
-share/gnome/help/gbrainy/el/export.page
-share/gnome/help/gbrainy/el/figures/all-games.png
-share/gnome/help/gbrainy/el/figures/gbrainy.png
-share/gnome/help/gbrainy/el/figures/logic-games.png
-share/gnome/help/gbrainy/el/figures/math-games.png
-share/gnome/help/gbrainy/el/figures/memory-games.png
-share/gnome/help/gbrainy/el/figures/verbal-games.png
-share/gnome/help/gbrainy/el/gameplay.page
-share/gnome/help/gbrainy/el/gametypes.page
-share/gnome/help/gbrainy/el/history.page
-share/gnome/help/gbrainy/el/index.page
-share/gnome/help/gbrainy/el/legal.xml
-share/gnome/help/gbrainy/el/license.page
-share/gnome/help/gbrainy/el/multiplayer.page
-share/gnome/help/gbrainy/el/newgame.page
-share/gnome/help/gbrainy/el/pause.page
-share/gnome/help/gbrainy/el/score.page
-share/gnome/help/gbrainy/el/times.page
-share/gnome/help/gbrainy/el/tips.page
-share/gnome/help/gbrainy/es/customgame.page
-share/gnome/help/gbrainy/es/difficulty.page
-share/gnome/help/gbrainy/es/export.page
-share/gnome/help/gbrainy/es/figures/all-games.png
-share/gnome/help/gbrainy/es/figures/gbrainy.png
-share/gnome/help/gbrainy/es/figures/logic-games.png
-share/gnome/help/gbrainy/es/figures/math-games.png
-share/gnome/help/gbrainy/es/figures/memory-games.png
-share/gnome/help/gbrainy/es/figures/verbal-games.png
-share/gnome/help/gbrainy/es/gameplay.page
-share/gnome/help/gbrainy/es/gametypes.page
-share/gnome/help/gbrainy/es/history.page
-share/gnome/help/gbrainy/es/index.page
-share/gnome/help/gbrainy/es/legal.xml
-share/gnome/help/gbrainy/es/license.page
-share/gnome/help/gbrainy/es/multiplayer.page
-share/gnome/help/gbrainy/es/newgame.page
-share/gnome/help/gbrainy/es/pause.page
-share/gnome/help/gbrainy/es/score.page
-share/gnome/help/gbrainy/es/times.page
-share/gnome/help/gbrainy/es/tips.page
-share/gnome/help/gbrainy/fr/customgame.page
-share/gnome/help/gbrainy/fr/difficulty.page
-share/gnome/help/gbrainy/fr/export.page
-share/gnome/help/gbrainy/fr/figures/all-games.png
-share/gnome/help/gbrainy/fr/figures/gbrainy.png
-share/gnome/help/gbrainy/fr/figures/logic-games.png
-share/gnome/help/gbrainy/fr/figures/math-games.png
-share/gnome/help/gbrainy/fr/figures/memory-games.png
-share/gnome/help/gbrainy/fr/figures/verbal-games.png
-share/gnome/help/gbrainy/fr/gameplay.page
-share/gnome/help/gbrainy/fr/gametypes.page
-share/gnome/help/gbrainy/fr/history.page
-share/gnome/help/gbrainy/fr/index.page
-share/gnome/help/gbrainy/fr/legal.xml
-share/gnome/help/gbrainy/fr/license.page
-share/gnome/help/gbrainy/fr/multiplayer.page
-share/gnome/help/gbrainy/fr/newgame.page
-share/gnome/help/gbrainy/fr/pause.page
-share/gnome/help/gbrainy/fr/score.page
-share/gnome/help/gbrainy/fr/times.page
-share/gnome/help/gbrainy/fr/tips.page
-share/gnome/help/gbrainy/gl/customgame.page
-share/gnome/help/gbrainy/gl/difficulty.page
-share/gnome/help/gbrainy/gl/export.page
-share/gnome/help/gbrainy/gl/figures/all-games.png
-share/gnome/help/gbrainy/gl/figures/gbrainy.png
-share/gnome/help/gbrainy/gl/figures/logic-games.png
-share/gnome/help/gbrainy/gl/figures/math-games.png
-share/gnome/help/gbrainy/gl/figures/memory-games.png
-share/gnome/help/gbrainy/gl/figures/verbal-games.png
-share/gnome/help/gbrainy/gl/gameplay.page
-share/gnome/help/gbrainy/gl/gametypes.page
-share/gnome/help/gbrainy/gl/history.page
-share/gnome/help/gbrainy/gl/index.page
-share/gnome/help/gbrainy/gl/legal.xml
-share/gnome/help/gbrainy/gl/license.page
-share/gnome/help/gbrainy/gl/multiplayer.page
-share/gnome/help/gbrainy/gl/newgame.page
-share/gnome/help/gbrainy/gl/pause.page
-share/gnome/help/gbrainy/gl/score.page
-share/gnome/help/gbrainy/gl/times.page
-share/gnome/help/gbrainy/gl/tips.page
-share/gnome/help/gbrainy/hi/customgame.page
-share/gnome/help/gbrainy/hi/difficulty.page
-share/gnome/help/gbrainy/hi/export.page
-share/gnome/help/gbrainy/hi/figures/all-games.png
-share/gnome/help/gbrainy/hi/figures/gbrainy.png
-share/gnome/help/gbrainy/hi/figures/logic-games.png
-share/gnome/help/gbrainy/hi/figures/math-games.png
-share/gnome/help/gbrainy/hi/figures/memory-games.png
-share/gnome/help/gbrainy/hi/figures/verbal-games.png
-share/gnome/help/gbrainy/hi/gameplay.page
-share/gnome/help/gbrainy/hi/gametypes.page
-share/gnome/help/gbrainy/hi/history.page
-share/gnome/help/gbrainy/hi/index.page
-share/gnome/help/gbrainy/hi/legal.xml
-share/gnome/help/gbrainy/hi/license.page
-share/gnome/help/gbrainy/hi/multiplayer.page
-share/gnome/help/gbrainy/hi/newgame.page
-share/gnome/help/gbrainy/hi/pause.page
-share/gnome/help/gbrainy/hi/score.page
-share/gnome/help/gbrainy/hi/times.page
-share/gnome/help/gbrainy/hi/tips.page
-share/gnome/help/gbrainy/hu/customgame.page
-share/gnome/help/gbrainy/hu/difficulty.page
-share/gnome/help/gbrainy/hu/export.page
-share/gnome/help/gbrainy/hu/figures/all-games.png
-share/gnome/help/gbrainy/hu/figures/gbrainy.png
-share/gnome/help/gbrainy/hu/figures/logic-games.png
-share/gnome/help/gbrainy/hu/figures/math-games.png
-share/gnome/help/gbrainy/hu/figures/memory-games.png
-share/gnome/help/gbrainy/hu/figures/verbal-games.png
-share/gnome/help/gbrainy/hu/gameplay.page
-share/gnome/help/gbrainy/hu/gametypes.page
-share/gnome/help/gbrainy/hu/history.page
-share/gnome/help/gbrainy/hu/index.page
-share/gnome/help/gbrainy/hu/legal.xml
-share/gnome/help/gbrainy/hu/license.page
-share/gnome/help/gbrainy/hu/multiplayer.page
-share/gnome/help/gbrainy/hu/newgame.page
-share/gnome/help/gbrainy/hu/pause.page
-share/gnome/help/gbrainy/hu/score.page
-share/gnome/help/gbrainy/hu/times.page
-share/gnome/help/gbrainy/hu/tips.page
-share/gnome/help/gbrainy/it/customgame.page
-share/gnome/help/gbrainy/it/difficulty.page
-share/gnome/help/gbrainy/it/export.page
-share/gnome/help/gbrainy/it/figures/all-games.png
-share/gnome/help/gbrainy/it/figures/gbrainy.png
-share/gnome/help/gbrainy/it/figures/logic-games.png
-share/gnome/help/gbrainy/it/figures/math-games.png
-share/gnome/help/gbrainy/it/figures/memory-games.png
-share/gnome/help/gbrainy/it/figures/verbal-games.png
-share/gnome/help/gbrainy/it/gameplay.page
-share/gnome/help/gbrainy/it/gametypes.page
-share/gnome/help/gbrainy/it/history.page
-share/gnome/help/gbrainy/it/index.page
-share/gnome/help/gbrainy/it/legal.xml
-share/gnome/help/gbrainy/it/license.page
-share/gnome/help/gbrainy/it/multiplayer.page
-share/gnome/help/gbrainy/it/newgame.page
-share/gnome/help/gbrainy/it/pause.page
-share/gnome/help/gbrainy/it/score.page
-share/gnome/help/gbrainy/it/times.page
-share/gnome/help/gbrainy/it/tips.page
-share/gnome/help/gbrainy/nl/customgame.page
-share/gnome/help/gbrainy/nl/difficulty.page
-share/gnome/help/gbrainy/nl/export.page
-share/gnome/help/gbrainy/nl/figures/all-games.png
-share/gnome/help/gbrainy/nl/figures/gbrainy.png
-share/gnome/help/gbrainy/nl/figures/logic-games.png
-share/gnome/help/gbrainy/nl/figures/math-games.png
-share/gnome/help/gbrainy/nl/figures/memory-games.png
-share/gnome/help/gbrainy/nl/figures/verbal-games.png
-share/gnome/help/gbrainy/nl/gameplay.page
-share/gnome/help/gbrainy/nl/gametypes.page
-share/gnome/help/gbrainy/nl/history.page
-share/gnome/help/gbrainy/nl/index.page
-share/gnome/help/gbrainy/nl/legal.xml
-share/gnome/help/gbrainy/nl/license.page
-share/gnome/help/gbrainy/nl/multiplayer.page
-share/gnome/help/gbrainy/nl/newgame.page
-share/gnome/help/gbrainy/nl/pause.page
-share/gnome/help/gbrainy/nl/score.page
-share/gnome/help/gbrainy/nl/times.page
-share/gnome/help/gbrainy/nl/tips.page
-share/gnome/help/gbrainy/pt_BR/customgame.page
-share/gnome/help/gbrainy/pt_BR/difficulty.page
-share/gnome/help/gbrainy/pt_BR/export.page
-share/gnome/help/gbrainy/pt_BR/figures/all-games.png
-share/gnome/help/gbrainy/pt_BR/figures/gbrainy.png
-share/gnome/help/gbrainy/pt_BR/figures/logic-games.png
-share/gnome/help/gbrainy/pt_BR/figures/math-games.png
-share/gnome/help/gbrainy/pt_BR/figures/memory-games.png
-share/gnome/help/gbrainy/pt_BR/figures/verbal-games.png
-share/gnome/help/gbrainy/pt_BR/gameplay.page
-share/gnome/help/gbrainy/pt_BR/gametypes.page
-share/gnome/help/gbrainy/pt_BR/history.page
-share/gnome/help/gbrainy/pt_BR/index.page
-share/gnome/help/gbrainy/pt_BR/legal.xml
-share/gnome/help/gbrainy/pt_BR/license.page
-share/gnome/help/gbrainy/pt_BR/multiplayer.page
-share/gnome/help/gbrainy/pt_BR/newgame.page
-share/gnome/help/gbrainy/pt_BR/pause.page
-share/gnome/help/gbrainy/pt_BR/score.page
-share/gnome/help/gbrainy/pt_BR/times.page
-share/gnome/help/gbrainy/pt_BR/tips.page
-share/gnome/help/gbrainy/ro/customgame.page
-share/gnome/help/gbrainy/ro/difficulty.page
-share/gnome/help/gbrainy/ro/export.page
-share/gnome/help/gbrainy/ro/figures/all-games.png
-share/gnome/help/gbrainy/ro/figures/gbrainy.png
-share/gnome/help/gbrainy/ro/figures/logic-games.png
-share/gnome/help/gbrainy/ro/figures/math-games.png
-share/gnome/help/gbrainy/ro/figures/memory-games.png
-share/gnome/help/gbrainy/ro/figures/verbal-games.png
-share/gnome/help/gbrainy/ro/gameplay.page
-share/gnome/help/gbrainy/ro/gametypes.page
-share/gnome/help/gbrainy/ro/history.page
-share/gnome/help/gbrainy/ro/index.page
-share/gnome/help/gbrainy/ro/legal.xml
-share/gnome/help/gbrainy/ro/license.page
-share/gnome/help/gbrainy/ro/multiplayer.page
-share/gnome/help/gbrainy/ro/newgame.page
-share/gnome/help/gbrainy/ro/pause.page
-share/gnome/help/gbrainy/ro/score.page
-share/gnome/help/gbrainy/ro/times.page
-share/gnome/help/gbrainy/ro/tips.page
-share/gnome/help/gbrainy/ru/customgame.page
-share/gnome/help/gbrainy/ru/difficulty.page
-share/gnome/help/gbrainy/ru/export.page
-share/gnome/help/gbrainy/ru/figures/all-games.png
-share/gnome/help/gbrainy/ru/figures/gbrainy.png
-share/gnome/help/gbrainy/ru/figures/logic-games.png
-share/gnome/help/gbrainy/ru/figures/math-games.png
-share/gnome/help/gbrainy/ru/figures/memory-games.png
-share/gnome/help/gbrainy/ru/figures/verbal-games.png
-share/gnome/help/gbrainy/ru/gameplay.page
-share/gnome/help/gbrainy/ru/gametypes.page
-share/gnome/help/gbrainy/ru/history.page
-share/gnome/help/gbrainy/ru/index.page
-share/gnome/help/gbrainy/ru/legal.xml
-share/gnome/help/gbrainy/ru/license.page
-share/gnome/help/gbrainy/ru/multiplayer.page
-share/gnome/help/gbrainy/ru/newgame.page
-share/gnome/help/gbrainy/ru/pause.page
-share/gnome/help/gbrainy/ru/score.page
-share/gnome/help/gbrainy/ru/times.page
-share/gnome/help/gbrainy/ru/tips.page
-share/gnome/help/gbrainy/sl/customgame.page
-share/gnome/help/gbrainy/sl/difficulty.page
-share/gnome/help/gbrainy/sl/export.page
-share/gnome/help/gbrainy/sl/figures/all-games.png
-share/gnome/help/gbrainy/sl/figures/gbrainy.png
-share/gnome/help/gbrainy/sl/figures/logic-games.png
-share/gnome/help/gbrainy/sl/figures/math-games.png
-share/gnome/help/gbrainy/sl/figures/memory-games.png
-share/gnome/help/gbrainy/sl/figures/verbal-games.png
-share/gnome/help/gbrainy/sl/gameplay.page
-share/gnome/help/gbrainy/sl/gametypes.page
-share/gnome/help/gbrainy/sl/history.page
-share/gnome/help/gbrainy/sl/index.page
-share/gnome/help/gbrainy/sl/legal.xml
-share/gnome/help/gbrainy/sl/license.page
-share/gnome/help/gbrainy/sl/multiplayer.page
-share/gnome/help/gbrainy/sl/newgame.page
-share/gnome/help/gbrainy/sl/pause.page
-share/gnome/help/gbrainy/sl/score.page
-share/gnome/help/gbrainy/sl/times.page
-share/gnome/help/gbrainy/sl/tips.page
-share/gnome/help/gbrainy/sr/customgame.page
-share/gnome/help/gbrainy/sr/difficulty.page
-share/gnome/help/gbrainy/sr/export.page
-share/gnome/help/gbrainy/sr/figures/all-games.png
-share/gnome/help/gbrainy/sr/figures/gbrainy.png
-share/gnome/help/gbrainy/sr/figures/logic-games.png
-share/gnome/help/gbrainy/sr/figures/math-games.png
-share/gnome/help/gbrainy/sr/figures/memory-games.png
-share/gnome/help/gbrainy/sr/figures/verbal-games.png
-share/gnome/help/gbrainy/sr/gameplay.page
-share/gnome/help/gbrainy/sr/gametypes.page
-share/gnome/help/gbrainy/sr/history.page
-share/gnome/help/gbrainy/sr/index.page
-share/gnome/help/gbrainy/sr/legal.xml
-share/gnome/help/gbrainy/sr/license.page
-share/gnome/help/gbrainy/sr/multiplayer.page
-share/gnome/help/gbrainy/sr/newgame.page
-share/gnome/help/gbrainy/sr/pause.page
-share/gnome/help/gbrainy/sr/score.page
-share/gnome/help/gbrainy/sr/times.page
-share/gnome/help/gbrainy/sr/tips.page
-share/gnome/help/gbrainy/sr@latin/customgame.page
-share/gnome/help/gbrainy/sr@latin/difficulty.page
-share/gnome/help/gbrainy/sr@latin/export.page
-share/gnome/help/gbrainy/sr@latin/figures/all-games.png
-share/gnome/help/gbrainy/sr@latin/figures/gbrainy.png
-share/gnome/help/gbrainy/sr@latin/figures/logic-games.png
-share/gnome/help/gbrainy/sr@latin/figures/math-games.png
-share/gnome/help/gbrainy/sr@latin/figures/memory-games.png
-share/gnome/help/gbrainy/sr@latin/figures/verbal-games.png
-share/gnome/help/gbrainy/sr@latin/gameplay.page
-share/gnome/help/gbrainy/sr@latin/gametypes.page
-share/gnome/help/gbrainy/sr@latin/history.page
-share/gnome/help/gbrainy/sr@latin/index.page
-share/gnome/help/gbrainy/sr@latin/legal.xml
-share/gnome/help/gbrainy/sr@latin/license.page
-share/gnome/help/gbrainy/sr@latin/multiplayer.page
-share/gnome/help/gbrainy/sr@latin/newgame.page
-share/gnome/help/gbrainy/sr@latin/pause.page
-share/gnome/help/gbrainy/sr@latin/score.page
-share/gnome/help/gbrainy/sr@latin/times.page
-share/gnome/help/gbrainy/sr@latin/tips.page
share/icons/hicolor/16x16/apps/gbrainy.png
share/icons/hicolor/32x32/apps/gbrainy.png
share/icons/hicolor/48x48/apps/gbrainy.png
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 889c96f119f5..f6dc3f43f674 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -3,6 +3,7 @@
PORTNAME= shotwell
PORTVERSION= 0.30.8
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
@@ -33,7 +34,7 @@ LIB_DEPENDS= libgio-2.0.so:devel/glib20 \
USES= gettext desktop-file-utils gnome meson ninja pkgconfig \
python:3.4+,build shebangfix sqlite tar:xz xorg
-USE_GNOME= cairo dconf gtk30 gnomedocutils
+USE_GNOME= cairo dconf gtk30
USE_GSTREAMER1= yes
USE_LDCONFIG= yes
USE_XORG= x11
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index 1cc091861730..864cff1e6718 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-subtitles
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -19,7 +19,7 @@ LIB_DEPENDS= libenchant.so:textproc/enchant \
USES= cpe desktop-file-utils gmake gnome libtool localbase mono \
pkgconfig
CPE_VENDOR= pedro_castro
-USE_GNOME= gnomeprefix gtksharp20 gnomesharp20 gnomedocutils intltool
+USE_GNOME= gnomeprefix gtksharp20 gnomesharp20 intltool
USE_GSTREAMER1= yes
GNU_CONFIGURE= yes
GCONF_SCHEMAS= gnome-subtitles.schemas
diff --git a/multimedia/gnome-subtitles/files/patch-Makefile.in b/multimedia/gnome-subtitles/files/patch-Makefile.in
new file mode 100644
index 000000000000..26877ec9e294
--- /dev/null
+++ b/multimedia/gnome-subtitles/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2020-01-19 22:22:50 UTC
++++ Makefile.in
+@@ -310,7 +310,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src data po help
++SUBDIRS = src data po
+ gstpbdir = $(pkglibdir)
+ EXTRA_DIST = \
+ autogen.sh \
diff --git a/multimedia/gnome-subtitles/files/patch-configure b/multimedia/gnome-subtitles/files/patch-configure
new file mode 100644
index 000000000000..ed3b16042674
--- /dev/null
+++ b/multimedia/gnome-subtitles/files/patch-configure
@@ -0,0 +1,62 @@
+--- configure.orig 2013-03-29 19:57:07 UTC
++++ configure
+@@ -2522,33 +2522,9 @@ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ fi
+
+
+-gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+-if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+@@ -2588,25 +2564,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_gnome-subtitles.in b/multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_gnome-subtitles.in
index 9de134eac6da..c5450e436d8e 100644
--- a/multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_gnome-subtitles.in
+++ b/multimedia/gnome-subtitles/files/patch-src_GnomeSubtitles_Execution_gnome-subtitles.in
@@ -1,14 +1,14 @@
---- src/GnomeSubtitles/Execution/gnome-subtitles.in.orig 2008-05-11 18:14:09.000000000 +0200
-+++ src/GnomeSubtitles/Execution/gnome-subtitles.in 2008-05-19 22:58:24.691677625 +0200
+--- src/GnomeSubtitles/Execution/gnome-subtitles.in.orig 2010-10-01 23:29:05 UTC
++++ src/GnomeSubtitles/Execution/gnome-subtitles.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
-@@ -8,5 +8,5 @@
+@@ -8,5 +8,5 @@ sublibdir=@SUBLIB_DLL_DIR@
- export LD_LIBRARY_PATH="$libdir/gnome-subtitles:$LD_LIBRARY_PATH"
+ export LD_LIBRARY_PATH=$libdir/gnome-subtitles${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export MONO_PATH=$sublibdir:$MONO_PATH
-exec -a gnome-subtitles @MONO@ $libdir/gnome-subtitles/gnome-subtitles.exe "$@"
+exec @MONO@ $libdir/gnome-subtitles/gnome-subtitles.exe "$@"
diff --git a/multimedia/gnome-subtitles/pkg-plist b/multimedia/gnome-subtitles/pkg-plist
index 76c59458fae0..aaa6b91743a1 100644
--- a/multimedia/gnome-subtitles/pkg-plist
+++ b/multimedia/gnome-subtitles/pkg-plist
@@ -3,19 +3,6 @@ lib/gnome-subtitles/gnome-subtitles.exe
lib/gnome-subtitles/gnome-subtitles.exe.config
lib/gnome-subtitles/libgstreamer_playbin.so
share/applications/gnome-subtitles.desktop
-share/gnome/help/gnome-subtitles/C/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/C/legal.xml
-share/gnome/help/gnome-subtitles/ca/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/cs/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/da/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/de/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/el/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/es/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/fr/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/oc/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/ro/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/sl/gnome-subtitles.xml
-share/gnome/help/gnome-subtitles/sv/gnome-subtitles.xml
%%NLS%%share/locale/ar/LC_MESSAGES/gnome-subtitles.mo
%%NLS%%share/locale/ca/LC_MESSAGES/gnome-subtitles.mo
%%NLS%%share/locale/ca@valencia/LC_MESSAGES/gnome-subtitles.mo
@@ -49,17 +36,5 @@ share/gnome/help/gnome-subtitles/sv/gnome-subtitles.xml
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnome-subtitles.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/gnome-subtitles.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnome-subtitles.mo
-share/omf/gnome-subtitles/gnome-subtitles-C.omf
-share/omf/gnome-subtitles/gnome-subtitles-ca.omf
-share/omf/gnome-subtitles/gnome-subtitles-cs.omf
-share/omf/gnome-subtitles/gnome-subtitles-da.omf
-share/omf/gnome-subtitles/gnome-subtitles-de.omf
-share/omf/gnome-subtitles/gnome-subtitles-el.omf
-share/omf/gnome-subtitles/gnome-subtitles-es.omf
-share/omf/gnome-subtitles/gnome-subtitles-fr.omf
-share/omf/gnome-subtitles/gnome-subtitles-oc.omf
-share/omf/gnome-subtitles/gnome-subtitles-ro.omf
-share/omf/gnome-subtitles/gnome-subtitles-sl.omf
-share/omf/gnome-subtitles/gnome-subtitles-sv.omf
share/pixmaps/gnome-subtitles.svg
man/man1/gnome-subtitles.1.gz
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 61de26ed5d24..687fa927723f 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -4,6 +4,7 @@
PORTNAME= telepathy-logger
PORTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
@@ -20,7 +21,7 @@ USES= gettext-tools gmake gnome libtool pathfix pkgconfig \
python:2.7,build sqlite tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_GNOME= glib20 gnomedocutils intltool libxml2 \
+USE_GNOME= glib20 intltool libxml2 \
libxslt:build introspection:build
GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml
INSTALL_TARGET= install-strip
diff --git a/net/gq/Makefile b/net/gq/Makefile
index d632d5809d3f..8c76a93290bd 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gq
PORTVERSION= 1.3.4
-PORTREVISION= 13
+PORTREVISION= 14
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
@@ -17,7 +17,7 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring
-USE_GNOME= intltool libglade2 gnomedocutils
+USE_GNOME= intltool libglade2
USE_OPENLDAP= yes
USES= desktop-file-utils gettext gmake gnome pkgconfig \
shared-mime-info ssl
diff --git a/net/gq/files/patch-Makefile.in b/net/gq/files/patch-Makefile.in
new file mode 100644
index 000000000000..5da3502e20cb
--- /dev/null
+++ b/net/gq/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2008-02-13 21:14:39 UTC
++++ Makefile.in
+@@ -240,7 +240,6 @@ SUBDIRS = \
+ src \
+ test \
+ po \
+- help \
+ $(NULL)
+
+ intltool = \
diff --git a/net/gq/files/patch-configure b/net/gq/files/patch-configure
new file mode 100644
index 000000000000..d8475403dbb8
--- /dev/null
+++ b/net/gq/files/patch-configure
@@ -0,0 +1,55 @@
+--- configure.orig 2008-02-13 21:14:37 UTC
++++ configure
+@@ -4804,29 +4804,9 @@ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal
+ echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; }
+
+
+-gdu_cv_version_required=0.3.2
+
+-if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- :
+-else
+- { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+-echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then
+ withval=$with_help_dir;
+@@ -4866,22 +4846,12 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/net/gq/files/patch-src__state.c b/net/gq/files/patch-src__state.c
index edc09cdb8360..3f0c6d549281 100644
--- a/net/gq/files/patch-src__state.c
+++ b/net/gq/files/patch-src__state.c
@@ -1,5 +1,5 @@
---- src/state.c.orig 2008-01-09 16:35:12.000000000 +0000
-+++ src/state.c 2013-03-06 13:32:20.000000000 +0000
+--- src/state.c.orig 2008-01-09 16:35:12 UTC
++++ src/state.c
@@ -36,7 +36,7 @@
#include <errno.h>
@@ -9,7 +9,7 @@
#include <gtk/gtk.h>
#include "configfile.h"
-@@ -806,7 +806,7 @@
+@@ -806,7 +806,7 @@ static void state_valueE(struct parser_context *ctx,
}
}
diff --git a/net/gq/files/patch-src_gq-server.c b/net/gq/files/patch-src_gq-server.c
index 51aab59ac05b..36af6083b9a9 100644
--- a/net/gq/files/patch-src_gq-server.c
+++ b/net/gq/files/patch-src_gq-server.c
@@ -1,5 +1,5 @@
---- src/gq-server.c.orig 2008-04-30 04:15:42.000000000 +0000
-+++ src/gq-server.c 2008-04-30 04:15:11.000000000 +0000
+--- src/gq-server.c.orig 2008-01-09 16:35:12 UTC
++++ src/gq-server.c
@@ -25,6 +25,7 @@
#include "gq-server.h"
diff --git a/net/gq/files/patch-src_gq-tab-schema.c b/net/gq/files/patch-src_gq-tab-schema.c
index aa6d6dbce6ec..339701d769b6 100644
--- a/net/gq/files/patch-src_gq-tab-schema.c
+++ b/net/gq/files/patch-src_gq-tab-schema.c
@@ -1,6 +1,4 @@
-diff --git src/gq-tab-schema.c src/gq-tab-schema.c
-index b0f16e6..29219c0 100644
---- src/gq-tab-schema.c
+--- src/gq-tab-schema.c.orig 2008-01-09 16:35:12 UTC
+++ src/gq-tab-schema.c
@@ -1902,7 +1902,6 @@ gq_tab_schema_init(GqTabSchema* self)
diff --git a/net/gq/pkg-plist b/net/gq/pkg-plist
index d92bd74f944d..4e7311022544 100644
--- a/net/gq/pkg-plist
+++ b/net/gq/pkg-plist
@@ -9,10 +9,6 @@ share/pixmaps/gq/hide.xpm
share/pixmaps/gq/new.xpm
share/pixmaps/gq/textview.png
share/pixmaps/gq/warning.xpm
-share/gnome/help/gq-manual/C/gq-manual.xml
-share/gnome/help/gq-manual/C/legal.xml
-share/gnome/help/gq-manual/de/gq-manual.xml
-share/gnome/help/gq-manual/de/legal.xml
share/icons/hicolor/16x16/apps/ldap-group.png
share/icons/hicolor/16x16/apps/ldap-organization.png
share/icons/hicolor/16x16/apps/ldap-person.png
@@ -20,5 +16,3 @@ share/locale/cs/LC_MESSAGES/gq.mo
share/locale/de/LC_MESSAGES/gq.mo
share/locale/ja/LC_MESSAGES/gq.mo
share/locale/zh_CN/LC_MESSAGES/gq.mo
-share/omf/gq-manual/gq-manual-C.omf
-share/omf/gq-manual/gq-manual-de.omf
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index fc03eb20f9a7..1c1d5ad137fd 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -3,7 +3,7 @@
PORTNAME= twitux
PORTVERSION= 0.69
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net
MASTER_SITES= SF
@@ -17,7 +17,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
USES= gettext gmake gnome pkgconfig tar:bzip2 xorg
USE_XORG= x11
-USE_GNOME= glib20 gtk20 gconf2 intltool libxml2 gnomedocutils
+USE_GNOME= glib20 gtk20 gconf2 intltool libxml2
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= GMSGFMT="${LOCALBASE}/bin/msgfmt"
diff --git a/net/twitux/files/patch-configure b/net/twitux/files/patch-configure
new file mode 100644
index 000000000000..8f4ad60d875b
--- /dev/null
+++ b/net/twitux/files/patch-configure
@@ -0,0 +1,58 @@
+--- configure.orig 2009-01-25 23:03:32 UTC
++++ configure
+@@ -22437,29 +22437,9 @@ fi
+
+
+
+-gdu_cv_version_required=0.3.2
+
+-if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- :
+-else
+- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then
+ withval=$with_help_dir;
+@@ -22499,25 +22479,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/net/twitux/files/patch-src_twitux-app.c b/net/twitux/files/patch-src_twitux-app.c
index 588eddf8b73f..0e7df8eefef6 100644
--- a/net/twitux/files/patch-src_twitux-app.c
+++ b/net/twitux/files/patch-src_twitux-app.c
@@ -1,5 +1,5 @@
---- src/twitux-app.c.orig 2011-08-16 15:27:29.000000000 +0200
-+++ src/twitux-app.c 2011-08-16 15:27:54.000000000 +0200
+--- src/twitux-app.c.orig 2009-01-25 01:24:00 UTC
++++ src/twitux-app.c
@@ -1446,8 +1446,7 @@ twitux_app_notify (gchar *msg)
notification = notify_notification_new (PACKAGE_NAME,
diff --git a/net/twitux/pkg-plist b/net/twitux/pkg-plist
index 096c01c21440..7cfe2be5d4ef 100644
--- a/net/twitux/pkg-plist
+++ b/net/twitux/pkg-plist
@@ -6,12 +6,8 @@ lib/locale/ja/LC_MESSAGES/twitux.mo
lib/locale/pt/LC_MESSAGES/twitux.mo
lib/locale/sv/LC_MESSAGES/twitux.mo
share/applications/twitux.desktop
-share/gnome/help/twitux/C/figures/client.png
-share/gnome/help/twitux/C/legal.xml
-share/gnome/help/twitux/C/twitux.xml
share/icons/hicolor/48x48/apps/twitux.png
share/icons/hicolor/scalable/apps/twitux.svg
-share/omf/twitux/twitux-C.omf
share/twitux/account_dlg.xml
share/twitux/add_friend_dlg.xml
share/twitux/lists_dlg.xml
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 6e1fedd92ab3..50b744f967b1 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gchemutils
PORTVERSION= 0.14.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= science
MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTVERSION:R}
DISTNAME= gnome-chemistry-utils-${PORTVERSION}
@@ -28,7 +28,7 @@ USES= compiler:c++11-lang desktop-file-utils gettext gl gmake gnome \
libtool:keepla localbase:ldflags pathfix pkgconfig \
shared-mime-info tar:xz xorg
USE_XORG= x11
-USE_GNOME= cairo gnomedocutils gtk30 intlhack libgsf libxml2
+USE_GNOME= cairo gtk30 intlhack libgsf libxml2
USE_GL= gl
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/science/gchemutils/files/patch-Makefile.in b/science/gchemutils/files/patch-Makefile.in
index 1bd691a6548d..e9c123a888f0 100644
--- a/science/gchemutils/files/patch-Makefile.in
+++ b/science/gchemutils/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2014-03-10 23:12:16.000000000 +0100
-+++ Makefile.in 2014-03-10 23:14:08.000000000 +0100
-@@ -927,7 +927,6 @@
+--- Makefile.in.orig 2020-01-19 23:15:40 UTC
++++ Makefile.in
+@@ -944,7 +944,6 @@ info-am:
install-data-am: install-mimeDATA
@$(NORMAL_INSTALL)
diff --git a/science/gchemutils/files/patch-configure b/science/gchemutils/files/patch-configure
new file mode 100644
index 000000000000..015a7a17dd6e
--- /dev/null
+++ b/science/gchemutils/files/patch-configure
@@ -0,0 +1,62 @@
+--- configure.orig 2020-01-19 23:15:40 UTC
++++ configure
+@@ -17046,33 +17046,9 @@ if test -z "$AM_DEFAULT_VERBOSITY"; then
+ fi
+
+
+-gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+-if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+@@ -17112,25 +17088,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/science/gchemutils/files/patch-docs_Makefile.in b/science/gchemutils/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..334152997613
--- /dev/null
+++ b/science/gchemutils/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig 2016-11-23 13:06:30 UTC
++++ docs/Makefile.in
+@@ -400,7 +400,7 @@ x11_CFLAGS = @x11_CFLAGS@
+ x11_LIBS = @x11_LIBS@
+ xml_CFLAGS = @xml_CFLAGS@
+ xml_LIBS = @xml_LIBS@
+-SUBDIRS = help man reference
++SUBDIRS = man reference
+ MAINTAINERCLEANFILES = Makefile.in
+ all: all-recursive
+
diff --git a/science/gchemutils/files/patch-libs_gcr_document.cc b/science/gchemutils/files/patch-libs_gcr_document.cc
index 5ededb3e9b8d..e18f6a6d40d2 100644
--- a/science/gchemutils/files/patch-libs_gcr_document.cc
+++ b/science/gchemutils/files/patch-libs_gcr_document.cc
@@ -1,10 +1,10 @@
---- libs/gcr/document.cc.orig 2013-12-03 21:16:21.000000000 +0100
-+++ libs/gcr/document.cc 2013-12-03 21:22:51.000000000 +0100
-@@ -1521,7 +1521,6 @@
+--- libs/gcr/document.cc.orig 2016-11-23 13:05:34 UTC
++++ libs/gcr/document.cc
+@@ -1794,7 +1794,6 @@ void Document::Save() const
if (error) {
- cerr << "gio error: " << error->message << endl;
+ g_message ("GIO error: %s", error->message);
g_error_free (error);
- g_object_unref (file);
throw (int) 1;
}
- std::map<std::string, sAtom>AtomsMap;
+ buf->context = output;
diff --git a/science/gchemutils/files/patch-libs_gcu_spacegroup.cc b/science/gchemutils/files/patch-libs_gcu_spacegroup.cc
index 6bd3a6d1d989..0fc235dd8302 100644
--- a/science/gchemutils/files/patch-libs_gcu_spacegroup.cc
+++ b/science/gchemutils/files/patch-libs_gcu_spacegroup.cc
@@ -1,6 +1,6 @@
---- libs/gcu/spacegroup.cc.orig 2018-05-20 17:09:17.854019000 +0200
-+++ libs/gcu/spacegroup.cc 2018-05-20 17:22:26.142391000 +0200
-@@ -340,7 +340,7 @@
+--- libs/gcu/spacegroup.cc.orig 2016-11-23 13:05:34 UTC
++++ libs/gcu/spacegroup.cc
+@@ -340,7 +340,7 @@ list<Vector> SpaceGroup::Transform (const Vector &v) c
Transform3d const * SpaceGroup::GetFirstTransform (list <Transform3d*>::const_iterator &i) const
{
i = m_Transforms.begin ();
@@ -9,7 +9,7 @@
}
/*!
-@@ -348,7 +348,7 @@
+@@ -348,7 +348,7 @@ Transform3d const * SpaceGroup::GetFirstTransform (lis
Transform3d const * SpaceGroup::GetNextTransform (list <Transform3d*>::const_iterator &i) const
{
i++;
diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index f912e3aa5f06..ffedd4dfb450 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -149,169 +149,6 @@ share/gchemutils/%%VER%%/pixmaps/gcrystal_logo.png
share/gchemutils/%%VER%%/pixmaps/gchempaint_logo.png
share/gchemutils/%%VER%%/radii.xml
share/gchemutils/%%VER%%/residues.xml
-share/gnome/help/gchem3d-%%VER%%/C/figures/ball-and-stick.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/cylinders.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/gchemcalc.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/gchempaint1.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/gchempaint2.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/main-window.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/smiles1.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/smiles2.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/smiles3.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/spacefill.png
-share/gnome/help/gchem3d-%%VER%%/C/figures/wireframe.png
-share/gnome/help/gchem3d-%%VER%%/C/gchem3d-%%VER%%.xml
-share/gnome/help/gchem3d-%%VER%%/C/legal.xml
-share/gnome/help/gchemcalc-%%VER%%/C/figures/braces.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/composition.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/formula.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/pattern.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchemcalc-%%VER%%/C/figures/start.png
-share/gnome/help/gchemcalc-%%VER%%/C/gchemcalc-%%VER%%.xml
-share/gnome/help/gchemcalc-%%VER%%/C/legal.xml
-share/gnome/help/gchempaint-%%VER%%/C/figures/Hposdlg.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-heads.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object-dlg.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-object3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrow-opts.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/arrows.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/bond-opts.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/bond.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/brackets-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/brackets.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/chain-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/chain.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/charges.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/choose-elt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/curved-arrow-end.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/curved-arrow-opts.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/curved-arrow.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cycle-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cyclentool-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cyclentool.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/cycletools.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/downbond.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/einstein.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/electrons.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/element.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/elt-menu.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/equation-props.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/equation.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/eraser.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/fragment.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/ghemical.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/group.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/lasso-prop.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/lasso.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/main-window.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/merge3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery-arrow.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mesomery3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mol-menu-bases.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mol-menu.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/mol-menu3d.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/new-template.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/newfile.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/newman-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/newman.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital-prop.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital-sample.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital-toolbox.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/orbital.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/phenyl-residue.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/phenyl-structure.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/preferences.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-arrows.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-atoms-font.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-atoms-other.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-bonds.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/prefs-text.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/properties.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction-arrows.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction4.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/reaction5.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/residues.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis1.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis2.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis3.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/retrosynthesis4.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/rotate.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/selection.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/stereobonds.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/templates-tools.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/templates.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/text-opt.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/text.png
-share/gnome/help/gchempaint-%%VER%%/C/figures/toolbox.png
-share/gnome/help/gchempaint-%%VER%%/C/gchempaint-%%VER%%.xml
-share/gnome/help/gchempaint-%%VER%%/C/legal.xml
-share/gnome/help/gchemtable-%%VER%%/C/figures/add-plot.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/atomic-radii.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/blocs.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/choose-data.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/curve.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/elec.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/electronegativity.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/family.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/graph-guru.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/main.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/new-chart-guru.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/new-chart.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/radii.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/start.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/state.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/thermo.png
-share/gnome/help/gchemtable-%%VER%%/C/figures/tip.png
-share/gnome/help/gchemtable-%%VER%%/C/gchemtable-%%VER%%.xml
-share/gnome/help/gchemtable-%%VER%%/C/legal.xml
-share/gnome/help/gcrystal-%%VER%%/C/figures/atoms-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/cleavages-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/default-view.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/lattice-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/lines-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/main-window.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/print-res.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/size-dlg.png
-share/gnome/help/gcrystal-%%VER%%/C/figures/view-settings.png
-share/gnome/help/gcrystal-%%VER%%/C/gcrystal-%%VER%%.xml
-share/gnome/help/gcrystal-%%VER%%/C/legal.xml
-share/gnome/help/gspectrum-%%VER%%/C/figures/fid-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/gspectrum.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/ir-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/nmr-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/page-setup.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/print-scale.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/simple-toolbar.png
-share/gnome/help/gspectrum-%%VER%%/C/figures/uv-vis-tools.png
-share/gnome/help/gspectrum-%%VER%%/C/gspectrum-%%VER%%.xml
-share/gnome/help/gspectrum-%%VER%%/C/legal.xml
-share/omf/gchem3d-%%VER%%/gchem3d-%%VER%%-C.omf
-share/omf/gchemcalc-%%VER%%/gchemcalc-%%VER%%-C.omf
-share/omf/gchempaint-%%VER%%/gchempaint-%%VER%%-C.omf
-share/omf/gchemtable-%%VER%%/gchemtable-%%VER%%-C.omf
-share/omf/gcrystal-%%VER%%/gcrystal-%%VER%%-C.omf
-share/omf/gspectrum-%%VER%%/gspectrum-%%VER%%-C.omf
share/mimelnk/application/x-gchempaint.desktop
share/mimelnk/application/x-gcrystal.desktop
share/icons/hicolor/scalable/apps/gchem3d.svg
diff --git a/security/hotssh/Makefile b/security/hotssh/Makefile
index 6023bba0a9e4..7e7eb44f26f2 100644
--- a/security/hotssh/Makefile
+++ b/security/hotssh/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hotssh
PORTVERSION= 0.2.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security gnome
MASTER_SITES= GNOME
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${PY_FLAVOR}
-USE_GNOME= glib20 gnomedocutils intltool libxslt pygobject pygtk2
+USE_GNOME= glib20 intltool libxslt pygobject pygtk2
USES= gettext gnome python:2.7 tar:bzip2 waf
INSTALLS_ICONS= yes
NO_ARCH= yes
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index b1d87bafbe0f..d8a2e92b4449 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gconf-editor
PORTVERSION= 3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
@@ -16,7 +16,7 @@ COMMENT= Gconf database editor for the GNOME 3 environment
USES= gettext gmake gnome pathfix pkgconfig tar:xz
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_GNOME= gnomeprefix intlhack gtk30 gconf2 gnomedocutils
+USE_GNOME= gnomeprefix intlhack gtk30 gconf2
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/sysutils/gconf-editor/files/patch-Makefile.in b/sysutils/gconf-editor/files/patch-Makefile.in
new file mode 100644
index 000000000000..5bb5aa4e7b96
--- /dev/null
+++ b/sysutils/gconf-editor/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2020-01-24 23:36:30 UTC
++++ Makefile.in
+@@ -264,7 +264,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = data src po docs
++SUBDIRS = data src po
+ EXTRA_DIST = \
+ autogen.sh \
+ ChangeLog.pre-git \
diff --git a/sysutils/gconf-editor/files/patch-configure b/sysutils/gconf-editor/files/patch-configure
new file mode 100644
index 000000000000..139fc69e7aae
--- /dev/null
+++ b/sysutils/gconf-editor/files/patch-configure
@@ -0,0 +1,62 @@
+--- configure.orig 2011-11-21 13:58:28 UTC
++++ configure
+@@ -12790,33 +12790,9 @@ $as_echo "no" >&6; }
+ fi
+ fi
+
+-gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+-if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+@@ -12856,25 +12832,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 8f244f69a9b0..e5c76709ac6d 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -1,5 +1,4 @@
bin/gconf-editor
-man/man1/gconf-editor.1.gz
share/applications/gconf-editor.desktop
%%DATADIR%%/icons/hicolor/16x16/status/type-boolean.png
%%DATADIR%%/icons/hicolor/16x16/status/type-float.png
@@ -9,167 +8,6 @@ share/applications/gconf-editor.desktop
%%DATADIR%%/icons/hicolor/16x16/status/type-schema.png
%%DATADIR%%/icons/hicolor/16x16/status/type-string.png
%%DATADIR%%/icons/hicolor/16x16/status/type-undefined.png
-share/gnome/help/gconf-editor/C/figures/entry-blank.png
-share/gnome/help/gconf-editor/C/figures/entry-bool.png
-share/gnome/help/gconf-editor/C/figures/entry-list.png
-share/gnome/help/gconf-editor/C/figures/entry-number.png
-share/gnome/help/gconf-editor/C/figures/entry-schema.png
-share/gnome/help/gconf-editor/C/figures/entry-string.png
-share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/C/gconf-editor.xml
-share/gnome/help/gconf-editor/C/legal.xml
-share/gnome/help/gconf-editor/ca/figures/entry-blank.png
-share/gnome/help/gconf-editor/ca/figures/entry-bool.png
-share/gnome/help/gconf-editor/ca/figures/entry-list.png
-share/gnome/help/gconf-editor/ca/figures/entry-number.png
-share/gnome/help/gconf-editor/ca/figures/entry-schema.png
-share/gnome/help/gconf-editor/ca/figures/entry-string.png
-share/gnome/help/gconf-editor/ca/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/ca/gconf-editor.xml
-share/gnome/help/gconf-editor/cs/figures/entry-blank.png
-share/gnome/help/gconf-editor/cs/figures/entry-bool.png
-share/gnome/help/gconf-editor/cs/figures/entry-list.png
-share/gnome/help/gconf-editor/cs/figures/entry-number.png
-share/gnome/help/gconf-editor/cs/figures/entry-schema.png
-share/gnome/help/gconf-editor/cs/figures/entry-string.png
-share/gnome/help/gconf-editor/cs/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/cs/gconf-editor.xml
-share/gnome/help/gconf-editor/de/figures/entry-blank.png
-share/gnome/help/gconf-editor/de/figures/entry-bool.png
-share/gnome/help/gconf-editor/de/figures/entry-list.png
-share/gnome/help/gconf-editor/de/figures/entry-number.png
-share/gnome/help/gconf-editor/de/figures/entry-schema.png
-share/gnome/help/gconf-editor/de/figures/entry-string.png
-share/gnome/help/gconf-editor/de/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/de/gconf-editor.xml
-share/gnome/help/gconf-editor/el/figures/entry-blank.png
-share/gnome/help/gconf-editor/el/figures/entry-bool.png
-share/gnome/help/gconf-editor/el/figures/entry-list.png
-share/gnome/help/gconf-editor/el/figures/entry-number.png
-share/gnome/help/gconf-editor/el/figures/entry-schema.png
-share/gnome/help/gconf-editor/el/figures/entry-string.png
-share/gnome/help/gconf-editor/el/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/el/gconf-editor.xml
-share/gnome/help/gconf-editor/en_GB/figures/entry-blank.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-bool.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-list.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-number.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-schema.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-string.png
-share/gnome/help/gconf-editor/en_GB/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/en_GB/gconf-editor.xml
-share/gnome/help/gconf-editor/es/figures/entry-blank.png
-share/gnome/help/gconf-editor/es/figures/entry-bool.png
-share/gnome/help/gconf-editor/es/figures/entry-list.png
-share/gnome/help/gconf-editor/es/figures/entry-number.png
-share/gnome/help/gconf-editor/es/figures/entry-schema.png
-share/gnome/help/gconf-editor/es/figures/entry-string.png
-share/gnome/help/gconf-editor/es/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/es/gconf-editor.xml
-share/gnome/help/gconf-editor/eu/figures/entry-blank.png
-share/gnome/help/gconf-editor/eu/figures/entry-bool.png
-share/gnome/help/gconf-editor/eu/figures/entry-list.png
-share/gnome/help/gconf-editor/eu/figures/entry-number.png
-share/gnome/help/gconf-editor/eu/figures/entry-schema.png
-share/gnome/help/gconf-editor/eu/figures/entry-string.png
-share/gnome/help/gconf-editor/eu/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/eu/gconf-editor.xml
-share/gnome/help/gconf-editor/fr/figures/entry-blank.png
-share/gnome/help/gconf-editor/fr/figures/entry-bool.png
-share/gnome/help/gconf-editor/fr/figures/entry-list.png
-share/gnome/help/gconf-editor/fr/figures/entry-number.png
-share/gnome/help/gconf-editor/fr/figures/entry-schema.png
-share/gnome/help/gconf-editor/fr/figures/entry-string.png
-share/gnome/help/gconf-editor/fr/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/fr/gconf-editor.xml
-share/gnome/help/gconf-editor/it/figures/entry-blank.png
-share/gnome/help/gconf-editor/it/figures/entry-bool.png
-share/gnome/help/gconf-editor/it/figures/entry-list.png
-share/gnome/help/gconf-editor/it/figures/entry-number.png
-share/gnome/help/gconf-editor/it/figures/entry-schema.png
-share/gnome/help/gconf-editor/it/figures/entry-string.png
-share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/it/gconf-editor.xml
-share/gnome/help/gconf-editor/oc/figures/entry-blank.png
-share/gnome/help/gconf-editor/oc/figures/entry-bool.png
-share/gnome/help/gconf-editor/oc/figures/entry-list.png
-share/gnome/help/gconf-editor/oc/figures/entry-number.png
-share/gnome/help/gconf-editor/oc/figures/entry-schema.png
-share/gnome/help/gconf-editor/oc/figures/entry-string.png
-share/gnome/help/gconf-editor/oc/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/oc/gconf-editor.xml
-share/gnome/help/gconf-editor/pt_BR/figures/entry-blank.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-bool.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-list.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-number.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-schema.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-string.png
-share/gnome/help/gconf-editor/pt_BR/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/pt_BR/gconf-editor.xml
-share/gnome/help/gconf-editor/ru/figures/entry-blank.png
-share/gnome/help/gconf-editor/ru/figures/entry-bool.png
-share/gnome/help/gconf-editor/ru/figures/entry-list.png
-share/gnome/help/gconf-editor/ru/figures/entry-number.png
-share/gnome/help/gconf-editor/ru/figures/entry-schema.png
-share/gnome/help/gconf-editor/ru/figures/entry-string.png
-share/gnome/help/gconf-editor/ru/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/ru/gconf-editor.xml
-share/gnome/help/gconf-editor/sl/figures/entry-blank.png
-share/gnome/help/gconf-editor/sl/figures/entry-bool.png
-share/gnome/help/gconf-editor/sl/figures/entry-list.png
-share/gnome/help/gconf-editor/sl/figures/entry-number.png
-share/gnome/help/gconf-editor/sl/figures/entry-schema.png
-share/gnome/help/gconf-editor/sl/figures/entry-string.png
-share/gnome/help/gconf-editor/sl/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/sl/gconf-editor.xml
-share/gnome/help/gconf-editor/sv/figures/entry-blank.png
-share/gnome/help/gconf-editor/sv/figures/entry-bool.png
-share/gnome/help/gconf-editor/sv/figures/entry-list.png
-share/gnome/help/gconf-editor/sv/figures/entry-number.png
-share/gnome/help/gconf-editor/sv/figures/entry-schema.png
-share/gnome/help/gconf-editor/sv/figures/entry-string.png
-share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/sv/gconf-editor.xml
-share/gnome/help/gconf-editor/th/figures/entry-blank.png
-share/gnome/help/gconf-editor/th/figures/entry-bool.png
-share/gnome/help/gconf-editor/th/figures/entry-list.png
-share/gnome/help/gconf-editor/th/figures/entry-number.png
-share/gnome/help/gconf-editor/th/figures/entry-schema.png
-share/gnome/help/gconf-editor/th/figures/entry-string.png
-share/gnome/help/gconf-editor/th/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/th/gconf-editor.xml
-share/gnome/help/gconf-editor/uk/figures/entry-blank.png
-share/gnome/help/gconf-editor/uk/figures/entry-bool.png
-share/gnome/help/gconf-editor/uk/figures/entry-list.png
-share/gnome/help/gconf-editor/uk/figures/entry-number.png
-share/gnome/help/gconf-editor/uk/figures/entry-schema.png
-share/gnome/help/gconf-editor/uk/figures/entry-string.png
-share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/uk/gconf-editor.xml
-share/gnome/help/gconf-editor/zh_CN/figures/entry-blank.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-bool.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-list.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-number.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-schema.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-string.png
-share/gnome/help/gconf-editor/zh_CN/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/zh_CN/gconf-editor.xml
-share/gnome/help/gconf-editor/zh_HK/figures/entry-blank.png
-share/gnome/help/gconf-editor/zh_HK/figures/entry-bool.png
-share/gnome/help/gconf-editor/zh_HK/figures/entry-list.png
-share/gnome/help/gconf-editor/zh_HK/figures/entry-number.png
-share/gnome/help/gconf-editor/zh_HK/figures/entry-schema.png
-share/gnome/help/gconf-editor/zh_HK/figures/entry-string.png
-share/gnome/help/gconf-editor/zh_HK/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/zh_HK/gconf-editor.xml
-share/gnome/help/gconf-editor/zh_TW/figures/entry-blank.png
-share/gnome/help/gconf-editor/zh_TW/figures/entry-bool.png
-share/gnome/help/gconf-editor/zh_TW/figures/entry-list.png
-share/gnome/help/gconf-editor/zh_TW/figures/entry-number.png
-share/gnome/help/gconf-editor/zh_TW/figures/entry-schema.png
-share/gnome/help/gconf-editor/zh_TW/figures/entry-string.png
-share/gnome/help/gconf-editor/zh_TW/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/zh_TW/gconf-editor.xml
share/icons/hicolor/16x16/apps/gconf-editor.png
share/icons/hicolor/22x22/apps/gconf-editor.png
share/icons/hicolor/24x24/apps/gconf-editor.png
@@ -263,23 +101,3 @@ share/locale/xh/LC_MESSAGES/gconf-editor.mo
share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
-share/omf/gconf-editor/gconf-editor-C.omf
-share/omf/gconf-editor/gconf-editor-ca.omf
-share/omf/gconf-editor/gconf-editor-cs.omf
-share/omf/gconf-editor/gconf-editor-de.omf
-share/omf/gconf-editor/gconf-editor-el.omf
-share/omf/gconf-editor/gconf-editor-en_GB.omf
-share/omf/gconf-editor/gconf-editor-es.omf
-share/omf/gconf-editor/gconf-editor-eu.omf
-share/omf/gconf-editor/gconf-editor-fr.omf
-share/omf/gconf-editor/gconf-editor-it.omf
-share/omf/gconf-editor/gconf-editor-oc.omf
-share/omf/gconf-editor/gconf-editor-pt_BR.omf
-share/omf/gconf-editor/gconf-editor-ru.omf
-share/omf/gconf-editor/gconf-editor-sl.omf
-share/omf/gconf-editor/gconf-editor-sv.omf
-share/omf/gconf-editor/gconf-editor-th.omf
-share/omf/gconf-editor/gconf-editor-uk.omf
-share/omf/gconf-editor/gconf-editor-zh_CN.omf
-share/omf/gconf-editor/gconf-editor-zh_HK.omf
-share/omf/gconf-editor/gconf-editor-zh_TW.omf
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index ee57479c854d..5793ffaaee88 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-schedule
PORTVERSION= 2.1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-2/${PORTNAME}-${PORTVERSION}
@@ -24,7 +24,7 @@ BUILD_DEPENDS= yelp:x11/yelp
RUN_DEPENDS= yelp:x11/yelp
USES= gmake gnome pathfix pkgconfig python:2.7
-USE_GNOME= gnomeprefix pygnome2 gnomedocutils intltool
+USE_GNOME= gnomeprefix pygnome2 intltool
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/sysutils/gnome-schedule/files/patch-Makefile.in b/sysutils/gnome-schedule/files/patch-Makefile.in
new file mode 100644
index 000000000000..f146b55160a0
--- /dev/null
+++ b/sysutils/gnome-schedule/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2020-01-26 13:24:29 UTC
++++ Makefile.in
+@@ -240,7 +240,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = desktop src icons po help $(am__append_1)
++SUBDIRS = desktop src icons po $(am__append_1)
+ intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
+ CLEANFILES = \
+ configure.in
diff --git a/sysutils/gnome-schedule/files/patch-configure b/sysutils/gnome-schedule/files/patch-configure
new file mode 100644
index 000000000000..fa82a7dc6cc0
--- /dev/null
+++ b/sysutils/gnome-schedule/files/patch-configure
@@ -0,0 +1,62 @@
+--- configure.orig 2011-09-03 12:06:11 UTC
++++ configure
+@@ -3705,33 +3705,9 @@ $as_echo "no, using $LN_S" >&6; }
+ fi
+
+
+-gdu_cv_version_required=0.3.2
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+-if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- :
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then :
+ withval=$with_help_dir;
+@@ -3771,25 +3747,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/sysutils/gnome-schedule/pkg-plist b/sysutils/gnome-schedule/pkg-plist
index cfd6888bd71c..00b28108fbb4 100644
--- a/sysutils/gnome-schedule/pkg-plist
+++ b/sysutils/gnome-schedule/pkg-plist
@@ -65,61 +65,6 @@ share/applications/gnome-schedule.desktop
%%DATADIR%%/xwrapper.py
%%DATADIR%%/xwrapper.pyc
%%DATADIR%%/xwrapper.pyo
-share/gnome/help/gnome-schedule/C/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/C/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/C/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/C/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/C/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/C/gnome-schedule.xml
-share/gnome/help/gnome-schedule/C/legal.xml
-share/gnome/help/gnome-schedule/cs/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/cs/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/cs/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/cs/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/cs/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/cs/gnome-schedule.xml
-share/gnome/help/gnome-schedule/de/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/de/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/de/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/de/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/de/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/de/gnome-schedule.xml
-share/gnome/help/gnome-schedule/es/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/es/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/es/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/es/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/es/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/es/gnome-schedule.xml
-share/gnome/help/gnome-schedule/fr/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/fr/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/fr/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/fr/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/fr/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/fr/gnome-schedule.xml
-share/gnome/help/gnome-schedule/it/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/it/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/it/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/it/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/it/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/it/gnome-schedule.xml
-share/gnome/help/gnome-schedule/oc/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/oc/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/oc/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/oc/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/oc/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/oc/gnome-schedule.xml
-share/gnome/help/gnome-schedule/sl/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/sl/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/sl/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/sl/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/sl/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/sl/gnome-schedule.xml
-share/gnome/help/gnome-schedule/sv/figures/gnome-schedule_main.png
-share/gnome/help/gnome-schedule/sv/figures/gnome-schedule_new_task.png
-share/gnome/help/gnome-schedule/sv/figures/gnome-schedule_new_task_once.png
-share/gnome/help/gnome-schedule/sv/figures/gnome-schedule_new_task_recurrent.png
-share/gnome/help/gnome-schedule/sv/figures/gnome-schedule_templates.png
-share/gnome/help/gnome-schedule/sv/gnome-schedule.xml
%%NLS%%share/locale/ar/LC_MESSAGES/gnome-schedule.mo
%%NLS%%share/locale/bg/LC_MESSAGES/gnome-schedule.mo
%%NLS%%share/locale/ca/LC_MESSAGES/gnome-schedule.mo
@@ -158,15 +103,6 @@ share/gnome/help/gnome-schedule/sv/gnome-schedule.xml
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnome-schedule.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/gnome-schedule.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnome-schedule.mo
-share/omf/gnome-schedule/gnome-schedule-C.omf
-share/omf/gnome-schedule/gnome-schedule-cs.omf
-share/omf/gnome-schedule/gnome-schedule-de.omf
-share/omf/gnome-schedule/gnome-schedule-es.omf
-share/omf/gnome-schedule/gnome-schedule-fr.omf
-share/omf/gnome-schedule/gnome-schedule-it.omf
-share/omf/gnome-schedule/gnome-schedule-oc.omf
-share/omf/gnome-schedule/gnome-schedule-sl.omf
-share/omf/gnome-schedule/gnome-schedule-sv.omf
share/pixmaps/gnome-schedule/at.svg
share/pixmaps/gnome-schedule/calendar.svg
share/pixmaps/gnome-schedule/crontab.svg
diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile
index 31ed5b790ba3..96453a32b123 100644
--- a/sysutils/policykit-gnome/Makefile
+++ b/sysutils/policykit-gnome/Makefile
@@ -4,7 +4,7 @@
PORTNAME= policykit-gnome
PORTVERSION= 0.9.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
DISTNAME= PolicyKit-gnome-${PORTVERSION}
@@ -15,7 +15,7 @@ COMMENT= GNOME frontend to the PolicyKit framework
LIB_DEPENDS= libpolkit.so:sysutils/policykit
USES= gettext gmake gnome libtool:keepla pathfix pkgconfig tar:bzip2
-USE_GNOME= gconf2 gnomedocutils intlhack
+USE_GNOME= gconf2 intlhack
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-gtk-doc \
diff --git a/sysutils/policykit-gnome/files/patch-Makefile.in b/sysutils/policykit-gnome/files/patch-Makefile.in
index 866eefdceaf9..949d59926bba 100644
--- a/sysutils/policykit-gnome/files/patch-Makefile.in
+++ b/sysutils/policykit-gnome/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2008-07-23 21:40:50.000000000 -0400
-+++ Makefile.in 2008-07-23 21:41:41.000000000 -0400
-@@ -259,7 +259,7 @@ top_builddir = @top_builddir@
+--- Makefile.in.orig 2020-01-19 15:22:06 UTC
++++ Makefile.in
+@@ -257,7 +257,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# Need to build docs after examples because the docs include generated files
diff --git a/sysutils/policykit-gnome/files/patch-configure b/sysutils/policykit-gnome/files/patch-configure
new file mode 100644
index 000000000000..55bb8dde0586
--- /dev/null
+++ b/sysutils/policykit-gnome/files/patch-configure
@@ -0,0 +1,58 @@
+--- configure.orig 2020-01-19 15:33:42 UTC
++++ configure
+@@ -20405,29 +20405,9 @@ $as_echo "no" >&6; }
+
+ fi
+
+-gdu_cv_version_required=0.3.2
+
+-if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- :
+-else
+- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then
+ withval=$with_help_dir;
+@@ -20467,25 +20447,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+
diff --git a/sysutils/policykit-gnome/files/patch-polkit-gnome_polkit-gnome-action.c b/sysutils/policykit-gnome/files/patch-polkit-gnome_polkit-gnome-action.c
index 32009984b2c4..7d34e2806235 100644
--- a/sysutils/policykit-gnome/files/patch-polkit-gnome_polkit-gnome-action.c
+++ b/sysutils/policykit-gnome/files/patch-polkit-gnome_polkit-gnome-action.c
@@ -1,6 +1,6 @@
---- polkit-gnome/polkit-gnome-action.c.old 2009-06-28 12:54:35.000000000 +0200
-+++ polkit-gnome/polkit-gnome-action.c 2009-06-28 12:55:07.000000000 +0200
-@@ -2062,6 +2062,8 @@
+--- polkit-gnome/polkit-gnome-action.c.orig 2008-07-22 17:00:53 UTC
++++ polkit-gnome/polkit-gnome-action.c
+@@ -2062,6 +2062,8 @@ _button_clicked (GtkButton *button, PolKitGnomeAction
case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS:
/* g_debug ("blocking clicked"); */
g_signal_stop_emission_by_name (button, "clicked");
@@ -9,5 +9,3 @@
break;
default:
-
-
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 823d081bb944..f4a6f9e70d89 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xvidcap
PORTVERSION= 1.1.7
-PORTREVISION= 11
+PORTREVISION= 12
PORTEPOCH= 1
CATEGORIES= sysutils multimedia
MASTER_SITES= SF
@@ -13,8 +13,7 @@ COMMENT= Capture your X display to individual frames or MPEG video
LICENSE= GPLv3
-BUILD_DEPENDS= xml2po:textproc/gnome-doc-utils \
- scrollkeeper-config:textproc/rarian
+BUILD_DEPENDS= scrollkeeper-config:textproc/rarian
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libfreetype.so:print/freetype2 \
libswscale.so:multimedia/ffmpeg \
diff --git a/textproc/Makefile b/textproc/Makefile
index 8dc26e3a36d5..933d4239fc52 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -219,7 +219,6 @@
SUBDIR += gladtex
SUBDIR += glark
SUBDIR += gmetadom
- SUBDIR += gnome-doc-utils
SUBDIR += gnugrep
SUBDIR += goldendict
SUBDIR += google-ctemplate
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
deleted file mode 100644
index 655268d3c871..000000000000
--- a/textproc/gnome-doc-utils/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/trunk/textproc/gnome-doc-utils/Makefile 19009 2014-03-02 22:41:42Z kwm $
-
-PORTNAME= gnome-doc-utils
-PORTVERSION= 0.20.10
-PORTREVISION= 5
-CATEGORIES= textproc gnome
-MASTER_SITES= GNOME
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME doc utils
-
-BUILD_DEPENDS= rarian-sk-config:textproc/rarian \
- ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${PY_FLAVOR}
-RUN_DEPENDS= rarian-sk-config:textproc/rarian \
- ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${PY_FLAVOR} \
- docbook-xml>0:textproc/docbook-xml
-
-USES= gettext-tools:build,run gmake gnome pathfix pkgconfig \
- python:2.7 tar:xz
-USE_GNOME= libxslt intlhack
-INSTALLS_OMF= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/omf
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-post-install:
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}/xml2po
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}/xml2po/modes
-
-.include <bsd.port.mk>
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
deleted file mode 100644
index c8e02ae7b975..000000000000
--- a/textproc/gnome-doc-utils/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome-doc-utils-0.20.10.tar.xz) = cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
-SIZE (gnome-doc-utils-0.20.10.tar.xz) = 526700
diff --git a/textproc/gnome-doc-utils/files/patch-tools_gnome-doc-tool.in b/textproc/gnome-doc-utils/files/patch-tools_gnome-doc-tool.in
deleted file mode 100644
index 55148f713ea3..000000000000
--- a/textproc/gnome-doc-utils/files/patch-tools_gnome-doc-tool.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- tools/gnome-doc-tool.in.orig 2013-12-19 16:08:52.000000000 +0100
-+++ tools/gnome-doc-tool.in 2013-12-19 16:08:59.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # gnome-doc-html - Convert documentation to HTML
- # gnome-doc-html. Generated from gnome-doc-html.in by configure.
- # Copyright (C) 2006 Shaun McCance <shaunm@gnome.org>
diff --git a/textproc/gnome-doc-utils/pkg-descr b/textproc/gnome-doc-utils/pkg-descr
deleted file mode 100644
index f8e90484ef5e..000000000000
--- a/textproc/gnome-doc-utils/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The GNOME Doc Utils is a collection of documentation utilities for the GNOME
-project. Notably, it contains utilities for building documentation and all
-auxiliary files in the source tree, and it contains the DocBook XSLT
-stylesheets that were once distributed with Yelp. Starting with GNOME 2.8, Yelp
-require GNOME Doc Utils for the XSLT.
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
deleted file mode 100644
index b69ca71697b7..000000000000
--- a/textproc/gnome-doc-utils/pkg-plist
+++ /dev/null
@@ -1,271 +0,0 @@
-bin/gnome-doc-prepare
-bin/gnome-doc-tool
-bin/xml2po
-libdata/pkgconfig/gnome-doc-utils.pc
-libdata/pkgconfig/xml2po.pc
-%%PYTHON_SITELIBDIR%%/xml2po/__init__.py
-%%PYTHON_SITELIBDIR%%/xml2po/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xml2po/modes/__init__.py
-%%PYTHON_SITELIBDIR%%/xml2po/modes/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/modes/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xml2po/modes/basic.py
-%%PYTHON_SITELIBDIR%%/xml2po/modes/basic.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/modes/basic.pyo
-%%PYTHON_SITELIBDIR%%/xml2po/modes/docbook.py
-%%PYTHON_SITELIBDIR%%/xml2po/modes/docbook.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/modes/docbook.pyo
-%%PYTHON_SITELIBDIR%%/xml2po/modes/gs.py
-%%PYTHON_SITELIBDIR%%/xml2po/modes/gs.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/modes/gs.pyo
-%%PYTHON_SITELIBDIR%%/xml2po/modes/mallard.py
-%%PYTHON_SITELIBDIR%%/xml2po/modes/mallard.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/modes/mallard.pyo
-%%PYTHON_SITELIBDIR%%/xml2po/modes/ubuntu.py
-%%PYTHON_SITELIBDIR%%/xml2po/modes/ubuntu.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/modes/ubuntu.pyo
-%%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.py
-%%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.pyc
-%%PYTHON_SITELIBDIR%%/xml2po/modes/xhtml.pyo
-man/man1/xml2po.1.gz
-share/aclocal/gnome-doc-utils.m4
-%%DATADIR%%/gnome-doc-utils.make
-%%DATADIR%%/icons/hicolor/48x48/status/admon-bug.png
-%%DATADIR%%/icons/hicolor/48x48/status/admon-caution.png
-%%DATADIR%%/icons/hicolor/48x48/status/admon-important.png
-%%DATADIR%%/icons/hicolor/48x48/status/admon-note.png
-%%DATADIR%%/icons/hicolor/48x48/status/admon-tip.png
-%%DATADIR%%/icons/hicolor/48x48/status/admon-warning.png
-%%DATADIR%%/icons/hicolor/scalable/status/admon-bug.svg
-%%DATADIR%%/icons/hicolor/scalable/status/admon-caution.svg
-%%DATADIR%%/icons/hicolor/scalable/status/admon-important.svg
-%%DATADIR%%/icons/hicolor/scalable/status/admon-note.svg
-%%DATADIR%%/icons/hicolor/scalable/status/admon-tip.svg
-%%DATADIR%%/icons/hicolor/scalable/status/admon-warning.svg
-%%DATADIR%%/template-document.xml
-%%DATADIR%%/template.make
-%%DATADIR%%/template.omf.in
-%%DATADIR%%/templates/gnome-app-template.xml
-%%DATADIR%%/templates/gnome-applet-template.xml
-%%DATADIR%%/templates/legal.xml
-%%DATADIR%%/watermarks/watermark-blockquote-00AB.png
-%%DATADIR%%/watermarks/watermark-blockquote-00BB.png
-%%DATADIR%%/watermarks/watermark-blockquote-201C.png
-%%DATADIR%%/watermarks/watermark-blockquote-201D.png
-%%DATADIR%%/watermarks/watermark-blockquote-201E.png
-%%DATADIR%%/watermarks/watermark-code-python.png
-%%DATADIR%%/watermarks/watermark-code.png
-share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml
-share/gnome/help/gnome-doc-make/C/legal.xml
-share/gnome/help/gnome-doc-make/C/make-ref.xml
-share/gnome/help/gnome-doc-make/de/gnome-doc-make.xml
-share/gnome/help/gnome-doc-make/de/legal.xml
-share/gnome/help/gnome-doc-make/de/make-ref.xml
-share/gnome/help/gnome-doc-xslt/C/db-chunk.xml
-share/gnome/help/gnome-doc-xslt/C/db-common.xml
-share/gnome/help/gnome-doc-xslt/C/db-label.xml
-share/gnome/help/gnome-doc-xslt/C/db-title.xml
-share/gnome/help/gnome-doc-xslt/C/db-xref.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-bibliography.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-block.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-callout.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-classsynopsis.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-cmdsynopsis.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-css.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-division.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-footnote.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-index.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-info.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-l10n.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-list.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-media.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-qanda.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-refentry.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-table.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-title.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml
-share/gnome/help/gnome-doc-xslt/C/db2html.xml
-share/gnome/help/gnome-doc-xslt/C/db2omf.xml
-share/gnome/help/gnome-doc-xslt/C/db2xhtml.xml
-share/gnome/help/gnome-doc-xslt/C/gettext.xml
-share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml
-share/gnome/help/gnome-doc-xslt/C/l10n-numbers.xml
-share/gnome/help/gnome-doc-xslt/C/legal.xml
-share/gnome/help/gnome-doc-xslt/C/utils.xml
-share/gnome/help/gnome-doc-xslt/C/theme.xml
-share/gnome/help/gnome-doc-xslt/C/translating.xml
-share/gnome/help/gnome-doc-xslt/de/db-chunk.xml
-share/gnome/help/gnome-doc-xslt/de/db-common.xml
-share/gnome/help/gnome-doc-xslt/de/db-label.xml
-share/gnome/help/gnome-doc-xslt/de/db-title.xml
-share/gnome/help/gnome-doc-xslt/de/db-xref.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-autotoc.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-bibliography.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-block.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-callout.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-classsynopsis.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-cmdsynopsis.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-css.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-division.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-ebnf.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-footnote.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-funcsynopsis.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-index.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-info.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-inline.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-l10n.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-list.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-media.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-qanda.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-refentry.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-table.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-title.xml
-share/gnome/help/gnome-doc-xslt/de/db2html-xref.xml
-share/gnome/help/gnome-doc-xslt/de/db2html.xml
-share/gnome/help/gnome-doc-xslt/de/db2omf.xml
-share/gnome/help/gnome-doc-xslt/de/db2xhtml.xml
-share/gnome/help/gnome-doc-xslt/de/gettext.xml
-share/gnome/help/gnome-doc-xslt/de/gnome-doc-xslt.xml
-share/gnome/help/gnome-doc-xslt/de/l10n-numbers.xml
-share/gnome/help/gnome-doc-xslt/de/legal.xml
-share/gnome/help/gnome-doc-xslt/de/theme.xml
-share/gnome/help/gnome-doc-xslt/de/translating.xml
-share/gnome/help/gnome-doc-xslt/de/utils.xml
-share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/as/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ast/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/be/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/be@latin/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ca/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/cs/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/cy/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/da/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/de/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/dz/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/el/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/eo/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/es/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/et/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/eu/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/fa/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/fi/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/fr/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ga/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/gl/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/gu/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/he/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/hi/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/hu/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/id/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/it/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ja/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ka/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/km/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/kn/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/lv/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/mai/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/mg/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/mk/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ml/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/mn/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/mr/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/nb/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ne/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/nl/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/nn/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/oc/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/or/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/pa/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/pl/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/pt/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ro/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ru/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/rw/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sk/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sl/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sq/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sr/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/sv/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ta/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/te/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/th/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/uz/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/uk/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/vi/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
-share/xml/gnome/xslt/common/utils.xsl
-share/xml/gnome/xslt/common/theme.xsl
-share/xml/gnome/xslt/docbook/common/db-chunk.xsl
-share/xml/gnome/xslt/docbook/common/db-common.xsl
-share/xml/gnome/xslt/docbook/common/db-label.xsl
-share/xml/gnome/xslt/docbook/common/db-title.xsl
-share/xml/gnome/xslt/docbook/common/db-xref.xsl
-share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl
-share/xml/gnome/xslt/docbook/html/db2html-bibliography.xsl
-share/xml/gnome/xslt/docbook/html/db2html-block.xsl
-share/xml/gnome/xslt/docbook/html/db2html-callout.xsl
-share/xml/gnome/xslt/docbook/html/db2html-classsynopsis.xsl
-share/xml/gnome/xslt/docbook/html/db2html-cmdsynopsis.xsl
-share/xml/gnome/xslt/docbook/html/db2html-css.xsl
-share/xml/gnome/xslt/docbook/html/db2html-division.xsl
-share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl
-share/xml/gnome/xslt/docbook/html/db2html-footnote.xsl
-share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl
-share/xml/gnome/xslt/docbook/html/db2html-index.xsl
-share/xml/gnome/xslt/docbook/html/db2html-info.xsl
-share/xml/gnome/xslt/docbook/html/db2html-inline.xsl
-share/xml/gnome/xslt/docbook/html/db2html-l10n.xsl
-share/xml/gnome/xslt/docbook/html/db2html-list.xsl
-share/xml/gnome/xslt/docbook/html/db2html-media.xsl
-share/xml/gnome/xslt/docbook/html/db2html-qanda.xsl
-share/xml/gnome/xslt/docbook/html/db2html-refentry.xsl
-share/xml/gnome/xslt/docbook/html/db2html-suppressed.xsl
-share/xml/gnome/xslt/docbook/html/db2html-table.xsl
-share/xml/gnome/xslt/docbook/html/db2html-title.xsl
-share/xml/gnome/xslt/docbook/html/db2html-xref.xsl
-share/xml/gnome/xslt/docbook/html/db2html.xsl
-share/xml/gnome/xslt/docbook/html/db2xhtml.xsl
-share/xml/gnome/xslt/docbook/omf/db2omf.xsl
-share/xml/gnome/xslt/docbook/utils/chunks.xsl
-share/xml/gnome/xslt/docbook/utils/credits.xsl
-share/xml/gnome/xslt/docbook/utils/figures.xsl
-share/xml/gnome/xslt/docbook/utils/graphics.xsl
-share/xml/gnome/xslt/docbook/utils/ids.xsl
-share/xml/gnome/xslt/gettext/gettext.xsl
-share/xml/gnome/xslt/gettext/l10n-numbers.xsl
-share/xml/gnome/xslt/gettext/l10n.xml
-share/xml/gnome/xslt/mallard/cache/mal-cache.xsl
-share/xml/gnome/xslt/mallard/common/mal-chunk.xsl
-share/xml/gnome/xslt/mallard/common/mal-link.xsl
-share/xml/gnome/xslt/mallard/html/mal2html-block.xsl
-share/xml/gnome/xslt/mallard/html/mal2html-css.xsl
-share/xml/gnome/xslt/mallard/html/mal2html-inline.xsl
-share/xml/gnome/xslt/mallard/html/mal2html-list.xsl
-share/xml/gnome/xslt/mallard/html/mal2html-media.xsl
-share/xml/gnome/xslt/mallard/html/mal2html-page.xsl
-share/xml/gnome/xslt/mallard/html/mal2html-table.xsl
-share/xml/gnome/xslt/mallard/html/mal2html.xsl
-share/xml/gnome/xslt/mallard/html/mal2xhtml.xsl
-share/xml/mallard/1.0/mallard.rnc
-share/xml/mallard/1.0/mallard.rng
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 16bbe164e48f..083a43ec1e4d 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= muffin
PORTVERSION= 2.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm gnome
DIST_SUBDIR= gnome3
@@ -23,7 +23,7 @@ USES= autoreconf:build gettext gmake gnome libtool pathfix pkgconfig \
python:2.7 xorg
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
-USE_GNOME= gconf2 gnomedocutils gnomeprefix gtk30 \
+USE_GNOME= gconf2 gnomeprefix gtk30 \
intlhack introspection:build
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
USE_LDCONFIG= yes
diff --git a/x11-wm/muffin/files/patch-configure.ac b/x11-wm/muffin/files/patch-configure.ac
new file mode 100644
index 000000000000..034a2609221a
--- /dev/null
+++ b/x11-wm/muffin/files/patch-configure.ac
@@ -0,0 +1,12 @@
+--- configure.ac.orig 2015-02-02 16:02:44 UTC
++++ configure.ac
+@@ -412,9 +412,6 @@ fi
+ # For fix-meta-rectangle.py
+ AM_PATH_PYTHON([2.5])
+
+-# Use gnome-doc-utils:
+-GNOME_DOC_INIT([0.8.0])
+-
+ #### Warnings (last since -Werror can disturb other tests)
+
+ # Stay command-line compatible with the gnome-common configure option. Here
diff --git a/x11-wm/muffin/files/patch-src_core_main.c b/x11-wm/muffin/files/patch-src_core_main.c
index a248e943ac3b..c2ee5f5e8625 100644
--- a/x11-wm/muffin/files/patch-src_core_main.c
+++ b/x11-wm/muffin/files/patch-src_core_main.c
@@ -1,6 +1,6 @@
---- src/core/main.c.orig 2010-02-12 12:17:38.000000000 -0500
-+++ src/core/main.c 2010-02-19 01:22:45.000000000 -0500
-@@ -59,7 +59,11 @@
+--- src/core/main.c.orig 2015-02-02 16:02:44 UTC
++++ src/core/main.c
+@@ -61,7 +61,11 @@
#include <stdlib.h>
#include <sys/types.h>
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index 4fa6614ad774..d5e7aca0de0a 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -3,7 +3,7 @@
PORTNAME= florence
PORTVERSION= 0.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= SF/florence/florence/${PORTVERSION}/
@@ -14,13 +14,14 @@ LICENSE= GPLv2+ GFDL
LICENSE_COMB= multi
LIB_DEPENDS= libnotify.so:devel/libnotify
+BUILD_DEPENDS= rarian-sk-config:textproc/rarian
USES= gmake gnome iconv libtool pathfix pkgconfig tar:bzip2 xorg
USE_XORG= xtst xext
-USE_GNOME= gtk30 cairo intlhack gnomedocutils librsvg2
+USE_GNOME= gtk30 cairo intlhack librsvg2
USE_GSTREAMER1= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-static
+CONFIGURE_ARGS= --disable-static --without-docs
USE_LDCONFIG= yes
INSTALLS_OMF= yes
GLIB_SCHEMAS= org.florence.gschema.xml
diff --git a/x11/florence/pkg-plist b/x11/florence/pkg-plist
index d2cdb9787671..e113829e8535 100644
--- a/x11/florence/pkg-plist
+++ b/x11/florence/pkg-plist
@@ -4,8 +4,6 @@ lib/libflorence-1.0.so
lib/libflorence-1.0.so.1
lib/libflorence-1.0.so.1.0.0
libdata/pkgconfig/florence-1.0.pc
-man/man1/florence.1.gz
-man/man1/florence_applet.1.gz
share/applications/florence.desktop
%%DATADIR%%/florence.conf
%%DATADIR%%/florence.css
@@ -123,50 +121,7 @@ share/applications/florence.desktop
%%DATADIR%%/svg11/svg-viewport-attrib.rnc
%%DATADIR%%/svg11/svg-xlink-attrib.rnc
%%DATADIR%%/svg11/svg11.rnc
-share/gnome/help/florence/C/figures/behaviour.png
-share/gnome/help/florence/C/figures/bigger.png
-share/gnome/help/florence/C/figures/close.png
-share/gnome/help/florence/C/figures/configuration.png
-share/gnome/help/florence/C/figures/florence.png
-share/gnome/help/florence/C/figures/layout.png
-share/gnome/help/florence/C/figures/minimize.png
-share/gnome/help/florence/C/figures/move.png
-share/gnome/help/florence/C/figures/smaller.png
-share/gnome/help/florence/C/figures/style.png
-share/gnome/help/florence/C/figures/switch.png
-share/gnome/help/florence/C/figures/window.png
-share/gnome/help/florence/C/florence.xml
-share/gnome/help/florence/C/gfdl.dbk
-share/gnome/help/florence/fr/figures/behaviour.png
-share/gnome/help/florence/fr/figures/bigger.png
-share/gnome/help/florence/fr/figures/close.png
-share/gnome/help/florence/fr/figures/configuration.png
-share/gnome/help/florence/fr/figures/florence.png
-share/gnome/help/florence/fr/figures/layout.png
-share/gnome/help/florence/fr/figures/minimize.png
-share/gnome/help/florence/fr/figures/move.png
-share/gnome/help/florence/fr/figures/smaller.png
-share/gnome/help/florence/fr/figures/style.png
-share/gnome/help/florence/fr/figures/switch.png
-share/gnome/help/florence/fr/figures/window.png
-share/gnome/help/florence/fr/florence.xml
-share/gnome/help/florence/ru/figures/behaviour.png
-share/gnome/help/florence/ru/figures/bigger.png
-share/gnome/help/florence/ru/figures/close.png
-share/gnome/help/florence/ru/figures/configuration.png
-share/gnome/help/florence/ru/figures/florence.png
-share/gnome/help/florence/ru/figures/layout.png
-share/gnome/help/florence/ru/figures/minimize.png
-share/gnome/help/florence/ru/figures/move.png
-share/gnome/help/florence/ru/figures/smaller.png
-share/gnome/help/florence/ru/figures/style.png
-share/gnome/help/florence/ru/figures/switch.png
-share/gnome/help/florence/ru/figures/window.png
-share/gnome/help/florence/ru/florence.xml
%%NLS%%share/locale/fr/LC_MESSAGES/florence.mo
%%NLS%%share/locale/it/LC_MESSAGES/florence.mo
%%NLS%%share/locale/ru/LC_MESSAGES/florence.mo
-share/omf/florence/florence-C.omf
-share/omf/florence/florence-fr.omf
-share/omf/florence/florence-ru.omf
share/pixmaps/florence.svg
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 788badc78ea1..fe215ea46862 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gsynaptics
PORTVERSION= 0.9.16
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= OSDN/${PORTNAME}/38463
@@ -15,7 +15,7 @@ LICENSE= GPLv2
RUN_DEPENDS= xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics
USES= gettext gmake gnome pathfix pkgconfig
-USE_GNOME= gconf2 libglade2 gnomedocutils intltool
+USE_GNOME= gconf2 libglade2 intltool
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11/gsynaptics/files/patch-configure b/x11/gsynaptics/files/patch-configure
new file mode 100644
index 000000000000..ff9ae47dbfa7
--- /dev/null
+++ b/x11/gsynaptics/files/patch-configure
@@ -0,0 +1,58 @@
+--- configure.orig 2009-03-29 07:19:10 UTC
++++ configure
+@@ -15004,29 +15004,9 @@ _ACEOF
+
+
+
+-gdu_cv_version_required=0.3.2
+
+-if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- gdu_cv_have_gdu=yes
+-else
+- gdu_cv_have_gdu=no
+-fi
+
+-if test "$gdu_cv_have_gdu" = "yes"; then
+- :
+-else
+- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+
+-
+-
+ # Check whether --with-help-dir was given.
+ if test "${with_help_dir+set}" = set; then
+ withval=$with_help_dir;
+@@ -15066,25 +15046,15 @@ else
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+- ENABLE_SK_TRUE=
+- ENABLE_SK_FALSE='#'
+-else
+ ENABLE_SK_TRUE='#'
+ ENABLE_SK_FALSE=
+-fi
+
+
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
+- HAVE_GNOME_DOC_UTILS_TRUE=
+- HAVE_GNOME_DOC_UTILS_FALSE='#'
+-else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+-fi
+
+
+