From owner-freebsd-ports Sat Mar 6 5:10:35 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 A9018151CE for ; Sat, 6 Mar 1999 05:10:15 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id FAA24754; Sat, 6 Mar 1999 05:10:01 -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 B2FE11511C for ; Sat, 6 Mar 1999 05:08:50 -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 PAA17675; Sat, 6 Mar 1999 15:08:30 +0200 (SAT) (envelope-from reg) Message-Id: <199903061308.PAA17675@shale.csir.co.za> Date: Sat, 6 Mar 1999 15:08: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/10425: Port update: x11/gnomelibs Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10425 >Category: ports >Synopsis: Port update: x11/gnomelibs >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 05:10: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-libs-1.0.1. >How-To-Repeat: Requires updated bsd.port.mk. >Fix: diff -urN -x CVS /usr/ports.ref/x11/gnomelibs/Makefile /usr/ports/x11/gnomelibs/Makefile --- /usr/ports.ref/x11/gnomelibs/Makefile Fri Feb 19 01:15:39 1999 +++ /usr/ports/x11/gnomelibs/Makefile Sat Mar 6 14:58:12 1999 @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomelibs -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 June 1998 # Whom: Yukihiro Nakai # # $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ # -DISTNAME= gnome-libs-0.99.8.1 -PKGNAME= gnomelibs-0.99.8.1 +DISTNAME= gnome-libs-1.0.1 +PKGNAME= gnomelibs-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-libs +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -20,7 +20,7 @@ esd.1:${PORTSDIR}/audio/esound # implicit dependencies: -# gettext, gtk11-devel, tiff34, jpeg, giflib, png +# gettext, gtk12, tiff34, jpeg, giflib, png USE_X_PREFIX= yes USE_PERL5= yes @@ -30,9 +30,9 @@ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff -urN -x CVS /usr/ports.ref/x11/gnomelibs/files/md5 /usr/ports/x11/gnomelibs/files/md5 --- /usr/ports.ref/x11/gnomelibs/files/md5 Fri Feb 19 01:15:40 1999 +++ /usr/ports/x11/gnomelibs/files/md5 Sat Mar 6 13:30:58 1999 @@ -1 +1 @@ -MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31 +MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f diff -urN -x CVS /usr/ports.ref/x11/gnomelibs/patches/patch-aa /usr/ports/x11/gnomelibs/patches/patch-aa --- /usr/ports.ref/x11/gnomelibs/patches/patch-aa Fri Feb 19 01:15:40 1999 +++ /usr/ports/x11/gnomelibs/patches/patch-aa Sat Mar 6 13:33:38 1999 @@ -1,6 +1,6 @@ ---- configure.orig Tue Feb 16 00:40:19 1999 -+++ configure Fri Feb 19 00:19:26 1999 -@@ -5137,7 +5137,7 @@ +--- configure.orig Mon Mar 1 21:51:08 1999 ++++ configure Sat Mar 6 13:33:05 1999 +@@ -5149,7 +5149,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,59 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6747,7 +6747,7 @@ +@@ -7233,7 +7233,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" +LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7007: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7007: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -+#include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -7077,16 +7077,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7083: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7083: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -+#include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -10218,7 +10218,7 @@ - ZVT_LIBS="-lzvt $GTK_LIBS" +@@ -10704,7 +10704,7 @@ + ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' @@ -69,3 +27,14 @@ GNOME_IDLDIR='-I${datadir}/idl' +@@ -11548,10 +11548,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff -urN -x CVS /usr/ports.ref/x11/gnomelibs/patches/patch-ab /usr/ports/x11/gnomelibs/patches/patch-ab --- /usr/ports.ref/x11/gnomelibs/patches/patch-ab Fri Feb 19 01:15:40 1999 +++ /usr/ports/x11/gnomelibs/patches/patch-ab Tue Mar 2 17:03:37 1999 @@ -14,7 +14,7 @@ -confexecdir = $(libdir) -+confexecdir = $(datadir) ++confexecdir = $(sysconfdir) confexec_DATA = gnomeConf.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -44,7 +44,7 @@ EXTRA_DIST = parse-path.cP --libgnome_la_LDFLAGS = -version-info 34:1:2 #-rpath $(libdir) +-libgnome_la_LDFLAGS = -version-info 34:2:2 #-rpath $(libdir) +libgnome_la_LDFLAGS = -version-info 1:0:0 libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) @@ -59,7 +59,7 @@ EXTRA_DIST = $(SGML) $(gtkrc_DATA) AUTHORS gnome.defs maketypes.awk makeenums.pl gnome-boxed.defs gnometypebuiltins_vars.c gnometypebuiltins_ids.c gnometypebuiltins_evals.c --libgnomeui_la_LDFLAGS = -version-info 37:0:5 -rpath $(libdir) +-libgnomeui_la_LDFLAGS = -version-info 39:0:7 -rpath $(libdir) +libgnomeui_la_LDFLAGS = -version-info 1:0:0 libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) @@ -88,7 +88,7 @@ libgnorbainclude_HEADERS = gnorba.h gnome-factory.h --libgnorba_la_LDFLAGS = -version-info 28:3:1 -rpath $(libdir) +-libgnorba_la_LDFLAGS = -version-info 28:4:1 -rpath $(libdir) +libgnorba_la_LDFLAGS = -version-info 1:0:0 libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm @@ -113,27 +113,16 @@ BUILT_SOURCES = gnomesupport.h ---- po/Makefile.in.in.orig Tue Feb 16 00:40:01 1999 -+++ po/Makefile.in.in Fri Feb 19 00:20:20 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 ---- zvt/Makefile.in.orig Tue Feb 16 01:09:29 1999 -+++ zvt/Makefile.in Fri Feb 19 00:23:46 1999 +--- zvt/Makefile.in.orig Sun Feb 28 02:22:21 1999 ++++ zvt/Makefile.in Mon Mar 1 21:01:11 1999 @@ -158,7 +158,7 @@ - libzvt_la_SOURCES = gnome-login-support.h gnome-login-support.c lists.c subshell.h subshell.c subshell-includes.h update.c vt.c zvtterm.c + libzvt_la_SOURCES = gnome-login-support.h gnome-login-support.c lists.c subshell.h subshell.c subshell-includes.h update.c vt.c zvtterm.c --libzvt_la_LDFLAGS = -version-info 3:1:1 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 1:0:0 +-libzvt_la_LDFLAGS = -version-info 3:2:1 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) - libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h + libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h @@ -433,8 +433,7 @@ check: check-am @@ -167,15 +156,6 @@ CONFIG_CLEAN_FILES = --- libart_lgpl/Makefile.in.orig Tue Feb 16 01:09:07 1999 +++ libart_lgpl/Makefile.in Fri Feb 19 00:20:20 1999 -@@ -45,7 +45,7 @@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - --INSTALL = @INSTALL@ -+INSTALL = /usr/bin/install -c -o root -g wheel - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -94,7 +94,7 @@ libart_lgpl_la_SOURCES = art_affine.c art_alphagamma.c art_bpath.c art_gray_svp.c art_misc.c art_pixbuf.c art_rect.c art_rect_svp.c art_rect_uta.c art_rgb.c art_rgb_affine.c art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_bitmap_affine.c art_rgb_pixbuf_affine.c art_rgb_rgba_affine.c art_rgb_svp.c art_svp.c art_svp_ops.c art_svp_render_aa.c art_svp_vpath.c art_svp_vpath_stroke.c art_svp_wind.c art_svp_wind.h art_uta.c art_uta_ops.c art_uta_rect.c art_uta_vpath.c art_uta_svp.c art_vpath.c art_vpath_bpath.c art_vpath_svp.c @@ -190,19 +170,10 @@ m4data_DATA = libart.m4 -confexecdir = $(libdir) -+confexecdir = $(datadir) ++confexecdir = $(sysconfdir) confexec_DATA = libartConf.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs -@@ -152,7 +152,7 @@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ --DATA = $(confexec_DATA) $(m4data_DATA) -+DATA = $(confexec_DATA) - - HEADERS = $(libart_lgplinc_HEADERS) - @@ -559,7 +559,7 @@ install-confexecDATA install-exec: install-exec-am diff -urN -x CVS /usr/ports.ref/x11/gnomelibs/patches/patch-ac /usr/ports/x11/gnomelibs/patches/patch-ac --- /usr/ports.ref/x11/gnomelibs/patches/patch-ac Thu Jan 14 18:59:33 1999 +++ /usr/ports/x11/gnomelibs/patches/patch-ac Tue Mar 2 09:02:01 1999 @@ -1,42 +1,49 @@ ---- gnome-config.in.orig Wed Jan 13 07:42:48 1999 -+++ gnome-config.in Fri Jan 15 00:02:56 1999 -@@ -41,18 +41,18 @@ +--- gnome-config.in.orig Mon Feb 15 20:05:33 1999 ++++ gnome-config.in Tue Mar 2 09:00:51 1999 +@@ -43,25 +43,25 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib11d (calls glib11d-config) ++ glib (calls glib12-config) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk11d (calls gtk11d-config) ++ gtk (calls gtk12-config) gtkxmhtml (only --libs) zvt (only --libs) If LIBRARY is none of these, - ${libdir}/Conf.sh -+ ${datadir}/Conf.sh ++ ${sysconfdir}/Conf.sh + + is looked in for the necessary information. Those currently installed + appear to be: - is looked in for the necessary information. EOF -@@ -114,33 +114,33 @@ + +- conf_shs=`cd ${libdir}; echo *Conf.sh` ++ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` + + if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then + echo " " +@@ -146,36 +146,36 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib11d-config --libs`" -+ the_flags="$the_flags `glib11d-config --cflags`" ++ the_libs="$the_libs `glib12-config --libs`" ++ the_flags="$the_flags `glib12-config --cflags`" ;; -- gtk) + gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ gtk11) -+ the_libs="$the_libs `gtk11d-config --libs`" -+ the_flags="$the_flags `gtk11d-config --cflags`" ++ the_libs="$the_libs `gtk12-config --libs`" ++ the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -65,4 +72,8 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" ;; *) - cnf_sh=${libdir}/${1}Conf.sh +- cnf_sh=${libdir}/${1}Conf.sh ++ cnf_sh=${sysconfdir}/${1}Conf.sh + if test -f ${cnf_sh}; then + . ${cnf_sh} + up_name=`echo $1 | tr a-z A-Z` diff -urN -x CVS /usr/ports.ref/x11/gnomelibs/patches/patch-ae /usr/ports/x11/gnomelibs/patches/patch-ae --- /usr/ports.ref/x11/gnomelibs/patches/patch-ae Mon Feb 1 22:58:45 1999 +++ /usr/ports/x11/gnomelibs/patches/patch-ae Sat Mar 6 13:34:32 1999 @@ -1,15 +1,15 @@ ---- ltconfig.orig Tue Feb 2 04:08:44 1999 -+++ ltconfig Tue Feb 2 04:08:53 1999 -@@ -1201,7 +1201,7 @@ +--- ltconfig.orig Mon Mar 1 21:51:10 1999 ++++ ltconfig Sat Mar 6 13:34:20 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$deplibs' + archive_cmds='$CC -shared -o $lib $libobjs $deplibs' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes -@@ -1606,7 +1606,7 @@ +@@ -1661,7 +1661,7 @@ shlibpath_var=PATH ;; diff -urN -x CVS /usr/ports.ref/x11/gnomelibs/pkg/PLIST /usr/ports/x11/gnomelibs/pkg/PLIST --- /usr/ports.ref/x11/gnomelibs/pkg/PLIST Fri Feb 19 01:15:40 1999 +++ /usr/ports/x11/gnomelibs/pkg/PLIST Tue Mar 2 17:44:13 1999 @@ -9,6 +9,8 @@ bin/libart-config bin/loadshlib bin/new-object +etc/gnomeConf.sh +etc/libartConf.sh etc/mime-magic etc/mime-magic.dat etc/paper.config @@ -16,7 +18,6 @@ etc/sound/events/gtk-events.soundlist include/gnome.h include/gnomesupport.h -include/popt-gnome.h include/gtk-xmhtml/HTML.h include/gtk-xmhtml/XmHTML.h include/gtk-xmhtml/XmHTMLI.h @@ -32,8 +33,8 @@ include/libart_lgpl/art_gray_svp.h include/libart_lgpl/art_misc.h include/libart_lgpl/art_pathcode.h -include/libart_lgpl/art_point.h include/libart_lgpl/art_pixbuf.h +include/libart_lgpl/art_point.h include/libart_lgpl/art_rect.h include/libart_lgpl/art_rect_svp.h include/libart_lgpl/art_rect_uta.h @@ -152,6 +153,7 @@ include/libgnomeui/libgnomeui.h include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h @@ -190,15 +192,14 @@ lib/libzvt.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/gnomeConf.sh share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko +share/gnome/gtkrc.ru share/gnome/idl/Table.idl share/gnome/idl/base.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl -share/gnome/libartConf.sh share/gnome/mime-info/gnome.mime share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png @@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +share/gnome/type-convert/gnome-make-postscript-mimes +share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo @@ -227,17 +230,18 @@ share/locale/pt/LC_MESSAGES/gnome-libs.mo share/locale/ru/LC_MESSAGES/gnome-libs.mo share/locale/sv/LC_MESSAGES/gnome-libs.mo -@dirrm etc/sound/events -@dirrm etc/sound -@dirrm include/gtk-xmhtml -@dirrm include/libart_lgpl -@dirrm include/libgnome -@dirrm include/libgnomeui -@dirrm include/libgnorba -@dirrm include/zvt -@dirrm share/gnome/games -@dirrm share/gnome/idl -@dirrm share/gnome/mime-info -@dirrm share/gnome/pixmaps +@exec mkdir -p %D/share/gnome/games @dirrm share/gnome/type-convert +@dirrm share/gnome/pixmaps +@dirrm share/gnome/mime-info +@dirrm share/gnome/idl +@dirrm share/gnome/games @dirrm share/gnome +@dirrm include/zvt +@dirrm include/libgnorba +@dirrm include/libgnomeui +@dirrm include/libgnome +@dirrm include/libart_lgpl +@dirrm include/gtk-xmhtml +@dirrm etc/sound/events +@dirrm etc/sound >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message