[Merge Req] Summary for xwem--steve--2.2--patch-1

[Steve Youngs <steve@xxxxxxxx>]

Location: steve@xxxxxxxxxxxxxx http://arch.eicq.org/2007/

Revision: xwem--steve--2.2--patch-1
Archive: steve@xxxxxxxxxxxxxx
Creator: Steve Youngs <steve@xxxxxxxx>
Date: Thu Dec 14 11:56:25 EST 2006
Standard-date: 2006-12-14 01:56:25 GMT
Modified-files: Makefile dockapp/xwem-weather.el
    xwem-loaddefs-gen.el
New-patches: steve@xxxxxxxxxxxxxx/xwem--steve--2.2--patch-1
Summary: Couple of build fixes plus fix xwem-weather
Keywords: bugfix, build/compile, internal

This changeset fixes a couple of "compatibility" problems due to updates
in XEmacs packages and to SXEmacs.  Problems addressed...

    - autoload.el in SXEmacs and XE 21.5 changes
    - SXEmacs' FHS compliant install hierarchy
    - url.el was updated in XEmacs packages.

* xwem-loaddefs-gen.el (xwem-batch-update-directory): XEmacs 21.5 and
  SXEmacs does not have `update-autoloads-from-directory', allow for
  this. 

* Makefile (XEMACS): Put programs and args variables above PREFIX def
  because we using the value of $XEMACS to determine default $PREFIX.
  (PREFIX): SXEmacs uses a FHS compliant install hierarchy, allow for
  that in $PREFIX.

* dockapp/xwem-weather.el (xwem-weather-retrieve-update): url.el has
  changed in XE packages, only use the `Content-length' HTTP header as a
  basis for writing the file if it exists.


* added files

    
{arch}/xwem/xwem--steve/xwem--steve--2.2/steve@xxxxxxxxxxxxxx/patch-log/patch-1

* modified files

--- orig/Makefile
+++ mod/Makefile
@@ -42,11 +42,26 @@
 # csh... yell no, we won't go!
 SHELL = /bin/sh
 
-# Everything hangs off this.  
+# Programs and their flags.
+ifndef XEMACS
+XEMACS = sxemacs
+endif
+XEMACS_FLAGS = -batch -no-autoloads
+INSTALL = install
+PKG_INSTALL = install
+TAR = tar
+TAR_FLAGS = czf
+
+# Our prefix.  Everything hangs off this.  
 ifndef PREFIX
-PREFIX = /usr/local/lib/xemacs/site-packages
+  ifeq $('$(XEMACS)','sxemacs')
+    PREFIX = /usr/local/share/sxemacs/site-packages
+  else
+    PREFIX = /usr/local/lib/xemacs/site-packages
+  endif
 endif
 prefix = $(PREFIX)
+
 # Where the lisp files go.
 LISP_DIR = $(prefix)/lisp/$(PACKAGE)
 
@@ -68,16 +83,6 @@
 DATA_STAGING = $(STAGING)/etc/$(PACKAGE)
 DOC_STAGING = $(STAGING)/man/$(PACKAGE)
 
-# Programs and their flags.
-ifndef XEMACS
-XEMACS = sxemacs
-endif
-XEMACS_FLAGS = -batch -no-autoloads
-INSTALL = install
-PKG_INSTALL = install
-TAR = tar
-TAR_FLAGS = czf
-
 ############################################################################
 ##                No User Configurable Items Below Here                   ##
 ############################################################################


--- orig/dockapp/xwem-weather.el
+++ mod/dockapp/xwem-weather.el
@@ -244,16 +244,17 @@
                                (upcase (concat xwem-weather-station-id 
".txt"))))))
     (with-current-buffer pbuf
       (goto-char (point-min))
-      (re-search-forward "^Content-Length: \\([0-9]+.*$\\)" nil t)
-      (let* ((file-length (string-to-int (match-string 1)))
-             (file-begin (progn
-                           (goto-char (point-min))
-                           (re-search-forward "^Content-Type:" nil t)
-                           (forward-line 2)
-                           (point-at-bol))))
-        (goto-char file-begin)
-        (forward-char file-length)
-        (write-region file-begin (point) (xwem-weather-data-file))))
+      (if (re-search-forward "^Content-Length: \\([0-9]+.*$\\)" nil t)
+         (let* ((file-length (string-to-int (match-string 1)))
+                (file-begin (progn
+                              (goto-char (point-min))
+                              (re-search-forward "^Content-Type:" nil t)
+                              (forward-line 2)
+                              (point-at-bol))))
+           (goto-char file-begin)
+           (forward-char file-length)
+           (write-region file-begin (point) (xwem-weather-data-file)))
+       (write-region (point-min) (point-max) (xwem-weather-data-file))))
     (kill-buffer pbuf)))
 
 (defun xwem-weather-get-temp ()


--- orig/xwem-loaddefs-gen.el
+++ mod/xwem-loaddefs-gen.el
@@ -7,7 +7,10 @@
          (generated-autoload-file (expand-file-name (concat genldfile ".el") 
gendir))
          (enable-local-eval nil))      ; Don't query in batch mode.
     (message "Updating internal XWEM autoloads for directory %s..." gendir)
-    (update-autoloads-from-directory gendir)
+    (cond ((fboundp 'update-autoloads-from-directory)
+          (update-autoloads-from-directory gendir))
+         ((fboundp 'update-autoload-files)
+          (update-autoload-files gendir "xwem-loaddefs" 
generated-autoload-file)))
     (cond ((fboundp 'fixup-autoload-buffer)
            (fixup-autoload-buffer genldfile))
           ((fboundp 'autoload-featurep-protect-autoloads)