head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.42 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.40 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.38 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.36 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.34 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.32 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.30 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.28 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.26 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.24 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.22 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.20 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.18 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.16 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.14 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.12 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.10 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.8 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.6 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.4 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.2 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.6.0.8 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.4 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.2 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.5.0.6 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.4 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.2 netbsd-1-6-1-base:1.5 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.7 date 2005.05.31.22.13.09; author wiz; state dead; branches; next 1.6; 1.6 date 2004.06.08.17.48.25; author jschauma; state Exp; branches; next 1.5; 1.5 date 2002.08.29.08.42.52; author jlam; state Exp; branches; next 1.4; 1.4 date 2002.04.09.21.39.24; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.03.23.04.54.14; author fredb; state Exp; branches; next 1.2; 1.2 date 2000.10.18.00.01.12; author jlam; state Exp; branches; next 1.1; 1.1 date 2000.07.25.06.19.24; author jlam; state Exp; branches; next ; desc @@ 1.7 log @Remove controlcenter (replaced by control-center). @ text @$NetBSD: patch-ab,v 1.6 2004/06/08 17:48:25 jschauma Exp $ --- configure.orig Sun Feb 10 16:36:55 2002 +++ configure @@@@ -7570,7 +7570,7 @@@@ for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h sys/param.h +unistd.h sys/param.h sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@@@ -8506,6 +8506,11 @@@@ +# NetBSD: set DATADIRNAME to "share" +DATADIRNAME="share" +INTLDEPS= +INTLLIBS="${INTLLIBS}" + for ac_hdr in dlfcn.h dl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` @ 1.6 log @Short: make this compile on Linux Long: Some OS have libintl functionality in libc, so we do not necessarily have to link against (a possibly non-existent) -lintl. For now, only deal with Linux -- those who know for a fact which OS also behave this way should adjust/add. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2002/08/29 08:42:52 jlam Exp $ @ 1.5 log @buildlink1 -> buildlink2 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2002/04/09 21:39:24 jlam Exp $ d21 1 a21 1 +INTLLIBS="-lintl" @ 1.4 log @* Strongly buildlinkify. * Use *_CONFIG instead of directly invoking *-config so that the wrappers will be used. This is also the correct way of invoking these scripts anyway, but the GNOME authors keep making this same stupid mistake over and over and over again ... ! @ text @d1 1 a1 1 $NetBSD$ a4 33 @@@@ -1307,8 +1307,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 @@@@ -1325,8 +1325,8 @@@@ gnome_cv_gnorba_found=no if test x$gnome_cv_orbit_found = xyes; then - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`" + GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`" if test -n "$GNORBA_LIBS"; then gnome_cv_gnorba_found=yes fi @@@@ -1346,8 +1346,8 @@@@ fi if test x$gnome_cv_orbit_found = xyes; then - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" + GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`" + GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`" else a25 26 @@@@ -8815,7 +8820,7 @@@@ fi -CFLAGS="`gnome-config --cflags gdk_pixbuf`${CFLAGS}" +CFLAGS="`$GNOME_CONFIG --cflags gdk_pixbuf`${CFLAGS}" have_libesd=no # Check whether --with-esd-prefix or --without-esd-prefix was given. @@@@ -9329,10 +9334,13 @@@@ echo $ac_n "checking for gnome-vfs library >= 0.9""... $ac_c" 1>&6 echo "configure:9332: checking for gnome-vfs library >= 0.9" >&5 -VFS_CFLAGS=`gnome-vfs-config --cflags` -VFS_LIBS=`gnome-vfs-config --libs` +if test x${GNOME_VFS_CONFIG+set} != xset ; then + GNOME_VFS_CONFIG=gnome-vfs-config +fi +VFS_CFLAGS=`$GNOME_VFS_CONFIG --cflags` +VFS_LIBS=`$GNOME_VFS_CONFIG --libs` if test "x$VFS_CFLAGS" != x ; then - vers=`gnome-vfs-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + vers=`$GNOME_VFS_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` if test "$vers" -ge 0009000; then echo "$ac_t""found" 1>&6 else @ 1.3 log @Let configure check for the presence of , in order to provide a prototype for waitpid() in the theme-switcher capplet. @ text @d3 1 a3 1 --- configure.orig Wed Mar 28 13:46:14 2001 d5 34 a38 1 @@@@ -4007,7 +4007,7 @@@@ d47 1 a47 1 @@@@ -4940,6 +4940,11 @@@@ a50 1 + d55 1 a55 1 d58 27 @ 1.2 log @Update control-center to 1.2.2. Changes from version 1.2.0 appear to be largely bugfixes, with a new feature: embossed logos. Add dependency on gdk-pixbuf. Make me the maintainer. @ text @d3 1 a3 1 --- configure.orig Mon Sep 11 22:00:51 2000 d5 1 a5 1 @@@@ -4873,6 +4873,11 @@@@ d7 8 d17 2 d23 1 a23 1 + a25 1 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` @ 1.1 log @Install the locale files under share/locale, not lib/locale. @ text @d3 14 a16 11 --- po/Makefile.in.in.orig Tue May 23 15:41:53 2000 +++ po/Makefile.in.in Tue Jul 25 01:29:03 2000 @@@@ -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 @