Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32708/10.4/stable/main/finkinfo/editors
Modified Files:
emacs22-carbon.info emacs22-carbon.patch
Log Message:
Move from stable.
Index: emacs22-carbon.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs22-carbon.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- emacs22-carbon.info 26 Jul 2008 00:48:43 -0000 1.2
+++ emacs22-carbon.info 1 Jan 2009 14:40:57 -0000 1.3
@@ -1,18 +1,17 @@
Package: emacs22-carbon
-Version: 22.1
-# I committed 1001 in 10.3 and 1 in 10.4 by mistake; add 2000 to Revision.
-Revision: 3003
+Version: 22.2
+Revision: 1001
BuildDepends: libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.2)
Depends: emacsen-common, ncurses (>= 5.4-20041023-1006), libncurses5-shlibs
(>= 5.4-20041023-1006), passwd, macosx
Provides: emacsen
Source: mirror:gnu:emacs/emacs-%v.tar.gz
-Source-MD5: 6949df37caec2d7a2e0eee3f1b422726
-Source2:
http://downloads.sourceforge.jp/macemacsjp/26030/inline_patch-1.0.3.tar.gz
-Source2-MD5: cd29ca429a1d361de19320aace66c60d
-Source3:
http://downloads.sourceforge.jp/macemacsjp/26111/transparency-3.1.0.tar.gz
-Source3-MD5: e6eabf1735c0e8268ee2cadd33f7234a
-Source4:
http://downloads.sourceforge.jp/macemacsjp/26400/fixed-width-fontset.1.2.0.tar.gz
-Source4-MD5: f1235b505bd51bf306a10fe30f2a5cc8
+Source-MD5: d6ee586b8752351334ebf072904c4d51
+Source2:
http://downloads.sourceforge.jp/macemacsjp/30446/inline_patch-1.0.4.tar.gz
+Source2-MD5: 63c14c4edb754e472dfd806435ecace1
+Source3:
http://downloads.sourceforge.jp/macemacsjp/30185/transparency-3.1.2.tar.gz
+Source3-MD5: 2074a81514a5f53ccd34f902a9437e31
+Source4:
http://downloads.sourceforge.jp/macemacsjp/30186/fixed-width-fontset.1.2.5.tar.gz
+Source4-MD5: c68c147cffcbbba24ad513c365972bde
Source5: http://downloads.sourceforge.jp/macemacsjp/17718/mac-functions.patch
Source5Rename: mac-functions-20051116.patch
Source5-MD5: 6d122157a8c1c98b2b569e07da545206
Index: emacs22-carbon.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/emacs22-carbon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- emacs22-carbon.patch 1 Mar 2008 05:05:27 -0000 1.1
+++ emacs22-carbon.patch 1 Jan 2009 14:40:57 -0000 1.2
@@ -43,7 +43,7 @@
- (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod
a+r DOC*; \
+ |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - --no-same-owner
--no-same-permissions && cat > /dev/null) || exit 1; \
+ (cd $(DESTDIR)$(docdir); chmod a+r DOC*; \
- if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
+ if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \
else true; fi
-unset CDPATH; \
@@ -488,8 +487,7 @@
@@ -114,9 +114,9 @@
"Non-nil if building Emacs overflowed pure space.")
@@ -815,8 +819,20 @@
- ;; Run the site-start library if it exists. The point of this file is
- ;; that it is run before .emacs. There is no point in doing this after
- ;; .emacs; that is useless.
+ ;; be loaded from site-run-file and wants to test if -q was given
+ ;; should check init-file-user instead, since that is already set.
+ ;; See cus-edit.el for an example.
+
+ ;; (if site-run-file
+ ;; (load site-run-file t t))
@@ -134,7 +134,7 @@
+
;; Sites should not disable this. Only individuals should disable
- ;; the startup message.
+ ;; the startup screen.
diff -Naur emacs-22.1.orig/mangle-info emacs-22.1/mangle-info
--- emacs-22.1.orig/mangle-info 1970-01-01 00:00:00.000000000 +0000
+++ emacs-22.1/mangle-info 2006-03-06 15:42:52.000000000 +0000
@@ -156,78 +156,3 @@
+print ${PREMATCH};
+print "$1($prefix/$2)";
+print ${POSTMATCH};
-diff -ruN --exclude '*~' --exclude '*.orig' emacs-22.1/src/unexmacosx.c
emacs-22.1.patched/src/unexmacosx.c
---- emacs-22.1/src/unexmacosx.c 2007-01-20 23:18:15.000000000 -0500
-+++ emacs-22.1.patched/src/unexmacosx.c 2007-11-14 21:44:17.000000000
-0500
-@@ -443,15 +443,13 @@
-
- while (num && num_unexec_regions < MAX_UNEXEC_REGIONS)
- {
-- /* Subtract the size of trailing null pages from filesize. It
-+ /* Subtract the size of trailing null bytes from filesize. It
- can be smaller than vmsize in segment commands. In such a
-- case, trailing pages are initialized with zeros. */
-- for (p = ranges->address + ranges->size; p > ranges->address;
-- p -= sizeof (int))
-- if (*(((int *) p)-1))
-- break;
-- filesize = ROUNDUP_TO_PAGE_BOUNDARY (p - ranges->address);
-- assert (filesize <= ranges->size);
-+ case, trailing bytes are initialized with zeros. */
-+ for (p = ranges->address + ranges->size; p > ranges->address; p--)
-+ if (*(((char *) p)-1))
-+ break;
-+ filesize = p - ranges->address;
-
- unexec_regions[num_unexec_regions].filesize = filesize;
- unexec_regions[num_unexec_regions++].range = *ranges;
-@@ -503,11 +501,19 @@
- {
- int i, n;
- unexec_region_info r;
-+ vm_size_t padsize;
-
- qsort (unexec_regions, num_unexec_regions, sizeof (unexec_regions[0]),
- &unexec_regions_sort_compare);
- n = 0;
- r = unexec_regions[0];
-+ padsize = r.range.address & (pagesize - 1);
-+ if (padsize)
-+ {
-+ r.range.address -= padsize;
-+ r.range.size += padsize;
-+ r.filesize += padsize;
-+ }
- for (i = 1; i < num_unexec_regions; i++)
- {
- if (r.range.address + r.range.size == unexec_regions[i].range.address
-@@ -520,6 +526,17 @@
- {
- unexec_regions[n++] = r;
- r = unexec_regions[i];
-+ padsize = r.range.address & (pagesize - 1);
-+ if (padsize)
-+ {
-+ if ((unexec_regions[n-1].range.address
-+ + unexec_regions[n-1].range.size) == r.range.address)
-+ unexec_regions[n-1].range.size -= padsize;
-+
-+ r.range.address -= padsize;
-+ r.range.size += padsize;
-+ r.filesize += padsize;
-+ }
- }
- }
- unexec_regions[n++] = r;
-@@ -562,6 +579,11 @@
- case LC_TWOLEVEL_HINTS:
- printf ("LC_TWOLEVEL_HINTS");
- break;
-+#ifdef LC_UUID
-+ case LC_UUID:
-+ printf ("LC_UUID ");
-+ break;
-+#endif
- default:
- printf ("unknown ");
- }
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
