API tools faq
paste
gusibsd

Untitled

gusibsd
Apr 29th, 2014
193
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.67 KB | None | 0 0
raw download clone embed print report
  1. Index: Makefile
  2. ===================================================================
  3. --- Makefile (revision 19578)
  4. +++ Makefile (working copy)
  5. @@ -3,7 +3,7 @@
  6. # $MCom$
  7.  
  8. PORTNAME= libgtop
  9. -PORTVERSION= 2.28.5
  10. +PORTVERSION= 2.30.0
  11. CATEGORIES= devel gnome
  12. MASTER_SITES= GNOME
  13. DIST_SUBDIR= gnome2
  14. @@ -19,9 +19,9 @@
  15. USE_LDCONFIG= yes
  16. GNU_CONFIGURE= yes
  17. CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H -D_WANT_IFADDR
  18. -LDFLAGS+= -L${LOCALBASE}/lib
  19. +LDFLAGS+= -L${LOCALBASE}/lib -lutil
  20. INSTALL_TARGET= install-strip
  21. -CONFIGURE_ARGS= --disable-introspection
  22. +CONFIGURE_ARGS= --enable-introspection
  23.  
  24. INFO= libgtop2
  25.  
  26. Index: distinfo
  27. ===================================================================
  28. --- distinfo (revision 19578)
  29. +++ distinfo (working copy)
  30. @@ -1,2 +1,2 @@
  31. -SHA256 (gnome2/libgtop-2.28.5.tar.xz) = c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342
  32. -SIZE (gnome2/libgtop-2.28.5.tar.xz) = 654828
  33. +SHA256 (gnome2/libgtop-2.30.0.tar.xz) = 463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5
  34. +SIZE (gnome2/libgtop-2.30.0.tar.xz) = 664476
  35. Index: files/patch-configure
  36. ===================================================================
  37. --- files/patch-configure (revision 19578)
  38. +++ files/patch-configure (working copy)
  39. @@ -1,10 +1,10 @@
  40. ---- configure.orig 2011-03-30 10:06:27.000000000 +0200
  41. -+++ configure 2011-03-30 10:07:52.000000000 +0200
  42. -@@ -13230,6 +13230,78 @@
  43. - if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
  44. - EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
  45. - fi
  46. -+ { echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
  47. +--- configure.orig 2014-04-29 10:12:29.633996234 +0000
  48. ++++ configure 2014-04-29 10:14:19.976988652 +0000
  49. +@@ -13638,6 +13638,79 @@
  50. +
  51. + done
  52. +
  53. ++ { echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
  54. +echo $ECHO_N "checking for kinfo_getfile in -lutil... $ECHO_C" >&6; }
  55. +if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then
  56. + echo $ECHO_N "(cached) $ECHO_C" >&6
  57. @@ -47,20 +47,20 @@
  58. + cat conftest.err >&5
  59. + echo "$as_me:$LINENO: \$? = $ac_status" >&5
  60. + (exit $ac_status); } && {
  61. -+ test -z "$ac_c_werror_flag" ||
  62. -+ test ! -s conftest.err
  63. ++ test -z "$ac_c_werror_flag" ||
  64. ++ test ! -s conftest.err
  65. + } && test -s conftest$ac_exeext &&
  66. -+ $as_test_x conftest$ac_exeext; then
  67. ++ $as_test_x conftest$ac_exeext; then
  68. + ac_cv_lib_util_kinfo_getfile=yes
  69. +else
  70. + echo "$as_me: failed program was:" >&5
  71. +sed 's/^/| /' conftest.$ac_ext >&5
  72. +
  73. -+ ac_cv_lib_util_kinfo_getfile=no
  74. ++ ac_cv_lib_util_kinfo_getfile=no
  75. +fi
  76. -+
  77. ++
  78. +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  79. -+ conftest$ac_exeext conftest.$ac_ext
  80. ++ conftest$ac_exeext conftest.$ac_ext
  81. +LIBS=$ac_check_lib_save_LIBS
  82. +fi
  83. +{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_kinfo_getfile" >&5
  84. @@ -67,15 +67,16 @@
  85. +echo "${ECHO_T}$ac_cv_lib_util_kinfo_getfile" >&6; }
  86. +if test $ac_cv_lib_util_kinfo_getfile = yes; then
  87. + EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
  88. -+
  89. ++
  90. +cat >>confdefs.h <<\_ACEOF
  91. +#define HAVE_KINFO_GETFILE 1
  92. +_ACEOF
  93. -+
  94. ++
  95. +else
  96. + :
  97. +fi
  98. +
  99. - ;;
  100. - esac
  101. -
  102. ++
  103. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for I4B" >&5
  104. + $as_echo_n "checking for I4B... " >&6; }
  105. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  106. Index: files/patch-libgtop-sysdeps.m4
  107. ===================================================================
  108. --- files/patch-libgtop-sysdeps.m4 (revision 19578)
  109. +++ files/patch-libgtop-sysdeps.m4 (working copy)
  110. @@ -1,12 +1,14 @@
  111. ---- libgtop-sysdeps.m4.orig 2008-04-21 14:58:38.000000000 -0400
  112. -+++ libgtop-sysdeps.m4 2008-12-06 16:16:00.000000000 -0500
  113. -@@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
  114. - if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
  115. - EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
  116. - fi
  117. -+ AC_CHECK_LIB(util, kinfo_getfile,
  118. -+ [EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
  119. -+ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
  120. - ;;
  121. - esac
  122. +--- libgtop-sysdeps.m4.orig 2014-04-29 10:43:13.405870723 +0000
  123. ++++ libgtop-sysdeps.m4 2014-04-29 10:43:43.361869829 +0000
  124. +@@ -160,6 +160,11 @@
  125. + AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
  126. + AC_SUBST(KVM_LIBS)
  127.  
  128. ++ AC_CHECK_LIB(util, kinfo_getfile,
  129. ++ [EXTRA_SYSDEPS_LIBS="${EXTRA_SYSDEPS_LIBS} -lutil"
  130. ++ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
  131. ++ AC_SUBST(EXTRA_SYSDEPS_LIBS)
  132. ++
  133. + AC_CHECK_HEADERS(net/if_var.h,,, [
  134. + #include <net/if.h>
  135. + #include <sys/types.h>
  136. Index: files/patch-sysdeps_freebsd_Makefile.in
  137. ===================================================================
  138. --- files/patch-sysdeps_freebsd_Makefile.in (revision 0)
  139. +++ files/patch-sysdeps_freebsd_Makefile.in (working copy)
  140. @@ -0,0 +1,20 @@
  141. +--- sysdeps/freebsd/Makefile.in.orig 2014-04-29 11:27:47.621685202 +0000
  142. ++++ sysdeps/freebsd/Makefile.in 2014-04-29 11:28:34.956686781 +0000
  143. +@@ -286,7 +286,8 @@
  144. + INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
  145. + INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
  146. + INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
  147. + KVM_LIBS = @KVM_LIBS@
  148. ++EXTRA_SYSDEPS_LIBS = @EXTRA_SYSDEPS_LIBS@
  149. + LD = @LD@
  150. + LDFLAGS = @LDFLAGS@
  151. + LIBGTOP_BINDIR = @LIBGTOP_BINDIR@
  152. +@@ -422,7 +423,7 @@
  153. + procaffinity.c glibtop_private.c open.c
  154. +
  155. + libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
  156. +-libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS)
  157. ++libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
  158. + libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \
  159. + proclist.c procstate.c procuid.c \
  160. + proctime.c procmem.c procsignal.c \
  161. Index: files/patch-sysdeps_freebsd_open.c
  162. ===================================================================
  163. --- files/patch-sysdeps_freebsd_open.c (revision 19578)
  164. +++ files/patch-sysdeps_freebsd_open.c (working copy)
  165. @@ -1,14 +0,0 @@
  166. ---- sysdeps/freebsd/open.c.orig 2011-07-24 15:13:56.000000000 -0400
  167. -+++ sysdeps/freebsd/open.c 2011-12-28 16:26:48.000000000 -0500
  168. -@@ -42,11 +42,5 @@ glibtop_open_s (glibtop *server, const c
  169. - sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
  170. - server->real_ncpu = ncpus - 1;
  171. - server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
  172. --
  173. --#if defined(__FreeBSD_kernel__)
  174. -- server->os_version_code = __FreeBSD_kernel_version;
  175. --#else
  176. - server->os_version_code = __FreeBSD_version;
  177. --#endif
  178. --
  179. - }
  180. Index: pkg-plist
  181. ===================================================================
  182. --- pkg-plist (revision 19578)
  183. +++ pkg-plist (working copy)
  184. @@ -47,15 +47,17 @@
  185. include/libgtop-2.0/glibtop_server.h
  186. include/libgtop-2.0/glibtop_suid.h
  187. include/libgtop-2.0/libgtopconfig.h
  188. +lib/girepository-1.0/GTop-2.0.typelib
  189. lib/libgtop-2.0.a
  190. lib/libgtop-2.0.la
  191. lib/libgtop-2.0.so
  192. -lib/libgtop-2.0.so.7
  193. -lib/libgtop-2.0.so.7.2.0
  194. +lib/libgtop-2.0.so.10
  195. +lib/libgtop-2.0.so.10.0.0
  196. libdata/pkgconfig/libgtop-2.0.pc
  197. %%DOCSDIR%%/home.png
  198. %%DOCSDIR%%/index.html
  199. %%DOCSDIR%%/index.sgml
  200. +%%DOCSDIR%%/left-insensitive.png
  201. %%DOCSDIR%%/left.png
  202. %%DOCSDIR%%/libgtop-Close.html
  203. %%DOCSDIR%%/libgtop-Command.html
  204. @@ -64,6 +66,9 @@
  205. %%DOCSDIR%%/libgtop-Net-List.html
  206. %%DOCSDIR%%/libgtop-Net-Load.html
  207. %%DOCSDIR%%/libgtop-PPP.html
  208. +%%DOCSDIR%%/libgtop-Process-Arguments.html
  209. +%%DOCSDIR%%/libgtop-Process-List.html
  210. +%%DOCSDIR%%/libgtop-Process-Time.html
  211. %%DOCSDIR%%/libgtop-Shared-Memory-Limits.html
  212. %%DOCSDIR%%/libgtop-Uptime.html
  213. %%DOCSDIR%%/libgtop-cpu.html
  214. @@ -75,9 +80,7 @@
  215. %%DOCSDIR%%/libgtop-msg-limits.html
  216. %%DOCSDIR%%/libgtop-open.html
  217. %%DOCSDIR%%/libgtop-parameter.html
  218. -%%DOCSDIR%%/libgtop-procargs.html
  219. %%DOCSDIR%%/libgtop-prockernel.html
  220. -%%DOCSDIR%%/libgtop-proclist.html
  221. %%DOCSDIR%%/libgtop-procmap.html
  222. %%DOCSDIR%%/libgtop-procmem.html
  223. %%DOCSDIR%%/libgtop-procopenfiles.html
  224. @@ -84,7 +87,6 @@
  225. %%DOCSDIR%%/libgtop-procsegment.html
  226. %%DOCSDIR%%/libgtop-procsignal.html
  227. %%DOCSDIR%%/libgtop-procstate.html
  228. -%%DOCSDIR%%/libgtop-proctime.html
  229. %%DOCSDIR%%/libgtop-procuid.html
  230. %%DOCSDIR%%/libgtop-sem-limits.html
  231. %%DOCSDIR%%/libgtop-signal.html
  232. @@ -96,9 +98,12 @@
  233. %%DOCSDIR%%/libgtop-white-paper-overview.html
  234. %%DOCSDIR%%/libgtop-white-paper.html
  235. %%DOCSDIR%%/libgtop.devhelp2
  236. +%%DOCSDIR%%/right-insensitive.png
  237. %%DOCSDIR%%/right.png
  238. %%DOCSDIR%%/style.css
  239. +%%DOCSDIR%%/up-insensitive.png
  240. %%DOCSDIR%%/up.png
  241. +share/gir-1.0/GTop-2.0.gir
  242. share/locale/am/LC_MESSAGES/libgtop-2.0.mo
  243. share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
  244. share/locale/as/LC_MESSAGES/libgtop-2.0.mo
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!