Update to 0.7.4.

8 files changed, 140 insertions, 12 deletions

diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 874e94b85899..5e414b76f73a 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gok
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
@@ -20,12 +20,10 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/gok/word-complete.c
 
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index ca786db78313..5fe370b98840 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gok-0.7.1.tar.gz) = 63d6efe86438bfc01bbdce37d614ad72
+MD5 (gnome2/gok-0.7.4.tar.gz) = 52e1435fa9578f12f2b72aaaf5a9ca8e
diff --git a/accessibility/gok/files/patch-gok_gok-data.c b/accessibility/gok/files/patch-gok_gok-data.c
new file mode 100644
index 000000000000..901b763b08ab
--- /dev/null
+++ b/accessibility/gok/files/patch-gok_gok-data.c
@@ -0,0 +1,12 @@
+--- gok/gok-data.c.orig	Mon Jun  2 21:49:16 2003
++++ gok/gok-data.c	Mon Jun  2 21:49:26 2003
+@@ -707,8 +707,8 @@
+  */
+ void gok_data_set_is_dock (GokDockType val)
+ {
+-	m_eDockType = val;
+ 	gchar *typestring;
++	m_eDockType = val;
+ 	switch (val) {
+ 	case GOK_DOCK_TOP:
+ 	  typestring = "top";
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index ae52bfd8ff51..5abf5267c180 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -41,6 +41,57 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml
 etc/gconf/schemas/gok.schemas
 libdata/pkgconfig/gok-1.0.pc
+share/doc/gok/c4.html
+share/doc/gok/gok-arraylist.html
+share/doc/gok/gok-callbacks.html
+share/doc/gok/gok-command-common.html
+share/doc/gok/gok-command-edge-data.html
+share/doc/gok/gok-command-edge.html
+share/doc/gok/gok-command-graph.html
+share/doc/gok/gok-command-predictor.html
+share/doc/gok/gok-command-vertex-data.html
+share/doc/gok/gok-command-vertex.html
+share/doc/gok/gok-global.html
+share/doc/gok/gok-gok-action.html
+share/doc/gok/gok-gok-branchback-stack.html
+share/doc/gok/gok-gok-chunker.html
+share/doc/gok/gok-gok-control.html
+share/doc/gok/gok-gok-data.html
+share/doc/gok/gok-gok-editor.html
+share/doc/gok/gok-gok-feedback.html
+share/doc/gok/gok-gok-file-util.html
+share/doc/gok/gok-gok-gconf-keys.html
+share/doc/gok/gok-gok-gconf.html
+share/doc/gok/gok-gok-key.html
+share/doc/gok/gok-gok-keyboard.html
+share/doc/gok/gok-gok-keyslotter.html
+share/doc/gok/gok-gok-log-priv.html
+share/doc/gok/gok-gok-log-reader.html
+share/doc/gok/gok-gok-log.html
+share/doc/gok/gok-gok-modifier.html
+share/doc/gok/gok-gok-output.html
+share/doc/gok/gok-gok-page-accessmethod.html
+share/doc/gok/gok-gok-page-actions.html
+share/doc/gok/gok-gok-page-feedbacks.html
+share/doc/gok/gok-gok-page-keysizespace.html
+share/doc/gok/gok-gok-page-wordcomplete.html
+share/doc/gok/gok-gok-predictor.html
+share/doc/gok/gok-gok-scanner.html
+share/doc/gok/gok-gok-settings-dialog.html
+share/doc/gok/gok-gok-sound.html
+share/doc/gok/gok-gok-spy-priv.html
+share/doc/gok/gok-gok-spy.html
+share/doc/gok/gok-gok-word-complete.html
+share/doc/gok/gok-gok.html
+share/doc/gok/gok-gokbutton.html
+share/doc/gok/gok-gtkjoyswitch.html
+share/doc/gok/gok-interface.html
+share/doc/gok/gok-main.html
+share/doc/gok/gok-support.html
+share/doc/gok/gok-switchapi.html
+share/doc/gok/gok-word-complete.html
+share/doc/gok/index.html
+share/doc/gok/index.sgml
 share/gnome/gok/Keyboard.kbd
 share/gnome/gok/alphabet.kbd
 share/gnome/gok/automatic-scanning.xam
@@ -66,11 +117,14 @@ share/locale/da/LC_MESSAGES/gok.mo
 share/locale/de/LC_MESSAGES/gok.mo
 share/locale/es/LC_MESSAGES/gok.mo
 share/locale/fr/LC_MESSAGES/gok.mo
+share/locale/it/LC_MESSAGES/gok.mo
 share/locale/ja/LC_MESSAGES/gok.mo
 share/locale/nl/LC_MESSAGES/gok.mo
 share/locale/no/LC_MESSAGES/gok.mo
 share/locale/pt/LC_MESSAGES/gok.mo
 share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/sr/LC_MESSAGES/gok.mo
+share/locale/sr@Latn/LC_MESSAGES/gok.mo
 share/locale/sv/LC_MESSAGES/gok.mo
 share/locale/uk/LC_MESSAGES/gok.mo
 share/locale/vi/LC_MESSAGES/gok.mo
diff --git a/sysutils/gok/Makefile b/sysutils/gok/Makefile
index 874e94b85899..5e414b76f73a 100644
--- a/sysutils/gok/Makefile
+++ b/sysutils/gok/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gok
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
@@ -20,12 +20,10 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/gok/word-complete.c
 
diff --git a/sysutils/gok/distinfo b/sysutils/gok/distinfo
index ca786db78313..5fe370b98840 100644
--- a/sysutils/gok/distinfo
+++ b/sysutils/gok/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gok-0.7.1.tar.gz) = 63d6efe86438bfc01bbdce37d614ad72
+MD5 (gnome2/gok-0.7.4.tar.gz) = 52e1435fa9578f12f2b72aaaf5a9ca8e
diff --git a/sysutils/gok/files/patch-gok_gok-data.c b/sysutils/gok/files/patch-gok_gok-data.c
new file mode 100644
index 000000000000..901b763b08ab
--- /dev/null
+++ b/sysutils/gok/files/patch-gok_gok-data.c
@@ -0,0 +1,12 @@
+--- gok/gok-data.c.orig	Mon Jun  2 21:49:16 2003
++++ gok/gok-data.c	Mon Jun  2 21:49:26 2003
+@@ -707,8 +707,8 @@
+  */
+ void gok_data_set_is_dock (GokDockType val)
+ {
+-	m_eDockType = val;
+ 	gchar *typestring;
++	m_eDockType = val;
+ 	switch (val) {
+ 	case GOK_DOCK_TOP:
+ 	  typestring = "top";
diff --git a/sysutils/gok/pkg-plist b/sysutils/gok/pkg-plist
index ae52bfd8ff51..5abf5267c180 100644
--- a/sysutils/gok/pkg-plist
+++ b/sysutils/gok/pkg-plist
@@ -41,6 +41,57 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml
 etc/gconf/schemas/gok.schemas
 libdata/pkgconfig/gok-1.0.pc
+share/doc/gok/c4.html
+share/doc/gok/gok-arraylist.html
+share/doc/gok/gok-callbacks.html
+share/doc/gok/gok-command-common.html
+share/doc/gok/gok-command-edge-data.html
+share/doc/gok/gok-command-edge.html
+share/doc/gok/gok-command-graph.html
+share/doc/gok/gok-command-predictor.html
+share/doc/gok/gok-command-vertex-data.html
+share/doc/gok/gok-command-vertex.html
+share/doc/gok/gok-global.html
+share/doc/gok/gok-gok-action.html
+share/doc/gok/gok-gok-branchback-stack.html
+share/doc/gok/gok-gok-chunker.html
+share/doc/gok/gok-gok-control.html
+share/doc/gok/gok-gok-data.html
+share/doc/gok/gok-gok-editor.html
+share/doc/gok/gok-gok-feedback.html
+share/doc/gok/gok-gok-file-util.html
+share/doc/gok/gok-gok-gconf-keys.html
+share/doc/gok/gok-gok-gconf.html
+share/doc/gok/gok-gok-key.html
+share/doc/gok/gok-gok-keyboard.html
+share/doc/gok/gok-gok-keyslotter.html
+share/doc/gok/gok-gok-log-priv.html
+share/doc/gok/gok-gok-log-reader.html
+share/doc/gok/gok-gok-log.html
+share/doc/gok/gok-gok-modifier.html
+share/doc/gok/gok-gok-output.html
+share/doc/gok/gok-gok-page-accessmethod.html
+share/doc/gok/gok-gok-page-actions.html
+share/doc/gok/gok-gok-page-feedbacks.html
+share/doc/gok/gok-gok-page-keysizespace.html
+share/doc/gok/gok-gok-page-wordcomplete.html
+share/doc/gok/gok-gok-predictor.html
+share/doc/gok/gok-gok-scanner.html
+share/doc/gok/gok-gok-settings-dialog.html
+share/doc/gok/gok-gok-sound.html
+share/doc/gok/gok-gok-spy-priv.html
+share/doc/gok/gok-gok-spy.html
+share/doc/gok/gok-gok-word-complete.html
+share/doc/gok/gok-gok.html
+share/doc/gok/gok-gokbutton.html
+share/doc/gok/gok-gtkjoyswitch.html
+share/doc/gok/gok-interface.html
+share/doc/gok/gok-main.html
+share/doc/gok/gok-support.html
+share/doc/gok/gok-switchapi.html
+share/doc/gok/gok-word-complete.html
+share/doc/gok/index.html
+share/doc/gok/index.sgml
 share/gnome/gok/Keyboard.kbd
 share/gnome/gok/alphabet.kbd
 share/gnome/gok/automatic-scanning.xam
@@ -66,11 +117,14 @@ share/locale/da/LC_MESSAGES/gok.mo
 share/locale/de/LC_MESSAGES/gok.mo
 share/locale/es/LC_MESSAGES/gok.mo
 share/locale/fr/LC_MESSAGES/gok.mo
+share/locale/it/LC_MESSAGES/gok.mo
 share/locale/ja/LC_MESSAGES/gok.mo
 share/locale/nl/LC_MESSAGES/gok.mo
 share/locale/no/LC_MESSAGES/gok.mo
 share/locale/pt/LC_MESSAGES/gok.mo
 share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/sr/LC_MESSAGES/gok.mo
+share/locale/sr@Latn/LC_MESSAGES/gok.mo
 share/locale/sv/LC_MESSAGES/gok.mo
 share/locale/uk/LC_MESSAGES/gok.mo
 share/locale/vi/LC_MESSAGES/gok.mo