pkgsrc/editors/xemacs/patches/patch-ak

46 lines
1.1 KiB
Text
Raw Normal View History

Restructure the following packages: editors/xemacs editors/xemacs-nox11 The latter is now just editors/xemacs built with a specific set of options. Changes include: + Add support for the following new options in options.mk: x11 Support X11 displays lucid Use Lucid widget set Also add commented out support for the following options for alternative widget sets: gtk GTK widgets motif Motif widgets xaw Athena widgets Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for the corresponding options. + Remove Makefile.common and move all logic into xemacs/Makefile and xemacs/options.mk. + Rename the "mule" PLIST variable to "canna", which more accurately reflects what is conditionally installed. + Include termcap.buildlink3.mk to properly deal with termcap/curses issues (xemacs needs termcap). Drop the --with-ncurses=no setting as the issue is handled by termcap.buildlink3.mk. + In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES if we're actually going to extract all of those files all of the time. Just list them all in DISTFILES. + Be slightly more aware of ${X11_TYPE} == "modular" by not referring to ${X11BASE} in that case. + In patch-ak, directly substitute the local value of etcdir (``../etc/'') into src/Makefile.in.in. This allows for overriding etcdir via INSTALL_MAKE_FLAGS at install-time so that destdir-style installation will work. + Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override where files are installed during the install phase. + Honor PKGMANDIR. + Bump the PKGREVISION for xemacs and xemacs-nox11 to 4. Both packages now track and use the same PKGREVISION number.
2008-04-24 17:32:15 +02:00
$NetBSD: patch-ak,v 1.5 2008/04/24 15:32:15 jlam Exp $
Restructure the following packages: editors/xemacs editors/xemacs-nox11 The latter is now just editors/xemacs built with a specific set of options. Changes include: + Add support for the following new options in options.mk: x11 Support X11 displays lucid Use Lucid widget set Also add commented out support for the following options for alternative widget sets: gtk GTK widgets motif Motif widgets xaw Athena widgets Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for the corresponding options. + Remove Makefile.common and move all logic into xemacs/Makefile and xemacs/options.mk. + Rename the "mule" PLIST variable to "canna", which more accurately reflects what is conditionally installed. + Include termcap.buildlink3.mk to properly deal with termcap/curses issues (xemacs needs termcap). Drop the --with-ncurses=no setting as the issue is handled by termcap.buildlink3.mk. + In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES if we're actually going to extract all of those files all of the time. Just list them all in DISTFILES. + Be slightly more aware of ${X11_TYPE} == "modular" by not referring to ${X11BASE} in that case. + In patch-ak, directly substitute the local value of etcdir (``../etc/'') into src/Makefile.in.in. This allows for overriding etcdir via INSTALL_MAKE_FLAGS at install-time so that destdir-style installation will work. + Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override where files are installed during the install phase. + Honor PKGMANDIR. + Bump the PKGREVISION for xemacs and xemacs-nox11 to 4. Both packages now track and use the same PKGREVISION number.
2008-04-24 17:32:15 +02:00
--- src/Makefile.in.in.orig 2005-01-30 21:55:02.000000000 -0500
XEmacs 21.4.12 "Portable Code". * The XEmacs Project announced that 21.4 is the official stable branch. 21.4.12 is the first release of the branch. The XEmacs 21.1 series is retired. * Changes new in 21.4 are as below * Changes in XEmacs 21.4 ======================== ** Summary of user-visible changes: -- The delete key now deletes forward by default. -- Shifted motion keys now select text by default. -- You can now build XEmacs with support for GTK+ widget set. -- ~/.xemacs/init.el is now the preferred location for the init file. - XEmacs now supports a `~/.xemacs/init.el' startup file. - Custom file will move to ~/.xemacs/custom.el. -- Much-improved sample init.el, showing how to use many useful features. -- XEmacs support for menu accelerators has been much improved. -- Default menubar improvements. - Default menubar has many new commands and better organization. - The font-menu is now available under MS Windows. -- Dialog box improvements, including a real file dialog box. - XEmacs now has a proper file dialog box under MS Windows (and GTK)! - The old clunky file dialog box is improved. - Keyboard traversal now works correctly in MS Windows dialog boxes. - There is a Search dialog box available from Edit->Find... -- New buffer tabs. -- There is a new MS Windows installer, netinstall, ported from Cygwin. -- The subprocess quote-handling mechanism under Windows is much improved. -- Printing support now available under MS Windows. -- Selection improvements. - Kill and yank now interact with the clipboard under Windows. - MS Windows support for selection is now much more robust. - Motif selection support is now more correct (but slower). -- Mail spool locking now works correctly. -- International support changes. - The default coding-priority-list is now safer. - International keysyms are now supported under X. - MS Windows 1251 code page now supported. - Czech, Thai, Cyrillic-KOI8, Vietnamese, Ethiopic now supported. - Proper support for words in Latin 3 and Latin 4. -- Help buffers contain hyperlinks, and other changes. -- The modeline's text is now scrollable. -- The mouse wheel under MS Windows now functions correctly. -- Interactive searching and matching case improvements. - Incremental search will now highlight all visible matches. - Interactive searches always respect uppercase characters. -- Rectangle functions rewritten to avoid inserting extra spaces. -- New command `kill-entire-line' that always kills the entire line. -- Default values correctly stored in minibuffer histories. -- You can now create "indirect buffers", like in GNU Emacs. -- Pixel-based scrolling has been implemented. -- Operation progress can be displayed using graphical widgets. -- User names following a tilde can now be completed at file name prompts. -- XEmacs can now play sound using Enlightenment Sound Daemon (ESD). -- X-Face support is now available under MS Windows. -- The PostgreSQL Relational Database Management System is now supported. -- Indentation no longer indents comments that begin at column zero. -- Face and variable settings can have comments in Customize. -- New locations for early package hierarchies. -- The `auto-save' library has been greatly improved. -- New variable `mswindows-alt-by-itself-activates-menu'. -- Other init-file-related changes. - Init file in your home directory may be called `.emacs.el'. - New command-line switches -user-init-file and -user-init-directory. -- Etags changes. - In DOS, etags looks for file.cgz if it cannot find file.c. - New option --ignore-case-regex is an alternative to --regex. - New option --declarations, for C-type languages. - In C++, tags are created for "operator". - Ada now supported. - In Fortran, procedure is no longer tagged. - In Java, tags are created for "interface". - In Lisp, def-type constructs are now tagged. - In Perl, the --globals option tags global variables. - Python now supported. - New file extensions recognized: .ss, .pdb, .psw.
2003-02-25 03:14:57 +01:00
+++ src/Makefile.in.in
Restructure the following packages: editors/xemacs editors/xemacs-nox11 The latter is now just editors/xemacs built with a specific set of options. Changes include: + Add support for the following new options in options.mk: x11 Support X11 displays lucid Use Lucid widget set Also add commented out support for the following options for alternative widget sets: gtk GTK widgets motif Motif widgets xaw Athena widgets Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for the corresponding options. + Remove Makefile.common and move all logic into xemacs/Makefile and xemacs/options.mk. + Rename the "mule" PLIST variable to "canna", which more accurately reflects what is conditionally installed. + Include termcap.buildlink3.mk to properly deal with termcap/curses issues (xemacs needs termcap). Drop the --with-ncurses=no setting as the issue is handled by termcap.buildlink3.mk. + In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES if we're actually going to extract all of those files all of the time. Just list them all in DISTFILES. + Be slightly more aware of ${X11_TYPE} == "modular" by not referring to ${X11BASE} in that case. + In patch-ak, directly substitute the local value of etcdir (``../etc/'') into src/Makefile.in.in. This allows for overriding etcdir via INSTALL_MAKE_FLAGS at install-time so that destdir-style installation will work. + Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override where files are installed during the install phase. + Honor PKGMANDIR. + Bump the PKGREVISION for xemacs and xemacs-nox11 to 4. Both packages now track and use the same PKGREVISION number.
2008-04-24 17:32:15 +02:00
@@ -72,8 +72,8 @@ CPPFLAGS=@CPPFLAGS@
XEmacs 21.4.12 "Portable Code". * The XEmacs Project announced that 21.4 is the official stable branch. 21.4.12 is the first release of the branch. The XEmacs 21.1 series is retired. * Changes new in 21.4 are as below * Changes in XEmacs 21.4 ======================== ** Summary of user-visible changes: -- The delete key now deletes forward by default. -- Shifted motion keys now select text by default. -- You can now build XEmacs with support for GTK+ widget set. -- ~/.xemacs/init.el is now the preferred location for the init file. - XEmacs now supports a `~/.xemacs/init.el' startup file. - Custom file will move to ~/.xemacs/custom.el. -- Much-improved sample init.el, showing how to use many useful features. -- XEmacs support for menu accelerators has been much improved. -- Default menubar improvements. - Default menubar has many new commands and better organization. - The font-menu is now available under MS Windows. -- Dialog box improvements, including a real file dialog box. - XEmacs now has a proper file dialog box under MS Windows (and GTK)! - The old clunky file dialog box is improved. - Keyboard traversal now works correctly in MS Windows dialog boxes. - There is a Search dialog box available from Edit->Find... -- New buffer tabs. -- There is a new MS Windows installer, netinstall, ported from Cygwin. -- The subprocess quote-handling mechanism under Windows is much improved. -- Printing support now available under MS Windows. -- Selection improvements. - Kill and yank now interact with the clipboard under Windows. - MS Windows support for selection is now much more robust. - Motif selection support is now more correct (but slower). -- Mail spool locking now works correctly. -- International support changes. - The default coding-priority-list is now safer. - International keysyms are now supported under X. - MS Windows 1251 code page now supported. - Czech, Thai, Cyrillic-KOI8, Vietnamese, Ethiopic now supported. - Proper support for words in Latin 3 and Latin 4. -- Help buffers contain hyperlinks, and other changes. -- The modeline's text is now scrollable. -- The mouse wheel under MS Windows now functions correctly. -- Interactive searching and matching case improvements. - Incremental search will now highlight all visible matches. - Interactive searches always respect uppercase characters. -- Rectangle functions rewritten to avoid inserting extra spaces. -- New command `kill-entire-line' that always kills the entire line. -- Default values correctly stored in minibuffer histories. -- You can now create "indirect buffers", like in GNU Emacs. -- Pixel-based scrolling has been implemented. -- Operation progress can be displayed using graphical widgets. -- User names following a tilde can now be completed at file name prompts. -- XEmacs can now play sound using Enlightenment Sound Daemon (ESD). -- X-Face support is now available under MS Windows. -- The PostgreSQL Relational Database Management System is now supported. -- Indentation no longer indents comments that begin at column zero. -- Face and variable settings can have comments in Customize. -- New locations for early package hierarchies. -- The `auto-save' library has been greatly improved. -- New variable `mswindows-alt-by-itself-activates-menu'. -- Other init-file-related changes. - Init file in your home directory may be called `.emacs.el'. - New command-line switches -user-init-file and -user-init-directory. -- Etags changes. - In DOS, etags looks for file.cgz if it cannot find file.c. - New option --ignore-case-regex is an alternative to --regex. - New option --declarations, for C-type languages. - In C++, tags are created for "operator". - Ada now supported. - In Fortran, procedure is no longer tagged. - In Java, tags are created for "interface". - In Lisp, def-type constructs are now tagged. - In Perl, the --globals option tags global variables. - Python now supported. - New file extensions recognized: .ss, .pdb, .psw.
2003-02-25 03:14:57 +01:00
LDFLAGS=@LDFLAGS@
c_switch_all=@c_switch_all@
-ld_switch_all=@ld_switch_all@
1999-07-03 17:43:32 +02:00
-ld_libs_all=@ld_libs_all@
+ld_switch_all=@ld_switch_all@ @LDFLAGS@
+ld_libs_all=@ld_libs_all@ @LIBOSSAUDIO@
ld_dynamic_link_flags=@ld_dynamic_link_flags@
1999-07-03 17:43:32 +02:00
extra_objs=@extra_objs@
Restructure the following packages: editors/xemacs editors/xemacs-nox11 The latter is now just editors/xemacs built with a specific set of options. Changes include: + Add support for the following new options in options.mk: x11 Support X11 displays lucid Use Lucid widget set Also add commented out support for the following options for alternative widget sets: gtk GTK widgets motif Motif widgets xaw Athena widgets Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for the corresponding options. + Remove Makefile.common and move all logic into xemacs/Makefile and xemacs/options.mk. + Rename the "mule" PLIST variable to "canna", which more accurately reflects what is conditionally installed. + Include termcap.buildlink3.mk to properly deal with termcap/curses issues (xemacs needs termcap). Drop the --with-ncurses=no setting as the issue is handled by termcap.buildlink3.mk. + In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES if we're actually going to extract all of those files all of the time. Just list them all in DISTFILES. + Be slightly more aware of ${X11_TYPE} == "modular" by not referring to ${X11BASE} in that case. + In patch-ak, directly substitute the local value of etcdir (``../etc/'') into src/Makefile.in.in. This allows for overriding etcdir via INSTALL_MAKE_FLAGS at install-time so that destdir-style installation will work. + Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override where files are installed during the install phase. + Honor PKGMANDIR. + Bump the PKGREVISION for xemacs and xemacs-nox11 to 4. Both packages now track and use the same PKGREVISION number.
2008-04-24 17:32:15 +02:00
@@ -163,9 +163,9 @@ ldflags += -Wl,--script=s/cygwin.sc
#ifdef SOLARIS2
%.o : %.c
-#else
-.c.o:
+ $(CC) -c $(cflags) $<
#endif
+.c.o:
$(CC) -c $(cflags) $<
## Create preprocessor output (debugging purposes only)
Restructure the following packages: editors/xemacs editors/xemacs-nox11 The latter is now just editors/xemacs built with a specific set of options. Changes include: + Add support for the following new options in options.mk: x11 Support X11 displays lucid Use Lucid widget set Also add commented out support for the following options for alternative widget sets: gtk GTK widgets motif Motif widgets xaw Athena widgets Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for the corresponding options. + Remove Makefile.common and move all logic into xemacs/Makefile and xemacs/options.mk. + Rename the "mule" PLIST variable to "canna", which more accurately reflects what is conditionally installed. + Include termcap.buildlink3.mk to properly deal with termcap/curses issues (xemacs needs termcap). Drop the --with-ncurses=no setting as the issue is handled by termcap.buildlink3.mk. + In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES if we're actually going to extract all of those files all of the time. Just list them all in DISTFILES. + Be slightly more aware of ${X11_TYPE} == "modular" by not referring to ${X11BASE} in that case. + In patch-ak, directly substitute the local value of etcdir (``../etc/'') into src/Makefile.in.in. This allows for overriding etcdir via INSTALL_MAKE_FLAGS at install-time so that destdir-style installation will work. + Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override where files are installed during the install phase. + Honor PKGMANDIR. + Bump the PKGREVISION for xemacs and xemacs-nox11 to 4. Both packages now track and use the same PKGREVISION number.
2008-04-24 17:32:15 +02:00
@@ -329,7 +329,7 @@ othersrcs = $(otherobjs:.o=.c)
LIBES = $(lwlib_libs) $(malloclib) $(ld_libs_all) $(lib_gcc)
#ifdef I18N3
-mo_dir = ${etcdir}
+mo_dir = ../etc/
mo_file = ${mo_dir}emacs.mo
#endif
@@ -658,7 +658,7 @@ libextcli_Xlib.so.1: ${external_client_x
#endif /* EXTERNAL_WIDGET */
config.h: ${srcdir}/config.h.in
-Emacs.ad.h: ${srcdir}/${etcdir}Emacs.ad
+Emacs.ad.h: ${srcdir}/../etc/Emacs.ad
config.h sheap-adjust.h paths.h Emacs.ad.h :
@echo "The file $@ needs to be re-generated."