diff options
| author | marcus <marcus@FreeBSD.org> | 2002-09-18 13:36:16 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2002-09-18 13:36:16 +0800 |
| commit | 214eabe1a4f3a500be6359a3151b4ffae927f27e (patch) | |
| tree | c9497c0dbb67e26469624877add0a8bbd90cb41a /x11 | |
| parent | 840adfb07399b2f65f4c395b2584c2b86203976f (diff) | |
| download | freebsd-ports-gnome-214eabe1a4f3a500be6359a3151b4ffae927f27e.tar.gz freebsd-ports-gnome-214eabe1a4f3a500be6359a3151b4ffae927f27e.tar.zst freebsd-ports-gnome-214eabe1a4f3a500be6359a3151b4ffae927f27e.zip | |
Fix patchs to DATADIR and GNOME_ICONDIR. This should restore the mixer
applet icon in the panel.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-applets/Makefile | 1 | ||||
| -rw-r--r-- | x11/gnome-applets/files/patch-aa | 29 | ||||
| -rw-r--r-- | x11/gnomeapplets2/Makefile | 1 | ||||
| -rw-r--r-- | x11/gnomeapplets2/files/patch-aa | 29 |
4 files changed, 56 insertions, 4 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 2f231fd4e39c..c4c224f0cfae 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeapplets2 PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= 2.0.2/sources/gnome-applets diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 168141cd62db..cf6bce530e2c 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Tue Aug 27 14:17:28 2002 -+++ configure Tue Aug 27 14:20:19 2002 +--- configure.orig Fri Sep 13 15:58:55 2002 ++++ configure Wed Sep 18 01:18:40 2002 @@ -6994,6 +6994,7 @@ # This can be used to rebuild libtool when needed @@ -8,6 +8,15 @@ # 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 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; @@ -37,3 +46,19 @@ ;; *-*-linux*) +@@ -11494,13 +11510,13 @@ + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + 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 +-#define DATADIR "${prefix}/share" ++#define DATADIR "${datadir}" + EOF + + cat >>confdefs.h <<EOF diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 2f231fd4e39c..c4c224f0cfae 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeapplets2 PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= 2.0.2/sources/gnome-applets diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index 168141cd62db..cf6bce530e2c 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Tue Aug 27 14:17:28 2002 -+++ configure Tue Aug 27 14:20:19 2002 +--- configure.orig Fri Sep 13 15:58:55 2002 ++++ configure Wed Sep 18 01:18:40 2002 @@ -6994,6 +6994,7 @@ # This can be used to rebuild libtool when needed @@ -8,6 +8,15 @@ # 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 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; @@ -37,3 +46,19 @@ ;; *-*-linux*) +@@ -11494,13 +11510,13 @@ + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + 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 +-#define DATADIR "${prefix}/share" ++#define DATADIR "${datadir}" + EOF + + cat >>confdefs.h <<EOF |