diff options
author | anray <anray@FreeBSD.org> | 2006-04-02 01:29:44 +0800 |
---|---|---|
committer | anray <anray@FreeBSD.org> | 2006-04-02 01:29:44 +0800 |
commit | d15463f91fcfe514e2476c54d279c14c79db5afa (patch) | |
tree | f62f472499e9902917fbed5b35e95283e96b634c | |
parent | 87b0695ca9033463f642736209c6a5c1899628b1 (diff) | |
download | freebsd-ports-gnome-d15463f91fcfe514e2476c54d279c14c79db5afa.tar.gz freebsd-ports-gnome-d15463f91fcfe514e2476c54d279c14c79db5afa.tar.zst freebsd-ports-gnome-d15463f91fcfe514e2476c54d279c14c79db5afa.zip |
Update to 21.5-b26 "endive".
-rw-r--r-- | editors/xemacs-devel-mule/Makefile | 2 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/distinfo | 6 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-configure.ac | 14 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-diagnose.el | 17 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/files/patch-profile.h | 16 | ||||
-rw-r--r-- | editors/xemacs-devel/Makefile | 3 | ||||
-rw-r--r-- | editors/xemacs-devel/distinfo | 6 | ||||
-rw-r--r-- | editors/xemacs-devel/files/patch-configure.ac | 14 | ||||
-rw-r--r-- | editors/xemacs-devel/files/patch-profile.h | 16 |
9 files changed, 22 insertions, 72 deletions
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index da08625368c1..9788d9824cc9 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -48,7 +48,7 @@ CONFIGURE_ARGS= --with-xpm .endif XEMACS_REL= 21.5 -XEMACS_VER= ${XEMACS_REL}-b25 +XEMACS_VER= ${XEMACS_REL}-b26 XEMACS_ARCH= ${MACHINE_ARCH}--freebsd WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./} diff --git a/editors/xemacs-devel-mule/distinfo b/editors/xemacs-devel-mule/distinfo index f85ee6ec449a..d5f349065ca0 100644 --- a/editors/xemacs-devel-mule/distinfo +++ b/editors/xemacs-devel-mule/distinfo @@ -1,3 +1,3 @@ -MD5 (xemacs/xemacs-21.5.25.tar.gz) = 8ec2425c25a2642e465710f1c535fc51 -SHA256 (xemacs/xemacs-21.5.25.tar.gz) = aa77a4a3499abd47a10b4d24c5774dc473401705b9cc4de549969d98d2ac02f0 -SIZE (xemacs/xemacs-21.5.25.tar.gz) = 15109551 +MD5 (xemacs/xemacs-21.5.26.tar.gz) = e0cd4521e8857a16f6cd675bb4c1039b +SHA256 (xemacs/xemacs-21.5.26.tar.gz) = ae685075bae37d06376e706c84e9aafad2237a78da3b906d29d75bb34797c84a +SIZE (xemacs/xemacs-21.5.26.tar.gz) = 15005618 diff --git a/editors/xemacs-devel-mule/files/patch-configure.ac b/editors/xemacs-devel-mule/files/patch-configure.ac index 1d9758ae1bae..d21c7f9b168b 100644 --- a/editors/xemacs-devel-mule/files/patch-configure.ac +++ b/editors/xemacs-devel-mule/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig Sun Dec 18 19:58:55 2005 -+++ configure.ac Mon Dec 19 16:04:59 2005 -@@ -1257,6 +1257,7 @@ +--- configure.ac.orig Thu Mar 30 21:11:17 2006 ++++ configure.ac Sat Apr 1 19:49:02 2006 +@@ -1272,6 +1272,7 @@ dnl Straightforward OS determination case "$ac_cv_build" in *-*-linux* ) opsys=linux ;; @@ -8,7 +8,7 @@ *-*-netbsd* ) opsys=netbsd ;; *-*-openbsd* ) opsys=openbsd ;; *-*-nextstep* ) opsys=nextstep ;; -@@ -3423,7 +3424,7 @@ +@@ -3439,7 +3440,7 @@ dnl #### How about /sw/include, and /opt/local/include? dnl these directories need to be the parent of the freetype directory for freetype_include_top in "/usr/X11R6/include/freetype2" \ @@ -16,13 +16,13 @@ + "$with_site_includes/freetype2" do if test -d $freetype_include_top; then - AC_CHECKING([in ${freetype_include_top}/freetype2]) -@@ -5296,7 +5297,7 @@ + AC_MSG_CHECKING([in ${freetype_include_top}/freetype2]) +@@ -5339,7 +5340,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([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <stdlib.h> #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) diff --git a/editors/xemacs-devel-mule/files/patch-diagnose.el b/editors/xemacs-devel-mule/files/patch-diagnose.el deleted file mode 100644 index 7d792952c410..000000000000 --- a/editors/xemacs-devel-mule/files/patch-diagnose.el +++ /dev/null @@ -1,17 +0,0 @@ -Index: lisp/diagnose.el -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/diagnose.el,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -r1.7 -r1.8 ---- lisp/diagnose.el 2005/11/25 01:41:46 1.7 -+++ lisp/diagnose.el 2006/03/12 09:10:39 1.8 -@@ -142,7 +142,7 @@ - (princ "\n") - (map-plist #'(lambda (stat num) - (when (string-match -- "\\(.*\\)-storage\\$" -+ "\\(.*\\)-storage$" - (symbol-name stat)) - (incf total num) - (princ (format fmt diff --git a/editors/xemacs-devel-mule/files/patch-profile.h b/editors/xemacs-devel-mule/files/patch-profile.h deleted file mode 100644 index da53be335d54..000000000000 --- a/editors/xemacs-devel-mule/files/patch-profile.h +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/profile.h -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/profile.h,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- src/profile.h 2005/10/25 11:16:27 1.3 -+++ src/profile.h 2006/03/14 19:31:43 1.4 -@@ -113,6 +113,7 @@ - RETURN_EXIT_PROFILING (tag, Lisp_Object, expr) - - #define RETURN_UNGCPRO_EXIT_PROFILING(tag, expr) \ -+do \ - { \ - Lisp_Object ret_ungc_val = (expr); \ - UNGCPRO; \ diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 78d5f9ae0eb1..8ddfb149c77a 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -34,7 +34,7 @@ USE_XPM= yes XEMACS_MAJOR_VER?= 21 XEMACS_REL= ${XEMACS_MAJOR_VER}.5 -XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b25 +XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b26 XEMACS_ARCH= ${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./} @@ -53,7 +53,6 @@ CONFIGURE_ARGS?=--enable-clash-detection \ --disable-debug \ --disable-error-checking \ --disable-kkcc \ - --disable-mc-alloc \ --disable-newgc \ ${WITH_XFACE} ${WITH_DIALOGS} ${WITH_OFFIX} ${WITH_GTK} MAKE_ARGS= prefix=${PREFIX} diff --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo index f85ee6ec449a..d5f349065ca0 100644 --- a/editors/xemacs-devel/distinfo +++ b/editors/xemacs-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (xemacs/xemacs-21.5.25.tar.gz) = 8ec2425c25a2642e465710f1c535fc51 -SHA256 (xemacs/xemacs-21.5.25.tar.gz) = aa77a4a3499abd47a10b4d24c5774dc473401705b9cc4de549969d98d2ac02f0 -SIZE (xemacs/xemacs-21.5.25.tar.gz) = 15109551 +MD5 (xemacs/xemacs-21.5.26.tar.gz) = e0cd4521e8857a16f6cd675bb4c1039b +SHA256 (xemacs/xemacs-21.5.26.tar.gz) = ae685075bae37d06376e706c84e9aafad2237a78da3b906d29d75bb34797c84a +SIZE (xemacs/xemacs-21.5.26.tar.gz) = 15005618 diff --git a/editors/xemacs-devel/files/patch-configure.ac b/editors/xemacs-devel/files/patch-configure.ac index 1d9758ae1bae..d21c7f9b168b 100644 --- a/editors/xemacs-devel/files/patch-configure.ac +++ b/editors/xemacs-devel/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig Sun Dec 18 19:58:55 2005 -+++ configure.ac Mon Dec 19 16:04:59 2005 -@@ -1257,6 +1257,7 @@ +--- configure.ac.orig Thu Mar 30 21:11:17 2006 ++++ configure.ac Sat Apr 1 19:49:02 2006 +@@ -1272,6 +1272,7 @@ dnl Straightforward OS determination case "$ac_cv_build" in *-*-linux* ) opsys=linux ;; @@ -8,7 +8,7 @@ *-*-netbsd* ) opsys=netbsd ;; *-*-openbsd* ) opsys=openbsd ;; *-*-nextstep* ) opsys=nextstep ;; -@@ -3423,7 +3424,7 @@ +@@ -3439,7 +3440,7 @@ dnl #### How about /sw/include, and /opt/local/include? dnl these directories need to be the parent of the freetype directory for freetype_include_top in "/usr/X11R6/include/freetype2" \ @@ -16,13 +16,13 @@ + "$with_site_includes/freetype2" do if test -d $freetype_include_top; then - AC_CHECKING([in ${freetype_include_top}/freetype2]) -@@ -5296,7 +5297,7 @@ + AC_MSG_CHECKING([in ${freetype_include_top}/freetype2]) +@@ -5339,7 +5340,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([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <stdlib.h> #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) diff --git a/editors/xemacs-devel/files/patch-profile.h b/editors/xemacs-devel/files/patch-profile.h deleted file mode 100644 index da53be335d54..000000000000 --- a/editors/xemacs-devel/files/patch-profile.h +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/profile.h -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/profile.h,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- src/profile.h 2005/10/25 11:16:27 1.3 -+++ src/profile.h 2006/03/14 19:31:43 1.4 -@@ -113,6 +113,7 @@ - RETURN_EXIT_PROFILING (tag, Lisp_Object, expr) - - #define RETURN_UNGCPRO_EXIT_PROFILING(tag, expr) \ -+do \ - { \ - Lisp_Object ret_ungc_val = (expr); \ - UNGCPRO; \ |