From owner-freebsd-ports Sat Mar 6 16:20:16 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 14F1515173 for ; Sat, 6 Mar 1999 16:20:15 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id QAA00316; Sat, 6 Mar 1999 16:20:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from shale.csir.co.za (shale.csir.co.za [146.64.46.5]) by hub.freebsd.org (Postfix) with ESMTP id BB32A151B4 for ; Sat, 6 Mar 1999 16:15:49 -0800 (PST) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by shale.csir.co.za (8.9.3/8.9.3) id CAA20388; Sun, 7 Mar 1999 02:15:30 +0200 (SAT) (envelope-from reg) Message-Id: <199903070015.CAA20388@shale.csir.co.za> Date: Sun, 7 Mar 1999 02:15:30 +0200 (SAT) From: reg@shale.csir.co.za Reply-To: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/10447: Port update: sysutils/gtop Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10447 >Category: ports >Synopsis: Port update: sysutils/gtop >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 6 16:20:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Jeremy Lea >Release: FreeBSD 4.0-CURRENT i386 >Organization: Arb's Inc. >Environment: FreeBSD Ports Collection. >Description: Upgrade to gtop-1.0.1. >How-To-Repeat: As before... Removes patch-ae (no longer needed). >Fix: diff -urN -x CVS /usr/ports.ref/sysutils/gtop/Makefile ./Makefile --- /usr/ports.ref/sysutils/gtop/Makefile Tue Feb 2 18:50:59 1999 +++ ./Makefile Sun Mar 7 02:12:28 1999 @@ -1,16 +1,15 @@ # New ports collection makefile for: gtop -# Version required: 0.99.2 +# Version required: 1.0.1 # Date created: 28 September 1998 # Whom: Yukihiro Nakai # # $Id: Makefile,v 1.7 1999/02/02 14:19:19 vanilla Exp $ # -DISTNAME= gtop-0.99.2 +DISTNAME= gtop-1.0.1 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} \ - ftp://ftp.home-of-linux.org/pub/gtop/0.99.2/ -MASTER_SITE_SUBDIR= gtop +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -23,11 +22,7 @@ --datadir=${PREFIX}/share/gnome \ --with-gnome=${X11BASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" - -post-install: - chown root.kmem ${PREFIX}/bin/gtop - chmod 2555 ${PREFIX}/bin/gtop .include diff -urN -x CVS /usr/ports.ref/sysutils/gtop/files/md5 ./files/md5 --- /usr/ports.ref/sysutils/gtop/files/md5 Fri Jan 15 20:12:24 1999 +++ ./files/md5 Sun Mar 7 01:56:44 1999 @@ -1 +1 @@ -MD5 (gtop-0.99.2.tar.gz) = fc0c5e0a39e9ecc9ec5c1bd91d7f5be0 +MD5 (gtop-1.0.1.tar.gz) = 20677ff8e3bb3f658ab0860969140cc2 diff -urN -x CVS /usr/ports.ref/sysutils/gtop/patches/patch-aa ./patches/patch-aa --- /usr/ports.ref/sysutils/gtop/patches/patch-aa Fri Jan 15 20:12:24 1999 +++ ./patches/patch-aa Wed Mar 3 12:59:13 1999 @@ -1,21 +1,11 @@ ---- configure.orig Wed Jan 6 07:28:55 1999 -+++ configure Fri Jan 15 14:32:45 1999 -@@ -1085,13 +1085,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1090: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1090: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 +--- configure.orig Sun Feb 28 18:14:31 1999 ++++ configure Wed Mar 3 12:58:55 1999 +@@ -5244,7 +5244,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff -urN -x CVS /usr/ports.ref/sysutils/gtop/patches/patch-ab ./patches/patch-ab --- /usr/ports.ref/sysutils/gtop/patches/patch-ab Tue Feb 2 18:50:59 1999 +++ ./patches/patch-ab Sun Mar 7 01:59:09 1999 @@ -1,53 +1,20 @@ ---- ltmain.sh.orig Wed Jan 6 07:28:41 1999 -+++ ltmain.sh Tue Feb 2 21:32:22 1999 -@@ -1030,6 +1030,16 @@ - versuffix=".$current.$revision" - ;; - -+ freebsd) -+ version_vars="$version_vars major versuffix" -+ major=".$current" -+ if [ $PORTOBJFORMAT = elf ]; then -+ versuffix=".$current" -+ else -+ versuffix=".$current.$revision" -+ fi -+ ;; -+ - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ---- ltconfig.orig Wed Jan 6 07:28:41 1999 -+++ ltconfig Tue Feb 2 21:32:54 1999 -@@ -823,7 +823,7 @@ +--- ltconfig.orig Tue Mar 2 00:47:37 1999 ++++ ltconfig Sun Mar 7 01:58:55 1999 +@@ -1201,7 +1201,7 @@ ;; # FreeBSD 3, at last, uses gcc -shared to do shared libraries. - freebsd3*) + freebsd*) - archive_cmds='$CC -shared -o $lib$libobjs' + archive_cmds='$CC -shared -o $lib$libobjs$deplibs' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes -@@ -1160,10 +1160,21 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' +@@ -1606,7 +1606,7 @@ + shlibpath_var=PATH ;; -freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos - library_names_spec='${libname}${release}.so$versuffix $libname.so' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ +freebsd*) -+ version_type=freebsd -+ library_names_spec='${libname}${release}.so$versuffix $libname.so' -+ if [ $PORTOBJFORMAT = elf ]; then -+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir' -+ else -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ fi - shlibpath_var=LD_LIBRARY_PATH - ;; - + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + library_names_spec='${libname}${release}.so$versuffix $libname.so' diff -urN -x CVS /usr/ports.ref/sysutils/gtop/patches/patch-ac ./patches/patch-ac --- /usr/ports.ref/sysutils/gtop/patches/patch-ac Fri Jan 15 20:12:24 1999 +++ ./patches/patch-ac Wed Mar 3 13:00:05 1999 @@ -1,33 +1,20 @@ ---- Makefile.in.orig Wed Jan 6 07:30:14 1999 -+++ Makefile.in Fri Jan 15 17:41:05 1999 -@@ -141,8 +141,8 @@ - INCLUDES = \ - -I$(includedir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -- -DLOCALEDIR=\"$(datadir)/locale\" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -+ -DLOCALEDIR=\"$(prefix)/share/locale\" \ - $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) +--- Makefile.in.orig Wed Feb 17 11:48:58 1999 ++++ Makefile.in Sat Feb 20 20:00:50 1999 +@@ -142,7 +142,7 @@ + + Utilitiesdir = $(datadir)/apps/Utilities + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(prefix)/share/locale\" $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - bin_PROGRAMS = gtop -@@ -493,7 +493,7 @@ + bin_PROGRAMS = gtop +@@ -513,7 +513,7 @@ install-exec-am: install-binPROGRAMS + install-exec: install-exec-recursive -install-data-am: install-gtkrcDATA +install-data-am: install-gtkrcDATA INSTALL-data-local + install-data: install-data-recursive - uninstall-am: uninstall-binPROGRAMS uninstall-gtkrcDATA - ---- po/Makefile.in.in.orig Wed Jan 6 07:28:35 1999 -+++ po/Makefile.in.in Fri Jan 15 14:37:23 1999 -@@ -18,7 +18,7 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = $(prefix)/@DATADIRNAME@ -+datadir = $(prefix)/share - localedir = $(datadir)/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po + install-am: all-am diff -urN -x CVS /usr/ports.ref/sysutils/gtop/patches/patch-ae ./patches/patch-ae --- /usr/ports.ref/sysutils/gtop/patches/patch-ae Fri Jan 1 08:44:36 1999 +++ ./patches/patch-ae Sat Feb 20 20:03:09 1999 @@ -1,10 +0,0 @@ ---- session.h.orig Fri Jan 1 13:54:05 1999 -+++ session.h Fri Jan 1 13:54:16 1999 -@@ -7,7 +7,6 @@ - #define SESSION_H - - #include --#include - - #include - >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message