Date: Sun, 31 Jan 1999 01:37:40 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/9823: Port upgrade: gnomeadmin Message-ID: <199901302337.BAA70566@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 9823
>Category: ports
>Synopsis: Port upgrade: gnomeadmin
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 30 15:40:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 3.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
Update to gnome-admin-0.99.1. Remove patch-ac, -ae, -af and add
patch-ag, -ah. Support 4.0-CURRENT.
>Description:
>How-To-Repeat:
>Fix:
diff -urN gnomeadmin.old/Makefile gnomeadmin/Makefile
--- gnomeadmin.old/Makefile Wed Jan 27 10:31:52 1999
+++ gnomeadmin/Makefile Wed Jan 27 13:03:19 1999
@@ -1,31 +1,33 @@
# New ports collection makefile for: gnomeadmin
-# Version required: 0.30
+# Version required: 0.99.1
# Date created: 03 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $Id: Makefile,v 1.3 1999/01/27 08:31:52 fenner Exp $
#
-DISTNAME= gnome-admin-0.30
-PKGNAME= gnomeadmin-0.30
-CATEGORIES= sysutils
+DISTNAME= gnome-admin-0.99.1
+PKGNAME= gnomeadmin-0.99.1
+CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= gnome-admin
MAINTAINER= nacai@iname.com
-LIB_DEPENDS= gnome.0:${PORTSDIR}/x11/gnomelibs
+RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS= obgnome.0:${PORTSDIR}/lang/gnomeobjc
-BROKEN= "Need to upgrade to latest version"
+# implict dependencies
+# gettext, gtk11-devel, gnomelibs
USE_X_PREFIX= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome \
--with-gnome=${X11BASE}
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \
- -I${X11BASE}/include" \
- GTK_CONFIG="${X11BASE}/bin/gtk11-config" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
post-install:
diff -urN gnomeadmin.old/files/md5 gnomeadmin/files/md5
--- gnomeadmin.old/files/md5 Tue Oct 20 18:30:45 1998
+++ gnomeadmin/files/md5 Sat Jan 16 18:43:25 1999
@@ -1 +1 @@
-MD5 (gnome-admin-0.30.tar.gz) = 5cfda7759c6aaab42b9e01defe626cd6
+MD5 (gnome-admin-0.99.1.tar.gz) = 99c9dca205b5538fcdf45f7a65e38acb
diff -urN gnomeadmin.old/patches/patch-aa gnomeadmin/patches/patch-aa
--- gnomeadmin.old/patches/patch-aa Tue Oct 20 18:30:45 1998
+++ gnomeadmin/patches/patch-aa Sun Jan 31 01:21:58 1999
@@ -1,40 +1,83 @@
---- configure.orig Wed Oct 14 00:28:03 1998
-+++ configure Wed Oct 14 00:28:41 1998
-@@ -926,12 +926,12 @@
+--- configure.orig Sun Jan 3 23:56:16 1999
++++ configure Sun Jan 31 01:21:29 1999
+@@ -1077,13 +1077,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:1082: 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:1082: 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
+@@ -1975,46 +1975,6 @@
+ PTHREAD_LIB="-lpthread"
+ else
+ echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:1980: checking for pthread_create in -lc_r" >&5
+-ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lc_r $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1988 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char pthread_create();
+-
+-int main() {
+-pthread_create()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- PTHREAD_LIB="-lc_r"
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+ 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:931: 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:931: 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
-+ echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
-
- else
- echo "$ac_t""not found" 1>&6
---- gxsnmp/configure.orig Wed Oct 14 00:31:35 1998
-+++ gxsnmp/configure Wed Oct 14 00:32:14 1998
-@@ -1111,12 +1111,12 @@
+
+@@ -2657,10 +2617,10 @@
+ OBJECTIVE_C=$ac_cv_prog_objc_works
- if test "$no_gnome_config" = "yes"; then
-- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1116: 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:1116: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+ if test -f $prefix/share/gnome/gnomeConf.sh; then
+- echo $ac_n "checking for obGnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
+-echo "configure:2662: 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:2662: 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
-- echo "loading gnome configuration from $gnome_prefix/gnomeConf.sh"
-- . $gnome_prefix/gnomeConf.sh
-+ echo "loading gnome configuration from $prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
-
- else
+ else
echo "$ac_t""not found" 1>&6
diff -urN gnomeadmin.old/patches/patch-ab gnomeadmin/patches/patch-ab
--- gnomeadmin.old/patches/patch-ab Thu Jan 28 23:31:43 1999
+++ gnomeadmin/patches/patch-ab Sun Jan 31 01:18:54 1999
@@ -1,8 +1,8 @@
---- ltmain.sh.orig Fri Sep 25 23:20:20 1998
-+++ ltmain.sh Wed Oct 14 00:29:08 1998
-@@ -923,6 +923,16 @@
- versuffix="$current.$revision"
+--- ltmain.sh.orig Sun Jan 3 23:56:14 1999
++++ ltmain.sh Sat Jan 16 18:53:22 1999
+@@ -1792,6 +1792,16 @@
;;
+ -*) ;;
+ freebsd)
+ version_vars="$version_vars major versuffix"
@@ -15,18 +15,28 @@
+ ;;
+
*)
- $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 Fri Sep 25 23:20:20 1998
-+++ ltconfig Wed Oct 14 00:30:41 1998
-@@ -1105,10 +1105,21 @@
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''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'
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+--- ltconfig.orig Sun Jan 3 23:56:14 1999
++++ ltconfig Sun Jan 31 01:18:24 1999
+@@ -823,7 +823,7 @@
+ ;;
+
+ # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+- freebsd3*)
++ freebsd3* | freebsd4*)
+ archive_cmds='$CC -shared -o $lib$libobjs'
+ 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'
;;
-freebsd2* | freebsd3*)
+freebsd2*)
version_type=sunos
- library_names_spec='$libname.so.$versuffix $libname.so'
+- library_names_spec='${libname}${release}.so$versuffix $libname.so'
++ library_names_spec='$libname.so.$versuffix $libname.so'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
diff -urN gnomeadmin.old/patches/patch-ac gnomeadmin/patches/patch-ac
--- gnomeadmin.old/patches/patch-ac Tue Oct 20 18:30:45 1998
+++ gnomeadmin/patches/patch-ac Mon Jan 18 10:47:56 1999
@@ -1,13 +0,0 @@
---- gxsnmp/app/Makefile.in.orig Wed Oct 14 00:33:10 1998
-+++ gxsnmp/app/Makefile.in Wed Oct 14 00:33:33 1998
-@@ -171,8 +171,8 @@
- BUILT_SOURCES = c_parser.h
-
- INCLUDES = \
-- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-- -DLOCALEDIR=\"$(datadir)/locale\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-+ -DLOCALEDIR=\"$(prefix)/share/locale\" \
- $(X_CFLAGS) \
- $(GNOME_INCLUDEDIR) \
- -I$(top_srcdir) \
diff -urN gnomeadmin.old/patches/patch-ae gnomeadmin/patches/patch-ae
--- gnomeadmin.old/patches/patch-ae Tue Oct 20 18:30:45 1998
+++ gnomeadmin/patches/patch-ae Mon Jan 18 10:48:06 1999
@@ -1,53 +0,0 @@
---- gxsnmp/Makefile.in.orig Wed Oct 14 01:22:04 1998
-+++ gxsnmp/Makefile.in Wed Oct 14 01:22:12 1998
-@@ -105,7 +105,7 @@
-
- Admindir = $(datadir)/apps/Administration
-
--SUBDIRS = po intl lib widgets app plugins pixmaps database docs #collector
-+SUBDIRS = po intl lib widgets app plugins pixmaps database #collector
-
- EXTRA_DIST = Agents TODO gxsnmpgtkrc \
- BUGS mib.txt.README gxsnmp.desktop
---- gxsnmp/plugins/sample/Makefile.in.orig Wed Oct 14 01:14:53 1998
-+++ gxsnmp/plugins/sample/Makefile.in Wed Oct 14 01:15:07 1998
-@@ -103,7 +103,7 @@
- YACC = @YACC@
- l = @l@
-
--plugindir = $(libdir)/gxsnmp/plugins
-+plugindir = $(datadir)/gxsnmp/plugins
-
- plugin_LTLIBRARIES = libsample.la
-
---- gxsnmp/app/browser.c.orig Wed Oct 14 01:00:52 1998
-+++ gxsnmp/app/browser.c Wed Oct 14 01:05:53 1998
-@@ -560,7 +560,7 @@
- obj = (SNMP_OBJECT *)objs->data;
- host->root_length = obj->id_len;
- memcpy(host->root, obj->id,
-- host->root_length * sizeof(ulong));
-+ host->root_length * sizeof(gulong));
- g_async_getnext(&host->hl_snmp, objs);
-
- }
-@@ -705,7 +705,7 @@
- {
- myhost->name_length = obj->id_len;
- memcpy(myhost->name, obj->id,
-- myhost->name_length * sizeof(ulong));
-+ myhost->name_length * sizeof(gulong));
- g_snmp_printf (buf, sizeof(buf), objs->data);
-
- gtk_entry_set_text (GTK_ENTRY (app_info->brows_panel->mib_value),
---- gxsnmp/app/rmon_panel.c.orig Wed Oct 14 01:11:49 1998
-+++ gxsnmp/app/rmon_panel.c Wed Oct 14 01:12:18 1998
-@@ -239,7 +239,7 @@
- nobj->request = 0;
- nobj->type = SNMP_NULL;
- nobj->id_len = obj->id_len;
-- g_memmove(nobj->id, obj->id, obj->id_len * sizeof(ulong));
-+ g_memmove(nobj->id, obj->id, obj->id_len * sizeof(gulong));
- nobjs = g_slist_append(nobjs, nobj);
- j++;
- }
diff -urN gnomeadmin.old/patches/patch-af gnomeadmin/patches/patch-af
--- gnomeadmin.old/patches/patch-af Fri Oct 23 16:25:51 1998
+++ gnomeadmin/patches/patch-af Mon Jan 18 10:48:12 1999
@@ -1,11 +0,0 @@
---- gxsnmp/app/plugins.c.orig Fri Oct 23 22:01:10 1998
-+++ gxsnmp/app/plugins.c Fri Oct 23 22:01:22 1998
-@@ -141,7 +141,7 @@
- g_free (plugin_dir);
-
- /* Load the system plugins */
-- plugin_dir = gnome_unconditional_libdir_file ("gxsnmp/plugins/");
-+ plugin_dir = gnome_unconditional_datadir_file ("gxsnmp/plugins/");
- plugin_load_plugins_in_dir (plugin_dir);
- g_free (plugin_dir);
- }
diff -urN gnomeadmin.old/patches/patch-ag gnomeadmin/patches/patch-ag
--- gnomeadmin.old/patches/patch-ag Thu Jan 1 02:00:00 1970
+++ gnomeadmin/patches/patch-ag Sat Jan 16 19:59:10 1999
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Sat Jan 16 19:57:59 1999
++++ po/Makefile.in.in Sat Jan 16 19:58:43 1999
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff -urN gnomeadmin.old/patches/patch-ah gnomeadmin/patches/patch-ah
--- gnomeadmin.old/patches/patch-ah Thu Jan 1 02:00:00 1970
+++ gnomeadmin/patches/patch-ah Fri Jan 22 15:45:33 1999
@@ -0,0 +1,11 @@
+--- logview/actions.c.orig Fri Jan 22 15:41:42 1999
++++ logview/actions.c Fri Jan 22 15:44:11 1999
+@@ -83,7 +83,7 @@
+ swin = gtk_scrolled_window_new (NULL, NULL);
+ gtk_container_add (GTK_CONTAINER (swin), GTK_WIDGET (ctree));
+ gtk_ctree_set_line_style (ctree, GTK_CTREE_LINES_DOTTED);
+- gtk_ctree_set_reorderable (ctree, TRUE);
++ gtk_clist_set_reorderable (ctree, TRUE);
+ gtk_widget_set_usize (GTK_WIDGET (ctree), -1, 300);
+
+ /* ----------------------------------------------------------------------
diff -urN gnomeadmin.old/pkg/PLIST gnomeadmin/pkg/PLIST
--- gnomeadmin.old/pkg/PLIST Tue Oct 20 18:30:46 1998
+++ gnomeadmin/pkg/PLIST Sat Jan 16 20:06:14 1999
@@ -1,67 +1,19 @@
-bin/gxsnmp
+bin/gulp
bin/logview
-etc/mib.txt
-lib/libgtkext.a
-lib/libgtkext.la
-lib/libgtkext.so
-lib/libgtkext.so.1
-lib/libgxsnmp.a
-lib/libgxsnmp.la
-lib/libgxsnmp.so
-lib/libgxsnmp.so.1.1
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-share/gnome/apps/Administration/gxsnmp.desktop
+share/gnome/apps/Administration/gulp.desktop
share/gnome/apps/Utilities/logview.desktop
-share/gnome/gxsnmp/database/capability.table
-share/gnome/gxsnmp/database/caplist.table
-share/gnome/gxsnmp/database/collect.table
-share/gnome/gxsnmp/database/h_services.table
-share/gnome/gxsnmp/database/history.table
-share/gnome/gxsnmp/database/host.table
-share/gnome/gxsnmp/database/link.table
-share/gnome/gxsnmp/database/linkgroup.table
-share/gnome/gxsnmp/database/linkgrplist.table
-share/gnome/gxsnmp/database/linktext.table
-share/gnome/gxsnmp/database/network.table
-share/gnome/gxsnmp/database/nodegroup.table
-share/gnome/gxsnmp/database/nodegrplist.table
-share/gnome/gxsnmp/database/nodetext.table
-share/gnome/gxsnmp/database/snmp.table
-share/gnome/gxsnmp/plugins/libsample.a
-share/gnome/gxsnmp/plugins/libsample.la
-share/gnome/gxsnmp/plugins/libsample.so
-share/gnome/gxsnmp/plugins/libsample.so.0
share/gnome/logview/logview-actions.db
share/gnome/logview/logview-descript.db
share/gnome/logview/logview-regexp.db
-share/gnome/pixmaps/add_host.xpm
-share/gnome/pixmaps/db_node.xpm
-share/gnome/pixmaps/del_host.xpm
-share/gnome/pixmaps/desktop.xpm
-share/gnome/pixmaps/exit.xpm
-share/gnome/pixmaps/host_list.xpm
-share/gnome/pixmaps/logo_h.xpm
-share/gnome/pixmaps/logo_v.xpm
-share/gnome/pixmaps/net_list.xpm
-share/gnome/pixmaps/page.xpm
-share/gnome/pixmaps/server_node.xpm
-share/gnome/pixmaps/toolbox.xpm
share/gnome/pixmaps/logview/logview.xpm
+share/locale/ca/LC_MESSAGES/gnome-admin.mo
share/locale/de/LC_MESSAGES/gnome-admin.mo
-share/locale/de/LC_MESSAGES/gxsnmp.mo
share/locale/es/LC_MESSAGES/gnome-admin.mo
-share/locale/es/LC_MESSAGES/gxsnmp.mo
share/locale/fr/LC_MESSAGES/gnome-admin.mo
-share/locale/fr/LC_MESSAGES/gxsnmp.mo
share/locale/ga/LC_MESSAGES/gnome-admin.mo
share/locale/it/LC_MESSAGES/gnome-admin.mo
share/locale/no/LC_MESSAGES/gnome-admin.mo
-share/locale/no/LC_MESSAGES/gxsnmp.mo
share/locale/pt/LC_MESSAGES/gnome-admin.mo
share/locale/sv/LC_MESSAGES/gnome-admin.mo
@dirrm share/gnome/pixmaps/logview
@dirrm share/gnome/logview
-@dirrm share/gnome/gxsnmp/plugins
-@dirrm share/gnome/gxsnmp/database
-@dirrm share/gnome/gxsnmp
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901302337.BAA70566>