- Update to version 23.3

- Update CANNA support[1]
- Fix bug in plist generation

Submitted by:	Yuji TAKANO <takachan@running-dog.net>[1] (via private email)

4 files changed, 52 insertions, 97 deletions

diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 408452d8787d..c22b2042064f 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -25,7 +24,7 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-24.* \
 
 INSTALLS_ICONS=	yes
 
-EMACS_VER=	23.2
+EMACS_VER=	23.3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
@@ -39,7 +38,8 @@ MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 		grep-changelog.1 rcs-checkin.1
 PLIST_SUB=	EMACS_VER=${EMACS_VER}
 
-EMACS_DIRS=	${DATADIR}/${EMACS_VER} ${PREFIX}/libexec/${PORTNAME}
+EMACS_DIRS=	${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
+		${PREFIX}/libexec/${PORTNAME}
 
 MAKE_ENV=	LC_ALL=C
 
@@ -194,9 +194,9 @@ CONFIGURE_ARGS+=	--without-xim
 .endif
 
 .if defined(WITH_CANNA)
-PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR+=	nork
-PATCHFILES+=	emacs232canna-20100608.patch.gz
+PATCH_SITES+=	http://wahjava.users.sourceforge.net/%SUBDIR%/ ${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR+=	ashish
+PATCHFILES+=	emacs23.3canna-20110316.diff.gz
 PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--with-canna \
 			--with-canna-includes=${LOCALBASE}/include \
@@ -231,17 +231,24 @@ post-configure:
 
 add-plist-data:
 .for i in ${EMACS_DIRS}
-	@${FIND} ${i} -type f |${SED} -e 's,${PREFIX}/,,g' >>${TMPPLIST}
+	@${FIND} ${i} -type f |${SED} -E -e 's,^${PREFIX}/,,g'  >>${TMPPLIST}
 .endfor
+	@${FIND} ${WRKSRC}/etc -type f |${SED} -E -e 's,^${WRKSRC},${DATADIR_REL}/${EMACS_VER},g' -e '/etc\/(\..*|ChangeLog|DOC)$$/d' >>${TMPPLIST}
+	@${FIND} ${WRKSRC}/etc -type d -depth |${SED} -E -e 's,^${WRKSRC},@dirrm ${DATADIR_REL}/${EMACS_VER},g' >>${TMPPLIST}
 .for i in ${EMACS_DIRS}
-	@${FIND} ${i} -type d -depth |${SED} -e 's,^${PREFIX}/,@dirrm ,g' >>${TMPPLIST}
+	@${FIND} ${i} -type d -depth |${SED} -E -e 's,^${PREFIX}/,@dirrm ,g' >>${TMPPLIST}
 .endfor
+	@${ECHO} "@unexec rmdir %D/${DATADIR_REL}/${EMACS_VER} 2>/dev/null || true" >>${TMPPLIST}
 
 .if defined(WITH_SOURCES)
+PLIST_SUB+=	SOURCES=""
+
 post-install:
 	@${MKDIR} ${DATADIR}/${EMACS_VER}/src
 	@${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${DATADIR}/${EMACS_VER}/src
 	@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+.else
+PLIST_SUB+=	SOURCES="@comment "
 .endif
 
 pre-everything::
diff --git a/editors/emacs23/distinfo b/editors/emacs23/distinfo
index e0030ac3c756..00fdcc08de51 100644
--- a/editors/emacs23/distinfo
+++ b/editors/emacs23/distinfo
@@ -1,4 +1,4 @@
-SHA256 (emacs-23.2.tar.bz2) = ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
-SIZE (emacs-23.2.tar.bz2) = 38376047
-SHA256 (emacs232canna-20100608.patch.gz) = 99d258a1924e9e2500e6ffd073d288f48260f86f24113abf91234cef711f455a
-SIZE (emacs232canna-20100608.patch.gz) = 33903
+SHA256 (emacs-23.3.tar.bz2) = 6adc96efd794513b25c7c93fcc2e2918353c427c94bd24269f2d82880d29ca4d
+SIZE (emacs-23.3.tar.bz2) = 38689490
+SHA256 (emacs23.3canna-20110316.diff.gz) = 26cb4bdb88685641e23d3a27953db56e04712caf154963edcaea41f5a403c7d3
+SIZE (emacs23.3canna-20110316.diff.gz) = 33845
diff --git a/editors/emacs23/files/patch-configure b/editors/emacs23/files/patch-configure
index e9da46794704..668668865700 100644
--- a/editors/emacs23/files/patch-configure
+++ b/editors/emacs23/files/patch-configure
@@ -3,10 +3,12 @@ $FreeBSD$
 
 --- configure.orig
 +++ configure
-@@ -6433,214 +6433,8 @@
- 
- 
+@@ -5806,159 +5806,6 @@
+   LIBSOUND=
+ fi
  
+-
+-
 -  ALSA_REQUIRED=1.0.0
 -  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
 -
@@ -14,9 +16,9 @@ $FreeBSD$
 -
 -  # Extract the first word of "pkg-config", so it can be a program name with args.
 -set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
 -  $as_echo_n "(cached) " >&6
 -else
 -  case $PKG_CONFIG in
@@ -29,14 +31,14 @@ $FreeBSD$
 -do
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
--done
+-  done
 -IFS=$as_save_IFS
 -
 -  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -45,10 +47,10 @@ $FreeBSD$
 -fi
 -PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 -if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 -$as_echo "$PKG_CONFIG" >&6; }
 -else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -fi
 -
@@ -59,27 +61,27 @@ $FreeBSD$
 -  else
 -     PKG_CONFIG_MIN_VERSION=0.9.0
 -     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        { $as_echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ALSA_MODULES" >&5
 -$as_echo_n "checking for $ALSA_MODULES... " >&6; }
 -
 -        if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
--            { $as_echo "$as_me:$LINENO: result: yes" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 -$as_echo "yes" >&6; }
 -            succeeded=yes
 -
--            { $as_echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_CFLAGS" >&5
 -$as_echo_n "checking ALSA_CFLAGS... " >&6; }
 -            ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
--            { $as_echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5
 -$as_echo "$ALSA_CFLAGS" >&6; }
 -
--            { $as_echo "$as_me:$LINENO: checking ALSA_LIBS" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_LIBS" >&5
 -$as_echo_n "checking ALSA_LIBS... " >&6; }
 -            ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
--            { $as_echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5
 -$as_echo "$ALSA_LIBS" >&6; }
 -        else
--            { $as_echo "$as_me:$LINENO: result: no" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -            ALSA_CFLAGS=""
 -            ALSA_LIBS=""
@@ -108,11 +110,7 @@ $FreeBSD$
 -    SAVE_LDFLAGS="$LDFLAGS"
 -    CFLAGS="$ALSA_CFLAGS $CFLAGS"
 -    LDFLAGS="$ALSA_LIBS $LDFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -#include <asoundlib.h>
 -int
@@ -123,39 +121,14 @@ $FreeBSD$
 -  return 0;
 -}
 -_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
+-if ac_fn_c_try_compile "$LINENO"; then :
 -  emacs_alsa_normal=yes
 -else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	emacs_alsa_normal=no
- fi
- 
+-  emacs_alsa_normal=no
+-fi
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    if test "$emacs_alsa_normal" != yes; then
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -#include <alsa/asoundlib.h>
 -int
@@ -166,37 +139,14 @@ $FreeBSD$
 -  return 0;
 -}
 -_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
