summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authorgj <gj@FreeBSD.org>2005-01-04 12:11:21 +0000
committergj <gj@FreeBSD.org>2005-01-04 12:11:21 +0000
commit0e8f4c3136fb264cde6df80e266fcfbca4c026be (patch)
treeed0093823b7fa8a337286d4213efc812da4b3695 /editors
parentb8def996b947bfb6c17c2e7783afd705e93e0dfb (diff)
downloadFreeBSD-ports-0e8f4c3136fb264cde6df80e266fcfbca4c026be.zip
FreeBSD-ports-0e8f4c3136fb264cde6df80e266fcfbca4c026be.tar.gz
Revert to 21.5.17 because 21.5.18 was imported without sufficient testing
by yours truely and is causing lots of build problems. I plan to keep working on 21.5.18 until all the bugs are eliminated. Approved by: portsmgr (kris)
Diffstat (limited to 'editors')
-rw-r--r--editors/xemacs-devel/Makefile6
-rw-r--r--editors/xemacs-devel/distinfo4
-rw-r--r--editors/xemacs-devel/files/patch-emacs.c11
-rw-r--r--editors/xemacs-devel/files/patch-mem-limits.h11
-rw-r--r--editors/xemacs-devel/pkg-plist7
5 files changed, 25 insertions, 14 deletions
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 11fd712..c1d3b9e 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -31,7 +31,7 @@ USE_XPM= yes
XEMACS_MAJOR_VER?= 21
XEMACS_REL= ${XEMACS_MAJOR_VER}.5
-XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b18
+XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b17
XEMACS_ARCH= ${CONFIGURE_TARGET}
WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./}
@@ -57,10 +57,6 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
.include <bsd.port.pre.mk>
-.if ${ARCH} != "i386" || ${OSVERSION} < 500000 || ${OSVERSION} > 600000
-BROKEN= "Does not build except on i386 5.x"
-.endif
-
# Undump and malloc do not behave on amd64 at the moment
.if ${ARCH} == "amd64"
CONFIGURE_ARGS+= --with-system-malloc --pdump
diff --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo
index 5ea02dd..150ebe4 100644
--- a/editors/xemacs-devel/distinfo
+++ b/editors/xemacs-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (xemacs/xemacs-21.5.18.tar.gz) = 979c2db1b6851e2496e837a14b805373
-SIZE (xemacs/xemacs-21.5.18.tar.gz) = 14985234
+MD5 (xemacs/xemacs-21.5.17.tar.gz) = 45f619328fa8ce0e7f38ade44601e3df
+SIZE (xemacs/xemacs-21.5.17.tar.gz) = 13818839
diff --git a/editors/xemacs-devel/files/patch-emacs.c b/editors/xemacs-devel/files/patch-emacs.c
new file mode 100644
index 0000000..ce4f8fd
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-emacs.c
@@ -0,0 +1,11 @@
+--- 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!
+
diff --git a/editors/xemacs-devel/files/patch-mem-limits.h b/editors/xemacs-devel/files/patch-mem-limits.h
new file mode 100644
index 0000000..a5ce6cb
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-mem-limits.h
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist
index 48d8501..16356ed 100644
--- a/editors/xemacs-devel/pkg-plist
+++ b/editors/xemacs-devel/pkg-plist
@@ -18,7 +18,6 @@ lib/xemacs-%%XEMACS_VER%%/etc/COPYING.LIB
lib/xemacs-%%XEMACS_VER%%/etc/ChangeLog
lib/xemacs-%%XEMACS_VER%%/etc/DEBUG
lib/xemacs-%%XEMACS_VER%%/etc/DISTRIB
-lib/xemacs-%%XEMACS_VER%%/etc/ETAGS.EBNF
lib/xemacs-%%XEMACS_VER%%/etc/Emacs.ad
lib/xemacs-%%XEMACS_VER%%/etc/FTP
lib/xemacs-%%XEMACS_VER%%/etc/GNU
@@ -78,7 +77,6 @@ lib/xemacs-%%XEMACS_VER%%/etc/gnudoit.1
lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.1
lib/xemacs-%%XEMACS_VER%%/etc/gnuserv.README
lib/xemacs-%%XEMACS_VER%%/etc/gray1.xbm
-lib/xemacs-%%XEMACS_VER%%/etc/gtkrc
lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit
lib/xemacs-%%XEMACS_VER%%/etc/ms-kermit-7bit
lib/xemacs-%%XEMACS_VER%%/etc/package-index.LATEST.gpg
@@ -1299,7 +1297,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/device-impl.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/devslots.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dragdrop.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dump-data.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/dumper.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/elhash.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/emodules.h
@@ -1347,9 +1344,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/miscplay.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/mule-ccl.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/ndir.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/nt.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-gmp.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number-mp.h
-lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/number.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk-impl.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-gtk.h
lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/objects-impl.h
@@ -1434,7 +1428,6 @@ 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/widget.info
OpenPOWER on IntegriCloud