øh2 .z]2 ..úh2Rootesûh2 Repositoryk i2ÄEntriesi2´ Entries.Log i2 Entries.Backupc$NetBSD$ --- configure.orig 2006-05-07 02:21:00.000000000 +0200 +++ configure @@ -357,7 +357,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir build build_cpu build_vendor build_os LN_S blddir configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD have_pg_config lwlib_objs ALLOCA have_pkg_config have_libst_config have_xine_config have_esd_config have_artsc_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME MULE version old_version instvardir srcdir datarootdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS sound_cflags dynodump_arch SXEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS inststaticdir statedir build build_cpu build_vendor build_os LN_S blddir configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD have_pg_config lwlib_objs ALLOCA LIBOSSAUDIO have_pkg_config have_libst_config have_xine_config have_esd_config have_artsc_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME MULE version old_version instvardir srcdir datarootdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS sound_cflags dynodump_arch SXEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -9723,9 +9723,10 @@ case "$ac_cv_build" in case "ac_cv_build" in i[3-9]86-*-netbsd*) machine=intel386 ;; hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* ) - machine=hp9000s300 ;; + machine=m68k ;; pc532-*-netbsd* | ns32k-*-netbsd* ) machine=ns32000 ;; pmax-*-netbsd* | mips-*-netbsd* ) machine=pmax ;; + alpha-*-netbsd ) machine=alpha ;; esac ;; @@ -14893,7 +14894,7 @@ if test -n "$with_site_runtime_libraries LD_RUN_PATH="`echo $with_site_runtime_libraries | sed -e 's/ */:/g'`" export LD_RUN_PATH for path in $with_site_runtime_libraries; do - $ld_switch_run="$$ld_switch_run "-R$path "" && if test "$extra_verbose" = "yes"; then echo " Appending \""-R$path "\" to \$$ld_switch_run"; fi + ld_switch_run="$ld_switch_run -R$path" && if test "$extra_verbose" = "yes"; then echo " Appending \""-R$path "\" to \$ld_switch_run"; fi done fi @@ -14918,7 +14919,7 @@ echo $ECHO_N "checking for runtime libra decosf* | linux* | irix*) dash_r="-rpath " ;; *) dash_r="" - for try_dash_r in "-R" "-R " "-rpath "; do + for try_dash_r in "-Wl,R" "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" if test "$GCC" = "yes"; then @@ -55535,6 +55536,41 @@ echo "$as_me: WARNING: --with-${feature} eval "with_${feature}=no" done fi +echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 +echo "configure:55540: checking for main in -lossaudio" >&5 +ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lossaudio " +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && + test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBOSSAUDIO=-lossaudio +else + echo "$ac_t""no" 1>&6 +fi test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" -o "$with_gtk" = "yes" -o "$with_gnome" = "yes" && extra_objs="$extra_objs event-unixoid.o" && if test "$extra_verbose" = "yes"; then echo " sxemacs will be linked with \"event-unixoid.o\"" fi @@ -58268,6 +58310,7 @@ s,@OBJECT_TO_BUILD@,$OBJECT_TO_BUILD,;t s,@have_pg_config@,$have_pg_config,;t t s,@lwlib_objs@,$lwlib_objs,;t t s,@ALLOCA@,$ALLOCA,;t t +s,@LIBOSSAUDIO@,$LIBOSSAUDIO,;t t s,@have_pkg_config@,$have_pkg_config,;t t s,@have_libst_config@,$have_libst_config,;t t s,@have_xine_config@,$have_xine_config,;t t $NetBSD$ --- lib-src/Makefile.in.in.orig 2005-11-13 03:05:13.000000000 +0100 +++ lib-src/Makefile.in.in @@ -230,12 +230,12 @@ do-blessmail: $(blessmail) ## Install the internal utilities. Until they are installed, we can ## just run them directly from lib-src. -${archlibdir}: all +install-archlibdir: all @echo; echo "Installing utilities run internally by XEmacs." ./make-path ${archlibdir} if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \ for f in ${PRIVATE_INSTALLABLE_EXES}; do \ - (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \ + (cd .. && $(BSD_INSTALL_SCRIPT) lib-src/$$f ${archlibdir}/$$f) ; \ done ; \ fi if test "`(cd ${archlibdir} && $(pwd))`" \ @@ -245,13 +245,19 @@ ${archlibdir}: all done ; \ fi -install: ${archlibdir} +install: install-archlibdir @echo; echo "Installing utilities for users to run." for file in ${PUBLIC_INSTALLABLE_EXES} ; do \ - (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ + if test $${file} = etags || test $${file} = ctags || test $${file} = b2m ; then \ + (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/xemacs-$${file}) ; else \ + (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ + fi \ done for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \ - (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \ + if test $${file} = rcs-checkin || test $${file} = send-pr ; then \ + (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; else \ + (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \ + fi \ done uninstall: $NetBSD$ --- Makefile.in.in.orig 2006-05-07 02:18:31.000000000 +0200 +++ Makefile.in.in @@ -453,7 +453,7 @@ lwlib/config.h: ${srcdir}/lwlib/config.h ## all. --cet check-features: all - ${blddir}/src/${PROGNAME} -batch -l check-features.el + ${blddir}/src/${PROGNAME} -vanilla -batch -l check-features.el install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep @@ -530,8 +530,10 @@ install-arch-indep: mkdir info fi cd ${srcdir}/etc && \ for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ - ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ - chmod 0644 ${mandir}/$${page}${manext} ; \ + if test $${page} = etags || test $${page} = ctags ; then \ + ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; else \ + ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ + fi \ done @echo "If you would like to save approximately 2M of disk space, do" @echo "make gzip-el" $NetBSD$ --- etc/ctags.1.orig 2005-11-13 03:04:50.000000000 +0100 +++ etc/ctags.1 @@ -1 +1 @@ -.so man1/etags.1 +.so man1/sxemacs-etags.1 $NetBSD$ --- configure.ac.orig 2006-05-07 02:18:31.000000000 +0200 +++ configure.ac @@ -1472,10 +1472,10 @@ case "$ac_cv_build" in case "ac_cv_build" in i[[3-9]]86-*-netbsd*) machine=intel386 ;; hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* ) - dnl Yes, this is somewhat bogus. - machine=hp9000s300 ;; + machine=m68k ;; pc532-*-netbsd* | ns32k-*-netbsd* ) machine=ns32000 ;; pmax-*-netbsd* | mips-*-netbsd* ) machine=pmax ;; + alpha-*-netbsd* ) machine=alpha ;; esac ;; @@ -2751,7 +2751,7 @@ if test "$add_runtime_path" = "yes"; the decosf* | linux* | irix*) dash_r="-rpath " ;; *) dash_r="" - for try_dash_r in "-R" "-R " "-rpath "; do + for try_dash_r in "-Wl,-R" "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" XE_PROTECT_LINKER_FLAGS(xe_check_libs) AC_LINK_IFELSE([AC_LANG_SOURCE([[]])], dash_r="$try_dash_r") @@ -5770,6 +5770,9 @@ else dnl "$with_tty" = "no" done fi dnl with_tty +AC_CHECK_LIB(ossaudio, main, LIBOSSAUDIO=-lossaudio) +AC_SUBST(LIBOSSAUDIO) + dnl Do we need event-unixoid.o ? dnl This is needed for X, or for TTY select() test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" -o "$with_gtk" = "yes" -o "$with_gnome" = "yes" && XE_ADD_OBJS(event-unixoid.o) $NetBSD$ --- src/gui-x.c.orig 2006-05-07 02:18:32.000000000 +0200 +++ src/gui-x.c @@ -659,7 +659,7 @@ static void sanity_check_lwlib(void) #endif #ifdef LWLIB_USES_MOTIF MACROLET(lwlib_uses_motif); -#if (XmVersion >= 1002) +#if defined (XmVersion) && (XmVersion >= 1002) MACROLET(lwlib_uses_motif_1_2); #else MACROLET(lwlib_does_not_use_motif_1_2); $NetBSD$ --- src/unexelf.c.orig 2005-11-13 03:05:16.000000000 +0100 +++ src/unexelf.c @@ -494,7 +494,7 @@ typedef struct { # define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type # endif # ifndef ELFSIZE -# ifdef _LP64 +# ifdef _LP64 || defined(__alpha__) # define ELFSIZE 64 # else # define ELFSIZE 32 @@ -975,7 +975,7 @@ unexec(char *new_name, char *old_name, u memcpy(NEW_SECTION_H(nn).sh_offset + new_base, src, NEW_SECTION_H(nn).sh_size); -#ifdef __alpha__ +#if defined(__alpha__) && !defined(__NetBSD__) /* Update Alpha COFF symbol table: */ if (strcmp (old_section_names + OLD_SECTION_H(n).sh_name, ".mdebug") $NetBSD$ --- src/unexfreebsd.c.orig 2005-11-13 03:04:54.000000000 +0100 +++ src/unexfreebsd.c @@ -273,7 +273,7 @@ copy_relocation_site(struct relocation_i /* We can get relocation sites in the bss region, for objects whose contents are copied from a shared library. We don't need or want to restore these at present. */ -#ifndef sparc +#if !defined(sparc) && !defined(__arm__) if (ri->r_copy) return; #else $NetBSD$ --- src/Makefile.in.in.orig 2005-12-07 08:33:48.000000000 +0100 +++ src/Makefile.in.in @@ -72,8 +72,8 @@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ c_switch_all=@c_switch_all@ -ld_switch_all=@ld_switch_all@ -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@ extra_objs=@extra_objs@ @@ -151,9 +151,10 @@ ldflags = $(LDFLAGS) $(ld_switch_all) $ #ifdef SOLARIS2 %.o : %.c -#else -.c.o: + $(CC) -c $(cflags) $< #endif + +.c.o: $(CC) -c $(cflags) $< ## Create preprocessor output (debugging purposes only) $NetBSD$ --- lwlib/Makefile.in.in.orig 2005-11-13 03:04:59.000000000 +0100 +++ lwlib/Makefile.in.in @@ -59,9 +59,10 @@ cflags = $(CFLAGS) $(cppflags) #ifdef SOLARIS2 %.o : %.c -#else -.c.o: + $(CC) -c $(cflags) $< #endif + +.c.o: $(CC) -c $(cflags) $< ## Create preprocessor output (debugging purposes only) $NetBSD$ --- src/database.c.orig 2005-11-13 03:04:53.000000000 +0100 +++ src/database.c @@ -45,14 +45,14 @@ Boston, MA 02111-1307, USA. */ #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ #include -#ifndef __FreeBSD__ +#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; typedef uint32_t u_int32_t; #ifdef WE_DONT_NEED_QUADS typedef uint64_t u_int64_t; -#endif #endif /* WE_DONT_NEED_QUADS */ +#endif /* !(__FreeBSD__ || __NetBSD__ || __OpenBSD__) */ #endif /* HAVE_INTTYPES_H */ #endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */ /* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */