Install po-mode.el in share/emacs/site-lisp.

Merge patches ae and aj.

PR:		15941
Submitted by:	Dmitry Sivachenko <dima@Chg.RU>

9 files changed, 123 insertions, 6 deletions

diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 5e74e29bcbb3..deeee97f1147 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -22,8 +22,9 @@ pre-configure:
 
 post-install:
 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
+	${MKDIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
-		${PREFIX}/share/gettext/po-mode.el
+		${PREFIX}/share/emacs/site-lisp/po-mode.el
 	${MKDIR} ${X11BASE}/share/locale
 
 .include <bsd.port.mk>
diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae
index 73bde596d6c4..bbb9fce0b072 100644
--- a/devel/gettext-devel/files/patch-ae
+++ b/devel/gettext-devel/files/patch-ae
@@ -1,5 +1,43 @@
 --- configure.orig	Fri May  1 07:48:25 1998
 +++ configure	Wed Feb 17 02:05:55 1999
+@@ -837,13 +837,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+-   ACLOCAL=aclocal
+-   echo "$ac_t""found" 1>&6
+-else
++#if (aclocal --version) < /dev/null > /dev/null 2>&1; then
++#   ACLOCAL=aclocal
++#   echo "$ac_t""found" 1>&6
++#else
+    ACLOCAL="$missing_dir/missing aclocal"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+ echo "configure:850: checking for working autoconf" >&5
+@@ -863,13 +863,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (automake --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOMAKE=automake
+-   echo "$ac_t""found" 1>&6
+-else
++#if (automake --version) < /dev/null > /dev/null 2>&1; then
++#   AUTOMAKE=automake
++#   echo "$ac_t""found" 1>&6
++#else
+    AUTOMAKE="$missing_dir/missing automake"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+ echo "configure:876: checking for working autoheader" >&5
 @@ -3958,7 +3958,7 @@
     fi
     
diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist
index 2fff53268f32..d8e27838e3d2 100644
--- a/devel/gettext-devel/pkg-plist
+++ b/devel/gettext-devel/pkg-plist
@@ -19,7 +19,6 @@ share/aclocal/gettext.m4
 share/aclocal/lcmessage.m4
 share/aclocal/progtest.m4
 share/gettext/ABOUT-NLS
-share/gettext/po-mode.el
 share/gettext/po/Makefile.in.in
 share/gettext/intl/ChangeLog
 share/gettext/intl/Makefile.in
@@ -57,6 +56,7 @@ share/locale/pt/LC_MESSAGES/gettext.mo
 share/locale/sl/LC_MESSAGES/gettext.mo
 share/locale/sv/LC_MESSAGES/gettext.mo
 share/locale/locale.alias
+share/emacs/site-lisp/po-mode.el
 @dirrm share/gettext/intl
 @dirrm share/gettext/po
 @dirrm share/gettext
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index 5e74e29bcbb3..deeee97f1147 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -22,8 +22,9 @@ pre-configure:
 
 post-install:
 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
+	${MKDIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
-		${PREFIX}/share/gettext/po-mode.el
+		${PREFIX}/share/emacs/site-lisp/po-mode.el
 	${MKDIR} ${X11BASE}/share/locale
 
 .include <bsd.port.mk>
diff --git a/devel/gettext-old/files/patch-ae b/devel/gettext-old/files/patch-ae
index 73bde596d6c4..bbb9fce0b072 100644
--- a/devel/gettext-old/files/patch-ae
+++ b/devel/gettext-old/files/patch-ae
@@ -1,5 +1,43 @@
 --- configure.orig	Fri May  1 07:48:25 1998
 +++ configure	Wed Feb 17 02:05:55 1999
+@@ -837,13 +837,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+-   ACLOCAL=aclocal
+-   echo "$ac_t""found" 1>&6
+-else
++#if (aclocal --version) < /dev/null > /dev/null 2>&1; then
++#   ACLOCAL=aclocal
++#   echo "$ac_t""found" 1>&6
++#else
+    ACLOCAL="$missing_dir/missing aclocal"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+ echo "configure:850: checking for working autoconf" >&5
+@@ -863,13 +863,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (automake --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOMAKE=automake
+-   echo "$ac_t""found" 1>&6
+-else
++#if (automake --version) < /dev/null > /dev/null 2>&1; then
++#   AUTOMAKE=automake
++#   echo "$ac_t""found" 1>&6
++#else
+    AUTOMAKE="$missing_dir/missing automake"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+ echo "configure:876: checking for working autoheader" >&5
 @@ -3958,7 +3958,7 @@
     fi
     
diff --git a/devel/gettext-old/pkg-plist b/devel/gettext-old/pkg-plist
index 2fff53268f32..d8e27838e3d2 100644
--- a/devel/gettext-old/pkg-plist
+++ b/devel/gettext-old/pkg-plist
@@ -19,7 +19,6 @@ share/aclocal/gettext.m4
 share/aclocal/lcmessage.m4
 share/aclocal/progtest.m4
 share/gettext/ABOUT-NLS
-share/gettext/po-mode.el
 share/gettext/po/Makefile.in.in
 share/gettext/intl/ChangeLog
 share/gettext/intl/Makefile.in
@@ -57,6 +56,7 @@ share/locale/pt/LC_MESSAGES/gettext.mo
 share/locale/sl/LC_MESSAGES/gettext.mo
 share/locale/sv/LC_MESSAGES/gettext.mo
 share/locale/locale.alias
+share/emacs/site-lisp/po-mode.el
 @dirrm share/gettext/intl
 @dirrm share/gettext/po
 @dirrm share/gettext
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 5e74e29bcbb3..deeee97f1147 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -22,8 +22,9 @@ pre-configure:
 
 post-install:
 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
+	${MKDIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
-		${PREFIX}/share/gettext/po-mode.el
+		${PREFIX}/share/emacs/site-lisp/po-mode.el
 	${MKDIR} ${X11BASE}/share/locale
 
 .include <bsd.port.mk>
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index 73bde596d6c4..bbb9fce0b072 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,5 +1,43 @@
 --- configure.orig	Fri May  1 07:48:25 1998
 +++ configure	Wed Feb 17 02:05:55 1999
+@@ -837,13 +837,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+-   ACLOCAL=aclocal
+-   echo "$ac_t""found" 1>&6
+-else
++#if (aclocal --version) < /dev/null > /dev/null 2>&1; then
++#   ACLOCAL=aclocal
++#   echo "$ac_t""found" 1>&6
++#else
+    ACLOCAL="$missing_dir/missing aclocal"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+ echo "configure:850: checking for working autoconf" >&5
+@@ -863,13 +863,13 @@
+ # Run test in a subshell; some versions of sh will print an error if
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (automake --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOMAKE=automake
+-   echo "$ac_t""found" 1>&6
+-else
++#if (automake --version) < /dev/null > /dev/null 2>&1; then
++#   AUTOMAKE=automake
++#   echo "$ac_t""found" 1>&6
++#else
+    AUTOMAKE="$missing_dir/missing automake"
+    echo "$ac_t""missing" 1>&6
+-fi
++#fi
+ 
+ echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+ echo "configure:876: checking for working autoheader" >&5
 @@ -3958,7 +3958,7 @@
     fi
     
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 2fff53268f32..d8e27838e3d2 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -19,7 +19,6 @@ share/aclocal/gettext.m4
 share/aclocal/lcmessage.m4
 share/aclocal/progtest.m4
 share/gettext/ABOUT-NLS
-share/gettext/po-mode.el
 share/gettext/po/Makefile.in.in
 share/gettext/intl/ChangeLog
 share/gettext/intl/Makefile.in
@@ -57,6 +56,7 @@ share/locale/pt/LC_MESSAGES/gettext.mo
 share/locale/sl/LC_MESSAGES/gettext.mo
 share/locale/sv/LC_MESSAGES/gettext.mo
 share/locale/locale.alias
+share/emacs/site-lisp/po-mode.el
 @dirrm share/gettext/intl
 @dirrm share/gettext/po
 @dirrm share/gettext