+-if ac_fn_c_try_compile "$LINENO"; then :
 -  emacs_alsa_subdir=yes
 -else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	emacs_alsa_subdir=no
+-  emacs_alsa_subdir=no
 -fi
--
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -      if test "$emacs_alsa_subdir" != yes; then
--        { { $as_echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile.  See config.log for error messages." >&5
--$as_echo "$as_me: error: pkg-config found alsa, but it does not compile.  See config.log for error messages." >&2;}
--   { (exit 1); exit 1; }; }
+-        as_fn_error $? "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
 -      fi
 -      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
 -    fi
@@ -206,15 +156,10 @@ $FreeBSD$
 -    LIBSOUND="$LIBSOUND $ALSA_LIBS"
 -    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
 -
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ALSA 1
--_ACEOF
+-$as_echo "#define HAVE_ALSA 1" >>confdefs.h
 -
 -  fi
 -
--fi
--
--
- 
- 
+ fi
  
+ for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
diff --git a/editors/emacs23/pkg-plist b/editors/emacs23/pkg-plist
index 09d22670d234..94667e7f982f 100644
--- a/editors/emacs23/pkg-plist
+++ b/editors/emacs23/pkg-plist
@@ -8,6 +8,8 @@ bin/etags
 bin/grep-changelog
 bin/rcs-checkin
 share/applications/emacs.desktop
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
+%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
 %%DATADIR%%/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png
@@ -20,6 +22,7 @@ share/icons/hicolor/48x48/apps/emacs.png
 share/icons/hicolor/48x48/apps/emacs22.png
 share/icons/hicolor/scalable/apps/emacs.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
 @dirrmtry share/icons/hicolor/scalable/mimetypes
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable