head 1.18; access; symbols pkgsrc-2013Q2:1.18.0.26 pkgsrc-2013Q2-base:1.18 pkgsrc-2012Q4:1.18.0.24 pkgsrc-2012Q4-base:1.18 pkgsrc-2011Q4:1.18.0.22 pkgsrc-2011Q4-base:1.18 pkgsrc-2011Q2:1.18.0.20 pkgsrc-2011Q2-base:1.18 pkgsrc-2009Q4:1.18.0.18 pkgsrc-2009Q4-base:1.18 pkgsrc-2008Q4:1.18.0.16 pkgsrc-2008Q4-base:1.18 pkgsrc-2008Q3:1.18.0.14 pkgsrc-2008Q3-base:1.18 cube-native-xorg:1.18.0.12 cube-native-xorg-base:1.18 pkgsrc-2008Q2:1.18.0.10 pkgsrc-2008Q2-base:1.18 pkgsrc-2008Q1:1.18.0.8 pkgsrc-2008Q1-base:1.18 pkgsrc-2007Q4:1.18.0.6 pkgsrc-2007Q4-base:1.18 pkgsrc-2007Q3:1.18.0.4 pkgsrc-2007Q3-base:1.18 pkgsrc-2007Q2:1.18.0.2 pkgsrc-2007Q2-base:1.18 pkgsrc-2007Q1:1.17.0.30 pkgsrc-2007Q1-base:1.17 pkgsrc-2006Q4:1.17.0.28 pkgsrc-2006Q4-base:1.17 pkgsrc-2006Q3:1.17.0.26 pkgsrc-2006Q3-base:1.17 pkgsrc-2006Q2:1.17.0.24 pkgsrc-2006Q2-base:1.17 pkgsrc-2006Q1:1.17.0.22 pkgsrc-2006Q1-base:1.17 pkgsrc-2005Q4:1.17.0.20 pkgsrc-2005Q4-base:1.17 pkgsrc-2005Q3:1.17.0.18 pkgsrc-2005Q3-base:1.17 pkgsrc-2005Q2:1.17.0.16 pkgsrc-2005Q2-base:1.17 pkgsrc-2005Q1:1.17.0.14 pkgsrc-2005Q1-base:1.17 pkgsrc-2004Q4:1.17.0.12 pkgsrc-2004Q4-base:1.17 pkgsrc-2004Q3:1.17.0.10 pkgsrc-2004Q3-base:1.17 pkgsrc-2004Q2:1.17.0.8 pkgsrc-2004Q2-base:1.17 pkgsrc-2004Q1:1.17.0.6 pkgsrc-2004Q1-base:1.17 pkgsrc-2003Q4:1.17.0.4 pkgsrc-2003Q4-base:1.17 netbsd-1-6-1:1.17.0.2 netbsd-1-6-1-base:1.17 netbsd-1-6:1.16.0.8 netbsd-1-6-RELEASE-base:1.16 pkgviews:1.16.0.4 pkgviews-base:1.16 buildlink2:1.16.0.2 buildlink2-base:1.16 netbsd-1-5-PATCH003:1.16 netbsd-1-5-PATCH001:1.12 netbsd-1-5-RELEASE:1.11 netbsd-1-4-PATCH003:1.11 netbsd-1-4-PATCH002:1.7 comdex-fall-1999:1.6 netbsd-1-4-PATCH001:1.5 netbsd-1-4-RELEASE:1.5 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.18 date 2007.05.20.17.28.18; author wiz; state dead; branches; next 1.17; 1.17 date 2002.08.25.18.40.32; author jlam; state Exp; branches; next 1.16; 1.16 date 2002.03.24.19.53.42; author rh; state Exp; branches 1.16.2.1; next 1.15; 1.15 date 2001.10.12.13.29.40; author tron; state Exp; branches; next 1.14; 1.14 date 2001.10.07.10.13.11; author rh; state Exp; branches; next 1.13; 1.13 date 2001.06.16.20.03.19; author jlam; state Exp; branches; next 1.12; 1.12 date 2000.10.17.23.57.45; author jlam; state Exp; branches; next 1.11; 1.11 date 2000.06.20.23.20.12; author jlam; state Exp; branches; next 1.10; 1.10 date 2000.05.30.19.23.48; author drochner; state Exp; branches; next 1.9; 1.9 date 2000.05.02.18.48.43; author danw; state Exp; branches; next 1.8; 1.8 date 2000.03.13.22.25.47; author tron; state Exp; branches; next 1.7; 1.7 date 99.11.15.18.47.56; author rh; state Exp; branches; next 1.6; 1.6 date 99.08.29.12.37.04; author rh; state Exp; branches; next 1.5; 1.5 date 99.05.01.17.31.04; author tron; state Exp; branches; next 1.4; 1.4 date 99.03.07.12.52.40; author tron; state Exp; branches; next 1.3; 1.3 date 98.12.29.14.23.04; author tron; state Exp; branches; next 1.2; 1.2 date 98.10.04.23.42.01; author tron; state Exp; branches; next 1.1; 1.1 date 98.09.04.22.14.26; author agc; state Exp; branches; next ; 1.16.2.1 date 2002.08.25.17.58.05; author jlam; state Exp; branches; next ; desc @@ 1.18 log @Remove gnome-libs from pkgsrc. All its dependencies were already removed. @ text @$NetBSD: patch-aa,v 1.17 2002/08/25 18:40:32 jlam Exp $ --- configure.orig Tue Jan 22 14:35:12 2002 +++ configure @@@@ -3271,12 +3271,9 @@@@ -GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` -GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` -if test -z "$GLIB_LDFLAGS" ; then - GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/\(-L[^ ]*\) .*$/\1/' -e 's/^.*\(-L[^ ]*\)$/\1/'` -fi -GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`" +GLIB_CFLAGS="`glib-config --cflags`" +GLIB_LIBS="`glib-config --libs`" +GLIB_LDFLAGS="$GLIB_LIBS" @@@@ -5127,6 +5124,11 @@@@ rm -f po/POTFILES sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES + +# NetBSD: set DATADIRNAME to "share" +DATADIRNAME="${PKGLOCALEDIR}" +INTLDEPS= +INTLLIBS="-lintl" # AM_GNOME_GETTEXT above substs $DATADIRNAME # this is the directory where the *.{mo,gmo} files are installed @@@@ -9942,7 +9944,7 @@@@ GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS" ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" -GNOME_LIBDIR='-L${libdir}' +GNOME_LIBDIR='-L${libdir} -Wl,-R${libdir}' GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' GNOME_IDLDIR='-I${datadir}/idl' @@@@ -10046,8 +10048,8 @@@@ fi if test x$gnome_cv_orbit_found = xyes; then - ORBIT_CFLAGS=`orbit-config --cflags client server` - ORBIT_LIBS=`orbit-config --use-service=name --libs client server` + ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server` + ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server` else @ 1.17 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.16.2.1 2002/08/25 17:58:05 jlam Exp $ @ 1.16 log @Update gnome-libs to 1.4.1.4. Changes are bugfixes, new man pages, and new translations. @ text @d1 1 a1 1 $NetBSD$ d15 2 a16 2 +GLIB_CFLAGS="`$GLIB_CONFIG --cflags`" +GLIB_LIBS="`$GLIB_CONFIG --libs`" @ 1.16.2.1 log @Call glib-config instead of GLIB_CONFIG (which was never set). This gives correct output using buildlink2. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $ d15 2 a16 2 +GLIB_CFLAGS="`glib-config --cflags`" +GLIB_LIBS="`glib-config --libs`" @ 1.15 log @Fix a typo in the "configure" script which cause runtime library path problems on systems which use "xpkwedge". @ text @d3 3 a5 3 --- configure.orig Tue Aug 21 23:41:20 2001 +++ configure Fri Oct 12 15:12:57 2001 @@@@ -3471,12 +3471,9 @@@@ d21 1 a21 1 @@@@ -5314,6 +5311,11 @@@@ d33 1 a33 10 @@@@ -5415,7 +5417,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else - save_LDFLAGS="$LDFLAGBS" + save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS `glib-config --libs gmodule`" if test "$cross_compiling" = yes; then ac_cv_gmodule=yes @@@@ -10116,7 +10118,7 @@@@ d39 1 a39 1 GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' d42 1 a42 1 @@@@ -10220,8 +10222,8 @@@@ @ 1.14 log @Don't derive GLIB_LDFLAGS from GTK_LDFLAGS as they may install in different locations. Fixes PRs 14133 and 14178. @ text @d4 1 a4 1 +++ configure d33 9 @ 1.13 log @Really put locale files under ${PKGLOCALEDIR}, not only under share, and refer to orbit-config as $ORBIT_CONFIG in the configure script. @ text @d3 19 a21 3 --- configure.orig Fri Mar 16 14:46:20 2001 +++ configure Sat Jun 16 01:11:24 2001 @@@@ -5312,6 +5312,11 @@@@ d33 1 a33 1 @@@@ -10358,7 +10363,7 @@@@ d42 1 a42 1 @@@@ -10462,8 +10467,8 @@@@ @ 1.12 log @Update gnome-libs to 1.2.5. Changes from version 1.2.3 are misc. bugfixes and documentation improvements. @ text @d3 3 a5 3 --- configure.orig Wed Sep 27 17:34:13 2000 +++ configure @@@@ -5301,6 +5301,11 @@@@ d11 1 a11 1 +DATADIRNAME="share" d17 1 a17 1 @@@@ -10265,7 +10270,7 @@@@ d26 11 @ 1.11 log @USE_LIBTOOL instead of PKGLIBTOOL. While here, rearrange stuff a bit to make editing easier. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2000/05/30 19:23:48 drochner Exp $ d3 11 a13 3 --- configure.orig Sat May 20 20:55:16 2000 +++ configure Fri May 26 23:39:02 2000 @@@@ -5304,7 +5304,7 @@@@ d17 1 a17 6 -gnomelocaledir='${prefix}/${DATADIRNAME}/locale' +gnomelocaledir='${prefix}/share/locale' echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 @@@@ -10213,7 +10213,7 @@@@ @ 1.10 log @update to 1.2.1 "many fixes and enhancements" @ text @d1 1 a1 1 $NetBSD$ a4 18 @@@@ -2000,7 +2000,7 @@@@ fi rm -f confcache - +if false; then # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ @@@@ -2029,7 +2029,7 @@@@ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. exec 5>>./config.log - +fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo "configure:2036: checking whether to enable maintainer-specific portions of Makefiles" >&5 @ 1.9 log @Remove patches to deal with two bugs involving configure's handling of INSTALL which have both been worked around in bsd.pkg.mk now. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2000/03/13 22:25:47 tron Exp $ d3 3 a5 3 --- configure.orig Tue Feb 22 15:29:37 2000 +++ configure Mon Mar 13 23:08:16 2000 @@@@ -2077,7 +2077,9 @@@@ d7 1 d9 1 a9 1 # Always use our own libtool. d11 8 a18 1 LIBTOOL='$(SHELL) $(top_builddir)/libtool' d21 3 a23 3 # Check for any special flags to pass to ltconfig. libtool_flags= @@@@ -5587,7 +5589,7 @@@@ d32 1 a32 1 @@@@ -10496,7 +10498,7 @@@@ @ 1.8 log @Update "gnome-libs" package to version 1.0.56. A change list for this release is not available unfortunately. @ text @d1 1 a1 1 $NetBSD$ a32 30 @@@@ -11093,10 +11095,10 @@@@ top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac +# case "$ac_given_INSTALL" in +# [/$]*) INSTALL="$ac_given_INSTALL" ;; +# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +# esac echo creating "$ac_file" rm -f "$ac_file" @@@@ -11366,10 +11368,10 @@@@ *) # 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 +# 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. @ 1.7 log @defuzz @ text @d3 2 a4 2 --- configure.orig Thu Oct 7 04:32:56 1999 +++ configure Mon Nov 15 19:18:04 1999 d23 2 a24 2 echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 @@@@ -10370,7 +10372,7 @@@@ d33 1 a33 1 @@@@ -10967,10 +10969,10 @@@@ d48 1 a48 1 @@@@ -11240,10 +11242,10 @@@@ @ 1.6 log @Update gnome-libs to 1.0.14 Changes include: * various bug fixes from the gnome bug database. * gnome-libs.spec.in: Use sysconfdir=/etc instead of $prefix/etc * libgnome/gnome-config.c: Ignore lines that begin with a '#' * libgnomeui/gnome-dentry-edit.c: Attempt to remove the memory leak from not destroy the icon entry window. * libgnomeui/gnome-scores.c: use strftime() to allow showing the dates in a localized way. * libgnomeui/gnome-app-helper.c: changed "Create _New Window" to "Create New _Window" to avoid conflicts with menus that also use "_New" (it is the case of gmc) * po/*.po: modified to reflect that change * libgnorba/orbitgtk.c (gnorba_CORBA_init): Add new flag to control the priority of the CORBA loop. * idl/gnome-factory.idl: #include guard. * gnome-data/gnome.mime: Midi files also end in .mid * idl/desktop-textviewer.idl: Replace libgnorba/GnomeObject.h with libgnorba/gnome-unknown.h. Also, #include gnome-unknown.idl instead of GnomeObject.idl. * idl/desktop-textviewer.idl: Reflect latest GNOME::obj to GNOME::Unknown renaming. * gnome-bug.in (CATEGORIES): added 'gnome-applets' category * libgnorba/Makefile.am (gnome_object_built): Added gnome-unknown to the compilation process. * idl/Makefile.am (idl_DATA): Added gnome-unknown interface. * Removed the hypot() hack. * gnome-data/*.soundlist: Added Portuguese translations. * libgnorba/goad.c (goad_server_register): If `name' is passed in as NULL, an object keeps from registering in the name service, although it still exposes its IOR as before. If `name' isn't NULL but `kind' is NULL, `kind' is set to "server", and the object is placed in the naming service. * idl/GnomeObject.idl: Removed `oneway' from ref and unref; when such network optimizations are necessary, they should be done by caching the refcount in the client. @ text @d3 4 a6 4 --- configure.orig Fri Aug 20 21:45:13 1999 +++ configure Sun Aug 29 12:56:36 1999 @@@@ -2373,7 +2373,9 @@@@ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" d13 3 a15 3 # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. @@@@ -5653,7 +5655,7 @@@@ d24 1 a24 1 @@@@ -10310,7 +10312,7 @@@@ d33 1 a33 1 @@@@ -10903,10 +10905,10 @@@@ d48 1 a48 1 @@@@ -11176,10 +11178,10 @@@@ @ 1.5 log @Fix run time library search path. @ text @d3 4 a6 4 --- configure.orig Sat Apr 10 02:29:31 1999 +++ configure Sat May 1 19:06:55 1999 @@@@ -2079,6 +2079,7 @@@@ fi a10 6 # Check for any special flags to pass to ltconfig. @@@@ -2310,6 +2311,7 @@@@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } d15 1 a15 1 @@@@ -5589,7 +5591,7 @@@@ d24 1 a24 1 @@@@ -10858,7 +10860,7 @@@@ d33 1 a33 1 @@@@ -11435,10 +11437,10 @@@@ d48 1 a48 1 @@@@ -11708,10 +11710,10 @@@@ @ 1.4 log @Use "share/locale" not "lib/locale" for ".mo" files. @ text @d3 3 a5 3 --- configure.orig Mon Mar 1 20:51:08 1999 +++ configure Sun Mar 7 12:49:50 1999 @@@@ -2082,6 +2082,7 @@@@ d13 1 a13 1 @@@@ -2313,6 +2314,7 @@@@ d21 1 a21 1 @@@@ -5523,7 +5525,7 @@@@ d30 10 a39 1 @@@@ -11275,10 +11277,10 @@@@ d54 1 a54 1 @@@@ -11548,10 +11550,10 @@@@ @ 1.3 log @Update "gnome-libs" package to version 0.99.0 and make it build again. XXX At the moment some files are installed at the wrong place (e.g "doc" XXX or "share/doc" instead of "share/doc/gnome-libs"). Other files should XXX not be installed at all (e.g. "lib/libart_lgpl.la"). @ text @d3 3 a5 3 --- configure.orig Wed Dec 16 10:52:23 1998 +++ configure Tue Dec 29 12:43:37 1998 @@@@ -1674,6 +1674,7 @@@@ d13 1 a13 1 @@@@ -1718,6 +1719,7 @@@@ d21 10 a30 1 @@@@ -9515,10 +9517,10 @@@@ d45 1 a45 1 @@@@ -9788,10 +9790,10 @@@@ @ 1.2 log @Update "gnome-libs" to version 0.30.1. @ text @d3 4 a6 14 --- configure.orig Tue Sep 29 01:46:18 1998 +++ configure Mon Oct 5 00:25:16 1998 @@@@ -86,6 +86,9 @@@@ # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +CFLAGS="-I../intl -I$X11BASE/include -I$LOCALBASE/include" +CPPFLAGS="-I../intl -I$X11BASE/include -I$LOCALBASE/include -I$LOCALBASE/include/giflib" +LDFLAGS="-L$X11BASE/lib -L$LOCALBASE/lib" # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@@@ -1629,6 +1632,7 @@@@ d12 3 a14 3 @@@@ -1708,6 +1712,7 @@@@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ d19 3 a21 3 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 @@@@ -7260,10 +7265,10 @@@@ d36 15 @ 1.1 log @Addition of gnome-libs-0.27, the libaries for the GNU Network Object Model Environment, to the NetBSD packages collection. @ text @d3 3 a5 7 Use our own version of libtool Set CPPFLAGS correctly so that it finds all the pre-req header files Comment out erroneous settings of the INSTALL variable. --- configure.orig Fri Aug 7 02:01:30 1998 +++ configure Fri Aug 14 14:59:42 1998 @@@@ -78,6 +78,9 @@@@ d15 1 a15 1 @@@@ -1621,6 +1624,7 @@@@ d23 1 a23 1 @@@@ -1700,6 +1704,7 @@@@ d31 1 a31 1 @@@@ -6711,10 +6716,10 @@@@ a45 15 @@@@ -6980,10 +6985,10 @@@@ *) # 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 +# 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. @