diff options
author | Andrey Slusar <anray@FreeBSD.org> | 2006-05-16 14:31:27 +0000 |
---|---|---|
committer | Andrey Slusar <anray@FreeBSD.org> | 2006-05-16 14:31:27 +0000 |
commit | 945429ef02ed33259aaaf5be37a7c21fd1da91f1 (patch) | |
tree | c8fb17c4aeab5b2ed7088a0545baab946a711838 /editors | |
parent | 0f0c123b43a5c25f142079fe9896907fed94d473 (diff) | |
download | ports-945429ef02ed33259aaaf5be37a7c21fd1da91f1.tar.gz ports-945429ef02ed33259aaaf5be37a7c21fd1da91f1.zip |
Update to 21.5-b27 "fiddleheads"
Notes
Notes:
svn path=/head/; revision=162569
Diffstat (limited to 'editors')
-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-objects-x.c | 18 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/pkg-plist | 4 | ||||
-rw-r--r-- | editors/xemacs-devel-mule/pkg-plist.arch-dep | 2 | ||||
-rw-r--r-- | editors/xemacs-devel/Makefile | 2 | ||||
-rw-r--r-- | editors/xemacs-devel/distinfo | 6 | ||||
-rw-r--r-- | editors/xemacs-devel/files/patch-objects-x.c | 18 | ||||
-rw-r--r-- | editors/xemacs-devel/pkg-plist | 4 |
9 files changed, 51 insertions, 11 deletions
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index b4bfa05275b0..14f1f81b0e33 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}-b26 +XEMACS_VER= ${XEMACS_REL}-b27 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 d5f349065ca0..113cd392a234 100644 --- a/editors/xemacs-devel-mule/distinfo +++ b/editors/xemacs-devel-mule/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (xemacs/xemacs-21.5.27.tar.gz) = c415348d58eb18a9f4ed57d97e2acc62 +SHA256 (xemacs/xemacs-21.5.27.tar.gz) = 0a89d42736504550ae3da70ea2b15b5ca0340ddae252e5d341d68246a93c180e +SIZE (xemacs/xemacs-21.5.27.tar.gz) = 15042023 diff --git a/editors/xemacs-devel-mule/files/patch-objects-x.c b/editors/xemacs-devel-mule/files/patch-objects-x.c new file mode 100644 index 000000000000..27f5d28c0b15 --- /dev/null +++ b/editors/xemacs-devel-mule/files/patch-objects-x.c @@ -0,0 +1,18 @@ +--- src/objects-x.c.orig Tue May 16 16:40:38 2006 ++++ src/objects-x.c Tue May 16 16:44:08 2006 +@@ -1215,6 +1215,7 @@ + stderr_out ("Failed fontconfig initialization\n"); + else + { ++ struct charset_reporter *cr; + FcPattern *fontxft; /* long-lived, freed at end of this block */ + FcResult fcresult; + FcConfig *fcc; +@@ -1302,7 +1303,6 @@ + Optimization: cache the generated FcCharSet in the Mule charset. + Don't forget to destroy it if the Mule charset gets deallocated. */ + +- struct charset_reporter *cr; + for (cr = charset_table; + cr->charset && !EQ (*(cr->charset), charset); + cr++) diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist index 84bdc42c686e..92d6be509d6d 100644 --- a/editors/xemacs-devel-mule/pkg-plist +++ b/editors/xemacs-devel-mule/pkg-plist @@ -527,6 +527,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xlib.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xt.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/faces.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/file-coding.h +lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/font-mgr.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame-impl.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frameslots.h @@ -834,7 +835,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/vdb.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window-impl.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/winslots.h -lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xft-fonts.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xgccache.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsic.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsicp.h @@ -1032,6 +1032,8 @@ lib/xemacs-%%XEMACS_VER%%/lisp/font-lock.el lib/xemacs-%%XEMACS_VER%%/lisp/font-lock.elc lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.el lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.elc +lib/xemacs-%%XEMACS_VER%%/lisp/font-mgr.el +lib/xemacs-%%XEMACS_VER%%/lisp/font-mgr.elc lib/xemacs-%%XEMACS_VER%%/lisp/font.el lib/xemacs-%%XEMACS_VER%%/lisp/font.elc lib/xemacs-%%XEMACS_VER%%/lisp/fontconfig.el diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep index 379068611b7a..3d6588c92955 100644 --- a/editors/xemacs-devel-mule/pkg-plist.arch-dep +++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep @@ -76,6 +76,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xlib.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xt.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/faces.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/file-coding.h +lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/font-mgr.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame-impl.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frameslots.h @@ -383,7 +384,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/vdb.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window-impl.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/winslots.h -lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xft-fonts.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xgccache.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsic.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsicp.h diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 8ddfb149c77a..eb5a109bbf6e 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-b26 +XEMACS_VER= ${XEMACS_MAJOR_VER}.5-b27 XEMACS_ARCH= ${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./} diff --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo index d5f349065ca0..113cd392a234 100644 --- a/editors/xemacs-devel/distinfo +++ b/editors/xemacs-devel/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (xemacs/xemacs-21.5.27.tar.gz) = c415348d58eb18a9f4ed57d97e2acc62 +SHA256 (xemacs/xemacs-21.5.27.tar.gz) = 0a89d42736504550ae3da70ea2b15b5ca0340ddae252e5d341d68246a93c180e +SIZE (xemacs/xemacs-21.5.27.tar.gz) = 15042023 diff --git a/editors/xemacs-devel/files/patch-objects-x.c b/editors/xemacs-devel/files/patch-objects-x.c new file mode 100644 index 000000000000..27f5d28c0b15 --- /dev/null +++ b/editors/xemacs-devel/files/patch-objects-x.c @@ -0,0 +1,18 @@ +--- src/objects-x.c.orig Tue May 16 16:40:38 2006 ++++ src/objects-x.c Tue May 16 16:44:08 2006 +@@ -1215,6 +1215,7 @@ + stderr_out ("Failed fontconfig initialization\n"); + else + { ++ struct charset_reporter *cr; + FcPattern *fontxft; /* long-lived, freed at end of this block */ + FcResult fcresult; + FcConfig *fcc; +@@ -1302,7 +1303,6 @@ + Optimization: cache the generated FcCharSet in the Mule charset. + Don't forget to destroy it if the Mule charset gets deallocated. */ + +- struct charset_reporter *cr; + for (cr = charset_table; + cr->charset && !EQ (*(cr->charset), charset); + cr++) diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist index 1cf07b41ba2f..0b5f8d40a006 100644 --- a/editors/xemacs-devel/pkg-plist +++ b/editors/xemacs-devel/pkg-plist @@ -527,6 +527,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xlib.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/extw-Xt.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/faces.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/file-coding.h +lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/font-mgr.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame-impl.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frame.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/frameslots.h @@ -834,7 +835,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/vdb.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window-impl.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/window.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/winslots.h -lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xft-fonts.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xgccache.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsic.h lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/xintrinsicp.h @@ -1029,6 +1029,8 @@ lib/xemacs-%%XEMACS_VER%%/lisp/font-lock.el lib/xemacs-%%XEMACS_VER%%/lisp/font-lock.elc lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.el lib/xemacs-%%XEMACS_VER%%/lisp/font-menu.elc +lib/xemacs-%%XEMACS_VER%%/lisp/font-mgr.el +lib/xemacs-%%XEMACS_VER%%/lisp/font-mgr.elc lib/xemacs-%%XEMACS_VER%%/lisp/font.el lib/xemacs-%%XEMACS_VER%%/lisp/font.elc lib/xemacs-%%XEMACS_VER%%/lisp/fontconfig.el |