[Midnightbsd-cvs] mports [21169] trunk/editors/emacs: remove old patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Mar 14 20:04:54 EDT 2016
Revision: 21169
http://svnweb.midnightbsd.org/mports/?rev=21169
Author: laffer1
Date: 2016-03-14 20:04:54 -0400 (Mon, 14 Mar 2016)
Log Message:
-----------
remove old patchset
Added Paths:
-----------
trunk/editors/emacs/pkg-deinstall
Removed Paths:
-------------
trunk/editors/emacs/files/patch-Makefile.in
trunk/editors/emacs/files/patch-configure
trunk/editors/emacs/files/patch-doc-emacs-Makefile.in
trunk/editors/emacs/files/patch-doc-lispintro-Makefile.in
trunk/editors/emacs/files/patch-doc-lispref-Makefile.in
trunk/editors/emacs/files/patch-doc-misc-Makefile.in
trunk/editors/emacs/files/patch-src_coding.c
trunk/editors/emacs/files/patch-src_config.in
trunk/editors/emacs/files/patch-src_process.c
trunk/editors/emacs/files/patch-src_s_freebsd.h
trunk/editors/emacs/files/patch-src_sysdep.c
trunk/editors/emacs/files/patch-src_term.c
Deleted: trunk/editors/emacs/files/patch-Makefile.in
===================================================================
--- trunk/editors/emacs/files/patch-Makefile.in 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-Makefile.in 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,43 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -518,14 +518,6 @@
-
- install-arch-indep: mkdir info install-etc
- -set ${COPYDESTS} ; \
-- unset CDPATH; \
-- for dir in ${COPYDIR} ; do \
-- if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
-- rm -rf $$1 ; \
-- fi ; \
-- shift ; \
-- done
-- -set ${COPYDESTS} ; \
- mkdir ${COPYDESTS} ; \
- chmod ugo+rx ${COPYDESTS} ; \
- unset CDPATH; \
-@@ -625,10 +617,10 @@
- cd ${srcdir}/info ; \
- for elt in $(INFO_FILES); do \
- test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
-- for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
-+ for f in `ls $$elt 2>/dev/null`; do \
- (cd $${thisdir}; \
-- ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
-- chmod a+r $(DESTDIR)${infodir}/$$f; \
-+ ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f.info); \
-+ chmod a+r $(DESTDIR)${infodir}/$$f.info; \
- if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
- rm -f $(DESTDIR)${infodir}/$$f.gz; \
- ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
-@@ -643,7 +635,7 @@
- for elt in $(INFO_FILES); do \
- test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
- (cd $${thisdir}; \
-- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
- done; \
- else true; fi
- -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
Deleted: trunk/editors/emacs/files/patch-configure
===================================================================
--- trunk/editors/emacs/files/patch-configure 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-configure 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,184 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -8276,177 +8276,13 @@
- LIBSOUND=
- fi
-
--
--
-- ALSA_REQUIRED=1.0.0
-- ALSA_MODULES="alsa >= $ALSA_REQUIRED"
--
-- succeeded=no
--
-- # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_PKG_CONFIG+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- case $PKG_CONFIG in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-- ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--
-- if test "$PKG_CONFIG" = "no" ; then
-- HAVE_ALSA=no
-- else
-- PKG_CONFIG_MIN_VERSION=0.9.0
-- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ALSA_MODULES" >&5
--$as_echo_n "checking for $ALSA_MODULES... " >&6; }
--
-- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-- succeeded=yes
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_CFLAGS" >&5
--$as_echo_n "checking ALSA_CFLAGS... " >&6; }
-- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5
--$as_echo "$ALSA_CFLAGS" >&6; }
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_LIBS" >&5
--$as_echo_n "checking ALSA_LIBS... " >&6; }
-- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5
--$as_echo "$ALSA_LIBS" >&6; }
-- else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-- ALSA_CFLAGS=""
-- ALSA_LIBS=""
-- ## If we have a custom action on failure, don't print errors, but
-- ## do set a variable so people can do so.
-- ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"`
--
-- fi
--
--
--
-- else
-- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-- echo "*** See http://www.freedesktop.org/software/pkgconfig"
-- fi
-- fi
--
-- if test $succeeded = yes; then
-- HAVE_ALSA=yes
-- else
-- HAVE_ALSA=no
-- fi
--
-- if test $HAVE_ALSA = yes; then
-- SAVE_CFLAGS="$CFLAGS"
-- SAVE_LIBS="$LIBS"
-- CFLAGS="$ALSA_CFLAGS $CFLAGS"
-- LIBS="$ALSA_LIBS $LIBS"
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#include <asoundlib.h>
--int
--main ()
--{
--snd_lib_error_set_handler (0);
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-- emacs_alsa_normal=yes
--else
-- emacs_alsa_normal=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- if test "$emacs_alsa_normal" != yes; then
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#include <alsa/asoundlib.h>
--int
--main ()
--{
--snd_lib_error_set_handler (0);
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-- emacs_alsa_subdir=yes
--else
-- emacs_alsa_subdir=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- if test "$emacs_alsa_subdir" != yes; then
-- as_fn_error $? "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5
-- fi
-- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
-- fi
--
-- CFLAGS="$SAVE_CFLAGS"
-- LIBS="$SAVE_LIBS"
-- LIBSOUND="$LIBSOUND $ALSA_LIBS"
-- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
--
--$as_echo "#define HAVE_ALSA 1" >>confdefs.h
--
-- fi
--
-- if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
-- case "$opsys" in
-- gnu-linux|freebsd|netbsd)
--
--$as_echo "#define HAVE_SOUND 1" >>confdefs.h
--
-- ;;
-- esac
-- fi
--
--
- fi
-
- for ac_header in sys/select.h sys/time.h unistd.h utime.h \
- linux/version.h sys/systeminfo.h \
- stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
- sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
-- sys/utsname.h pwd.h utmp.h dirent.h util.h
-+ sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
Deleted: trunk/editors/emacs/files/patch-doc-emacs-Makefile.in
===================================================================
--- trunk/editors/emacs/files/patch-doc-emacs-Makefile.in 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-doc-emacs-Makefile.in 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/emacs/Makefile.in.orig
-+++ doc/emacs/Makefile.in
-@@ -38,7 +38,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
- MAKEINFO = @MAKEINFO@
--MAKEINFO_OPTS = --force --enable-encoding -I $(srcdir)
-+MAKEINFO_OPTS = --force --no-split --enable-encoding -I $(srcdir)
-
- TEXI2DVI = texi2dvi
- TEXI2PDF = texi2pdf
Deleted: trunk/editors/emacs/files/patch-doc-lispintro-Makefile.in
===================================================================
--- trunk/editors/emacs/files/patch-doc-lispintro-Makefile.in 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-doc-lispintro-Makefile.in 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/lispintro/Makefile.in.orig
-+++ doc/lispintro/Makefile.in
-@@ -27,7 +27,7 @@
- texinfodir = $(srcdir)/../misc
-
- MAKEINFO = @MAKEINFO@
--MAKEINFO_OPTS = --force -I $(srcdir)
-+MAKEINFO_OPTS = --force --no-split -I $(srcdir)
- TEXI2DVI = texi2dvi
- TEXI2PDF = texi2pdf
- DVIPS = dvips
Deleted: trunk/editors/emacs/files/patch-doc-lispref-Makefile.in
===================================================================
--- trunk/editors/emacs/files/patch-doc-lispref-Makefile.in 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-doc-lispref-Makefile.in 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/lispref/Makefile.in.orig
-+++ doc/lispref/Makefile.in
-@@ -31,7 +31,7 @@
- emacsdir = $(srcdir)/../emacs
-
- MAKEINFO = @MAKEINFO@
--MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir)
-+MAKEINFO_OPTS = --force --no-split --enable-encoding -I $(emacsdir) -I $(srcdir)
- TEXI2DVI = texi2dvi
- TEXI2PDF = texi2pdf
- DVIPS = dvips
Deleted: trunk/editors/emacs/files/patch-doc-misc-Makefile.in
===================================================================
--- trunk/editors/emacs/files/patch-doc-misc-Makefile.in 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-doc-misc-Makefile.in 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/misc/Makefile.in.orig
-+++ doc/misc/Makefile.in
-@@ -41,7 +41,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
- MAKEINFO = @MAKEINFO@
--MAKEINFO_OPTS = --force -I$(emacsdir)
-+MAKEINFO_OPTS = --force --no-split -I$(emacsdir)
-
- # Also add new entries to INFO_FILES in the top-level Makefile.in.
- INFO_TARGETS = \
Deleted: trunk/editors/emacs/files/patch-src_coding.c
===================================================================
--- trunk/editors/emacs/files/patch-src_coding.c 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-src_coding.c 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,51 +0,0 @@
-
-$FreeBSD$
-
---- src/coding.c.orig
-+++ src/coding.c
-@@ -3717,8 +3717,20 @@
- else
- charset = CHARSET_FROM_ID (charset_id_2);
- ONE_MORE_BYTE (c1);
-- if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
-- goto invalid_code;
-+ /*
-+ * <ESC>N sequence is recognized as SS2 in some ISO2022
-+ * encodings. As a workaround, mark invalid only if
-+ * <ESC>N + GR in a 7-bit encoding or <ESC>N + GL in an 8-bit
-+ * encoding.
-+ */
-+ if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) {
-+ if (c1 < 0x20 || c1 >= 0x80)
-+ goto invalid_code;
-+ }
-+ else {
-+ if (c1 < 0xA0)
-+ goto invalid_code;
-+ }
- break;
-
- case 'O': /* invocation of single-shift-3 */
-@@ -3731,8 +3743,20 @@
- else
- charset = CHARSET_FROM_ID (charset_id_3);
- ONE_MORE_BYTE (c1);
-- if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0))
-- goto invalid_code;
-+ /*
-+ * <ESC>O sequence by arrow keys is recognized as SS3 in
-+ * some ISO2022 encodings. As a workaround, mark invalid only if
-+ * <ESC>O + GR in a 7-bit encoding or <ESC>O + GL in an 8-bit
-+ * encoding.
-+ */
-+ if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) {
-+ if (c1 < 0x20 || c1 >= 0x80)
-+ goto invalid_code;
-+ }
-+ else {
-+ if (c1 < 0xA0)
-+ goto invalid_code;
-+ }
- break;
-
- case '0': case '2': case '3': case '4': /* start composition */
Deleted: trunk/editors/emacs/files/patch-src_config.in
===================================================================
--- trunk/editors/emacs/files/patch-src_config.in 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-src_config.in 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/config.in.orig
-+++ src/config.in
-@@ -468,6 +468,9 @@
- /* Define to 1 if using SELinux. */
- #undef HAVE_LIBSELINUX
-
-+/* Define to 1 if you have the <libutil.h> header file. */
-+#undef HAVE_LIBUTIL_H
-+
- /* Define to 1 if you have the `Xext' library (-lXext). */
- #undef HAVE_LIBXEXT
-
Deleted: trunk/editors/emacs/files/patch-src_process.c
===================================================================
--- trunk/editors/emacs/files/patch-src_process.c 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-src_process.c 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- src/process.c.orig
-+++ src/process.c
-@@ -83,6 +83,10 @@
- #include <util.h>
- #endif
-
-+#ifdef HAVE_LIBUTIL_H
-+#include <libutil.h>
-+#endif
-+
- #ifdef HAVE_PTY_H
- #include <pty.h>
- #endif
Deleted: trunk/editors/emacs/files/patch-src_s_freebsd.h
===================================================================
--- trunk/editors/emacs/files/patch-src_s_freebsd.h 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-src_s_freebsd.h 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/s/freebsd.h.orig
-+++ src/s/freebsd.h
-@@ -58,3 +58,17 @@
- /* Tell that garbage collector that setjmp is known to save all
- registers relevant for conservative garbage collection in the jmp_buf. */
- #define GC_SETJMP_WORKS 1
-+
-+#define PTY_ITERATION int i; for (i = 0; i < 1; i++)
-+#define PTY_NAME_SPRINTF /* none */
-+#define PTY_TTY_NAME_SPRINTF /* none */
-+#define PTY_OPEN \
-+ do \
-+ { \
-+ int slave; \
-+ if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1) \
-+ fd = -1; \
-+ else \
-+ emacs_close (slave); \
-+ } \
-+ while (0)
Deleted: trunk/editors/emacs/files/patch-src_sysdep.c
===================================================================
--- trunk/editors/emacs/files/patch-src_sysdep.c 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-src_sysdep.c 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,244 +0,0 @@
-
-$FreeBSD$
-
---- src/sysdep.c.orig
-+++ src/sysdep.c
-@@ -37,6 +37,20 @@
- #include "sysselect.h"
- #include "blockinput.h"
-
-+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+/* machine/frame.h in Sparc has 'struct frame' which conflicts with Emacs' 'struct frame', so rename it */
-+#ifdef __sparc__
-+#define frame freebsd_sparc_frame
-+#endif
-+#include <sys/user.h>
-+#ifdef __sparc__
-+#undef frame
-+#endif
-+#include <sys/resource.h>
-+#include <math.h>
-+#endif
-+
- #ifdef WINDOWSNT
- #define read sys_read
- #define write sys_write
-@@ -2529,6 +2543,40 @@
- return proclist;
- }
-
-+#elif defined (__FreeBSD__)
-+
-+Lisp_Object
-+list_system_processes ()
-+{
-+ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
-+ size_t len;
-+ struct kinfo_proc *procs;
-+ size_t i;
-+
-+ struct gcpro gcpro1;
-+ Lisp_Object proclist = Qnil;
-+
-+ if (sysctl (mib, 3, NULL, &len, NULL, 0) != 0)
-+ return proclist;
-+
-+ procs = xmalloc (len);
-+ if (sysctl (mib, 3, procs, &len, NULL, 0) != 0)
-+ {
-+ xfree (procs);
-+ return proclist;
-+ }
-+
-+ GCPRO1 (proclist);
-+ len /= sizeof (struct kinfo_proc);
-+ for (i = 0; i < len; i++)
-+ proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
-+ UNGCPRO;
-+
-+ xfree (procs);
-+
-+ return proclist;
-+}
-+
- /* The WINDOWSNT implementation is in w32.c.
- The MSDOS implementation is in dosfns.c. */
- #elif !defined (WINDOWSNT) && !defined (MSDOS)
-@@ -3079,6 +3127,176 @@
- return attrs;
- }
-
-+#elif defined(__FreeBSD__)
-+
-+Lisp_Object
-+system_process_attributes (Lisp_Object pid)
-+{
-+ int proc_id;
-+ int pagesize = getpagesize();
-+ int npages;
-+ int fscale;
-+ struct passwd *pw;
-+ struct group *gr;
-+ char *ttyname;
-+ size_t len;
-+ char args[MAXPATHLEN];
-+ EMACS_TIME t, now;
-+
-+ int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID};
-+ struct kinfo_proc proc;
-+ size_t proclen = sizeof(proc);
-+
-+ struct gcpro gcpro1, gcpro2;
-+ Lisp_Object attrs = Qnil;
-+ Lisp_Object decoded_comm;
-+
-+ CHECK_NUMBER_OR_FLOAT (pid);
-+ proc_id = FLOATP (pid) ? XFLOAT_DATA (pid) : XINT (pid);
-+ mib[3] = proc_id;
-+
-+ if (sysctl (mib, 4, &proc, &proclen, NULL, 0) != 0)
-+ return attrs;
-+
-+ GCPRO2 (attrs, decoded_comm);
-+
-+ attrs = Fcons (Fcons (Qeuid, make_fixnum_or_float(proc.ki_uid)), attrs);
-+
-+ BLOCK_INPUT;
-+ pw = getpwuid (proc.ki_uid);
-+ UNBLOCK_INPUT;
-+ if (pw)
-+ attrs = Fcons (Fcons (Quser, build_string (pw->pw_name)), attrs);
-+
-+ attrs = Fcons (Fcons (Qegid, make_fixnum_or_float(proc.ki_svgid)), attrs);
-+
-+ BLOCK_INPUT;
-+ gr = getgrgid (proc.ki_svgid);
-+ UNBLOCK_INPUT;
-+ if (gr)
-+ attrs = Fcons (Fcons (Qgroup, build_string (gr->gr_name)), attrs);
-+
-+ decoded_comm = code_convert_string_norecord
-+ (make_unibyte_string (proc.ki_comm, strlen (proc.ki_comm)),
-+ Vlocale_coding_system, 0);
-+
-+ attrs = Fcons (Fcons (Qcomm, decoded_comm), attrs);
-+ {
-+ char state[2] = {'\0', '\0'};
-+ switch (proc.ki_stat)
-+ {
-+ case SRUN:
-+ state[0] = 'R';
-+ break;
-+
-+ case SSLEEP:
-+ state[0] = 'S';
-+ break;
-+
-+ case SLOCK:
-+ state[0] = 'D';
-+ break;
-+
-+ case SZOMB:
-+ state[0] = 'Z';
-+ break;
-+
-+ case SSTOP:
-+ state[0] = 'T';
-+ break;
-+ }
-+ attrs = Fcons (Fcons (Qstate, build_string (state)), attrs);
-+ }
-+
-+ attrs = Fcons (Fcons (Qppid, make_fixnum_or_float (proc.ki_ppid)), attrs);
-+ attrs = Fcons (Fcons (Qpgrp, make_fixnum_or_float (proc.ki_pgid)), attrs);
-+ attrs = Fcons (Fcons (Qsess, make_fixnum_or_float (proc.ki_sid)), attrs);
-+
-+ BLOCK_INPUT;
-+ ttyname = proc.ki_tdev == NODEV ? NULL : devname (proc.ki_tdev, S_IFCHR);
-+ UNBLOCK_INPUT;
-+ if (ttyname)
-+ attrs = Fcons (Fcons (Qtty, build_string (ttyname)), attrs);
-+
-+ attrs = Fcons (Fcons (Qtpgid, make_fixnum_or_float (proc.ki_tpgid)), attrs);
-+ attrs = Fcons (Fcons (Qminflt, make_fixnum_or_float (proc.ki_rusage.ru_minflt)), attrs);
-+ attrs = Fcons (Fcons (Qmajflt, make_fixnum_or_float (proc.ki_rusage.ru_majflt)), attrs);
-+ attrs = Fcons (Fcons (Qcminflt, make_number (proc.ki_rusage_ch.ru_minflt)), attrs);
-+ attrs = Fcons (Fcons (Qcmajflt, make_number (proc.ki_rusage_ch.ru_majflt)), attrs);
-+
-+#define TIMELIST(ts) \
-+ list3 (make_number (EMACS_SECS (ts) >> 16 & 0xffff), \
-+ make_number (EMACS_SECS (ts) & 0xffff), \
-+ make_number (EMACS_USECS (ts)))
-+
-+ attrs = Fcons (Fcons (Qutime, TIMELIST(proc.ki_rusage.ru_utime)), attrs);
-+ attrs = Fcons (Fcons (Qstime, TIMELIST(proc.ki_rusage.ru_stime)), attrs);
-+ EMACS_ADD_TIME (t, proc.ki_rusage.ru_utime, proc.ki_rusage.ru_stime);
-+ attrs = Fcons (Fcons (Qtime, TIMELIST(t)), attrs);
-+
-+ attrs = Fcons (Fcons (Qcutime, TIMELIST(proc.ki_rusage_ch.ru_utime)), attrs);
-+ attrs = Fcons (Fcons (Qcstime, TIMELIST(proc.ki_rusage_ch.ru_utime)), attrs);
-+ EMACS_ADD_TIME (t, proc.ki_rusage_ch.ru_utime, proc.ki_rusage_ch.ru_stime);
-+ attrs = Fcons (Fcons (Qctime, TIMELIST(t)), attrs);
-+
-+ attrs = Fcons (Fcons (Qthcount, make_fixnum_or_float (proc.ki_numthreads)), attrs);
-+ attrs = Fcons (Fcons (Qpri, make_number (proc.ki_pri.pri_native)), attrs);
-+ attrs = Fcons (Fcons (Qnice, make_number (proc.ki_nice)), attrs);
-+ attrs = Fcons (Fcons (Qstart, TIMELIST(proc.ki_start)), attrs);
-+ attrs = Fcons (Fcons (Qvsize, make_number (proc.ki_size >> 10)), attrs);
-+ attrs = Fcons (Fcons (Qrss, make_number (proc.ki_rssize * pagesize >> 10)), attrs);
-+
-+ EMACS_GET_TIME (now);
-+ EMACS_SUB_TIME (t, now, proc.ki_start);
-+ attrs = Fcons (Fcons (Qetime, TIMELIST(t)), attrs);
-+
-+#undef TIMELIST
-+
-+ len = sizeof(fscale);
-+ if (sysctlbyname ("kern.fscale", &fscale, &len, NULL, 0) == 0)
-+ {
-+ float pcpu;
-+ fixpt_t ccpu;
-+ len = sizeof (ccpu);
-+ if (sysctlbyname ("kern.ccpu", &ccpu, &len, NULL, 0) == 0)
-+ {
-+ pcpu = 100.0 * ((double) proc.ki_pctcpu / fscale)
-+ / (1.0 - exp(proc.ki_swtime * log((double) ccpu / fscale)));
-+ attrs = Fcons (Fcons (Qpcpu, make_fixnum_or_float(pcpu)), attrs);
-+ }
-+ }
-+
-+ len = sizeof(npages);
-+ if (sysctlbyname ("hw.availpages", &npages, &len, NULL, 0) == 0)
-+ {
-+ float pmem = proc.ki_flag & P_INMEM
-+ ? 100.0 * ((float) proc.ki_rssize / npages)
-+ : 0.0;
-+ attrs = Fcons (Fcons (Qpmem, make_fixnum_or_float(pmem)), attrs);
-+ }
-+
-+ mib[2] = KERN_PROC_ARGS;
-+ len = MAXPATHLEN;
-+ if (sysctl (mib, 4, args, &len, NULL, 0) == 0)
-+ {
-+ int i;
-+ for (i = 0; i < len; i++)
-+ {
-+ if (! args[i] && i < len - 1)
-+ args[i] = ' ';
-+ }
-+
-+ decoded_comm = code_convert_string_norecord
-+ (make_unibyte_string (args, strlen (args)),
-+ Vlocale_coding_system, 0);
-+
-+ attrs = Fcons (Fcons (Qargs, decoded_comm), attrs);
-+ }
-+
-+ UNGCPRO;
-+ return attrs;
-+}
-+
- /* The WINDOWSNT implementation is in w32.c.
- The MSDOS implementation is in dosfns.c. */
- #elif !defined (WINDOWSNT) && !defined (MSDOS)
Deleted: trunk/editors/emacs/files/patch-src_term.c
===================================================================
--- trunk/editors/emacs/files/patch-src_term.c 2016-03-15 00:03:25 UTC (rev 21168)
+++ trunk/editors/emacs/files/patch-src_term.c 2016-03-15 00:04:54 UTC (rev 21169)
@@ -1,22 +0,0 @@
-$FreeBSD$
-
-$NetBSD: patch-ag,v 1.13 2010/05/15 10:00:57 roy Exp $
-
-When running terminfo but compiled for termcap, we cannot assume
-that we actually have anything useable in termcap_term_buffer so just
-use the terminfo fixed size defined ealier.
-
---- src/term.c 2010-01-06 10:11:04.000000000 +0000
-+++ src/term.c 2010-01-06 10:11:53.000000000 +0000
-@@ -3590,11 +3590,6 @@
- #endif
- }
-
--#ifndef TERMINFO
-- if (strlen (tty->termcap_term_buffer) >= buffer_size)
-- abort ();
-- buffer_size = strlen (tty->termcap_term_buffer);
--#endif
- tty->termcap_strings_buffer = area = (char *) xmalloc (buffer_size);
- tty->TS_ins_line = tgetstr ("al", address);
- tty->TS_ins_multi_lines = tgetstr ("AL", address);
Added: trunk/editors/emacs/pkg-deinstall
===================================================================
--- trunk/editors/emacs/pkg-deinstall (rev 0)
+++ trunk/editors/emacs/pkg-deinstall 2016-03-15 00:04:54 UTC (rev 21169)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+GAMESROOT=/var/games/emacs
+
+if [ "$2" = "DEINSTALL" ]; then
+ for s in snake tetris; do
+ if [ ! -s $GAMESROOT/$s-scores ]; then
+ rm -f $GAMESROOT/$s-scores
+ fi
+ done
+ rmdir $GAMESROOT 2>/dev/null
+fi
+
+exit 0
Property changes on: trunk/editors/emacs/pkg-deinstall
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list