From owner-freebsd-ports Sat Jan 30 14:10:05 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id OAA22751 for freebsd-ports-outgoing; Sat, 30 Jan 1999 14:10:05 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id OAA22714 for ; Sat, 30 Jan 1999 14:10:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id OAA57781; Sat, 30 Jan 1999 14:10: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 (8.8.8/8.8.8) with ESMTP id OAA21937 for ; Sat, 30 Jan 1999 14:05:30 -0800 (PST) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by shale.csir.co.za (8.9.2/8.9.2) id AAA32306; Sun, 31 Jan 1999 00:05:19 +0200 (SAT) (envelope-from reg) Message-Id: <199901302205.AAA32306@shale.csir.co.za> Date: Sun, 31 Jan 1999 00:05:19 +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/9816: Port update: gnomecontrolcenter Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9816 >Category: ports >Synopsis: Port update: gnomecontrolcenter >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 14:10:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Jeremy Lea >Release: FreeBSD 3.0-CURRENT i386 >Organization: Arb's Inc. >Environment: FreeBSD Ports collection >Description: Update to control-center-0.99.3.1. Remove impilict depends. Cleanup CONFIGURE_ENV. Support 4.0-CURRENT. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /usr/home/ncvs/ports/sysutils/gnomecontrolcenter/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 1999/01/27 08:31:52 1.4 +++ Makefile 1999/01/27 11:04:09 @@ -1,33 +1,33 @@ # New ports collection makefile for: control-center -# Version required: 0.99.1 +# Version required: 0.99.3.1 # Date created: 29 Dec 1998 # Whom: Vanilla I. Shu # # $Id: Makefile,v 1.4 1999/01/27 08:31:52 fenner Exp $ # -DISTNAME= control-center-0.99.1 -PKGNAME= gnomecontrolcenter-0.99.1 -CATEGORIES= sysutils +DISTNAME= control-center-0.99.3.1 +PKGNAME= gnomecontrolcenter-0.99.3.1 +CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= control-center MAINTAINER= vanilla@FreeBSD.ORG +BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs +# implicit dependencies +# gettext, esound, imlib, xpm, 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" \ - CXXFLAGS="${CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ - GLIB_CONFIG="${X11BASE}/bin/glib11d-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: Index: files/md5 =================================================================== RCS file: /usr/home/ncvs/ports/sysutils/gnomecontrolcenter/files/md5,v retrieving revision 1.2 diff -u -r1.2 md5 --- md5 1999/01/17 12:49:48 1.2 +++ md5 1999/01/23 15:57:33 @@ -1 +1 @@ -MD5 (control-center-0.99.1.tar.gz) = 1702d8b3ad2c09c4fe5b4f047f79fe95 +MD5 (control-center-0.99.3.1.tar.gz) = 38cba87ac9c5e7c2936029c33bdfdd74 Index: patches/patch-aa =================================================================== RCS file: /usr/home/ncvs/ports/sysutils/gnomecontrolcenter/patches/patch-aa,v retrieving revision 1.2 diff -u -r1.2 patch-aa --- patch-aa 1999/01/17 12:49:48 1.2 +++ patch-aa 1999/01/23 15:59:31 @@ -1,14 +1,14 @@ ---- configure.orig Thu Jan 7 05:48:54 1999 -+++ configure Sun Jan 17 19:13:10 1999 -@@ -1091,13 +1091,13 @@ +--- configure.orig Wed Jan 20 19:50:27 1999 ++++ configure Sat Jan 23 17:59:06 1999 +@@ -1097,13 +1097,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:1096: checking for gnomeConf.sh file in $gnome_prefix" >&5 +-echo "configure:1102: 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:1096: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 ++echo "configure:1102: 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" \ Index: patches/patch-ab =================================================================== RCS file: /usr/home/ncvs/ports/sysutils/gnomecontrolcenter/patches/patch-ab,v retrieving revision 1.4 diff -u -r1.4 patch-ab --- patch-ab 1999/01/28 21:31:43 1.4 +++ patch-ab 1999/01/30 21:26:29 @@ -1,43 +1,20 @@ ---- ltmain.sh.orig Thu Jan 7 05:48:40 1999 -+++ ltmain.sh Sun Jan 17 19:14:20 1999 -@@ -1030,6 +1030,15 @@ - versuffix=".$current.$revision" - ;; +--- ltconfig.orig Sat Jan 30 23:25:55 1999 ++++ ltconfig Sat Jan 30 23:26:15 1999 +@@ -1201,7 +1201,7 @@ + ;; -+ freebsd) -+ 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 Thu Jan 7 05:48:40 1999 -+++ ltconfig Sun Jan 17 19:14:58 1999 -@@ -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' + # FreeBSD 3, at last, uses gcc -shared to do shared libraries. +- freebsd3*) ++ freebsd3* | freebsd4*) + archive_cmds='$CC -shared -o $lib$libobjs$deplibs' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -1606,7 +1606,7 @@ + shlibpath_var=PATH ;; -freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos ++freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat library_names_spec='${libname}${release}.so$versuffix $libname.so' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd3* | freebsd4*) -+ 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 - ;; - Index: patches/patch-ac =================================================================== RCS file: /usr/home/ncvs/ports/sysutils/gnomecontrolcenter/patches/patch-ac,v retrieving revision 1.3 diff -u -r1.3 patch-ac --- patch-ac 1999/01/15 18:25:34 1.3 +++ patch-ac 1999/01/23 16:05:53 @@ -1,12 +1,12 @@ ---- capplets/background-properties/Makefile.in.orig Tue Jan 5 19:21:12 1999 -+++ capplets/background-properties/Makefile.in Tue Jan 5 19:21:30 1999 -@@ -124,7 +124,7 @@ +--- capplets/background-properties/Makefile.in.orig Wed Jan 20 19:56:31 1999 ++++ capplets/background-properties/Makefile.in Sat Jan 23 18:02:52 1999 +@@ -131,7 +131,7 @@ INCLUDES = \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../control-center \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS) bin_PROGRAMS =background-properties-capplet --- capplets/bell-properties/Makefile.in.orig Tue Jan 5 19:21:38 1999 @@ -53,29 +53,17 @@ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = mouse-properties-capplet ---- capplets/screensaver-properties/Makefile.in.orig Wed Dec 16 08:32:57 1998 -+++ capplets/screensaver-properties/Makefile.in Fri Jan 15 04:08:52 1999 -@@ -124,7 +124,7 @@ +--- capplets/screensaver-properties/Makefile.in.orig Wed Jan 20 19:56:23 1999 ++++ capplets/screensaver-properties/Makefile.in Sat Jan 23 18:02:16 1999 +@@ -131,7 +131,7 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../control-center \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) $(GNOME_INCLUDEDIR) $(IMLIB_CFLAGS) bin_PROGRAMS = screensaver-properties-capplet -@@ -139,9 +139,9 @@ - parser.h - - screensaver_properties_capplet_LDADD = ../../control-center/libcapplet.la \ -- $(GNOME_LIBDIR) $(ORB_LIBS) \ -+ $(GNOME_LIBDIR) $(ORB_LIBS) -lImlib \ - $(GNOMEUI_LIBS) $(INTLLIBS) \ -- -lImlib -lgnorba -+ -lgnorba - - EXTRA_DIST = screensaver-properties.desktop - --- capplets/sound-properties/Makefile.in.orig Tue Jan 5 19:23:24 1999 +++ capplets/sound-properties/Makefile.in Tue Jan 5 19:23:34 1999 @@ -124,7 +124,7 @@ Index: pkg/PLIST =================================================================== RCS file: /usr/home/ncvs/ports/sysutils/gnomecontrolcenter/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- PLIST 1999/01/05 13:12:01 1.1.1.1 +++ PLIST 1999/01/16 21:33:30 @@ -1,5 +1,5 @@ bin/background-properties-capplet -bin/bell-properties +bin/bell-properties-capplet bin/e-conf bin/gnomecc bin/keyboard-properties @@ -90,8 +90,11 @@ share/gnome/control-center/.data/Xlyap.desktop share/gnome/control-center/.data/Xroger.desktop share/gnome/control-center/.data/ant.png +share/gnome/control-center/.data/bouboule.png share/gnome/control-center/.data/deco.png +share/gnome/control-center/.data/laser.png share/gnome/control-center/.data/qix.png +share/gnome/control-center/.data/starfish.png share/gnome/control-center/.directory share/gnome/control-center/Appearances/.directory share/gnome/control-center/Appearances/theme-selector.desktop @@ -107,12 +110,7 @@ share/gnome/control-center/Multimedia/sound-properties.desktop share/gnome/control-center/WindowManager/.directory share/gnome/control-center/Workspace/.directory -share/gnome/control-center/Workspace/Enlightenment/.directory -share/gnome/control-center/Workspace/Enlightenment/e-colors.desktop -share/gnome/control-center/Workspace/Enlightenment/e-conf.desktop -share/gnome/control-center/Workspace/Enlightenment/e-desks.desktop -share/gnome/control-center/Workspace/Enlightenment/e-fonts.desktop -share/gnome/control-center/Workspace/Enlightenment/e-sound.desktop +share/gnome/control-center/Workspace/Enlightenment.desktop share/gnome/control-center/Workspace/background-properties.desktop share/gnome/control-center/Workspace/screensaver-properties.desktop share/gnome/control-center/Workspace/url-properties.desktop @@ -141,6 +139,5 @@ @dirrm share/gnome/control-center/Inputdevs @dirrm share/gnome/control-center/Multimedia @dirrm share/gnome/control-center/WindowManager -@dirrm share/gnome/control-center/Workspace/Enlightenment @dirrm share/gnome/control-center/Workspace @dirrm share/gnome/control-center >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message