diff options
author | sem <sem@FreeBSD.org> | 2005-02-08 18:18:12 +0000 |
---|---|---|
committer | sem <sem@FreeBSD.org> | 2005-02-08 18:18:12 +0000 |
commit | fadb3b731f40b8ee0b3578e86326847f91418b16 (patch) | |
tree | edf875b75fcb3b404f7c0944235f13ce7aff6207 /sysutils | |
parent | 8121d9133fba424f951640924c67fab3c69be245 (diff) | |
download | FreeBSD-ports-fadb3b731f40b8ee0b3578e86326847f91418b16.zip FreeBSD-ports-fadb3b731f40b8ee0b3578e86326847f91418b16.tar.gz |
- Update to 2.7
PR: ports/77140
Submitted by: ports fury
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/lavaps/Makefile | 50 | ||||
-rw-r--r-- | sysutils/lavaps/distinfo | 4 | ||||
-rw-r--r-- | sysutils/lavaps/files/patch-aa | 15 | ||||
-rw-r--r-- | sysutils/lavaps/files/patch-configure | 9 | ||||
-rw-r--r-- | sysutils/lavaps/files/patch-gconf | 24 | ||||
-rw-r--r-- | sysutils/lavaps/files/patch-po | 12 | ||||
-rw-r--r-- | sysutils/lavaps/files/patch-src::Makefile.in | 13 | ||||
-rw-r--r-- | sysutils/lavaps/files/patch-src::main.c | 42 | ||||
-rw-r--r-- | sysutils/lavaps/pkg-plist | 6 |
9 files changed, 84 insertions, 91 deletions
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index 27c91dfa..ba08ef1 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -6,44 +6,40 @@ # PORTNAME= lavaps -PORTVERSION= 2.6 +PORTVERSION= 2.7 CATEGORIES= sysutils MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/ MAINTAINER= ports@FreeBSD.org COMMENT= A lava lamp of currently running processes -OPTIONS= GTK2 "Use GTK2 instead of TCL/TK for GUI (untested!)" off +WANT_GNOME= yes +USE_GNOME= gnometarget +USE_PERL5_BUILD= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +MAN1= lavaps.1 + TCL_VER?= 8.4 -.ifdef WITH_GTK2 -LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext \ - iconv:${PORTSDIR}/converters/libiconv -USE_GNOME= gtk2 -CONFIGURE_ARGS+=--with-gtk -PLIST_SUB+= MO='' - -post-configure: - ${MV} ${WRKSRC}/po/Makefile.in ${WRKSRC}/po/Makefile -.else -LIB_DEPENDS+= tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//} -CONFIGURE_ARGS+=--with-tcltk -USE_REINPLACE= yes -PLIST_SUB+= MO='@comment ' - -post-configure: - ${REINPLACE_CMD} -e 's/ po / /' ${WRKSRC}/Makefile -.endif -USE_PERL5_BUILD=yes, for documentation +CPPFLAGS= -I${LOCALBASE}/include/tcl${TCL_VER} \ + -I${LOCALBASE}/include/tk${TCL_VER} \ + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> -GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" USE_NLS=yes -CONFIGURE_ENV+= TK_DOTTED_HI_VERS=${TCL_VER} TCL_DOTTED_HI_VERS=${TCL_VER} -CONFIGURE_ARGS+=--with-tcl-ver=${TCL_VER} --with-tk-ver=${TCL_VER} -CONFIGURE_ARGS+=--with-libintl --with-libiconv -MAN1= lavaps.1 +.if ${HAVE_GNOME:Mgtk20}!="" +PKGNAMESUFFIX= -gtk2 +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --with-gtk +PLIST_SUB+= NLS="" +.else +LIB_DEPENDS+= tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//} +CONFIGURE_ARGS+= --with-tcltk --disable-nls \ + --with-tcl-ver=${TCL_VER} --with-tk-ver=${TCL_VER} +PLIST_SUB+= NLS="@comment " +.endif .include <bsd.port.post.mk> diff --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo index e3952b4..b841bad 100644 --- a/sysutils/lavaps/distinfo +++ b/sysutils/lavaps/distinfo @@ -1,2 +1,2 @@ -MD5 (lavaps-2.6.tar.gz) = 008a63f3fb9b06676cca9ac085aee9e2 -SIZE (lavaps-2.6.tar.gz) = 318054 +MD5 (lavaps-2.7.tar.gz) = cf56a2becae9053130768e4dff5b4a59 +SIZE (lavaps-2.7.tar.gz) = 399332 diff --git a/sysutils/lavaps/files/patch-aa b/sysutils/lavaps/files/patch-aa deleted file mode 100644 index 2130f77..0000000 --- a/sysutils/lavaps/files/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ ---- src/change_tracking.hh Tue Jul 15 00:42:06 2003 -+++ src/change_tracking.hh Sat Nov 20 08:35:14 2004 -@@ -77,9 +77,9 @@ - protected: - static SUM s_; -- void update_sum() { s_.sum_ += change_; } -+ void update_sum() { s_.sum_ += change_tracking<T>::change_; } - public: - sum_change_tracking() {}; -- sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(frst); }; -- ~sum_change_tracking() { tick_incr(-last_); }; -+ sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(first); }; -+ ~sum_change_tracking() { tick_incr(-change_tracking<T>::last_); }; - - diff --git a/sysutils/lavaps/files/patch-configure b/sysutils/lavaps/files/patch-configure deleted file mode 100644 index a40ceb2..0000000 --- a/sysutils/lavaps/files/patch-configure +++ /dev/null @@ -1,9 +0,0 @@ ---- configure Sun Jun 6 22:20:50 2004 -+++ configure Sat Nov 20 07:37:39 2004 -@@ -6494,5 +6494,5 @@ - TCLTK_INCLUDES=${PLATFORM_SPECIFIC_TCLTK_INCLUDES:-""} - TCLTK_LIBS=${PLATFORM_SPECIFIC_TCLTK_LIBS:-"tba"} --TCLTK_DL_LIB=${PLATFORM_SPECIFIC_TCLTK_DL_LIB:-"-ldl"} -+TCLTK_DL_LIB=${PLATFORM_SPECIFIC_TCLTK_DL_LIB} - - echo "$as_me:$LINENO: checking for platform-specific tcl/tk code" >&5 diff --git a/sysutils/lavaps/files/patch-gconf b/sysutils/lavaps/files/patch-gconf deleted file mode 100644 index b2dca85..0000000 --- a/sysutils/lavaps/files/patch-gconf +++ /dev/null @@ -1,24 +0,0 @@ ---- src/Makefile.in Sun Jun 6 22:20:46 2004 -+++ src/Makefile.in Sat Nov 20 09:08:06 2004 -@@ -249,5 +249,5 @@ - localstatedir = @localstatedir@ - mandir = @mandir@ --mkdir_p = @mkdir_p@ -+mkdir_p = mkdir -p - oldincludedir = @oldincludedir@ - prefix = @prefix@ -@@ -459,11 +459,11 @@ - install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) -- test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)" -- @list='$(schema_DATA)'; for p in $$list; do \ -+ test -z "$(schemadir)" || ($(mkdir_p) "$(DESTDIR)$(schemadir)"; \ -+ list='$(schema_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ - $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ -- done -+ done) - - uninstall-schemaDATA: diff --git a/sysutils/lavaps/files/patch-po b/sysutils/lavaps/files/patch-po deleted file mode 100644 index bf9726a..0000000 --- a/sysutils/lavaps/files/patch-po +++ /dev/null @@ -1,12 +0,0 @@ -We fix this Makefile and install the .gmo even though lavaps does -not use them yet -- not without Gnome, anyway. May be, this will -change... ---- po/Makefile.in.in Sun Jun 6 22:19:05 2004 -+++ po/Makefile.in.in Sat Nov 20 08:46:31 2004 -@@ -60,5 +60,5 @@ - POTFILES = \ - --CATALOGS = @CATALOGS@ -+CATALOGS != echo *.gmo - - # Makevars gets inserted here. (Don't remove this line!) diff --git a/sysutils/lavaps/files/patch-src::Makefile.in b/sysutils/lavaps/files/patch-src::Makefile.in new file mode 100644 index 0000000..e1fea10 --- /dev/null +++ b/sysutils/lavaps/files/patch-src::Makefile.in @@ -0,0 +1,13 @@ +--- src/Makefile.in.orig Sat Dec 25 11:42:03 2004 ++++ src/Makefile.in Sat Feb 5 13:51:37 2005 +@@ -318,8 +318,8 @@ + + + # according to http://www.gnome.org/projects/gconf/ +-schemadir = @GCONF_SCHEMA_FILE_DIR@ +-schema_DATA = lavaps.schemas ++#schemadir = @GCONF_SCHEMA_FILE_DIR@ ++#schema_DATA = lavaps.schemas + EXTRA_DIST = \ + $(schema_DATA) \ + linux/proc/Makefile \ diff --git a/sysutils/lavaps/files/patch-src::main.c b/sysutils/lavaps/files/patch-src::main.c new file mode 100644 index 0000000..5598f36 --- /dev/null +++ b/sysutils/lavaps/files/patch-src::main.c @@ -0,0 +1,42 @@ +--- src/main.cc.orig Sat Dec 18 04:59:03 2004 ++++ src/main.cc Sat Feb 5 03:27:07 2005 +@@ -42,6 +42,27 @@ + #endif /* USE_TEXT_BLOB */ + + ++// XXX Implement strndup for FreeBSD. ++#ifdef __FreeBSD__ ++#ifdef __cplusplus ++extern "C" { ++#endif ++static char * ++mystrndup(const char *str, int len) { ++ char *ret; ++ ++ if ((str == NULL || len < 0)) return(NULL); ++ ret = (char *)malloc(len + 1); ++ if (ret == NULL) return(NULL); ++ memcpy(ret, str, len); ++ ret[len] = '\0'; ++ return(ret); ++} ++#ifdef __cplusplus ++} ++#endif ++#endif ++ + int filter_good_uid = 0, + filter_good_pid = 0; + bool allow_autosize = true; +@@ -153,7 +174,11 @@ + if (arg == NULL) { + die (N_("--geometry option requires argument giving X-style geometry specification.\n")); + }; ++#ifdef __FreeBSD__ ++ lava_default_geometry = mystrndup(arg, 1024); // leaks memory, but probably doesn't matter ++#else + lava_default_geometry = strndup(arg, 1024); // leaks memory, but probably doesn't matter ++#endif + break; + case OPTION_DEBUG: + lava_debug = true; diff --git a/sysutils/lavaps/pkg-plist b/sysutils/lavaps/pkg-plist index 9126203..2718f18 100644 --- a/sysutils/lavaps/pkg-plist +++ b/sysutils/lavaps/pkg-plist @@ -1,5 +1,7 @@ bin/lavaps -%%MO%%share/locale/es/LC_MESSAGES/lavaps.mo -%%MO%%share/locale/ru/LC_MESSAGES/lavaps.mo +%%NLS%%share/locale/es/LC_MESSAGES/lavaps.mo +%%NLS%%share/locale/ru/LC_MESSAGES/lavaps.mo +%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true +%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true @exec chgrp kmem %D/bin/lavaps @exec chmod g+s %D/bin/lavaps |