mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

* Update to 21.5-b21 "corn"

Browse Source 
* Unbreak on non-i386 platforms
* Update EMACS_VER on editors/xemacs-devel-mule
* Fix EMACS_VER on editors/xemacs-devel

PR:		ports/81866
Submitted by:	Andrey Slusar <anrays@gmail.com> (maintainer)
This commit is contained in:
Sergey Matveychuk 2005-06-04 09:56:18 +00:00
parent 5514ee6daf
commit 261feb1dc8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=136780
10 changed files with 20 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.emacs.mk
View File

@ -1,5 +1,5 @@
#
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.41 2005-04-17 18:13:12 sem Exp $
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.42 2005-06-04 09:56:18 sem Exp $
#
# bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
#
@ -166,7 +166,7 @@ PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
# XEmacs-21 development version
.elif (${EMACS_PORT_NAME} == "xemacs-devel")
EMACS_NAME= xemacs
EMACS_VER= 21.5-b17
EMACS_VER= 21.5-b20
EMACS_MAJOR_VER= 21
EMACS_LIBDIR?= lib/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER}
@ -183,7 +183,7 @@ PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
# XEmacs-21 development version with Mule
.elif (${EMACS_PORT_NAME} == "xemacs-devel-mule")
EMACS_NAME= xemacs
EMACS_VER= 21.5-b20
EMACS_VER= 21.5-b21
EMACS_MAJOR_VER= 21
EMACS_LIBDIR?= lib/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER}

11
editors/xemacs-devel-mule/Makefile
View File

@ -48,7 +48,7 @@ USE_XPM= yes
.endif
XEMACS_REL= 21.5
XEMACS_VER= ${XEMACS_REL}-b20
XEMACS_VER= ${XEMACS_REL}-b21
XEMACS_ARCH= ${MACHINE_ARCH}--freebsd
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
@ -105,15 +105,6 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
.include <bsd.port.pre.mk>
# Undump and malloc do not behave on amd64 and sparc64
.if (${ARCH} == "amd64") || (${ARCH} == "sparc64")
CONFIGURE_ARGS+=--with-system-malloc --enable-pdump
.endif
.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" || ${ARCH} == "ia64"
BROKEN= "Does not build on amd64, sparc64 or ia64"
.endif
pre-fetch:
.if defined(WITHOUT_X11)
@${ECHO_MSG} ""

4
editors/xemacs-devel-mule/distinfo
View File

@ -1,2 +1,2 @@
MD5 (xemacs/xemacs-21.5.20.tar.gz) = 8bf5f1af05588cb59a67bade939c4aeb
SIZE (xemacs/xemacs-21.5.20.tar.gz) = 11872002
MD5 (xemacs/xemacs-21.5.21.tar.gz) = 5941238fe8eda3a120bc5735cc50a94d
SIZE (xemacs/xemacs-21.5.21.tar.gz) = 14963507

20
editors/xemacs-devel-mule/files/patch-ai
View File

@ -1,20 +0,0 @@
--- lib-src/fakemail.c.orig Tue Mar 23 22:09:58 1999
+++ lib-src/fakemail.c Tue Mar 23 22:12:20 1999
@@ -157,9 +157,17 @@
extern char *malloc (), *realloc ();
#endif
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
+#define CURRENT_USER
+#endif
+
#ifdef CURRENT_USER
extern struct passwd *getpwuid ();
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
+extern uid_t geteuid ();
+#else
extern unsigned short geteuid ();
+#endif
static struct passwd *my_entry;
#define cuserid(s) \
(my_entry = getpwuid (((int) geteuid ())), \

17
editors/xemacs-devel-mule/files/patch-ak
View File

@ -1,17 +0,0 @@
--- ./src/unexelf.c~ Sun Aug 15 03:29:56 1999
+++ ./src/unexelf.c Tue Nov 2 10:24:55 1999
@@ -515,6 +515,14 @@
# include <sys/exec_elf.h>
#endif
+#if defined(__FreeBSD__) && (defined(__alpha__) || defined(__amd64__))
+# ifdef __STDC__
+# define ElfW(type) Elf64_##type
+# else
+# define ElfW(type) Elf64_/**/type
+# endif
+#endif
+
#if __GNU_LIBRARY__ - 0 >= 6
# include <link.h> /* get ElfW etc */
#endif

16
editors/xemacs-devel-mule/files/patch-alloc.c
View File

@ -1,16 +0,0 @@
Index: src/alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.106
diff -u -r1.106 alloc.c
--- src/alloc.c 2005/02/03 16:14:04 1.106
+++ src/alloc.c 2005/02/23 00:01:18
@@ -349,7 +349,7 @@
#else /* ERROR_CHECK_MALLOC */
-#define MALLOC_BEGIN(block)
+#define MALLOC_BEGIN()
#define FREE_OR_REALLOC_BEGIN(block)
#define MALLOC_END()

63
editors/xemacs-devel-mule/files/patch-configure.ac
View File

@ -1,19 +1,5 @@
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
@ -22,55 +8,6 @@ diff -u -r1.2 configure.ac
*-*-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

11
editors/xemacs-devel-mule/files/patch-regex.c Normal file
View File

@ -0,0 +1,11 @@
--- src/regex.c.orig Sun Apr 18 22:19:13 2004
+++ src/regex.c Sun Apr 18 22:18:40 2004
@@ -1322,7 +1322,7 @@
exactly that if always used MAX_FAILURE_SPACE each time we failed.
This is a variable only so users of regex can assign to it; we never
change it ourselves. */
-#if defined (MATCH_MAY_ALLOCATE)
+#if defined (MATCH_MAY_ALLOCATE) || defined (REGEX_MALLOC)
/* 4400 was enough to cause a crash on Alpha OSF/1,
whose default stack limit is 2mb. */
int re_max_failures = 20000;

2
editors/xemacs-devel-mule/pkg-plist
View File

@ -583,6 +583,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp-union.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lrecord.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lstream.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mc-alloc.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/7300.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/README
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/acorn.h
@ -900,6 +901,7 @@ lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
lib/xemacs-%%XEMACS_VER%%/info/lispref.info-10
lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
lib/xemacs-%%XEMACS_VER%%/info/standards.info
lib/xemacs-%%XEMACS_VER%%/info/term.info

1
editors/xemacs-devel-mule/pkg-plist.arch-dep
View File

@ -105,6 +105,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp-union.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lisp.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lrecord.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/lstream.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mc-alloc.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/7300.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/README
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m/acorn.h