Add more locale directory hacks to bsd.gnome.mk, and fix ports that tried

to fix these using their own patches.

PR:		68256
Submitted by:	Jean-Yves Lefort <jylefort@brutele.be>

8 files changed, 3 insertions, 68 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index c456c9205ce8..2cd4bcead14f 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -59,7 +59,9 @@ gnomehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLA
 				 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
 			${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
 				's|-lpthread|${PTHREAD_LIBS}|g ; \
-				 s|DATADIRNAME=lib|DATADIRNAME=share|g'
+				 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+				 s|{datadir}/locale|{prefix}/share/locale|g ; \
+				 s|{libdir}/locale|{prefix}/share/locale|g'
 
 lthack_PRE_PATCH=	${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
 				'/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|'
diff --git a/audio/beast/files/patch-configure b/audio/beast/files/patch-configure
index f059d310df87..4483e08bbdf7 100644
--- a/audio/beast/files/patch-configure
+++ b/audio/beast/files/patch-configure
@@ -13,12 +13,3 @@
  
  
  	case "$enable_static" in
-@@ -20267,7 +20263,7 @@
-     if test "x$CATOBJEXT" = "x.mo" ; then
-       beastlocaledir=`eval echo "${libdir}/locale"`
-     else
--      beastlocaledir=`eval echo "${datadir}/locale"`
-+      beastlocaledir=`eval echo "${prefix}/share/locale"`
-     fi
-     exec_prefix="$saved_exec_prefix"
-     prefix="$saved_prefix"
diff --git a/audio/streamtuner/files/patch-configure b/audio/streamtuner/files/patch-configure
deleted file mode 100644
index 2e59bab0b65b..000000000000
--- a/audio/streamtuner/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Jun 20 18:00:57 2004
-+++ configure	Sun Jun 20 18:01:19 2004
-@@ -20531,7 +20531,7 @@
- if test "x$CATOBJEXT" = "x.mo" ; then
-   localedir=`eval echo "${libdir}/locale"`
- else
--  localedir=`eval echo "${datadir}/locale"`
-+  localedir=`eval echo "${prefix}/share/locale"`
- fi
- prefix="$glib_save_prefix"
- exec_prefix="$glib_save_exec_prefix"
diff --git a/databases/gnome-db/files/patch-configure b/databases/gnome-db/files/patch-configure
index 8925b93fafb4..d3acccbb89bc 100644
--- a/databases/gnome-db/files/patch-configure
+++ b/databases/gnome-db/files/patch-configure
@@ -20,12 +20,3 @@ $FreeBSD$
  		
  		
  		
-@@ -8906,7 +8907,7 @@
- 
- GNOMEDB_CFLAGS="`gda-config --cflags client` `gnome-config --cflags xml oaf bonobox print gdk_pixbuf`"
- GNOMEDB_LIBS="`gda-config --libs client` `gnome-config --libs xml oaf bonobox print gdk_pixbuf`"
--GNOMEDB_CFLAGS="${GNOMEDB_CFLAGS} -DGNOMELOCALEDIR=\\\"${datadir}/locale\\\""
-+GNOMEDB_CFLAGS="${GNOMEDB_CFLAGS} -DGNOMELOCALEDIR=\\\"${prefix}/share/locale\\\""
- 
- 
- 
diff --git a/databases/gnomedb/files/patch-configure b/databases/gnomedb/files/patch-configure
index 8925b93fafb4..d3acccbb89bc 100644
--- a/databases/gnomedb/files/patch-configure
+++ b/databases/gnomedb/files/patch-configure
@@ -20,12 +20,3 @@ $FreeBSD$
  		
  		
  		
-@@ -8906,7 +8907,7 @@
- 
- GNOMEDB_CFLAGS="`gda-config --cflags client` `gnome-config --cflags xml oaf bonobox print gdk_pixbuf`"
- GNOMEDB_LIBS="`gda-config --libs client` `gnome-config --libs xml oaf bonobox print gdk_pixbuf`"
--GNOMEDB_CFLAGS="${GNOMEDB_CFLAGS} -DGNOMELOCALEDIR=\\\"${datadir}/locale\\\""
-+GNOMEDB_CFLAGS="${GNOMEDB_CFLAGS} -DGNOMELOCALEDIR=\\\"${prefix}/share/locale\\\""
- 
- 
- 
diff --git a/net/gnomba/files/patch-ac b/net/gnomba/files/patch-ac
deleted file mode 100644
index e56e855838d4..000000000000
--- a/net/gnomba/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Feb 10 01:53:13 2000
-+++ configure	Thu Feb 10 01:54:54 2000
-@@ -3440,7 +3440,7 @@
- 	< $srcdir/po/POTFILES.in > po/POTFILES
-   
- 
--localedir=${datadir}/locale
-+localedir=${prefix}/${DATADIRNAME}/locale
- 
- 
- trap '' 1 2 15
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 820e1fc4bfb4..44a777897908 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -16,15 +16,6 @@
   have_ngettext=yes
  fi
  done
-@@ -25595,7 +25597,7 @@
- if test "x$CATOBJEXT" = "x.mo" ; then
-   localedir=`eval echo "${libdir}/locale"`
- else
--  localedir=`eval echo "${datadir}/locale"`
-+  localedir=`eval echo "${prefix}/share/locale"`
- fi
- prefix="$glib_save_prefix"
- exec_prefix="$glib_save_exec_prefix"
 @@ -26257,7 +26259,7 @@
  
  
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 820e1fc4bfb4..44a777897908 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -16,15 +16,6 @@
   have_ngettext=yes
  fi
  done
-@@ -25595,7 +25597,7 @@
- if test "x$CATOBJEXT" = "x.mo" ; then
-   localedir=`eval echo "${libdir}/locale"`
- else
--  localedir=`eval echo "${datadir}/locale"`
-+  localedir=`eval echo "${prefix}/share/locale"`
- fi
- prefix="$glib_save_prefix"
- exec_prefix="$glib_save_exec_prefix"
 @@ -26257,7 +26259,7 @@