mirror of
https://git.freebsd.org/ports.git
synced 2025-07-08 12:59:17 -04:00
d98bb49da8
editors/emacs - Update to v. 24.1[1] - Update CANNA patch to v. 24.1[2] - Convert OPTIONS to OptionsNG - Remove patch to VC to make it work with Subversion 1.7 - Add patch to implement process support for FreeBSD from Emacs bug# 5243 - Add patch to fix segfault on Terminal (from NetBSD emacs port)[2] editors/emacs23 - Convert OPTIONS to OptionsNG - Bump PORTREVISION of editors/emacs23 port - Remove PORTEPOCH, as port needs to be explicitly installed/upgraded - Connect repocopied editors/emacs23 to build editors/emacs-devel - Update to bzr revision 109364 - Convert OPTIONS to OptionsNG - Remove redundant patches - Add patch to add openpty support for 10-CURRENT from Emacs bug# 12040[3] Mk/bsd.emacs.mk - Add EMACS_PORT_NAME block for Emacs 24 to bsd.emacs.mk - Update major version for emacs-devel port - Take maintainership of bsd.emacs.mk Thanks to everyone who tested these updates, and provided their feedback. Submitted by: http://www.gnu.org/software/emacs/NEWS.24.1[1] Submitted by: Yuji TAKANO[2] (via private email), Jan Beich[3]
73 lines
2.6 KiB
Text
73 lines
2.6 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -1166,39 +1166,10 @@
|
|
AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
|
|
AC_SUBST(LIBSOUND)
|
|
|
|
- ALSA_REQUIRED=1.0.0
|
|
- ALSA_MODULES="alsa >= $ALSA_REQUIRED"
|
|
- PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
|
|
- if test $HAVE_ALSA = yes; then
|
|
- SAVE_CFLAGS="$CFLAGS"
|
|
- SAVE_LIBS="$LIBS"
|
|
- CFLAGS="$ALSA_CFLAGS $CFLAGS"
|
|
- LIBS="$ALSA_LIBS $LIBS"
|
|
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
|
|
- emacs_alsa_normal=yes,
|
|
- emacs_alsa_normal=no)
|
|
- if test "$emacs_alsa_normal" != yes; then
|
|
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]],
|
|
- [[snd_lib_error_set_handler (0);]])],
|
|
- emacs_alsa_subdir=yes,
|
|
- emacs_alsa_subdir=no)
|
|
- if test "$emacs_alsa_subdir" != yes; then
|
|
- AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.])
|
|
- fi
|
|
- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
|
|
- fi
|
|
-
|
|
- CFLAGS="$SAVE_CFLAGS"
|
|
- LIBS="$SAVE_LIBS"
|
|
- LIBSOUND="$LIBSOUND $ALSA_LIBS"
|
|
- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
|
|
- AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
|
|
- fi
|
|
-
|
|
dnl Define HAVE_SOUND if we have sound support. We know it works and
|
|
dnl compiles only on the specified platforms. For others, it
|
|
dnl probably doesn't make sense to try.
|
|
- if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
|
|
+ if test x$have_sound_header = xyes; then
|
|
case "$opsys" in
|
|
dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
|
|
gnu-linux|freebsd|netbsd)
|
|
@@ -1215,7 +1186,7 @@
|
|
linux/version.h sys/systeminfo.h
|
|
stdio_ext.h fcntl.h coff.h pty.h
|
|
sys/vlimit.h sys/resource.h
|
|
- sys/utsname.h pwd.h utmp.h dirent.h util.h)
|
|
+ sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h)
|
|
|
|
AC_MSG_CHECKING(if personality LINUX32 can be set)
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
|
|
@@ -3378,7 +3349,7 @@
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] )
|
|
;;
|
|
|
|
- darwin )
|
|
+ darwin | freebsd )
|
|
AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] )
|
|
dnl Not used, because PTY_ITERATION is defined.
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
|
|
@@ -3390,7 +3361,7 @@
|
|
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] )
|
|
;;
|
|
|
|
- gnu | freebsd | netbsd | openbsd )
|
|
+ gnu | netbsd | openbsd )
|
|
AC_DEFINE(FIRST_PTY_LETTER, ['p'])
|
|
;;
|
|
|