From owner-freebsd-ports Sat Mar 6 15:40: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 BDD1714EA2 for ; Sat, 6 Mar 1999 15:40:15 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id PAA97674; Sat, 6 Mar 1999 15:40: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 4E29C152CF for ; Sat, 6 Mar 1999 15:31:08 -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 BAA42496; Sun, 7 Mar 1999 01:30:46 +0200 (SAT) (envelope-from reg) Message-Id: <199903062330.BAA42496@shale.csir.co.za> Date: Sun, 7 Mar 1999 01:30:46 +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/10445: Port update: sysutils/gnomeadmin Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10445 >Category: ports >Synopsis: Port update: sysutils/gnomeadmin >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 15:40: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 gnome-admin-1.0.1. >How-To-Repeat: Same old story... Removes patch-ae (no longer needed). >Fix: diff -urN -x CVS /usr/ports.ref/sysutils/gnomeadmin/Makefile ./Makefile --- /usr/ports.ref/sysutils/gnomeadmin/Makefile Tue Feb 2 14:14:47 1999 +++ ./Makefile Sun Mar 7 01:11:43 1999 @@ -1,24 +1,24 @@ # New ports collection makefile for: gnomeadmin -# Version required: 0.99.1 +# Version required: 1.0.1 # Date created: 03 July 1998 # Whom: Yukihiro Nakai # # $Id: Makefile,v 1.4 1999/02/02 09:54:02 vanilla Exp $ # -DISTNAME= gnome-admin-0.99.1 -PKGNAME= gnomeadmin-0.99.1 +DISTNAME= gnome-admin-1.0.1 +PKGNAME= gnomeadmin-1.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-admin +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= obgnome.0:${PORTSDIR}/lang/gnomeobjc +LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc # implict dependencies -# gettext, gtk11-devel, gnomelibs +# gettext, gtk12, gnomelibs USE_X_PREFIX= yes USE_GMAKE= yes @@ -27,7 +27,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: diff -urN -x CVS /usr/ports.ref/sysutils/gnomeadmin/files/md5 ./files/md5 --- /usr/ports.ref/sysutils/gnomeadmin/files/md5 Tue Feb 2 14:14:47 1999 +++ ./files/md5 Sun Mar 7 01:12:10 1999 @@ -1 +1 @@ -MD5 (gnome-admin-0.99.1.tar.gz) = 99c9dca205b5538fcdf45f7a65e38acb +MD5 (gnome-admin-1.0.1.tar.gz) = 233c773ab5ba4e00c27ac2f68d0a152b diff -urN -x CVS /usr/ports.ref/sysutils/gnomeadmin/patches/patch-aa ./patches/patch-aa --- /usr/ports.ref/sysutils/gnomeadmin/patches/patch-aa Tue Feb 2 14:14:47 1999 +++ ./patches/patch-aa Sun Mar 7 01:27:12 1999 @@ -1,30 +1,11 @@ ---- 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" +--- configure.orig Tue Mar 2 00:05:30 1999 ++++ configure Sun Mar 7 01:27:00 1999 +@@ -2633,44 +2633,6 @@ + PTHREAD_LIB="-lpthreads" 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 +-echo "configure:2638: 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 @@ -32,7 +13,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lc_r $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +-if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -61,23 +42,34 @@ - PTHREAD_LIB="-lc_r" -else - echo "$ac_t""no" 1>&6 --fi -- + echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 + echo "configure:2676: checking for pthread_create" >&5 + if eval "test \"`echo '$''{'ac_cv_func_pthread_create'+set}'`\" = set"; then +@@ -2722,9 +2684,6 @@ + fi +- +-fi +- -@@ -2657,10 +2617,10 @@ - OBJECTIVE_C=$ac_cv_prog_objc_works + fi +@@ -3421,7 +3380,7 @@ -- 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 - else - echo "$ac_t""not found" 1>&6 + echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 + echo "configure:3424: 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 +@@ -4690,7 +4649,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/gnomeadmin/patches/patch-ab ./patches/patch-ab --- /usr/ports.ref/sysutils/gnomeadmin/patches/patch-ab Tue Feb 2 14:14:47 1999 +++ ./patches/patch-ab Wed Mar 3 13:45:35 1999 @@ -1,54 +1,20 @@ ---- 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" -+ major="$current" -+ if [ $PORTOBJFORMAT = elf ]; then -+ versuffix="$current"; -+ else -+ versuffix="$current.$revision"; -+ fi -+ ;; -+ - *) - # 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 @@ +--- ltconfig.orig Thu Feb 25 02:24:15 1999 ++++ ltconfig Wed Mar 3 13:45:22 1999 +@@ -1225,7 +1225,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' +@@ -1661,7 +1661,7 @@ + shlibpath_var=PATH ;; -freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos -- 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 -+ ;; -+ +freebsd*) -+ version_type=freebsd -+ library_names_spec='$libname.so.$versuffix $libname.so' -+ if [ $PORTSOBJFORMAT = 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/gnomeadmin/patches/patch-ac ./patches/patch-ac --- /usr/ports.ref/sysutils/gnomeadmin/patches/patch-ac Tue Feb 2 14:14:47 1999 +++ ./patches/patch-ac Wed Mar 3 14:19:31 1999 @@ -1,11 +1,22 @@ ---- 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 +--- gulp/Makefile.in.orig Wed Mar 3 14:17:33 1999 ++++ gulp/Makefile.in Wed Mar 3 14:18:35 1999 +@@ -124,7 +124,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-Admindir = $(datadir)/gnome/apps/Administration ++Admindir = $(datadir)/apps/Administration + + INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) + +--- logview/Makefile.in.orig Wed Mar 3 14:17:10 1999 ++++ logview/Makefile.in Wed Mar 3 14:19:16 1999 +@@ -124,7 +124,7 @@ + ZVT_LIBS = @ZVT_LIBS@ + l = @l@ + +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities + pixmapsdir = $(datadir)/pixmaps/logview + additionaldir = $(datadir)/logview + diff -urN -x CVS /usr/ports.ref/sysutils/gnomeadmin/patches/patch-ad ./patches/patch-ad --- /usr/ports.ref/sysutils/gnomeadmin/patches/patch-ad Tue Oct 20 18:30:45 1998 +++ ./patches/patch-ad Wed Mar 3 13:55:17 1999 @@ -1,26 +1,33 @@ ---- logview/actions.c.orig Thu Oct 15 21:06:01 1998 -+++ logview/actions.c Thu Oct 15 21:06:09 1998 -@@ -1,6 +1,6 @@ +--- logview/actions.c.orig Sun Feb 14 22:44:06 1999 ++++ logview/actions.c Wed Mar 3 13:52:57 1999 +@@ -1,7 +1,11 @@ #include "logview.h" #include --#include + #include ++#ifdef __FreeBSD__ +#include ++#else + #include ++#endif + #include + #include - #define MAX_NUM_MATCHES 10 - #define DELIM ":" ---- logview/desc_db.c.orig Thu Oct 15 21:06:28 1998 -+++ logview/desc_db.c Thu Oct 15 21:06:35 1998 -@@ -1,6 +1,6 @@ +--- logview/desc_db.c.orig Thu Jan 7 18:59:45 1999 ++++ logview/desc_db.c Wed Mar 3 13:53:43 1999 +@@ -1,6 +1,10 @@ #include "logview.h" #include --#include ++#ifdef __FreeBSD__ +#include ++#else + #include ++#endif + #include #define MAX_NUM_MATCHES 10 - #define DELIM ":" ---- logview/logrtns.c.orig Thu Oct 15 20:49:17 1998 -+++ logview/logrtns.c Thu Oct 15 21:14:25 1998 -@@ -578,6 +578,7 @@ +--- logview/logrtns.c.orig Sun Feb 14 22:44:06 1999 ++++ logview/logrtns.c Wed Mar 3 13:51:43 1999 +@@ -580,6 +580,7 @@ DateMark *curmark; struct stat filestat; struct tm *tmptm, footm; @@ -28,7 +35,7 @@ /* Clear struct. */ log->lstats.startdate = 0; -@@ -666,6 +667,7 @@ +@@ -668,6 +669,7 @@ is the date last accessed */ curdate = filestat.st_mtime; tmptm = localtime (&curdate); @@ -36,14 +43,15 @@ thisyear = tmptm->tm_year; lastyear = offsetyear; footm.tm_sec = footm.tm_mon = 0; ---- logview/logrtns.h.orig Thu Oct 15 21:10:20 1998 -+++ logview/logrtns.h Thu Oct 15 21:10:28 1998 -@@ -24,7 +24,7 @@ +--- logview/logrtns.h.orig Wed Feb 11 23:02:18 1998 ++++ logview/logrtns.h Wed Mar 3 13:55:00 1999 +@@ -24,7 +24,9 @@ #include #include #include --#include -+//#include ++#ifndef __FreeBSD__ + #include ++#endif #include #include "logview.h" diff -urN -x CVS /usr/ports.ref/sysutils/gnomeadmin/patches/patch-ae ./patches/patch-ae --- /usr/ports.ref/sysutils/gnomeadmin/patches/patch-ae Tue Feb 2 14:14:48 1999 +++ ./patches/patch-ae Wed Mar 3 13:57:17 1999 @@ -1,11 +0,0 @@ ---- 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); - - /* ---------------------------------------------------------------------- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message