mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-03 01:23:49 +00:00
Upgrade to 21.5 beta20 "cilantro" with help from xemacs-devel-mule upgrade
by Andrey Slusar. The same patch-configure.ac is used. Changes in patches patch-mem-limits.h and patch-emacs.c are solved, but a bit differently in source so remove them. Autoconf 2.59 is changed which changes a few configure options names. Security: Fixes VuXML 3e3c860d-7dae-11d9-a9e7-0001020eed82
This commit is contained in:
Dejan Lesjak
parent
479decc488
commit
0dc0910d43
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=133568
@ -32,22 +32,22 @@ USE_XPM= yes
|
||||
|
||||
XEMACS_MAJOR_VER?= 21
|
||||
XEMACS_REL= ${XEMACS_MAJOR_VER}.5
|
||||
XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b17
|
||||
XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b20
|
||||
XEMACS_ARCH= ${CONFIGURE_TARGET}
|
||||
|
||||
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
|
||||
STRIP=
|
||||
USE_AUTOCONF_VER=213
|
||||
USE_AUTOCONF_VER=259
|
||||
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
|
||||
|
||||
CONFIGURE_ARGS?=--with-clash-detection \
|
||||
--with-sound=native,nonas,noesd \
|
||||
--site-includes=${LOCALBASE}/include \
|
||||
--site-libraries=${LOCALBASE}/lib \
|
||||
CONFIGURE_ARGS?=--enable-clash-detection \
|
||||
--enable-sound=native,nonas,noesd \
|
||||
--with-site-includes=${LOCALBASE}/include \
|
||||
--with-site-libraries=${LOCALBASE}/lib \
|
||||
--with-ldap=no \
|
||||
--with-postgresql=no \
|
||||
--with-site-lisp \
|
||||
--with-database=berkdb \
|
||||
--enable-database=berkdb \
|
||||
${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX} ${WITH_GTK}
|
||||
MAKE_ARGS= prefix=${PREFIX}
|
||||
MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
|
||||
@ -60,7 +60,7 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
|
||||
|
||||
# Undump and malloc do not behave on amd64 at the moment
|
||||
.if ${ARCH} == "amd64"
|
||||
CONFIGURE_ARGS+= --with-system-malloc --pdump
|
||||
CONFIGURE_ARGS+= --with-system-malloc --enable-pdump
|
||||
BROKEN= "Incomplete pkg-plist"
|
||||
.endif
|
||||
|
||||
@ -89,12 +89,12 @@ pre-fetch:
|
||||
CONFIG_ARGS+= --with-png=yes --with-tiff=yes
|
||||
.endif
|
||||
.if defined(WITHOUT_X11)
|
||||
CONFIGURE_ARGS+= --without-x11
|
||||
CONFIGURE_ARGS+= --with-x11=no
|
||||
.endif
|
||||
|
||||
# hack to avoid shipping binaries linked with Motif
|
||||
.if defined(MOTIF_STATIC)
|
||||
WITH_DIALOGS= --with-dialogs=athena
|
||||
WITH_DIALOGS= --enable-dialogs=athena
|
||||
.endif
|
||||
|
||||
.if defined(WITH_XAW3D)
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
MD5 (xemacs/xemacs-21.5.17.tar.gz) = 45f619328fa8ce0e7f38ade44601e3df
|
||||
SIZE (xemacs/xemacs-21.5.17.tar.gz) = 13818839
|
||||
MD5 (xemacs/xemacs-21.5.20.tar.gz) = 8bf5f1af05588cb59a67bade939c4aeb
|
||||
SIZE (xemacs/xemacs-21.5.20.tar.gz) = 11872002
|
||||
|
||||
82
editors/xemacs-devel/files/patch-configure.ac
Normal file
82
editors/xemacs-devel/files/patch-configure.ac
Normal file
@ -0,0 +1,82 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
|
||||
retrieving revision 1.2
|
||||
diff -u -r1.2 configure.ac
|
||||
--- configure.ac 2005/03/11 11:19:01 1.2
|
||||
+++ configure.ac 2005/03/17 20:16:50
|
||||
@@ -11,7 +11,7 @@
|
||||
xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
|
||||
xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
|
||||
ac_cpp='$CPP '"$xe_cppflags"
|
||||
-ac_compile='$CC -c $CFLAGS'"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
|
||||
+ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
])
|
||||
@@ -1148,6 +1148,7 @@
|
||||
dnl Straightforward OS determination
|
||||
case "$ac_cv_build" in
|
||||
*-*-linux* ) opsys=linux ;;
|
||||
+ *-*-freebsd* ) opsys=freebsd ;;
|
||||
*-*-netbsd* ) opsys=netbsd ;;
|
||||
*-*-openbsd* ) opsys=openbsd ;;
|
||||
*-*-nextstep* ) opsys=nextstep ;;
|
||||
@@ -1706,12 +1707,12 @@
|
||||
else cflags_warning_specified=no;
|
||||
fi
|
||||
|
||||
-if test "${cflags_optimization-unset}" != unset
|
||||
+if test "${with_cflags_optimization-unset}" != unset
|
||||
then cflags_optimization_specified=yes;
|
||||
else cflags_optimization_specified=no;
|
||||
fi
|
||||
|
||||
-if test "${cflags_debugging-unset}" != unset
|
||||
+if test "${with_cflags_debugging-unset}" != unset
|
||||
then cflags_debugging_specified=yes;
|
||||
else cflags_debugging_specified=no;
|
||||
fi
|
||||
@@ -2048,11 +2049,11 @@
|
||||
dnl Calculate optimization flags. These will be off by default in beta
|
||||
dnl versions and on in release versions.
|
||||
|
||||
-if test -z "$with_optimization" ; then
|
||||
- if test -n "$emacs_is_beta" ; then
|
||||
- with_optimization=no
|
||||
- else
|
||||
+if test -z "$with_optimization"; then
|
||||
+ if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then
|
||||
with_optimization=yes
|
||||
+ else
|
||||
+ with_optimization=no
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -3811,7 +3812,7 @@
|
||||
png_problem=""
|
||||
test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) }
|
||||
test -z "$with_png" && { AC_CHECK_HEADER(png.h, ,with_png=no) }
|
||||
- test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) }
|
||||
+ test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no,[-lz]) }
|
||||
if test -z "$with_png"; then
|
||||
AC_MSG_CHECKING(for workable png version information)
|
||||
xe_check_libs="-lpng -lz"
|
||||
@@ -3847,7 +3848,7 @@
|
||||
|
||||
dnl autodetect TIFF
|
||||
test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h, ,with_tiff=no) }
|
||||
- test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no) }
|
||||
+ test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no,[-lz]) }
|
||||
test -z "$with_tiff" && with_tiff=yes
|
||||
if test "$with_tiff" = "yes"; then
|
||||
AC_DEFINE(HAVE_TIFF)
|
||||
@@ -4943,7 +4950,7 @@
|
||||
dnl Check for Berkeley DB.
|
||||
if test "$enable_database_berkdb" != "no"; then
|
||||
AC_MSG_CHECKING(for Berkeley db.h)
|
||||
- for header in "db/db.h" "db.h"; do
|
||||
+ for header in "/usr/include/db.h" "db/db.h" "db.h"; do
|
||||
AC_TRY_COMPILE([
|
||||
#include <stdlib.h>
|
||||
#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
|
||||
@ -1,11 +0,0 @@
|
||||
--- src/emacs.c.orig Sun Mar 9 03:37:54 2003
|
||||
+++ src/emacs.c Tue Jul 20 21:59:42 2004
|
||||
@@ -398,7 +398,7 @@
|
||||
|
||||
/* Number of bytes of writable memory we can expect to be able to get:
|
||||
Leave this as an unsigned int because it could potentially be 4G */
|
||||
-unsigned int lim_data;
|
||||
+rlim_t lim_data;
|
||||
|
||||
/* WARNING!
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- src/mem-limits.h.bak Thu Mar 18 13:08:19 2004
|
||||
+++ src/mem-limits.h Thu Mar 18 13:08:42 2004
|
||||
@@ -108,7 +108,7 @@
|
||||
static POINTER data_space_start;
|
||||
|
||||
/* Number of bytes of writable memory we can expect to be able to get */
|
||||
-extern unsigned int lim_data;
|
||||
+extern rlim_t lim_data;
|
||||
|
||||
#if defined (HEAP_IN_DATA) && !defined(PDUMP)
|
||||
extern unsigned long static_heap_size;
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user