Index: head/devel/dbus-sharp/files/patch-src_UnixNativeTransport.cs =================================================================== --- head/devel/dbus-sharp/files/patch-src_UnixNativeTransport.cs (revision 397063) +++ head/devel/dbus-sharp/files/patch-src_UnixNativeTransport.cs (revision 397064) @@ -1,37 +1,34 @@ - -$FreeBSD$ - --- src/UnixNativeTransport.cs.orig +++ src/UnixNativeTransport.cs @@ -93,10 +93,15 @@ byte[] sa = new byte[2 + p.Length + 1]; +#if false //we use BitConverter to stay endian-safe byte[] afData = BitConverter.GetBytes (UnixSocket.AF_UNIX); sa[0] = afData[0]; sa[1] = afData[1]; +#endif + + sa[0] = (byte) sa.Length; + sa[1] = 1; /* AF_UNIX */ for (int i = 0 ; i != p.Length ; i++) sa[2 + i] = p[i]; @@ -111,10 +116,15 @@ byte[] sa = new byte[2 + 1 + p.Length]; +#if false //we use BitConverter to stay endian-safe byte[] afData = BitConverter.GetBytes (UnixSocket.AF_UNIX); sa[0] = afData[0]; sa[1] = afData[1]; +#endif + + sa[0] = (byte) sa.Length; + sa[1] = 1; /* AF_UNIX */ sa[2] = 0; //null prefix for abstract domain socket addresses, see unix(7) for (int i = 0 ; i != p.Length ; i++) Index: head/devel/fpp/files/patch-sparc-Makefile =================================================================== --- head/devel/fpp/files/patch-sparc-Makefile (revision 397063) +++ head/devel/fpp/files/patch-sparc-Makefile (revision 397064) @@ -1,17 +1,14 @@ - -$FreeBSD$ - --- sparc/Makefile.orig Tue Mar 18 21:23:25 1997 +++ sparc/Makefile Mon Oct 21 14:10:57 2002 @@ -1,8 +1,8 @@ SRC = ../src -CC = gcc -COPTS = -ansi -O -w -EXTRA_DEF = "-DRELEASE=\"v1.1\"" +CC ?= gcc +COPTS = -ansi -w ${CFLAGS} +EXTRA_DEF = "-DRELEASE=\"v1.1\"" -I../src all: fpp Index: head/devel/libhoard/files/patch-src_source_unixtls.cpp =================================================================== --- head/devel/libhoard/files/patch-src_source_unixtls.cpp (revision 397063) +++ head/devel/libhoard/files/patch-src_source_unixtls.cpp (revision 397064) @@ -1,12 +1,11 @@ -# $FreeBSD$ --- src/source/unixtls.cpp.orig 2014-08-21 06:10:50.000000000 +0200 +++ source/unixtls.cpp 2014-08-21 06:12:43.000000000 +0200 @@ -315,7 +315,7 @@ const pthread_attr_t *attr, void * (*start_routine) (void *), void * arg) -#if !defined(__SUNPRO_CC) && !defined(__APPLE__) +#if !defined(__SUNPRO_CC) && !defined(__APPLE__) && !defined(__FreeBSD__) throw () #endif { Index: head/devel/mono-addins/files/patch-Makefile.include =================================================================== --- head/devel/mono-addins/files/patch-Makefile.include (revision 397063) +++ head/devel/mono-addins/files/patch-Makefile.include (revision 397064) @@ -1,12 +1,9 @@ - -$FreeBSD$ - --- Makefile.include.orig +++ Makefile.include @@ -32,5 +32,5 @@ DISTCLEANFILES = $(GENERATED_FILES) $(build_datafiles) $(pc_files) bin_SCRIPTS = $(ASSEMBLY_WRAPPER) -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(libdir)/../libdata/pkgconfig pkgconfig_DATA = $(pc_files) Index: head/devel/mono-addins/files/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj =================================================================== --- head/devel/mono-addins/files/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj (revision 397063) +++ head/devel/mono-addins/files/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj (revision 397064) @@ -1,21 +1,18 @@ - -$FreeBSD$ - --- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig +++ Mono.Addins.Gui/Mono.Addins.Gui.csproj @@ -52,7 +52,7 @@ - + @@ -181,4 +181,4 @@ - \ No newline at end of file + Index: head/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_MakefileProjectServiceExtension.cs =================================================================== --- head/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_MakefileProjectServiceExtension.cs (revision 397063) +++ head/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_MakefileProjectServiceExtension.cs (revision 397064) @@ -1,59 +1,56 @@ - -$FreeBSD$ - --- src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs.orig +++ src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs @@ -168,7 +168,7 @@ chainedOutput.ChainWriter (monitor.Log); chainedOutput.ChainWriter (swOutput); - ProcessWrapper process = Runtime.ProcessService.StartProcess ("make", + ProcessWrapper process = Runtime.ProcessService.StartProcess ("gmake", args, baseDir, chainedOutput, @@ -254,7 +254,7 @@ // Snatched from our codedom code :-). //FIXME: Get this from the language binding.. if a known lang - static Regex regexEnterDir = new Regex (@"make\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'"); + static Regex regexEnterDir = new Regex (@"gmake\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'"); private static CompilerError CreateCompilerErrorFromString (string error_string, Stack dirs, Regex regex) { @@ -280,7 +280,7 @@ return null; } - if (error_string.StartsWith ("make")) + if (error_string.StartsWith ("gmake")) return null; match = regex.Match (error_string); @@ -345,7 +345,7 @@ { string baseDir = proj.BaseDirectory; - ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", + ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake", data.CleanTargetName, baseDir, monitor.Log, @@ -354,7 +354,7 @@ process.WaitForOutput (); if ( process.ExitCode > 0 ) - throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "make " + data.CleanTargetName) ); + throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "gmake " + data.CleanTargetName) ); monitor.Step ( 1 ); } @@ -400,7 +400,7 @@ monitor.BeginTask (GettextCatalog.GetString ("Executing {0}", project.Name), 1); try { - ProcessWrapper process = Runtime.ProcessService.StartProcess ("make", + ProcessWrapper process = Runtime.ProcessService.StartProcess ("gmake", data.ExecuteTargetName, project.BaseDirectory, console.Out, Index: head/devel/monodevelop/files/patch-src_addins_MonoDeveloperExtensions_MonoSolutionItemHandler.cs =================================================================== --- head/devel/monodevelop/files/patch-src_addins_MonoDeveloperExtensions_MonoSolutionItemHandler.cs (revision 397063) +++ head/devel/monodevelop/files/patch-src_addins_MonoDeveloperExtensions_MonoSolutionItemHandler.cs (revision 397064) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs.orig +++ src/addins/MonoDeveloperExtensions/MonoSolutionItemHandler.cs @@ -185,7 +185,7 @@ tw.ChainWriter (output); tw.ChainWriter (monitor.Log); - ProcessWrapper proc = Runtime.ProcessService.StartProcess ("make", "PROFILE=" + conf.Id + " " + target, conf.OutputDirectory, monitor.Log, tw, null); + ProcessWrapper proc = Runtime.ProcessService.StartProcess ("gmake", "PROFILE=" + conf.Id + " " + target, conf.OutputDirectory, monitor.Log, tw, null); proc.WaitForOutput (); CompilerResults cr = new CompilerResults (null); @@ -202,7 +202,7 @@ { // When IncludeDebugInformation is true, prevents the debug symbols stats from braeking this. if (error_string.StartsWith ("WROTE SYMFILE") || - error_string.StartsWith ("make[") || + error_string.StartsWith ("gmake[") || error_string.StartsWith ("OffsetTable") || error_string.StartsWith ("Compilation succeeded") || error_string.StartsWith ("Compilation failed")) Index: head/devel/monodevelop/files/patch-src_addins_VersionControl_MonoDevelop.VersionControl.Subversion.dll.config =================================================================== --- head/devel/monodevelop/files/patch-src_addins_VersionControl_MonoDevelop.VersionControl.Subversion.dll.config (revision 397063) +++ head/devel/monodevelop/files/patch-src_addins_VersionControl_MonoDevelop.VersionControl.Subversion.dll.config (revision 397064) @@ -1,10 +1,7 @@ - -$FreeBSD$ - --- /dev/null +++ src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.dll.config @@ -0,0 +1,4 @@ + + + + Index: head/devel/srecord/files/patch-Makefile.in =================================================================== --- head/devel/srecord/files/patch-Makefile.in (revision 397063) +++ head/devel/srecord/files/patch-Makefile.in (revision 397064) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- Makefile.in.orig +++ Makefile.in @@ -4594,7 +4594,7 @@ # to install the *.a and *.so* files as well, which is why you don't see them # explicitly mentioned here. # -install-libdir: $(libdir)/libsrecord.la $(libdir)/pkgconfig/srecord.pc +install-libdir: $(libdir)/libsrecord.la install-man: $(mandir)/man1/srec_cat.1 $(mandir)/man1/srec_cmp.1 \ $(mandir)/man1/srec_examples.1 $(mandir)/man1/srec_info.1 \ Index: head/editors/emacs-devel/files/extrapatch-lldb-gud.el =================================================================== --- head/editors/emacs-devel/files/extrapatch-lldb-gud.el (revision 397063) +++ head/editors/emacs-devel/files/extrapatch-lldb-gud.el (revision 397064) @@ -1,294 +1,291 @@ - -$FreeBSD$ - This diff is retrieved from http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00274.html And traces its origin back to https://gitorious.org/lldb/lldb/commit/40e4dbf It's also present on Apple's OS site: http://www.opensource.apple.com/source/lldb/lldb-76/utils/emacs/ diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 42c5b20..7f2e9c0 100644 --- lisp/progmodes/gud.el +++ lisp/progmodes/gud.el @@ -35,7 +35,7 @@ ;; kluge with the gud-xdb-directories hack producing gud-dbx-directories. ;; Derek L. Davies added support for jdb (Java ;; debugger.) Jan Nieuwenhuizen added support for the Guile REPL (Guile -;; debugger). +;; debugger). llvm.org added support for lldb. ;;; Code: @@ -56,7 +56,7 @@ (defgroup gud nil "The \"Grand Unified Debugger\" interface. -Supported debuggers include gdb, sdb, dbx, xdb, perldb, +Supported debuggers include lldb, gdb, sdb, dbx, xdb, perldb, pdb (Python), and jdb." :group 'processes :group 'tools) @@ -141,12 +141,12 @@ Used to gray out relevant toolbar icons.") (display-graphic-p) (fboundp 'x-show-tip)) :visible (memq gud-minor-mode - '(gdbmi guiler dbx sdb xdb pdb)) + '(lldb gdbmi guiler dbx sdb xdb pdb)) :button (:toggle . gud-tooltip-mode)) ([refresh] "Refresh" . gud-refresh) ([run] menu-item "Run" gud-run :enable (not gud-running) - :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb))) + :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb))) ([go] menu-item (if (bound-and-true-p gdb-active-process) "Continue" "Run") gud-go :visible (and (eq gud-minor-mode 'gdbmi) @@ -164,18 +164,18 @@ Used to gray out relevant toolbar icons.") ([tbreak] menu-item "Temporary Breakpoint" gud-tbreak :enable (not gud-running) :visible (memq gud-minor-mode - '(gdbmi gdb sdb xdb))) + '(lldb gdbmi gdb sdb xdb))) ([break] menu-item "Set Breakpoint" gud-break :enable (not gud-running) :visible (gud-tool-bar-item-visible-no-fringe)) ([up] menu-item "Up Stack" gud-up :enable (not gud-running) :visible (memq gud-minor-mode - '(gdbmi gdb guiler dbx xdb jdb pdb))) + '(lldb gdbmi gdb guiler dbx xdb jdb pdb))) ([down] menu-item "Down Stack" gud-down :enable (not gud-running) :visible (memq gud-minor-mode - '(gdbmi gdb guiler dbx xdb jdb pdb))) + '(lldb gdbmi gdb guiler dbx xdb jdb pdb))) ([pp] menu-item "Print S-expression" gud-pp :enable (and (not gud-running) (bound-and-true-p gdb-active-process)) @@ -187,7 +187,7 @@ Used to gray out relevant toolbar icons.") "Dump object" "Print Dereference") gud-pstar :enable (not gud-running) - :visible (memq gud-minor-mode '(gdbmi gdb jdb))) + :visible (memq gud-minor-mode '(lldb gdbmi gdb jdb))) ([print] menu-item "Print Expression" gud-print :enable (not gud-running)) ([watch] menu-item "Watch Expression" gud-watch @@ -196,13 +196,13 @@ Used to gray out relevant toolbar icons.") ([finish] menu-item "Finish Function" gud-finish :enable (not gud-running) :visible (memq gud-minor-mode - '(gdbmi gdb guiler xdb jdb pdb))) + '(lldb gdbmi gdb guiler xdb jdb pdb))) ([stepi] menu-item "Step Instruction" gud-stepi :enable (not gud-running) - :visible (memq gud-minor-mode '(gdbmi gdb dbx))) + :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx))) ([nexti] menu-item "Next Instruction" gud-nexti :enable (not gud-running) - :visible (memq gud-minor-mode '(gdbmi gdb dbx))) + :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx))) ([step] menu-item "Step Line" gud-step :enable (not gud-running)) ([next] menu-item "Next Line" gud-next @@ -237,7 +237,7 @@ Used to gray out relevant toolbar icons.") :visible (not (eq gud-minor-mode 'gdbmi))) ([menu-bar run] menu-item ,(propertize "run" 'face 'font-lock-doc-face) gud-run - :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb))) + :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb))) ([menu-bar go] menu-item ,(propertize " go " 'face 'font-lock-doc-face) gud-go :visible (and (eq gud-minor-mode 'gdbmi) @@ -356,6 +356,7 @@ are interpreted specially if present. These are: %l -- Number of current source line. %e -- Text of the C lvalue or function-call expression surrounding point. %a -- Text of the hexadecimal address surrounding point. + %b -- Text of the most recently created breakpoint id. %p -- Prefix argument to the command (if any) as a number. %c -- Fully qualified class name derived from the expression surrounding point (jdb only). @@ -964,6 +965,131 @@ SKIP is the number of chars to skip on each line, it defaults to 0." ;; ====================================================================== +;; lldb functions + +;; History of argument lists passed to lldb. +(defvar gud-lldb-history nil) + +;; Keeps track of breakpoint created. In the following case, the id is "1". +;; It is used to implement temporary breakpoint. +;; (lldb) b main.c:39 +;; breakpoint set --file 'main.c' --line 39 +;; Breakpoint created: 1: file ='main.c', line = 39, locations = 1 +(defvar gud-breakpoint-id nil) + +(defun lldb-extract-breakpoint-id (string) + ;; Search for "Breakpoint created: \\([^:\n]*\\):" pattern. + (if (string-match "Breakpoint created: \\([^:\n]*\\):" string) + (progn + (setq gud-breakpoint-id (match-string 1 string)) + (message "breakpoint id: %s" gud-breakpoint-id))) +) + +(defun gud-lldb-marker-filter (string) + (setq gud-marker-acc + (if gud-marker-acc (concat gud-marker-acc string) string)) + (lldb-extract-breakpoint-id gud-marker-acc) + (let (start) + ;; Process all complete markers in this chunk + (while (or + ;; (lldb) r + ;; Process 15408 launched: '/Volumes/data/lldb/svn/trunk/test/conditional_break/a.out' (x86_64) + ;; (lldb) Process 15408 stopped + ;; * thread #1: tid = 0x2e03, 0x0000000100000de8 a.out`c + 7 at main.c:39, stop reason = breakpoint 1.1, queue = com.apple.main-thread + (string-match " at \\([^:\n]*\\):\\([0-9]*\\), stop reason = .*\n" + gud-marker-acc start) + ;; (lldb) frame select -r 1 + ;; frame #1: 0x0000000100000e09 a.out`main + 25 at main.c:44 + (string-match "\nframe.* at \\([^:\n]*\\):\\([0-9]*\\)\n" + gud-marker-acc start)) + (setq gud-last-frame + (cons (match-string 1 gud-marker-acc) + (string-to-number (match-string 2 gud-marker-acc))) + start (match-end 0))) + + ;; Search for the last incomplete line in this chunk + (while (string-match "\n" gud-marker-acc start) + (setq start (match-end 0))) + + ;; If we have an incomplete line, store it in gud-marker-acc. + (setq gud-marker-acc (substring gud-marker-acc (or start 0)))) + string) + +;; Keeps track of whether the Python lldb_oneshot_break function definition has +;; been exec'ed. +(defvar lldb-oneshot-break-defined nil) + +;;;###autoload +(defun lldb (command-line) + "Run lldb on program FILE in buffer *gud-FILE*. +The directory containing FILE becomes the initial working directory +and source-file directory for your debugger." + (interactive (list (gud-query-cmdline 'lldb))) + + (gud-common-init command-line nil 'gud-lldb-marker-filter) + (set (make-local-variable 'gud-minor-mode) 'lldb) + (setq lldb-oneshot-break-defined nil) + + (gud-def gud-listb "breakpoint list" + "l" "List all breakpoints.") + (gud-def gud-bt "thread backtrace" + "b" "Show stack for the current thread.") + (gud-def gud-bt-all "thread backtrace all" + "B" "Show stacks for all the threads.") + + (gud-def gud-break "breakpoint set -f %f -l %l" + "\C-b" "Set breakpoint at current line.") + (gud-def gud-tbreak + (progn (gud-call "breakpoint set -f %f -l %l") + (sit-for 1) + (if (not lldb-oneshot-break-defined) + (progn + ;; The "\\n"'s are required to escape the newline chars + ;; passed to the lldb process. + (gud-call (concat "script exec \"def lldb_oneshot_break(frame, bp_loc):\\n" + " target=frame.GetThread().GetProcess().GetTarget()\\n" + " bp=bp_loc.GetBreakpoint()\\n" + " print 'Deleting oneshot breakpoint:', bp\\n" + " target.BreakpointDelete(bp.GetID())\"")) + (sit-for 1) + ;; Set the flag since Python knows about the function def now. + (setq lldb-oneshot-break-defined t))) + (gud-call "breakpoint command add -p %b -o 'lldb_oneshot_break(frame, bp_loc)'")) + "\C-t" "Set temporary breakpoint at current line.") + (gud-def gud-remove "breakpoint clear -f %f -l %l" + "\C-d" "Remove breakpoint at current line") + (gud-def gud-step "thread step-in" + "\C-s" "Step one source line with display.") + (gud-def gud-stepi "thread step-inst" + "\C-i" "Step one instruction with display.") + (gud-def gud-next "thread step-over" + "\C-n" "Step one line (skip functions).") + (gud-def gud-nexti "thread step-inst-over" + nil "Step one instruction (skip functions).") + (gud-def gud-cont "process continue" + "\C-r" "Continue with display.") + (gud-def gud-finish "thread step-out" + "\C-f" "Finish executing current function.") + (gud-def gud-up "frame select -r %p" + "<" "Up 1 stack frame.") + (gud-def gud-down "frame select -r -%p" + ">" "Down 1 stack frame.") + (gud-def gud-print "expression -- %e" + "\C-p" "Evaluate C expression at point.") + (gud-def gud-pstar "expression -- *%e" + nil "Evaluate C dereferenced pointer expression at point.") + (gud-def gud-run "run" + nil "Run the program.") + (gud-def gud-stop-subjob "process kill" + nil "Stop the program.") + + (setq comint-prompt-regexp "\\(^\\|\n\\)\\*") + (setq paragraph-start comint-prompt-regexp) + (run-hooks 'lldb-mode-hook) + ) + + +;; ====================================================================== ;; sdb functions ;; History of argument lists passed to sdb. @@ -2499,9 +2625,10 @@ gud, see `gud-mode'." "Major mode for interacting with an inferior debugger process. You start it up with one of the commands M-x gdb, M-x sdb, M-x dbx, -M-x perldb, M-x xdb, or M-x jdb. Each entry point finishes by executing a -hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook', -`perldb-mode-hook', `xdb-mode-hook', or `jdb-mode-hook' respectively. +M-x perldb, M-x xdb, M-x jdb, or M-x lldb. Each entry point finishes by +executing a hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook', +`perldb-mode-hook', `xdb-mode-hook', `jdb-mode-hook', or `lldb-mode-hook' +respectively. After startup, the following commands are available in both the GUD interaction buffer and any source buffer GUD visits due to a breakpoint stop @@ -2531,7 +2658,7 @@ Under gdb, sdb and xdb, \\[gud-tbreak] behaves exactly like \\[gud-break], except that the breakpoint is temporary; that is, it is removed when execution stops on it. -Under gdb, dbx, and xdb, \\[gud-up] pops up through an enclosing stack +Under gdb, dbx, xdb, and lldb, \\[gud-up] pops up through an enclosing stack frame. \\[gud-down] drops back down through one. If you are using gdb or xdb, \\[gud-finish] runs execution to the return from @@ -2858,7 +2985,7 @@ Obeying it means displaying in another window the specified file and line." result) (while (and str (let ((case-fold-search nil)) - (string-match "\\([^%]*\\)%\\([adefFlpc]\\)" str))) + (string-match "\\([^%]*\\)%\\([abdefFlpc]\\)" str))) (let ((key (string-to-char (match-string 2 str))) subst) (cond @@ -2886,6 +3013,8 @@ Obeying it means displaying in another window the specified file and line." (setq subst (gud-find-expr))) ((eq key ?a) (setq subst (gud-read-address))) + ((eq key ?b) + (setq subst gud-breakpoint-id)) ((eq key ?c) (setq subst (gud-find-class @@ -3520,6 +3649,7 @@ With arg, dereference expr if ARG is positive, otherwise do not dereference." (defun gud-tooltip-print-command (expr) "Return a suitable command to print the expression EXPR." (pcase gud-minor-mode + (`lldb (concat "expression -o -- \"" expr "\"")) (`gdbmi (concat "-data-evaluate-expression \"" expr "\"")) (`guiler expr) (`dbx (concat "print " expr)) Index: head/editors/nano-devel/files/patch-doc_man_nano.1 =================================================================== --- head/editors/nano-devel/files/patch-doc_man_nano.1 (revision 397063) +++ head/editors/nano-devel/files/patch-doc_man_nano.1 (revision 397064) @@ -1,14 +1,11 @@ - -$FreeBSD: /tmp/pcvs/ports/editors/nano-devel/files/patch-doc_man_nano.1,v 1.1 2008-11-16 23:59:19 wxs Exp $ - --- doc/man/nano.1.orig +++ doc/man/nano.1 @@ -224,8 +224,6 @@ .PD 0 .TP \fBnanorc\fP(5) -.PP -\fI/usr/share/doc/nano/\fP (or equivalent on your system) .SH AUTHOR Chris Allegretta , et al (see \fIAUTHORS\fP and Index: head/editors/nano-devel/files/patch-doc_man_nanorc.5 =================================================================== --- head/editors/nano-devel/files/patch-doc_man_nanorc.5 (revision 397063) +++ head/editors/nano-devel/files/patch-doc_man_nanorc.5 (revision 397064) @@ -1,15 +1,12 @@ - -$FreeBSD: /tmp/pcvs/ports/editors/nano-devel/files/patch-doc_man_nanorc.5,v 1.1 2008-11-16 23:59:19 wxs Exp $ - --- doc/man/nanorc.5.orig +++ doc/man/nanorc.5 @@ -250,8 +250,7 @@ .TP \fBnano\fP(1) .PP -\fI/usr/share/doc/nano/examples/nanorc.sample\fP (or equivalent on your -system) +\fIEXAMPLESDIR/nanorc.sample\fP .SH AUTHOR Chris Allegretta , et al (see \fIAUTHORS\fP and \fITHANKS\fP for details). This manual page was originally written by Index: head/games/bsdtris/files/patch-Makefile =================================================================== --- head/games/bsdtris/files/patch-Makefile (revision 397063) +++ head/games/bsdtris/files/patch-Makefile (revision 397064) @@ -1,26 +1,25 @@ --- Makefile.orig 2014-08-16 10:46:48 UTC +++ Makefile -@@ -0,0 +1,23 @@ +@@ -0,0 +1,22 @@ +# Makefile for Tetris -+# $FreeBSD: /tmp/pcvs/ports/games/bsdtris/files/patch-Makefile,v 1.1 2003-04-02 13:02:40 edwin Exp $ + +TMPLDFLAGS+= -lcurses -ltermcap +SRCS= screen.c shapes.c input.c tetris.c scores.c + +PREFIX?=/usr/local +MKDIR?=mkdir -p + +all: +. for files in ${SRCS} + ${CC} ${CFLAGS} ${LDFLAGS} -c ${files} +. endfor + ${CC} ${CFLAGS} ${LDFLAGS} ${TMPLDFLAGS} -o tetris input.o scores.o \ + screen.o shapes.o tetris.o + +install: + ${BSD_INSTALL_PROGRAM} tetris ${DESTDIR}${PREFIX}/bin/bsdtris + ${BSD_INSTALL_MAN} tetris.6 ${DESTDIR}${MANPREFIX}/man/man6/bsdtris.6 + ${MKDIR} ${DESTDIR}/var/games + +clean: + rm -f *.o *.core Index: head/graphics/wings/files/patch-src_wings____font.erl =================================================================== --- head/graphics/wings/files/patch-src_wings____font.erl (revision 397063) +++ head/graphics/wings/files/patch-src_wings____font.erl (revision 397064) @@ -1,76 +1,73 @@ - -$FreeBSD$ - --- src/wings__font.erl.orig +++ src/wings__font.erl @@ -11,45 +11,50 @@ %% $Id$ %% --module(wings__font, [Key,Desc,Width,Height,GlyphTab,Bitmaps]). --export([key/0,desc/0,width/0,height/0,draw/1,char/1,char_width/1, - bold_char/1,bold_char_width/1]). +-module(wings__font). +-export([new/6,key/1,desc/1,width/1,height/1,draw/2,char/2,char_width/2, + bold_char/2,bold_char_width/2]). -draw([C|T]) -> - char(C), - draw(T); -draw([]) -> ok. +-record(font, {key, desc, width, height, glyph_tab, bitmaps}). -key() -> Key. -desc() -> Desc. +new(Key, Desc, Width, Height, GlyphTab, Bitmaps) -> + #font{key = Key, desc = Desc, width = Width, height = Height, glyph_tab = GlyphTab, bitmaps = Bitmaps}. -char_width(C) -> - element(1, glyph_info(C)). -width() -> +draw(Font, [C|T]) -> + char(Font, C), + draw(Font, T); +draw(_Font, []) -> ok. + +key(#font{key = Key}) -> Key. +desc(#font{desc = Desc}) -> Desc. + +char_width(Font, C) -> + element(1, glyph_info(Font, C)). +width(#font{width = Width}) -> insert_glyph(char_width, Width), Width. -height() -> +height(#font{height = Height}) -> insert_glyph(char_height, Height), Height. -bold_char(C) -> - Glyph = glyph_info(C), +bold_char(Font, C) -> + Glyph = glyph_info(Font, C), draw_glyph(Glyph), Cw = glyph_width(Glyph), gl:bitmap(1, 1, 0, 0, -Cw+1, 0, <<0>>), draw_glyph(Glyph). -bold_char_width(C) -> - Glyph = glyph_info(C), +bold_char_width(Font, C) -> + Glyph = glyph_info(Font, C), glyph_width(Glyph)+1. -char(C) -> - draw_glyph(glyph_info(C)). +char(Font, C) -> + draw_glyph(glyph_info(Font, C)). draw_glyph({W,H,Xorig,Yorig,Xmove,B}) -> gl:bitmap(W, H, Xorig, Yorig, Xmove, 0, B). -glyph_info(C) -> +glyph_info(#font{glyph_tab = GlyphTab, width = Width, height = Height, bitmaps = Bitmaps}, C) -> BitMap = case ets:lookup(GlyphTab, C) of [] when is_integer(C), C > 0 -> %% Undefined character. Return a filled box. Index: head/graphics/wings/files/patch-src_wings__text.erl =================================================================== --- head/graphics/wings/files/patch-src_wings__text.erl (revision 397063) +++ head/graphics/wings/files/patch-src_wings__text.erl (revision 397064) @@ -1,73 +1,70 @@ - -$FreeBSD$ - --- src/wings_text.erl.orig +++ src/wings_text.erl @@ -65,7 +65,7 @@ bold_string_width([C|S], W) -> BCW = case wings_font_table:bold_char_width(C) of - undefined -> (current_font()):bold_char_width(C); + undefined -> wings__font:bold_char_width(current_font(), C); Other -> Other end, bold_string_width(S, BCW+W); @@ -74,19 +74,19 @@ char_width(C) -> case wings_font_table:char_width(C) of - undefined -> (current_font()):char_width(C); + undefined -> wings__font:char_width(current_font(), C); Other -> Other end. width() -> case wings_font_table:char(char_width) of - undefined -> (current_font()):width(); + undefined -> wings__font:width(current_font()); Other -> Other end. height() -> case wings_font_table:char(char_height) of - undefined -> (current_font()):height(); + undefined -> wings__font:height(current_font()); Other -> Other end. @@ -111,13 +111,13 @@ char(C) when is_atom(C) -> special(C); char(C) -> case wings_font_table:char(C) of - undefined -> (current_font()):char(C); + undefined -> wings__font:char(current_font(), C); Other -> Other end. bold([C|S]) -> case wings_font_table:bold_char(C) of - undefined -> (current_font()):bold_char(C); + undefined -> wings__font:bold_char(current_font(), C); Other -> Other end, bold(S); @@ -195,7 +195,7 @@ CharWidth = wings_text:width([$\s])*2, Line = [$\s,$\s|Line0], string_to_text_box(Tb#tb{text=Text,lw=LW+CharWidth,line=Line}); - + string_to_text_box(#tb{text=[{Style,String}=Stylized|Text],lw=Lw, max=Max, line=Line0,res=Res}=Tb0) -> Sw = width([Stylized]), NLW = Lw + Sw, @@ -504,8 +504,8 @@ {ok,Bin} = file:read_file(FontDir), Font = binary_to_term(Bin), Mod = load_font_1(Font), - Key = Mod:key(), - Desc = Mod:desc(), + Key = wings__font:key(Mod), + Desc = wings__font:desc(Mod), ets:insert(wings_fonts, {Key,Mod,Desc}). load_font_1({wings_font,?wings_version,Font}) -> Index: head/japanese/mailman/files/patch-configure.in =================================================================== --- head/japanese/mailman/files/patch-configure.in (revision 397063) +++ head/japanese/mailman/files/patch-configure.in (revision 397064) @@ -1,70 +1,67 @@ - -$FreeBSD: /tmp/pcvs/ports/japanese/mailman/files/patch-configure.in,v 1.1 2012-03-04 06:00:38 tota Exp $ - Mailman tests for existence of users during configure -- unfortunately this creates a problem; we create the users just before install. We remove the testing part. --- configure.in.orig 2011-12-11 16:56:23.000000000 +0900 +++ configure.in 2012-02-15 06:11:05.000000000 +0900 @@ -341,28 +341,7 @@ # $2 == user id to check for AC_SUBST($1) changequote(,) -if test -z "$$1" -then - cat > conftest.py < conftest.py <= FD_SETSIZE) return -2; + if(descriptor >= (int_fd_t)FD_SETSIZE) return -2; highest = descriptor > highest ? descriptor : highest; if(descriptor >= 0) FD_SET((int_fd_t)descriptor, set); Index: head/lang/sagittarius-scheme/files/patch-CMakeLists.txt =================================================================== --- head/lang/sagittarius-scheme/files/patch-CMakeLists.txt (revision 397063) +++ head/lang/sagittarius-scheme/files/patch-CMakeLists.txt (revision 397064) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- CMakeLists.txt.orig +++ CMakeLists.txt @@ -30,7 +30,7 @@ GET_PARAMETER(SHARE_DIR share) # FreeBSD ports adds a patch for this directory # so make it configurable -GET_PARAMETER(PKGCONFIG_DIR lib/pkgconfig) +GET_PARAMETER(PKGCONFIG_DIR libdata/pkgconfig) if (WATCOM) message(STATUS "*CAUTION* open watcom is experimental") Index: head/lang/sagittarius-scheme/files/patch-cmake_CMakeLists.txt =================================================================== --- head/lang/sagittarius-scheme/files/patch-cmake_CMakeLists.txt (revision 397063) +++ head/lang/sagittarius-scheme/files/patch-cmake_CMakeLists.txt (revision 397064) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- cmake/CMakeLists.txt.orig +++ cmake/CMakeLists.txt @@ -1,5 +1,5 @@ # Post install script # running ldconfig -INSTALL(CODE "MESSAGE(STATUS \"Running ldconfig\")") -INSTALL(CODE "execute_process(COMMAND ldconfig)") +#INSTALL(CODE "MESSAGE(STATUS \"Running ldconfig\")") +#INSTALL(CODE "execute_process(COMMAND ldconfig)") Index: head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in =================================================================== --- head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in (revision 397063) +++ head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in (revision 397064) @@ -1,18 +1,15 @@ - -$FreeBSD$ - --- mk/smtpd/Makefile.in.orig +++ mk/smtpd/Makefile.in @@ -1793,11 +1793,7 @@ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \ - $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \ - else \ - echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \ - fi + $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample $(INSTALL) -m 644 aliases.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5 $(INSTALL) -m 644 forward.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/forward.5 Index: head/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h =================================================================== --- head/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h (revision 397063) +++ head/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h (revision 397064) @@ -1,20 +1,17 @@ - -$FreeBSD$ - Fix for a build failure, taken from http://article.gmane.org/gmane.mail.opensmtpd.general/2291 --- openbsd-compat/defines.h.orig +++ openbsd-compat/defines.h @@ -79,6 +79,10 @@ # define MAXHOSTNAMELEN 64 #endif +#ifndef HOST_NAME_MAX +# define HOST_NAME_MAX 255 +#endif + #ifndef LOGIN_NAME_MAX # define LOGIN_NAME_MAX 9 #endif Index: head/math/eukleides/files/patch-doc_eukleides.texi =================================================================== --- head/math/eukleides/files/patch-doc_eukleides.texi (revision 397063) +++ head/math/eukleides/files/patch-doc_eukleides.texi (revision 397064) @@ -1,20 +1,17 @@ - -$FreeBSD$ - --- doc/eukleides.texi.orig +++ doc/eukleides.texi @@ -6,12 +6,14 @@ % ------------------------------------------------------------------------------ +@iftex \def\LaTeX{L\kern-.34em\raise.49ex\hbox{\sevenrm A}\kern-.18em\TeX} \def\mdeg{$^\circ$} \font\degfont=cmtt8 \def\deg{\raise.7ex\hbox{\degfont o}} \def\exm#1{\noindent{\textit Example:}\quad{\texttt #1}} \def\exmp{\noindent{\textit Example:}} +@end iftex % ------------------------------------------------------------------------------ Index: head/net/hping-devel/files/patch-bytesex.h =================================================================== --- head/net/hping-devel/files/patch-bytesex.h (revision 397063) +++ head/net/hping-devel/files/patch-bytesex.h (revision 397064) @@ -1,18 +1,15 @@ - -$FreeBSD: /tmp/pcvs/ports/net/hping-devel/files/patch-bytesex.h,v 1.1 2005-11-15 10:22:58 az Exp $ - --- bytesex.h.orig Tue Sep 14 15:22:45 2004 +++ bytesex.h Tue Sep 14 15:21:50 2004 @@ -8,10 +8,12 @@ #define ARS_BYTESEX_H #if defined(__i386__) \ + || defined(__ia64__) \ || defined(__alpha__) \ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) #define BYTE_ORDER_LITTLE_ENDIAN #elif defined(__mc68000__) \ + || defined (__amd64__) \ || defined (__sparc__) \ || defined (__sparc) \ || defined (__PPC__) \ Index: head/net/slurm/files/patch-src_if__media.c =================================================================== --- head/net/slurm/files/patch-src_if__media.c (revision 397063) +++ head/net/slurm/files/patch-src_if__media.c (revision 397064) @@ -1,19 +1,16 @@ - -$FreeBSD$ - --- src/if_media.c.orig +++ src/if_media.c @@ -95,8 +95,13 @@ * */ +#if __FreeBSD__ >= 2 + type = IFM_TYPE(ifmr.ifm_active); + physical = IFM_SUBTYPE(ifmr.ifm_active); +#else type = ifmr.ifm_active & 0xf0; physical = ifmr.ifm_active & 0x0f; +#endif #ifdef MEDIADEBUG printf(" all: %6d\n", ifmr.ifm_current); Index: head/net-im/ejabberd/files/patch-ejabberdctl.template =================================================================== --- head/net-im/ejabberd/files/patch-ejabberdctl.template (revision 397063) +++ head/net-im/ejabberd/files/patch-ejabberdctl.template (revision 397064) @@ -1,40 +1,37 @@ - -$FreeBSD$ - --- ejabberdctl.template.orig +++ ejabberdctl.template @@ -71,10 +71,10 @@ EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml fi if [ "$LOGS_DIR" = "" ] ; then - LOGS_DIR={{localstatedir}}/log/ejabberd + LOGS_DIR=/var/log/ejabberd fi if [ "$SPOOL_DIR" = "" ] ; then - SPOOL_DIR={{localstatedir}}/lib/ejabberd + SPOOL_DIR=/var/spool/ejabberd fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then EJABBERD_DOC_PATH={{docdir}} @@ -88,10 +88,10 @@ EJABBERDDIR={{libdir}}/ejabberd fi if [ "$EJABBERD_EBIN_PATH" = "" ] ; then - EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin + EJABBERD_EBIN_PATH={{rootdir}}/lib/erlang/lib/ejabberd/ebin fi if [ "$EJABBERD_PRIV_PATH" = "" ] ; then - EJABBERD_PRIV_PATH=$EJABBERDDIR/priv + EJABBERD_PRIV_PATH={{rootdir}}/lib/erlang/lib/ejabberd/priv fi if [ "$EJABBERD_BIN_PATH" = "" ] ; then EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin @@ -335,7 +335,7 @@ # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 - CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl + CONNLOCKDIR={{localstatedir}}/run/ejabberdctl FLOCK=/usr/bin/flock if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then JOT=/usr/bin/jot Property changes on: head/net-im/ejabberd/files/patch-ejabberdctl.template ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/net-im/ejabberd/files/patch-erlang-17-dict-queue =================================================================== --- head/net-im/ejabberd/files/patch-erlang-17-dict-queue (revision 397063) +++ head/net-im/ejabberd/files/patch-erlang-17-dict-queue (revision 397064) @@ -1,229 +1,212 @@ -$FreeBSD$ - Fixes to make it work with Erlang R17 - -$FreeBSD$ - --- ../deps/riak_pb/src/riak_pb_kv_codec.erl.orig +++ ../deps/riak_pb/src/riak_pb_kv_codec.erl @@ -49,7 +49,11 @@ -type symbolic_quorum() :: one | quorum | all | default. -type value() :: binary(). +-ifdef(ERLANG_17). +-type metadata() :: dict:dict(). +-else. -type metadata() :: dict(). +-endif. -type contents() :: [{metadata(), value()}]. %% @doc Convert a list of object {MetaData,Value} pairs to protocol -$FreeBSD$ - --- ../deps/riak_pb/rebar.config.orig +++ ../deps/riak_pb/rebar.config @@ -1,5 +1,5 @@ %% -*- mode: erlang -*- -{erl_opts, [debug_info]}. +{erl_opts, [{platform_define, "^1[78]-", 'ERLANG_17'},debug_info]}. {deps, [ {protobuffs, "0.8.1", {git, "git://github.com/basho/erlang_protobuffs.git", {tag, "0.8.1p1"}}} ]}. -$FreeBSD$ - --- ../deps/esip/src/esip_listener.erl.orig +++ ../deps/esip/src/esip_listener.erl @@ -37,7 +37,11 @@ -include("esip_lib.hrl"). -define(TCP_SEND_TIMEOUT, 10000). +-ifdef(ERLANG_17). +-record(state, {listeners = dict:new() :: dict:dict()}). +-else. -record(state, {listeners = dict:new() :: dict()}). +-endif. %%%=================================================================== %%% API -$FreeBSD$ - --- ../deps/esip/rebar.config.orig +++ ../deps/esip/rebar.config @@ -1,4 +1,5 @@ -{erl_opts, [{i, "include"}, +{erl_opts, [{platform_define, "^1[78]-", 'ERLANG_17'}, + {i, "include"}, {i, "deps/p1_stun/include"}, {i, "../p1_stun/include"}]}. -$FreeBSD$ - --- ../deps/p1_stun/src/turn.erl.orig +++ ../deps/p1_stun/src/turn.erl @@ -56,6 +56,29 @@ -type addr() :: {inet:ip_address(), inet:port_number()}. +-ifdef(ERLANG_17). +-record(state, + {sock_mod = gen_udp :: gen_udp | gen_tcp | p1_tls, + sock :: inet:socket() | p1_tls:tls_socket(), + addr = {{0,0,0,0}, 0} :: addr(), + owner = self() :: pid(), + username = <<"">> :: binary(), + realm = <<"">> :: binary(), + key = {<<"">>, <<"">>, <<"">>} :: {binary(), binary(), binary()}, + server_name = <<"">> :: binary(), + permissions = ?DICT:new() :: dict:dict(), + channels = ?DICT:new() :: dict:dict(), + max_permissions :: non_neg_integer() | atom(), + relay_ip = {127,0,0,1} :: inet:ip_address(), + min_port = 49152 :: non_neg_integer(), + max_port = 65535 :: non_neg_integer(), + relay_addr :: addr(), + relay_sock :: inet:socket(), + last_trid :: non_neg_integer(), + last_pkt = <<>> :: binary(), + seq = 1 :: non_neg_integer(), + life_timer :: reference()}). +-else. -record(state, {sock_mod = gen_udp :: gen_udp | gen_tcp | p1_tls, sock :: inet:socket() | p1_tls:tls_socket(), @@ -77,6 +100,7 @@ last_pkt = <<>> :: binary(), seq = 1 :: non_neg_integer(), life_timer :: reference()}). +-endif. %%==================================================================== %% API -$FreeBSD$ - --- ../deps/p1_stun/rebar.config.orig +++ ../deps/p1_stun/rebar.config @@ -1,4 +1,5 @@ -{erl_opts, [debug_info, {i, "include"}]}. +{erl_opts, [{platform_define, "^1[78]-", 'ERLANG_17'}, + debug_info, {i, "include"}]}. {deps, [{p1_tls, ".*", {git, "git://github.com/processone/tls.git"}}, {p1_utils, ".*", {git, "git://github.com/processone/p1_utils.git"}}]}. - -$FreeBSD$ --- ../deps/p1_stun/src/stun_listener.erl.orig +++ ../deps/p1_stun/src/stun_listener.erl @@ -36,7 +36,11 @@ terminate/2, code_change/3]). -define(TCP_SEND_TIMEOUT, 10000). +-ifdef(ERLANG_17). +-record(state, {listeners = dict:new() :: dict:dict()}). +-else. -record(state, {listeners = dict:new() :: dict()}). +-endif. %%%=================================================================== %%% API --- ../deps/riakc/rebar.config.orig +++ ../deps/riakc/rebar.config @@ -1,6 +1,8 @@ {cover_enabled, true}. {eunit_opts, [verbose]}. -{erl_opts, [warnings_as_errors, debug_info]}. +{erl_opts, [ + {platform_define, "^1[78]-", 'ERLANG_17'}, + warnings_as_errors, debug_info]}. {deps, [ {riak_pb, ".*", {git, "git://github.com/basho/riak_pb", {tag, "1.4.4.0"}}} ]}. --- ../deps/riakc/src/riakc_obj.erl.orig +++ ../deps/riakc/src/riakc_obj.erl @@ -79,7 +79,11 @@ -type key() :: binary() | 'undefined'. %% A key name -type id() :: {bucket(), key()}. -type vclock() :: binary(). %% An opaque vector clock +-ifdef(ERLANG_17). +-type metadata() :: dict:dict(). %% Value metadata +-else. -type metadata() :: dict(). %% Value metadata +-endif. -type content_type() :: string(). %% The media type of a value -type value() :: binary(). %% An opaque value -type contents() :: [{metadata(), value()}]. %% All metadata/value pairs in a `riakc_obj'. @@ -98,6 +102,16 @@ -type tag() :: binary(). -type link() :: {tag(), [id()]}. +-ifdef(ERLANG_17). +-record(riakc_obj, { + bucket :: bucket(), + key :: key(), + vclock :: vclock(), + contents :: contents(), + updatemetadata :: dict:dict(), + updatevalue :: value() + }). +-else. -record(riakc_obj, { bucket :: bucket(), key :: key(), @@ -106,6 +120,7 @@ updatemetadata :: dict(), updatevalue :: value() }). +-endif. -type riakc_obj() :: #riakc_obj{}. %% The record/type containing the entire Riak object. -export_type([riakc_obj/0, bucket/0, key/0, vclock/0, contents/0, metadata/0, value/0, @@ -284,7 +299,11 @@ end. %% @doc Return the content type from metadata +-ifdef(ERLANG_17). +-spec md_ctype(dict:dict()) -> undefined | content_type(). +-else. -spec md_ctype(dict()) -> undefined | content_type(). +-endif. md_ctype(MetaData) -> case dict:find(?MD_CTYPE, MetaData) of error -> --- ../deps/riakc/src/riakc_pb_socket.erl.orig +++ ../deps/riakc/src/riakc_pb_socket.erl @@ -110,6 +110,20 @@ -type portnum() :: non_neg_integer(). %% The TCP port number of the Riak node's Protocol Buffers interface -type address() :: string() | atom() | inet:ip_address(). %% The TCP/IP host name or address of the Riak node +-ifdef(ERLANG_17). +-record(state, {address :: address(), % address to connect to + port :: portnum(), % port to connect to + auto_reconnect = false :: boolean(), % if true, automatically reconnects to server + % if false, exits on connection failure/request timeout + queue_if_disconnected = false :: boolean(), % if true, add requests to queue if disconnected + sock :: port(), % gen_tcp socket + active :: #request{} | undefined, % active request + queue :: queue:queue() | undefined, % queue of pending requests + connects=0 :: non_neg_integer(), % number of successful connects + failed=[] :: [connection_failure()], % breakdown of failed connects + connect_timeout=infinity :: timeout(), % timeout of TCP connection + reconnect_interval=?FIRST_RECONNECT_INTERVAL :: non_neg_integer()}). +-else. -record(state, {address :: address(), % address to connect to port :: portnum(), % port to connect to auto_reconnect = false :: boolean(), % if true, automatically reconnects to server @@ -122,6 +136,7 @@ failed=[] :: [connection_failure()], % breakdown of failed connects connect_timeout=infinity :: timeout(), % timeout of TCP connection reconnect_interval=?FIRST_RECONNECT_INTERVAL :: non_neg_integer()}). +-endif. %% @doc Create a linked process to talk with the riak server on Address:Port %% Client id will be assigned by the server. Property changes on: head/net-im/ejabberd/files/patch-erlang-17-dict-queue ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/security/hotssh/files/patch-wscript =================================================================== --- head/security/hotssh/files/patch-wscript (revision 397063) +++ head/security/hotssh/files/patch-wscript (revision 397064) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- wscript.orig +++ wscript @@ -14,7 +14,7 @@ opt.tool_options('python') def configure(conf): - conf.check_tool('gcc gnome python intltool misc') + conf.check_tool('cc gnome python intltool misc') conf.check_python_version((2,4,2)) conf.check_python_module('dbus') Index: head/security/openssh-portable/files/extra-patch-tcpwrappers =================================================================== --- head/security/openssh-portable/files/extra-patch-tcpwrappers (revision 397063) +++ head/security/openssh-portable/files/extra-patch-tcpwrappers (revision 397064) @@ -1,160 +1,159 @@ Revert TCPWRAPPER removal -bdrewery -$FreeBSD$ commit f2719b7c2b8a3b14d778d8a6d8dc729b5174b054 Author: Damien Miller Date: Sun Apr 20 13:22:18 2014 +1000 - tedu@cvs.openbsd.org 2014/03/26 19:58:37 [sshd.8 sshd.c] remove libwrap support. ok deraadt djm mfriedl diff --git sshd.8 sshd.8 index 289e13d..e6a900b 100644 --- sshd.8 +++ sshd.8 @@ -851,6 +851,12 @@ the user's home directory becomes accessible. This file should be writable only by the user, and need not be readable by anyone else. .Pp +.It Pa /etc/hosts.allow +.It Pa /etc/hosts.deny +Access controls that should be enforced by tcp-wrappers are defined here. +Further details are described in +.Xr hosts_access 5 . +.Pp .It Pa /etc/hosts.equiv This file is for host-based authentication (see .Xr ssh 1 ) . @@ -954,6 +960,7 @@ The content of this file is not sensitive; it can be world-readable. .Xr ssh-keygen 1 , .Xr ssh-keyscan 1 , .Xr chroot 2 , +.Xr hosts_access 5 , .Xr login.conf 5 , .Xr moduli 5 , .Xr sshd_config 5 , diff --git sshd.c sshd.c index 0ade557..045f149 100644 --- sshd.c +++ sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.421 2014/03/26 19:58:37 tedu Exp $ */ +/* $OpenBSD: sshd.c,v 1.422 2014/03/27 23:01:27 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -122,6 +122,13 @@ #include "ssh-sandbox.h" #include "version.h" +#ifdef LIBWRAP +#include +#include +int allow_severity; +int deny_severity; +#endif /* LIBWRAP */ + #ifndef O_NOCTTY #define O_NOCTTY 0 #endif @@ -2027,6 +2034,24 @@ main(int ac, char **av) #ifdef SSH_AUDIT_EVENTS audit_connection_from(remote_ip, remote_port); #endif +#ifdef LIBWRAP + allow_severity = options.log_facility|LOG_INFO; + deny_severity = options.log_facility|LOG_WARNING; + /* Check whether logins are denied from this host. */ + if (packet_connection_is_on_socket()) { + struct request_info req; + + request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); + fromhost(&req); + + if (!hosts_access(&req)) { + debug("Connection refused by tcp wrapper"); + refuse(&req); + /* NOTREACHED */ + fatal("libwrap refuse returns"); + } + } +#endif /* LIBWRAP */ /* Log the connection. */ verbose("Connection from %s port %d on %s port %d", diff --git configure.ac configure.ac index f48ba4a..66fbe82 100644 --- configure.ac +++ configure.ac @@ -1380,6 +1380,62 @@ AC_ARG_WITH([skey], ] ) +# Check whether user wants TCP wrappers support +TCPW_MSG="no" +AC_ARG_WITH([tcp-wrappers], + [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)], + [ + if test "x$withval" != "xno" ; then + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + if test -n "${withval}" && \ + test "x${withval}" != "xyes"; then + if test -d "${withval}/lib"; then + if test -n "${need_dash_r}"; then + LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" + else + LDFLAGS="-L${withval}/lib ${LDFLAGS}" + fi + else + if test -n "${need_dash_r}"; then + LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" + else + LDFLAGS="-L${withval} ${LDFLAGS}" + fi + fi + if test -d "${withval}/include"; then + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" + else + CPPFLAGS="-I${withval} ${CPPFLAGS}" + fi + fi + LIBS="-lwrap $LIBS" + AC_MSG_CHECKING([for libwrap]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +#include +#include +#include +int deny_severity = 0, allow_severity = 0; + ]], [[ + hosts_access(0); + ]])], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([LIBWRAP], [1], + [Define if you want + TCP Wrappers support]) + SSHDLIBS="$SSHDLIBS -lwrap" + TCPW_MSG="yes" + ], [ + AC_MSG_ERROR([*** libwrap missing]) + + ]) + LIBS="$saved_LIBS" + fi + ] +) + # Check whether user wants to use ldns LDNS_MSG="no" AC_ARG_WITH(ldns, @@ -4803,6 +4859,7 @@ echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" +echo " TCP Wrappers support: $TCPW_MSG" echo " MD5 password support: $MD5_MSG" echo " libedit support: $LIBEDIT_MSG" echo " Solaris process contract support: $SPC_MSG" Index: head/security/openssh-portable-devel/files/extra-patch-tcpwrappers =================================================================== --- head/security/openssh-portable-devel/files/extra-patch-tcpwrappers (revision 397063) +++ head/security/openssh-portable-devel/files/extra-patch-tcpwrappers (revision 397064) @@ -1,160 +1,159 @@ Revert TCPWRAPPER removal -bdrewery -$FreeBSD$ commit f2719b7c2b8a3b14d778d8a6d8dc729b5174b054 Author: Damien Miller Date: Sun Apr 20 13:22:18 2014 +1000 - tedu@cvs.openbsd.org 2014/03/26 19:58:37 [sshd.8 sshd.c] remove libwrap support. ok deraadt djm mfriedl diff --git sshd.8 sshd.8 index 289e13d..e6a900b 100644 --- sshd.8 +++ sshd.8 @@ -851,6 +851,12 @@ the user's home directory becomes accessible. This file should be writable only by the user, and need not be readable by anyone else. .Pp +.It Pa /etc/hosts.allow +.It Pa /etc/hosts.deny +Access controls that should be enforced by tcp-wrappers are defined here. +Further details are described in +.Xr hosts_access 5 . +.Pp .It Pa /etc/hosts.equiv This file is for host-based authentication (see .Xr ssh 1 ) . @@ -954,6 +960,7 @@ The content of this file is not sensitive; it can be world-readable. .Xr ssh-keygen 1 , .Xr ssh-keyscan 1 , .Xr chroot 2 , +.Xr hosts_access 5 , .Xr login.conf 5 , .Xr moduli 5 , .Xr sshd_config 5 , diff --git sshd.c sshd.c index 0ade557..045f149 100644 --- sshd.c +++ sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.421 2014/03/26 19:58:37 tedu Exp $ */ +/* $OpenBSD: sshd.c,v 1.422 2014/03/27 23:01:27 markus Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -122,6 +122,13 @@ #include "ssh-sandbox.h" #include "version.h" +#ifdef LIBWRAP +#include +#include +int allow_severity; +int deny_severity; +#endif /* LIBWRAP */ + #ifndef O_NOCTTY #define O_NOCTTY 0 #endif @@ -2027,6 +2034,24 @@ main(int ac, char **av) #ifdef SSH_AUDIT_EVENTS audit_connection_from(remote_ip, remote_port); #endif +#ifdef LIBWRAP + allow_severity = options.log_facility|LOG_INFO; + deny_severity = options.log_facility|LOG_WARNING; + /* Check whether logins are denied from this host. */ + if (packet_connection_is_on_socket()) { + struct request_info req; + + request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); + fromhost(&req); + + if (!hosts_access(&req)) { + debug("Connection refused by tcp wrapper"); + refuse(&req); + /* NOTREACHED */ + fatal("libwrap refuse returns"); + } + } +#endif /* LIBWRAP */ /* Log the connection. */ verbose("Connection from %s port %d on %s port %d", diff --git configure.ac configure.ac index f48ba4a..66fbe82 100644 --- configure.ac +++ configure.ac @@ -1380,6 +1380,62 @@ AC_ARG_WITH([skey], ] ) +# Check whether user wants TCP wrappers support +TCPW_MSG="no" +AC_ARG_WITH([tcp-wrappers], + [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)], + [ + if test "x$withval" != "xno" ; then + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + if test -n "${withval}" && \ + test "x${withval}" != "xyes"; then + if test -d "${withval}/lib"; then + if test -n "${need_dash_r}"; then + LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" + else + LDFLAGS="-L${withval}/lib ${LDFLAGS}" + fi + else + if test -n "${need_dash_r}"; then + LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" + else + LDFLAGS="-L${withval} ${LDFLAGS}" + fi + fi + if test -d "${withval}/include"; then + CPPFLAGS="-I${withval}/include ${CPPFLAGS}" + else + CPPFLAGS="-I${withval} ${CPPFLAGS}" + fi + fi + LIBS="-lwrap $LIBS" + AC_MSG_CHECKING([for libwrap]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +#include +#include +#include +int deny_severity = 0, allow_severity = 0; + ]], [[ + hosts_access(0); + ]])], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([LIBWRAP], [1], + [Define if you want + TCP Wrappers support]) + SSHDLIBS="$SSHDLIBS -lwrap" + TCPW_MSG="yes" + ], [ + AC_MSG_ERROR([*** libwrap missing]) + + ]) + LIBS="$saved_LIBS" + fi + ] +) + # Check whether user wants to use ldns LDNS_MSG="no" AC_ARG_WITH(ldns, @@ -4803,6 +4859,7 @@ echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" +echo " TCP Wrappers support: $TCPW_MSG" echo " MD5 password support: $MD5_MSG" echo " libedit support: $LIBEDIT_MSG" echo " Solaris process contract support: $SPC_MSG" Index: head/sysutils/cdrkit/files/patch-genisomage =================================================================== --- head/sysutils/cdrkit/files/patch-genisomage (revision 397063) +++ head/sysutils/cdrkit/files/patch-genisomage (revision 397064) @@ -1,87 +1,85 @@ -$FreeBSD$ - Use instead of the linux-ish Use __attribute__ ((__nothrow__)) instead of the linux-ish __THROW (from the linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD. --- genisoimage/sha256.c.orig 2009-10-11 12:27:59.000000000 -0600 +++ genisoimage/sha256.c 2011-10-27 14:55:25.000000000 -0600 @@ -24,9 +24,9 @@ /* Written by Ulrich Drepper , 2007. */ -#include #include #include +#include #include #include "sha256.h" --- genisoimage/sha256.h.orig 2009-05-10 15:49:54.000000000 -0600 +++ genisoimage/sha256.h 2011-10-27 14:58:30.000000000 -0600 @@ -42,14 +42,14 @@ /* Initialize structure containing state of computation. (FIPS 180-2: 5.3.2) */ -extern void sha256_init_ctx (struct sha256_ctx *ctx) __THROW; +extern void sha256_init_ctx (struct sha256_ctx *ctx) __attribute__ ((__nothrow__)); /* Starting with the result of former calls of this function (or the initialization function update the context for the next LEN bytes starting at BUFFER. It is NOT required that LEN is a multiple of 64. */ extern void sha256_process_bytes (const void *buffer, size_t len, - struct sha256_ctx *ctx) __THROW; + struct sha256_ctx *ctx) __attribute__ ((__nothrow__)); /* Process the remaining bytes in the buffer and put result from CTX in first 32 bytes following RESBUF. @@ -57,6 +57,6 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ extern void *sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf) - __THROW; + __attribute__ ((__nothrow__)); #endif /* sha256.h */ --- genisoimage/sha512.h.orig 2009-05-10 15:49:54.000000000 -0600 +++ genisoimage/sha512.h 2011-10-27 14:58:35.000000000 -0600 @@ -42,14 +42,14 @@ /* Initialize structure containing state of computation. (FIPS 180-2: 5.3.3) */ -extern void sha512_init_ctx (struct sha512_ctx *ctx) __THROW; +extern void sha512_init_ctx (struct sha512_ctx *ctx) __attribute__ ((__nothrow__)); /* Starting with the result of former calls of this function (or the initialization function update the context for the next LEN bytes starting at BUFFER. It is NOT required that LEN is a multiple of 128. */ extern void sha512_process_bytes (const void *buffer, size_t len, - struct sha512_ctx *ctx) __THROW; + struct sha512_ctx *ctx) __attribute__ ((__nothrow__)); /* Process the remaining bytes in the buffer and put result from CTX in first 64 bytes following RESBUF. @@ -57,6 +57,6 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 64 bits value. */ extern void *sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf) - __THROW; + __attribute__ ((__nothrow__)); #endif /* sha512.h */ --- genisoimage/sha512.c.orig 2009-10-11 12:27:59.000000000 -0600 +++ genisoimage/sha512.c 2011-10-27 14:59:01.000000000 -0600 @@ -24,9 +24,9 @@ /* Written by Ulrich Drepper , 2007. */ -#include #include #include +#include #include #include "sha512.h" Index: head/sysutils/mcollective-shell-agent/files/patch-lib-mcollective-agent-shell-job.rb =================================================================== --- head/sysutils/mcollective-shell-agent/files/patch-lib-mcollective-agent-shell-job.rb (revision 397063) +++ head/sysutils/mcollective-shell-agent/files/patch-lib-mcollective-agent-shell-job.rb (revision 397064) @@ -1,9 +1,8 @@ -# $FreeBSD$ --- lib/mcollective/agent/shell/job.rb.orig 2014-08-14 12:52:06.644348698 +0200 +++ lib/mcollective/agent/shell/job.rb 2014-08-14 12:52:14.552664032 +0200 @@ -1,4 +1,5 @@ require 'securerandom' +require 'pathname' # The Job class manages the spawning and state tracking for a process as it's # running. Index: head/sysutils/squashfs-tools/files/patch-action.c =================================================================== --- head/sysutils/squashfs-tools/files/patch-action.c (revision 397063) +++ head/sysutils/squashfs-tools/files/patch-action.c (revision 397064) @@ -1,19 +1,17 @@ Hack for lack of strdupa() in BSD libc -$FreeBSD$ - --- action.c.orig +++ action.c @@ -44,6 +44,12 @@ #include "action.h" #include "error.h" +#ifndef strdupa +#include // required for str*() +#include // required for alloca +#define strdupa(foo) (strncpy( alloca( strlen(foo) + 1 ), foo, strlen( foo ) + 1 )) +#endif + /* * code to parse actions */ Index: head/www/trac-downloads/files/patch-tracdownloads_tags.py =================================================================== --- head/www/trac-downloads/files/patch-tracdownloads_tags.py (revision 397063) +++ head/www/trac-downloads/files/patch-tracdownloads_tags.py (revision 397064) @@ -1,17 +1,14 @@ - -$FreeBSD: ports/www/trac-downloads/files/no-sets-module.diff,v 1.1 2011/01/12 00:47:17 brooks Exp $ - --- tracdownloads/tags.py.orig +++ tracdownloads/tags.py @@ -1,11 +1,5 @@ # -*- coding: utf-8 -*- -# Deprecated as for Python 2.6. -try: - import sets -except: - pass - # Trac imports. from trac.core import * from trac.resource import Resource Index: head/www/xsp/files/patch-docs_Mono.FastCGI_Makefile.am =================================================================== --- head/www/xsp/files/patch-docs_Mono.FastCGI_Makefile.am (revision 397063) +++ head/www/xsp/files/patch-docs_Mono.FastCGI_Makefile.am (revision 397064) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- docs/Mono.FastCGI/Makefile.am.orig +++ docs/Mono.FastCGI/Makefile.am @@ -8,7 +8,7 @@ INSTALL_FILES=$(DOCS_ARCHIVE_20) $(DOCS_TREE_20) $(DOCS_SOURCE_20) -DOC_FILES=$(shell find en -path '*/.svn' -prune -o -type f -printf "%p ") +DOC_FILES=$(shell find en -path '*/.svn' -prune -o -type f) EXTRA_DIST = \ $(DOCS_SOURCE_20) \ Index: head/www/xsp/files/patch-docs_Mono.WebServer_Makefile.am =================================================================== --- head/www/xsp/files/patch-docs_Mono.WebServer_Makefile.am (revision 397063) +++ head/www/xsp/files/patch-docs_Mono.WebServer_Makefile.am (revision 397064) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- docs/Mono.WebServer/Makefile.am.orig +++ docs/Mono.WebServer/Makefile.am @@ -8,7 +8,7 @@ INSTALL_FILES=$(DOCS_ARCHIVE_20) $(DOCS_TREE_20) $(DOCS_SOURCE_20) -DOC_FILES=$(shell find en -path '*/.svn' -prune -o -type f -printf "%p ") +DOC_FILES=$(shell find en -path '*/.svn' -prune -o -type f) EXTRA_DIST = \ $(DOCS_SOURCE_20) \ Index: head/x11-toolkits/libgdiplus/files/patch-src_gifcodec.c =================================================================== --- head/x11-toolkits/libgdiplus/files/patch-src_gifcodec.c (revision 397063) +++ head/x11-toolkits/libgdiplus/files/patch-src_gifcodec.c (revision 397064) @@ -1,176 +1,173 @@ - -$FreeBSD$ - --- src/gifcodec.c.orig +++ src/gifcodec.c @@ -40,9 +40,13 @@ #include "gifcodec.h" #ifdef EgifOpen -/* giflib declares this incorrectly as EgifOpen */ +/* giflib declares this incorrectly as EgifOpen up to 4.1.2 + GIF_LIB_VERSION is defined up to 4.1.6, and prototype is changed in 5.0, + so it is safe to use it as check condition */ +#ifdef GIF_LIB_VERSION extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); #endif +#endif /* Data structure used for callback */ typedef struct @@ -131,7 +135,11 @@ if (ExtData) { memcpy(ep->Bytes, ExtData, Len); +#if GIFLIB_MAJOR >= 5 + ep->Function = New->ExtensionBlocks[New->ExtensionBlockCount++].Function; +#else ep->Function = New->Function; +#endif } return (GIF_OK); @@ -234,7 +242,11 @@ } case EXTENSION_RECORD_TYPE: { +#if GIFLIB_MAJOR >= 5 + if (DGifGetExtension(GifFile, &temp_save.ExtensionBlocks[temp_save.ExtensionBlockCount].Function, &ExtData) == GIF_ERROR) { +#else if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { +#endif return (GIF_ERROR); } @@ -247,7 +259,9 @@ if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { return (GIF_ERROR); } +#if GIFLIB_MAJOR < 5 temp_save.Function = 0; +#endif } break; } @@ -306,9 +320,17 @@ loop_counter = FALSE; if (from_file) { +#if GIFLIB_MAJOR >= 5 + gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); +#else gif = DGifOpen(stream, &gdip_gif_fileinputfunc); +#endif } else { +#if GIFLIB_MAJOR >= 5 + gif = DGifOpen (stream, &gdip_gif_inputfunc, NULL); +#else gif = DGifOpen (stream, &gdip_gif_inputfunc); +#endif } if (gif == NULL) { @@ -663,9 +685,17 @@ } if (from_file) { +#if GIFLIB_MAJOR >= 5 + fp = EGifOpenFileName (stream, 0, NULL); +#else fp = EGifOpenFileName (stream, 0); +#endif } else { +#if GIFLIB_MAJOR >= 5 + fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); +#else fp = EGifOpen (stream, gdip_gif_outputfunc); +#endif } if (!fp) { @@ -704,7 +734,11 @@ goto error; } +#if GIFLIB_MAJOR >= 5 + cmap = GifMakeMapObject(cmap_size, 0); +#else cmap = MakeMapObject(cmap_size, 0); +#endif pixbuf = GdipAlloc(pixbuf_size); if (pixbuf == NULL) { @@ -795,7 +829,11 @@ pixbuf = pixbuf_org; } else { cmap_size = 256; +#if GIFLIB_MAJOR >= 5 + cmap = GifMakeMapObject (cmap_size, 0); +#else cmap = MakeMapObject (cmap_size, 0); +#endif red = GdipAlloc(pixbuf_size); green = GdipAlloc(pixbuf_size); @@ -826,13 +864,21 @@ v += 4; } } +#if GIFLIB_MAJOR >= 5 + if (GifQuantizeBuffer(bitmap_data->width, bitmap_data->height, &cmap_size, +#else if (QuantizeBuffer(bitmap_data->width, bitmap_data->height, &cmap_size, +#endif red, green, blue, pixbuf, cmap->Colors) == GIF_ERROR) { goto error; } } +#if GIFLIB_MAJOR >= 5 + cmap->BitsPerPixel = GifBitSize (cmap_size); +#else cmap->BitsPerPixel = BitSize (cmap_size); +#endif cmap->ColorCount = 1 << cmap->BitsPerPixel; if ((frame == 0) && (k == 0)) { @@ -850,8 +896,15 @@ Buffer[0] = 1; Buffer[1] = ptr[0]; Buffer[2] = ptr[1]; +#if GIFLIB_MAJOR >= 5 + EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); + EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); + EGifPutExtensionBlock(fp, 3, Buffer); + EGifPutExtensionTrailer(fp); +#else EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); +#endif } } @@ -903,7 +956,11 @@ pixbuf += bitmap_data->width; } +#if GIFLIB_MAJOR >= 5 + GifFreeMapObject (cmap); +#else FreeMapObject (cmap); +#endif if (red != NULL) { GdipFree (red); } @@ -931,7 +988,11 @@ error: if (cmap != NULL) { +#if GIFLIB_MAJOR >= 5 + GifFreeMapObject (cmap); +#else FreeMapObject (cmap); +#endif } if (red != NULL) { Index: head/x11-wm/afterstep/files/patch-icons.c =================================================================== --- head/x11-wm/afterstep/files/patch-icons.c (revision 397063) +++ head/x11-wm/afterstep/files/patch-icons.c (revision 397064) @@ -1,21 +1,19 @@ -$FreeBSD: /tmp/pcvs/ports/x11-wm/afterstep/files/patch-icons.c,v 1.1 2005-10-24 14:19:00 dinoex Exp $ - --- afterstep/icons.c.orig Thu Mar 20 19:09:21 1997 +++ afterstep/icons.c Sun May 26 18:15:10 2002 @@ -779,10 +779,12 @@ } } - if(tmp_win->flags & ICON_MOVED) - CreateIconWindow(tmp_win,tmp_win->icon_x_loc,tmp_win->icon_y_loc); - else - CreateIconWindow(tmp_win, def_x, def_y); + if(tmp_win->icon_pixmap_w == None) { + if(tmp_win->flags & ICON_MOVED) + CreateIconWindow(tmp_win,tmp_win->icon_x_loc,tmp_win->icon_y_loc); + else + CreateIconWindow(tmp_win, def_x, def_y); + } AutoPlace(tmp_win); tmp_win->flags |= ICONIFIED; Index: head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-xmlproc.c =================================================================== --- head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-xmlproc.c (revision 397063) +++ head/x11-wm/afterstep-stable/files/patch-src-ASDocGen-xmlproc.c (revision 397064) @@ -1,25 +1,23 @@ -$FreeBSD$ - --- src/ASDocGen/xmlproc.c.orig 2013-05-01 06:34:11.000000000 -0700 +++ src/ASDocGen/xmlproc.c 2014-04-13 10:29:12.000000000 -0700 @@ -179,7 +179,7 @@ fputs( "\\&", state->dest_fp ); else if ( c == '\\' && state->doc_type == DocType_NROFF ) fputc( '\\', state->dest_fp ); - else if ( c == '˜' && state->doc_type == DocType_NROFF ) + else if ( c == 152 /*'˜'*/ && state->doc_type == DocType_NROFF ) c = '~'; fputc( c, state->dest_fp ); } @@ -514,9 +514,10 @@ char *target = NULL, *target2 ; char *term = NULL, *term2 ; char *ptr = &(state->dest_file[strlen(state->dest_file)-4]); + size_t curr_url_anchor_len = state->curr_url_anchor ? strlen(state->curr_url_anchor) : 0; if( state->doc_type == DocType_PHP && *ptr == '.') *ptr = '\0' ; - target = safemalloc( strlen( state->dest_file)+5+1+strlen(state->curr_url_anchor)+1); + target = safemalloc( strlen( state->dest_file)+5+1+curr_url_anchor_len+1); sprintf( target, "%s#%s", state->dest_file, state->curr_url_anchor ); if( state->doc_type == DocType_PHP && *ptr == '\0' ) *ptr = '.' ;