6 files changed, 24 insertions, 224 deletions

diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 36f7699342bc..abf127f314d7 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tork
-PORTVERSION=	0.27
+PORTVERSION=	0.28
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	SF
 
diff --git a/net-mgmt/tork/distinfo b/net-mgmt/tork/distinfo
index 2605203c76ed..84701df67182 100644
--- a/net-mgmt/tork/distinfo
+++ b/net-mgmt/tork/distinfo
@@ -1,3 +1,3 @@
-MD5 (tork-0.27.tar.gz) = 491f1ce831e76ddebddaeb9e87fd892f
-SHA256 (tork-0.27.tar.gz) = 0f819824a6043ea8e3f66d646952337db258b0c3deaecbae4e103fab419307bc
-SIZE (tork-0.27.tar.gz) = 3158051
+MD5 (tork-0.28.tar.gz) = c583acd3bda497babddfd57ffb04c33a
+SHA256 (tork-0.28.tar.gz) = d0922d40ef88ccc4269551919c5adb9dd4386787cf50fd19c300095685c7bfc3
+SIZE (tork-0.28.tar.gz) = 3167037
diff --git a/net-mgmt/tork/files/patch-configure b/net-mgmt/tork/files/patch-configure
index 48a794e9f067..c10856b34e5c 100644
--- a/net-mgmt/tork/files/patch-configure
+++ b/net-mgmt/tork/files/patch-configure
@@ -1,136 +1,6 @@
---- configure.orig	2007-12-30 14:03:06.000000000 +0100
-+++ configure	2008-02-10 03:25:35.000000000 +0100
-@@ -11975,13 +11975,13 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12037,7 +12037,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lc"
- else
- 
-     lt_cv_dlopen="dyld"
-@@ -12281,13 +12281,13 @@
- if test $ac_cv_func_dlopen = yes; then
-   lt_cv_dlopen="dlopen"
- else
--  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12343,7 +12343,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lc"
- else
-   { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
- echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-@@ -15604,13 +15604,13 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15666,7 +15666,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lc"
- else
- 
-     lt_cv_dlopen="dyld"
-@@ -15910,13 +15910,13 @@
- if test $ac_cv_func_dlopen = yes; then
-   lt_cv_dlopen="dlopen"
- else
--  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15972,7 +15972,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lc"
- else
-   { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
- echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-@@ -20946,13 +20946,13 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -21008,7 +21008,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lc"
- else
- 
-     lt_cv_dlopen="dyld"
-@@ -21252,13 +21252,13 @@
+--- configure.orig	2008-04-21 19:36:01.000000000 +0200
++++ configure	2008-04-21 19:41:19.000000000 +0200
+@@ -12289,13 +12289,13 @@
  if test $ac_cv_func_dlopen = yes; then
    lt_cv_dlopen="dlopen"
  else
@@ -147,7 +17,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21314,7 +21314,7 @@
+@@ -12351,7 +12351,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
  echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
  if test $ac_cv_lib_dl_dlopen = yes; then
@@ -156,70 +26,13 @@
  else
    { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
  echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-@@ -27209,13 +27209,13 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
-+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27272,7 +27272,7 @@
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- 
--LIBDL="-ldl"
-+LIBDL="-lc"
- ac_cv_have_dlfcn=yes
- 
- fi
-@@ -37132,13 +37132,13 @@
- LIBS=
- 
- 
--{ echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
--echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for dlsym in -lc" >&5
-+echo $ECHO_N "checking for dlsym in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
-+LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -37198,11 +37198,11 @@
- #define HAVE_LIBDL 1
- _ACEOF
- 
--  LIBS="-ldl $LIBS"
-+  LIBS="-lc $LIBS"
- 
- else
--  { { echo "$as_me:$LINENO: error: \"libdl is required\"" >&5
--echo "$as_me: error: \"libdl is required\"" >&2;}
-+  { { echo "$as_me:$LINENO: error: \"liblc is required\"" >&5
-+echo "$as_me: error: \"liblc is required\"" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -37710,8 +37710,9 @@
+@@ -38129,9 +38129,9 @@
  
  { echo "$as_me:$LINENO: checking for correct poll prototype" >&5
  echo $ECHO_N "checking for correct poll prototype... $ECHO_C" >&6; }
 -PROTO=
--for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout'
+-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' \
+-                 'struct pollfd *ufds, nfds_t nfds, int timeout'
 +PROTO1="struct pollfd fds[], nfds_t nfds, int timeout"
 +PROTO2="struct pollfd *fds, unsigned int nfds, int timeout"
 +for PROTO in "$PROTO1" "$PROTO2"
diff --git a/net-mgmt/tork/files/patch-configure.in b/net-mgmt/tork/files/patch-configure.in
index 7ba4b9b35fd7..9eb27b66ddd2 100644
--- a/net-mgmt/tork/files/patch-configure.in
+++ b/net-mgmt/tork/files/patch-configure.in
@@ -1,20 +1,12 @@
---- configure.in.orig	2007-12-30 14:02:27.000000000 +0100
-+++ configure.in	2008-02-10 04:02:25.000000000 +0100
-@@ -465,7 +465,7 @@
- 
- dnl Checks for libraries.
- dnl Replace `main' with a function in -ldl:
--AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))
-+AC_CHECK_LIB(c, dlsym,,AC_MSG_ERROR("liblc is required"))
- 
- dnl If we're using gcc here define _GNU_SOURCE
- AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h)
-@@ -671,8 +671,9 @@
+--- configure.in.orig	2008-04-21 19:43:11.000000000 +0200
++++ configure.in	2008-04-21 19:43:47.000000000 +0200
+@@ -887,9 +887,9 @@
  
  dnl Find the correct poll prototype on this machine 
  AC_MSG_CHECKING(for correct poll prototype)
 -PROTO=
--for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 
+-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' \
+-                 'struct pollfd *ufds, nfds_t nfds, int timeout'
 +PROTO1="struct pollfd fds[], nfds_t nfds, int timeout"
 +PROTO2="struct pollfd *fds, unsigned int nfds, int timeout"
 +for PROTO in "$PROTO1" "$PROTO2"
diff --git a/net-mgmt/tork/files/patch-configure.in.in b/net-mgmt/tork/files/patch-configure.in.in
index 52a5bcd7c136..088d22c11760 100644
--- a/net-mgmt/tork/files/patch-configure.in.in
+++ b/net-mgmt/tork/files/patch-configure.in.in
@@ -1,20 +1,12 @@
---- configure.in.in.orig	2007-12-29 22:18:50.000000000 +0100
-+++ configure.in.in	2008-02-10 04:03:12.000000000 +0100
-@@ -400,7 +400,7 @@
- 
- dnl Checks for libraries.
- dnl Replace `main' with a function in -ldl:
--AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))
-+AC_CHECK_LIB(c, dlsym,,AC_MSG_ERROR("liblc is required"))
- 
- dnl If we're using gcc here define _GNU_SOURCE
- AC_MSG_CHECKING(for RTLD_NEXT from dlfcn.h)
-@@ -606,8 +606,9 @@
+--- configure.in.in.orig	2008-04-21 19:45:36.000000000 +0200
++++ configure.in.in	2008-04-21 19:46:32.000000000 +0200
+@@ -822,9 +822,9 @@
  
  dnl Find the correct poll prototype on this machine 
  AC_MSG_CHECKING(for correct poll prototype)
 -PROTO=
--for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 
+-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' \
+-                 'struct pollfd *ufds, nfds_t nfds, int timeout'
 +PROTO1="struct pollfd fds[], nfds_t nfds, int timeout"
 +PROTO2="struct pollfd *fds, unsigned int nfds, int timeout"
 +for PROTO in "$PROTO1" "$PROTO2"
diff --git a/net-mgmt/tork/pkg-plist b/net-mgmt/tork/pkg-plist
index e615e90a1f34..ce4c9ed7ace5 100644
--- a/net-mgmt/tork/pkg-plist
+++ b/net-mgmt/tork/pkg-plist
@@ -407,11 +407,14 @@ share/locale/de/LC_MESSAGES/tork.mo
 share/locale/fr/LC_MESSAGES/tork.mo
 share/locale/libkickermenu_tork-cs/LC_MESSAGES/tork.mo
 share/locale/libkickermenu_tork-fr/LC_MESSAGES/tork.mo
+share/locale/libkickermenu_tork-zh_CN/LC_MESSAGES/tork.mo
 share/locale/tr/LC_MESSAGES/tork.mo
 share/locale/zh_CN/LC_MESSAGES/tork.mo
 share/menu/tork
 share/pixmaps/tork.xpm
 share/services/torioslave.protocol
+@dirrm share/locale/libkickermenu_tork-zh_CN/LC_MESSAGES
+@dirrm share/locale/libkickermenu_tork-zh_CN
 @dirrm share/locale/libkickermenu_tork-fr/LC_MESSAGES
 @dirrm share/locale/libkickermenu_tork-fr
 @dirrm share/locale/libkickermenu_tork-cs/LC_MESSAGES