diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-11-12 06:37:37 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2002-11-12 06:37:37 +0800 |
| commit | c6904c93bc709c2ca11defe08257ceb5162e64f3 (patch) | |
| tree | b4436c1e6955defc560a973894a78bf651b59b4d /x11/gnome-applets/files/patch-aa | |
| parent | 1dd8b86a51aed8056f454210ea721e93ada1778c (diff) | |
| download | marcuscom-ports-c6904c93bc709c2ca11defe08257ceb5162e64f3.tar marcuscom-ports-c6904c93bc709c2ca11defe08257ceb5162e64f3.tar.gz marcuscom-ports-c6904c93bc709c2ca11defe08257ceb5162e64f3.tar.bz2 marcuscom-ports-c6904c93bc709c2ca11defe08257ceb5162e64f3.tar.lz marcuscom-ports-c6904c93bc709c2ca11defe08257ceb5162e64f3.tar.xz marcuscom-ports-c6904c93bc709c2ca11defe08257ceb5162e64f3.tar.zst marcuscom-ports-c6904c93bc709c2ca11defe08257ceb5162e64f3.zip | |
Update to 2.1.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@147 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-applets/files/patch-aa')
| -rw-r--r-- | x11/gnome-applets/files/patch-aa | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index cf6bce530..6e97117be 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Fri Sep 13 15:58:55 2002 -+++ configure Wed Sep 18 01:18:40 2002 -@@ -6994,6 +6994,7 @@ +--- configure.orig Sun Nov 3 14:13:35 2002 ++++ configure Mon Nov 11 16:56:45 2002 +@@ -5682,6 +5682,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,16 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -10518,7 +10519,7 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - INSTOBJEXT=.mo -@@ -10765,6 +10766,7 @@ +@@ -8918,6 +8919,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -25,16 +16,14 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -10817,6 +10819,20 @@ - HAVE_LIBAPM_TRUE='#' - HAVE_LIBAPM_FALSE= +@@ -8980,6 +8982,20 @@ fi -+ ;; + + ;; + i386-*-freebsd*) + HAVE_LIBAPM=no -+ +if test "x$HAVE_LIBAPM" = "xyes"; then -+ HAVE_LIBAPM_TRUE= ++ HAVE_LIBAPM_TRUE= + HAVE_LIBAPM_FALSE='#' +else + HAVE_LIBAPM_TRUE='#' @@ -43,22 +32,25 @@ + ;; + *-*-freebsd*) + build_battstat_applet=no - - ;; ++ ++ ;; *-*-linux*) -@@ -11494,13 +11510,13 @@ + echo $ac_n "checking for apm_read in -lapm""... $ac_c" 1>&6 + echo "configure:8986: checking for apm_read in -lapm" >&5 +@@ -9567,14 +9583,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - cat >>confdefs.h <<EOF + cat >> confdefs.h <<EOF -#define GNOME_ICONDIR "${prefix}/share/pixmaps" +#define GNOME_ICONDIR "${datadir}/pixmaps" EOF - #defined the below to enable help to work for applets - cat >>confdefs.h <<EOF + #defined the below to enable help to work for applets + + cat >> confdefs.h <<EOF -#define DATADIR "${prefix}/share" +#define DATADIR "${datadir}" EOF - cat >>confdefs.h <<EOF + cat >> confdefs.h <<EOF |