From owner-freebsd-ports Sat Mar 6 14:50:17 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 4908714F1A for ; Sat, 6 Mar 1999 14:50:15 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id OAA93489; Sat, 6 Mar 1999 14:50: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 814F615053 for ; Sat, 6 Mar 1999 14:44:52 -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 AAA29638; Sun, 7 Mar 1999 00:44:32 +0200 (SAT) (envelope-from reg) Message-Id: <199903062244.AAA29638@shale.csir.co.za> Date: Sun, 7 Mar 1999 00:44:32 +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/10442: Port update: misc/gnomeutils Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10442 >Category: ports >Synopsis: Port update: misc/gnomeutils >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 14:50: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: Update to gnome-utils-1.0.1. >How-To-Repeat: Requires updated bsd.port.mk. >Fix: diff -urN -x CVS /usr/ports.ref/misc/gnomeutils/Makefile ./Makefile --- /usr/ports.ref/misc/gnomeutils/Makefile Tue Feb 2 14:10:48 1999 +++ ./Makefile Sat Mar 6 23:23:00 1999 @@ -1,21 +1,22 @@ # New ports collection makefile for: gnomeutils -# Version required: 0.99.5 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai # # $Id: Makefile,v 1.6 1999/02/02 09:56:05 vanilla Exp $ # -DISTNAME= gnome-utils-0.99.5 -PKGNAME= gnomeutils-0.99.5 -CATEGORIES= misc +DISTNAME= gnome-utils-1.0.1 +PKGNAME= gnomeutils-1.0.1 +CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-utils +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc USE_X_PREFIX= yes USE_GMAKE= yes @@ -24,7 +25,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" MAN1= gtt.1 diff -urN -x CVS /usr/ports.ref/misc/gnomeutils/files/md5 ./files/md5 --- /usr/ports.ref/misc/gnomeutils/files/md5 Tue Feb 2 14:10:48 1999 +++ ./files/md5 Sat Mar 6 23:52:36 1999 @@ -1 +1 @@ -MD5 (gnome-utils-0.99.5.tar.gz) = 9eac5326842d1027edf2b959cbb23583 +MD5 (gnome-utils-1.0.1.tar.gz) = c267d32ddf310b3e9f70a2d915cccf5a diff -urN -x CVS /usr/ports.ref/misc/gnomeutils/patches/patch-aa ./patches/patch-aa --- /usr/ports.ref/misc/gnomeutils/patches/patch-aa Tue Feb 2 14:10:48 1999 +++ ./patches/patch-aa Sat Mar 6 23:55:56 1999 @@ -1,36 +1,20 @@ ---- configure.orig Tue Feb 2 09:42:09 1999 -+++ configure Tue Feb 2 09:43:37 1999 -@@ -1108,13 +1108,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:1113: 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:1113: 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 -@@ -3121,10 +3121,10 @@ - - if test $OBJECTIVE_C = yes; then +--- configure.orig Tue Mar 2 00:23:40 1999 ++++ configure Sat Mar 6 23:55:23 1999 +@@ -3143,7 +3143,7 @@ -- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:3126: checking for obGnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/obGnomeConf.sh; then -- . $gnome_prefix/obGnomeConf.sh -+ echo $ac_n "checking for obGnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:3126: checking for obGnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/obGnomeConf.sh; then -+ . $prefix/share/gnome/obGnomeConf.sh - echo "$ac_t""found" 1>&6 - else - echo "$ac_t""not found" 1>&6 + echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 + echo "configure:3146: checking for an obGnomeConf.sh" >&5 +- my_gnome_libdir=`$GNOME_CONFIG --libdir` ++ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` + if test -f $my_gnome_libdir/obGnomeConf.sh; then + . $my_gnome_libdir/obGnomeConf.sh + echo "$ac_t""found $my_gnome_libdir" 1>&6 +@@ -5389,7 +5389,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/misc/gnomeutils/patches/patch-ac ./patches/patch-ac --- /usr/ports.ref/misc/gnomeutils/patches/patch-ac Tue Feb 2 14:10:48 1999 +++ ./patches/patch-ac Sun Mar 7 00:00:00 1999 @@ -1,18 +1,32 @@ ---- gcalc/Makefile.in.orig Tue Feb 2 09:49:10 1999 -+++ gcalc/Makefile.in Tue Feb 2 09:49:26 1999 -@@ -148,7 +148,7 @@ +--- cromagnon/Makefile.in.orig Tue Mar 2 00:27:09 1999 ++++ cromagnon/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - Utilitiesdir = $(datadir)/apps/Utilities +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities + GNOMEG = $(bindir)/gnomeg + + bin_SCRIPTS = cromagnon +--- gcalc/Makefile.in.orig Tue Mar 2 00:26:55 1999 ++++ gcalc/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,9 +147,9 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gcalc ---- gdiskfree/Makefile.in.orig Tue Feb 2 09:49:45 1999 -+++ gdiskfree/Makefile.in Tue Feb 2 09:49:55 1999 -@@ -146,7 +146,7 @@ - YACC = @YACC@ +--- gdiskfree/Makefile.in.orig Tue Mar 2 00:27:01 1999 ++++ gdiskfree/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -20,9 +34,18 @@ bin_PROGRAMS = gdiskfree ---- ghex/Makefile.in.orig Tue Feb 2 09:50:07 1999 -+++ ghex/Makefile.in Tue Feb 2 09:50:41 1999 -@@ -152,7 +152,7 @@ +@@ -160,7 +160,7 @@ + + EXTRA_DIST = gdiskfree.desktop + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities + Utilities_DATA = gdiskfree.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- ghex/Makefile.in.orig Tue Mar 2 00:26:56 1999 ++++ ghex/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -153,7 +153,7 @@ appicon_DATA = gnome-ghex.png @@ -31,9 +54,18 @@ bin_PROGRAMS = ghex ---- ghex/help/C/Makefile.in.orig Tue Feb 2 09:50:59 1999 -+++ ghex/help/C/Makefile.in Tue Feb 2 09:51:07 1999 -@@ -149,7 +149,7 @@ +@@ -164,7 +164,7 @@ + + EXTRA_DIST = ghex.desktop $(appicon_DATA) + +-sysdir = $(datadir)/gnome/apps/Applications ++sysdir = $(datadir)/apps/Applications + sys_DATA = ghex.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- ghex/help/C/Makefile.in.orig Tue Mar 2 00:26:58 1999 ++++ ghex/help/C/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -150,7 +150,7 @@ EXTRA_DIST = index.html topic.dat @@ -42,9 +74,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- ghex/help/es/Makefile.in.orig Tue Feb 2 09:51:11 1999 -+++ ghex/help/es/Makefile.in Tue Feb 2 09:51:19 1999 -@@ -149,7 +149,7 @@ +--- ghex/help/es/Makefile.in.orig Tue Mar 2 00:26:59 1999 ++++ ghex/help/es/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -150,7 +150,7 @@ EXTRA_DIST = index.html topic.dat @@ -53,20 +85,43 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- gsearchtool/Makefile.in.orig Tue Feb 2 09:51:27 1999 -+++ gsearchtool/Makefile.in Tue Feb 2 09:51:45 1999 -@@ -148,7 +148,7 @@ +--- gnome-find/Makefile.in.orig Tue Mar 2 00:27:29 1999 ++++ gnome-find/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -10,7 +10,7 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-#Utilitiesdir = $(datadir)/gnome/apps/Utilities ++#Utilitiesdir = $(datadir)/apps/Utilities + + + SHELL = @SHELL@ +@@ -149,7 +149,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - Utilitiesdir = $(datadir)/apps/Utilities +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" + + + LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) +--- gsearchtool/Makefile.in.orig Tue Mar 2 00:27:00 1999 ++++ gsearchtool/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,9 +147,9 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(prefix)/share/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gsearchtool ---- gstripchart/Makefile.in.orig Tue Feb 2 09:51:53 1999 -+++ gstripchart/Makefile.in Tue Feb 2 09:52:31 1999 -@@ -147,7 +147,7 @@ +--- gstripchart/Makefile.in.orig Tue Mar 2 00:27:02 1999 ++++ gstripchart/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -148,7 +148,7 @@ CFLAGS = @CFLAGS@ -Wall @@ -75,7 +130,14 @@ bin_PROGRAMS = gstripchart -@@ -168,7 +168,7 @@ +@@ -163,13 +163,13 @@ + EXTRA_DIST = gstripchart.conf gstripchart.desktop gstripchart.html topic.dat + + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities + + Utilities_DATA = gstripchart.desktop @@ -84,9 +146,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h ---- gtt/Makefile.in.orig Tue Feb 2 09:52:36 1999 -+++ gtt/Makefile.in Tue Feb 2 09:52:52 1999 -@@ -148,7 +148,7 @@ +--- gtt/Makefile.in.orig Tue Mar 2 00:27:04 1999 ++++ gtt/Makefile.in Sat Mar 6 23:58:21 1999 +@@ -149,7 +149,7 @@ SUBDIRS = help @@ -95,9 +157,18 @@ bin_PROGRAMS = gtt ---- gtt/help/C/Makefile.in.orig Tue Feb 2 09:52:57 1999 -+++ gtt/help/C/Makefile.in Tue Feb 2 09:53:05 1999 -@@ -151,7 +151,7 @@ +@@ -163,7 +163,7 @@ + EXTRA_DIST = gtt.desktop + + +-Productivitydir = $(datadir)/gnome/apps/Applications ++Productivitydir = $(datadir)/apps/Applications + Productivity_DATA = gtt.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gtt/help/C/Makefile.in.orig Tue Mar 2 00:27:06 1999 ++++ gtt/help/C/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -152,7 +152,7 @@ EXTRA_DIST = gtt-db.sgml gtt.1 index.html topic.dat @@ -106,43 +177,80 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- mini-utils/gcolorsel/Makefile.in.orig Tue Feb 2 09:55:01 1999 -+++ mini-utils/gcolorsel/Makefile.in Tue Feb 2 09:55:22 1999 -@@ -148,7 +148,7 @@ +--- gtt/help/de/Makefile.in.orig Tue Mar 2 00:27:08 1999 ++++ gtt/help/de/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -149,7 +149,7 @@ + + EXTRA_DIST = topic.dat # gtt-db.sgml index.html + +-gtt_helpdir = $(datadir)/gnome/help/gtt/de ++gtt_helpdir = $(datadir)/help/gtt/de + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- gtt/help/es/Makefile.in.orig Tue Mar 2 00:27:07 1999 ++++ gtt/help/es/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -150,7 +150,7 @@ + EXTRA_DIST = gtt-db.sgml index.html topic.dat + + +-gtt_helpdir = $(datadir)/gnome/help/gtt/es ++gtt_helpdir = $(datadir)/help/gtt/es + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- mini-utils/gcolorsel/Makefile.in.orig Tue Mar 2 00:27:24 1999 ++++ mini-utils/gcolorsel/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,9 +147,9 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - Utilitiesdir = $(datadir)/apps/Utilities +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(prefix)/share/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gcolorsel ---- mini-utils/gfontsel/Makefile.in.orig Tue Feb 2 09:55:26 1999 -+++ mini-utils/gfontsel/Makefile.in Tue Feb 2 09:55:45 1999 -@@ -148,7 +148,7 @@ +--- mini-utils/gfontsel/Makefile.in.orig Tue Mar 2 00:27:23 1999 ++++ mini-utils/gfontsel/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,9 +147,9 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ - Utilitiesdir = $(datadir)/apps/Utilities +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DLOCALEDIR=\"$(prefix)/share/locale\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gfontsel ---- mini-utils/gless/Makefile.in.orig Tue Feb 2 09:55:49 1999 -+++ mini-utils/gless/Makefile.in Tue Feb 2 09:55:57 1999 -@@ -146,7 +146,7 @@ - YACC = @YACC@ +--- mini-utils/gless/Makefile.in.orig Tue Mar 2 00:27:19 1999 ++++ mini-utils/gless/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(prefix)/locale"\" $(GNOME_INCLUDEDIR) ++INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) bin_PROGRAMS = gless ---- mini-utils/gnome-run/Makefile.in.orig Tue Feb 2 09:56:05 1999 -+++ mini-utils/gnome-run/Makefile.in Tue Feb 2 09:56:14 1999 -@@ -146,7 +146,7 @@ - YACC = @YACC@ +@@ -158,7 +158,7 @@ + gless_LDADD = $(GNOME_LIBDIR) $(GTKXMHTML_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) + + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities + Utilities_DATA = gless.desktop + + EXTRA_DIST = gless.desktop +--- mini-utils/gnome-run/Makefile.in.orig Tue Mar 2 00:27:17 1999 ++++ mini-utils/gnome-run/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) @@ -150,9 +258,29 @@ bin_PROGRAMS = gnome-run ---- mini-utils/gshutdown/Makefile.in.orig Tue Feb 2 09:56:38 1999 -+++ mini-utils/gshutdown/Makefile.in Tue Feb 2 09:56:52 1999 -@@ -148,7 +148,7 @@ +@@ -158,7 +158,7 @@ + gnome_run_LDADD = $(GNOME_LIBDIR) $(GTKXMHTML_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) + + +-Rootdir = $(datadir)/gnome/apps ++Rootdir = $(datadir)/apps + Root_DATA = gnome-run.desktop + + EXTRA_DIST = gnome-run.desktop +--- mini-utils/grun/Makefile.in.orig Tue Mar 2 00:27:18 1999 ++++ mini-utils/grun/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -157,7 +157,7 @@ + + grun_LDADD = $(GTK_LIBS) + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../config.h + CONFIG_CLEAN_FILES = +--- mini-utils/gshutdown/Makefile.in.orig Tue Mar 2 00:27:11 1999 ++++ mini-utils/gshutdown/Makefile.in Sat Mar 6 23:59:00 1999 +@@ -149,7 +149,7 @@ SUBDIRS = help @@ -161,9 +289,18 @@ bin_PROGRAMS = gshutdown ---- mini-utils/gshutdown/help/C/Makefile.in.orig Tue Feb 2 09:57:01 1999 -+++ mini-utils/gshutdown/help/C/Makefile.in Tue Feb 2 09:57:09 1999 -@@ -149,7 +149,7 @@ +@@ -163,7 +163,7 @@ + EXTRA_DIST = gshutdown.desktop + + +-Systemdir = $(datadir)/gnome/apps/Settings ++Systemdir = $(datadir)/apps/Settings + System_DATA = gshutdown.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../config.h +--- mini-utils/gshutdown/help/C/Makefile.in.orig Tue Mar 2 00:27:13 1999 ++++ mini-utils/gshutdown/help/C/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -150,7 +150,7 @@ EXTRA_DIST = index.html topic.dat @@ -172,9 +309,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h CONFIG_CLEAN_FILES = ---- mini-utils/gshutdown/help/es/Makefile.in.orig Tue Feb 2 09:57:13 1999 -+++ mini-utils/gshutdown/help/es/Makefile.in Tue Feb 2 09:57:18 1999 -@@ -149,7 +149,7 @@ +--- mini-utils/gshutdown/help/es/Makefile.in.orig Tue Mar 2 00:27:14 1999 ++++ mini-utils/gshutdown/help/es/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -150,7 +150,7 @@ EXTRA_DIST = index.html topic.dat @@ -183,10 +320,21 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h CONFIG_CLEAN_FILES = ---- mini-utils/guname/Makefile.in.orig Tue Feb 2 09:57:24 1999 -+++ mini-utils/guname/Makefile.in Tue Feb 2 09:57:35 1999 -@@ -146,7 +146,7 @@ - YACC = @YACC@ +--- mini-utils/gsu/Makefile.in.orig Tue Mar 2 00:27:25 1999 ++++ mini-utils/gsu/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) ++INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) + + + bin_PROGRAMS = gsu-helper gsu-test +--- mini-utils/guname/Makefile.in.orig Tue Mar 2 00:27:15 1999 ++++ mini-utils/guname/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) $(LIBGTOP_NAMES_INCS) @@ -194,10 +342,19 @@ bin_PROGRAMS = guname ---- mini-utils/gw/Makefile.in.orig Tue Feb 2 09:57:41 1999 -+++ mini-utils/gw/Makefile.in Tue Feb 2 09:57:50 1999 -@@ -146,7 +146,7 @@ - YACC = @YACC@ +@@ -164,7 +164,7 @@ + guname_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(LIBGTOP_NAMES_LIBS) $(LIBGTOP_EXTRA_LIBS) + + +-Rootdir = $(datadir)/gnome/apps/Utilities ++Rootdir = $(datadir)/apps/Utilities + Root_DATA = guname.desktop + + EXTRA_DIST = guname.desktop moreinfo.c moreinfo.h +--- mini-utils/gw/Makefile.in.orig Tue Mar 2 00:27:16 1999 ++++ mini-utils/gw/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) @@ -205,10 +362,19 @@ bin_PROGRAMS = gw ---- mini-utils/idetool/Makefile.in.orig Tue Feb 2 09:59:46 1999 -+++ mini-utils/idetool/Makefile.in Tue Feb 2 09:59:56 1999 -@@ -146,7 +146,7 @@ - YACC = @YACC@ +@@ -158,7 +158,7 @@ + gw_LDADD = $(GNOME_LIBDIR) $(GTKXMHTML_LIBS) $(GNOMEUI_LIBS) $(INTLLIBS) + + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities + Utilities_DATA = gw.desktop + + EXTRA_DIST = gw.desktop +--- mini-utils/idetool/Makefile.in.orig Tue Mar 2 00:27:20 1999 ++++ mini-utils/idetool/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) @@ -216,21 +382,10 @@ bin_PROGRAMS = idetool ---- po/Makefile.in.in.orig Tue Feb 2 10:00:14 1999 -+++ po/Makefile.in.in Tue Feb 2 10:00:25 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 ---- splash/Makefile.in.orig Tue Feb 2 10:00:34 1999 -+++ splash/Makefile.in Tue Feb 2 10:01:06 1999 -@@ -146,7 +146,7 @@ - YACC = @YACC@ +--- splash/Makefile.in.orig Tue Mar 2 00:27:26 1999 ++++ splash/Makefile.in Sat Mar 6 23:57:47 1999 +@@ -147,7 +147,7 @@ + ZVT_LIBS = @ZVT_LIBS@ l = @l@ -INCLUDES = -I$(includedir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(GNOME_INCLUDEDIR) @@ -238,12 +393,3 @@ bin_PROGRAMS = splash splac ---- po/POTFILES.in.orig Tue Feb 2 14:01:12 1999 -+++ po/POTFILES.in Tue Feb 2 14:09:00 1999 -@@ -22,6 +22,5 @@ - mini-utils/gshutdown/gshutdown.c - mini-utils/guname/guname.c - mini-utils/guname/info.c --mini-utils/guname/moreinfo.c - mini-utils/gw/gw.c - mini-utils/idetool/idetool.c diff -urN -x CVS /usr/ports.ref/misc/gnomeutils/patches/patch-ae ./patches/patch-ae --- /usr/ports.ref/misc/gnomeutils/patches/patch-ae Tue Feb 2 14:10:48 1999 +++ ./patches/patch-ae Sun Mar 7 00:28:55 1999 @@ -1,22 +1,21 @@ ---- mini-utils/Makefile.in.orig Mon Feb 1 08:35:02 1999 -+++ mini-utils/Makefile.in Tue Feb 2 16:46:07 1999 -@@ -148,7 +148,7 @@ +--- mini-utils/Makefile.in.orig Tue Mar 2 23:22:46 1999 ++++ mini-utils/Makefile.in Tue Mar 2 23:23:10 1999 +@@ -151,7 +151,7 @@ - @MU_IDETOOL_TRUE@idetool = idetool + @FALSE_TRUE@gsu = gsu --SUBDIRS = gshutdown guname gw gnome-run grun gless $(idetool) gpenguin gfontsel gcolorsel -+SUBDIRS = gshutdown gw gnome-run grun gless $(idetool) gfontsel gcolorsel +-SUBDIRS = gshutdown guname gw gnome-run grun gless $(idetool) gpenguin gfontsel gcolorsel $(gsu) ++SUBDIRS = gshutdown gw gnome-run grun gless $(idetool) gfontsel gcolorsel $(gsu) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h -@@ -160,8 +160,8 @@ - - TAR = tar +@@ -164,7 +164,7 @@ + TAR = gtar GZIP_ENV = --best -DIST_SUBDIRS = gshutdown guname gw gnome-run grun gless idetool \ --gpenguin gfontsel gcolorsel +-gpenguin gfontsel gcolorsel gsu +DIST_SUBDIRS = gshutdown gw gnome-run grun gless idetool \ -+gfontsel gcolorsel ++gfontsel gcolorsel gsu all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) diff -urN -x CVS /usr/ports.ref/misc/gnomeutils/pkg/PLIST ./pkg/PLIST --- /usr/ports.ref/misc/gnomeutils/pkg/PLIST Tue Feb 2 14:10:48 1999 +++ ./pkg/PLIST Sun Mar 7 00:25:01 1999 @@ -15,10 +15,11 @@ bin/splac bin/splash share/gnome/apps/Applications/ghex.desktop -share/gnome/apps/Productivity/gtt.desktop -share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/Settings/gshutdown.desktop share/gnome/apps/Utilities/gcalc.desktop share/gnome/apps/Utilities/gcolorsel.desktop +share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop @@ -39,6 +40,10 @@ share/gnome/help/gstripchart/C/topic.dat share/gnome/help/gtt/C/index.html share/gnome/help/gtt/C/topic.dat +share/gnome/help/gtt/de/index.html +share/gnome/help/gtt/de/topic.dat +share/gnome/help/gtt/es/index.html +share/gnome/help/gtt/es/topic.dat share/gnome/pixmaps/gnome-ghex.png share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/de/LC_MESSAGES/gnome-utils.mo @@ -46,20 +51,24 @@ share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo +share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/gstripchart -@dirrm share/gnome/help/ghex/C -@dirrm share/gnome/help/ghex/es -@dirrm share/gnome/help/ghex -@dirrm share/gnome/help/gshutdown/C -@dirrm share/gnome/help/gshutdown/es -@dirrm share/gnome/help/gshutdown -@dirrm share/gnome/help/gstripchart/C -@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gtt/es +@dirrm share/gnome/help/gtt/de @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C +@dirrm share/gnome/help/gstripchart +@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C +@dirrm share/gnome/help/gshutdown +@dirrm share/gnome/help/ghex/es +@dirrm share/gnome/help/ghex/C +@dirrm share/gnome/help/ghex +@dirrm share/gnome/gstripchart >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message