From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 6 14:43:41 2005 Return-Path: X-Original-To: freebsd-ports-bugs@FreeBSD.org Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17A7C16A41F; Tue, 6 Sep 2005 14:43:41 +0000 (GMT) (envelope-from jh@jameshoward.us) Received: from foxxy.triohost.com (foxxy.triohost.com [65.110.50.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11D2B43D55; Tue, 6 Sep 2005 14:43:33 +0000 (GMT) (envelope-from jh@jameshoward.us) Received: from foxxy.triohost.com (localhost [127.0.0.1]) by foxxy.triohost.com (8.12.8/8.12.8) with ESMTP id j86EhZbq024936 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Sep 2005 10:43:35 -0400 Received: (from howardjp@localhost) by foxxy.triohost.com (8.12.8/8.12.8/Submit) id j86EhZgN024926; Tue, 6 Sep 2005 10:43:35 -0400 X-Authentication-Warning: foxxy.triohost.com: howardjp set sender to jh@jameshoward.us using -f Date: Tue, 6 Sep 2005 10:43:34 -0400 From: "James P. Howard, II" To: Pav Lucistnik Message-ID: <20050906144334.GA24345@foxxy.triohost.com> References: <200509032251.j83MpXR8001896@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200509032251.j83MpXR8001896@freefall.freebsd.org> User-Agent: Mutt/1.4.1i Copyright: Copyright 2005 James P. Howard, II. Received-SPF: pass (foxxy.triohost.com: localhost is always allowed.) Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/85570: update math/pspp from pspp-0.2.4 to pspp-0.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2005 14:43:41 -0000 On Sat, Sep 03, 2005 at 10:51:33PM +0000, Pav Lucistnik wrote: > Synopsis: update math/pspp from pspp-0.2.4 to pspp-0.4.0 The following version of the patch should be correct: diff -Nur pspp.orig/Makefile pspp/Makefile --- pspp.orig/Makefile Thu Oct 30 21:39:30 2003 +++ pspp/Makefile Wed Aug 31 14:44:20 2005 @@ -6,7 +6,7 @@ # PORTNAME= pspp -PORTVERSION= 0.2.4 +PORTVERSION= 0.4.0 PORTREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU_ALPHA} @@ -16,5 +16,9 @@ COMMENT= Program for statistical analysis of sampled data GNU_CONFIGURE= yes +USE_GMAKE= yes + +LIB_DEPENDS+= plot:${PORTSDIR}/graphics/plotutils + .include diff -Nur pspp.orig/distinfo pspp/distinfo --- pspp.orig/distinfo Thu Jan 29 11:10:10 2004 +++ pspp/distinfo Tue Aug 30 11:22:55 2005 @@ -1,2 +1,2 @@ -MD5 (pspp-0.2.4.tar.gz) = dedd6906c55da015911394b79bd2f665 -SIZE (pspp-0.2.4.tar.gz) = 1117124 +MD5 (pspp-0.4.0.tar.gz) = 637bb190ae21bd3aee9ea2ce7ce81896 +SIZE (pspp-0.4.0.tar.gz) = 1566807 diff -Nur pspp.orig/files/patch-aa pspp/files/patch-aa --- pspp.orig/files/patch-aa Sat May 13 10:16:12 2000 +++ pspp/files/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Jan 16 19:06:30 2000 -+++ Makefile.in Sat Apr 22 15:23:56 2000 -@@ -97,7 +97,7 @@ - - SUBDIRS = doc intl po lib src config tests - --pkgdocdir = $(prefix)/doc/@PACKAGE@ -+pkgdocdir = $(datadir)/doc/@PACKAGE@ - pkgdoc_DATA = NEWS README TODO - noinst_DATA = AUTHORS THANKS - diff -Nur pspp.orig/files/patch-ab pspp/files/patch-ab --- pspp.orig/files/patch-ab Sat May 13 10:16:12 2000 +++ pspp/files/patch-ab Wed Dec 31 19:00:00 1969 @@ -1,20 +0,0 @@ ---- config/Makefile.in.orig Sun Jan 16 19:06:43 2000 -+++ config/Makefile.in Sat Apr 22 13:04:25 2000 -@@ -125,12 +125,15 @@ - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) - @list='$(pkgsysconf_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgsysconfdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgsysconfdir)/$$p; \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgsysconfdir)/$$p.default"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgsysconfdir)/$$p.default; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgsysconfdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(pkgsysconfdir)/$$p; \ - fi; fi; \ -+ if test ! -f $(DESTDIR)$(pkgsysconfdir)/$$p; then \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgsysconfdir)/$$p; \ -+ fi; \ - done - - uninstall-pkgsysconfDATA: diff -Nur pspp.orig/files/patch-ac pspp/files/patch-ac --- pspp.orig/files/patch-ac Sat May 27 23:55:27 2000 +++ pspp/files/patch-ac Wed Dec 31 19:00:00 1969 @@ -1,43 +0,0 @@ ---- src/filename.c.orig Sat May 27 18:56:28 2000 -+++ src/filename.c Sat May 27 18:59:02 2000 -@@ -213,7 +213,7 @@ - /* Expands csh tilde notation from the path INPUT into a malloc()'d - returned string. */ - char * --tilde_expand (const char *input) -+my_tilde_expand (const char *input) - { - char *output, *end; - const char *ip; -@@ -288,7 +288,7 @@ - } - #else /* !unix */ - char * --tilde_expand (char *input) -+my_tilde_expand (char *input) - { - return xstrdup (input); - } -@@ -340,7 +340,7 @@ - if (is_special_filename (filename)) - return xstrdup (filename); - -- fn1 = tilde_expand (filename); -+ fn1 = my_tilde_expand (filename); - - /* Follow symbolic links. */ - while (1) -@@ -585,11 +585,11 @@ - boilerplate_len += 1 + strlen (prepend); - - if (absolute_filename_p (name)) -- return tilde_expand (name); -+ return my_tilde_expand (name); - - { - char *temp = interp_vars (path, blp_getenv); -- bp = subst_path = tilde_expand (temp); -+ bp = subst_path = my_tilde_expand (temp); - free (temp); - } - diff -Nur pspp.orig/files/patch-ad pspp/files/patch-ad --- pspp.orig/files/patch-ad Sat May 27 23:55:27 2000 +++ pspp/files/patch-ad Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- src/filename.h.orig Sat May 27 18:55:01 2000 -+++ src/filename.h Sat May 27 18:56:43 2000 -@@ -31,7 +31,7 @@ - const char *getenv_default (const char *key, const char *def); - char *interp_vars (const char *, const char *(*)(const char *)); - --char *tilde_expand (const char *); -+char *my_tilde_expand (const char *); - char *search_path (const char *name, const char *path, const char *prepend); - - char *gnu_getcwd (void); diff -Nur pspp.orig/files/patch-ae pspp/files/patch-ae --- pspp.orig/files/patch-ae Sat May 27 23:55:27 2000 +++ pspp/files/patch-ae Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- src/getline.c.orig Sat May 27 18:57:13 2000 -+++ src/getline.c Sat May 27 18:57:18 2000 -@@ -384,7 +384,7 @@ - if (!history_file) - { - #if unix -- history_file = tilde_expand (HISTORY_FILE); -+ history_file = my_tilde_expand (HISTORY_FILE); - #endif - using_history (); - read_history (history_file); diff -Nur pspp.orig/files/patch-af pspp/files/patch-af --- pspp.orig/files/patch-af Sat May 27 23:55:27 2000 +++ pspp/files/patch-af Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- src/groff-font.c.orig Sat May 27 18:57:34 2000 -+++ src/groff-font.c Sat May 27 18:57:45 2000 -@@ -100,7 +100,7 @@ - int prev_index = -1; - - #if unix -- fn = tilde_expand (fn); -+ fn = my_tilde_expand (fn); - #endif - - verbose_msg (1, _("%s: Opening Groff font file..."), fn); diff -Nur pspp.orig/files/patch-ag pspp/files/patch-ag --- pspp.orig/files/patch-ag Sat May 27 23:55:27 2000 +++ pspp/files/patch-ag Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- src/postscript.c.orig Sat May 27 18:57:57 2000 -+++ src/postscript.c Sat May 27 18:58:10 2000 -@@ -864,7 +864,7 @@ - pre_pathname = getenv ("GROFF_FONT_PATH"); - if (pre_pathname == NULL) - pre_pathname = groff_font_path; -- pathname = tilde_expand (pre_pathname); -+ pathname = my_tilde_expand (pre_pathname); - } - - /* Search all possible places for the file. */ diff -Nur pspp.orig/files/patch-lib::gmp::longlong.h pspp/files/patch-lib::gmp::longlong.h --- pspp.orig/files/patch-lib::gmp::longlong.h Wed Oct 15 09:31:14 2003 +++ pspp/files/patch-lib::gmp::longlong.h Wed Dec 31 19:00:00 1969 @@ -1,572 +0,0 @@ ---- lib/gmp/longlong.h.orig Wed Oct 15 06:11:33 2003 -+++ lib/gmp/longlong.h Wed Oct 15 06:23:05 2003 -@@ -112,7 +112,7 @@ - - #if (defined (__a29k__) || defined (_AM29K)) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("add %1,%4,%5 -+ __asm__ ("add %1,%4,%5 \n\ - addc %0,%2,%3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -121,7 +121,7 @@ - "%r" ((USItype)(al)), \ - "rI" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("sub %1,%4,%5 -+ __asm__ ("sub %1,%4,%5 \n\ - subc %0,%2,%3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -179,7 +179,7 @@ - - #if defined (__arm__) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("adds %1, %4, %5 -+ __asm__ ("adds %1, %4, %5 \n\ - adc %0, %2, %3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -188,7 +188,7 @@ - "%r" ((USItype)(al)), \ - "rI" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("subs %1, %4, %5 -+ __asm__ ("subs %1, %4, %5 \n\ - sbc %0, %2, %3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -197,18 +197,18 @@ - "r" ((USItype)(al)), \ - "rI" ((USItype)(bl))) - #define umul_ppmm(xh, xl, a, b) \ -- __asm__ ("%@ Inlined umul_ppmm -- mov %|r0, %2, lsr #16 -- mov %|r2, %3, lsr #16 -- bic %|r1, %2, %|r0, lsl #16 -- bic %|r2, %3, %|r2, lsl #16 -- mul %1, %|r1, %|r2 -- mul %|r2, %|r0, %|r2 -- mul %|r1, %0, %|r1 -- mul %0, %|r0, %0 -- adds %|r1, %|r2, %|r1 -- addcs %0, %0, #65536 -- adds %1, %1, %|r1, lsl #16 -+ __asm__ ("%@ Inlined umul_ppmm \n\ -+ mov %|r0, %2, lsr #16 \n\ -+ mov %|r2, %3, lsr #16 \n\ -+ bic %|r1, %2, %|r0, lsl #16 \n\ -+ bic %|r2, %3, %|r2, lsl #16 \n\ -+ mul %1, %|r1, %|r2 \n\ -+ mul %|r2, %|r0, %|r2 \n\ -+ mul %|r1, %0, %|r1 \n\ -+ mul %0, %|r0, %0 \n\ -+ adds %|r1, %|r2, %|r1 \n\ -+ addcs %0, %0, #65536 \n\ -+ adds %1, %1, %|r1, lsl #16 \n\ - adc %0, %0, %|r1, lsr #16" \ - : "=&r" ((USItype)(xh)), \ - "=r" ((USItype)(xl)) \ -@@ -249,7 +249,7 @@ - - #if defined (__gmicro__) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("add.w %5,%1 -+ __asm__ ("add.w %5,%1 \n\ - addx %3,%0" \ - : "=g" ((USItype)(sh)), \ - "=&g" ((USItype)(sl)) \ -@@ -258,7 +258,7 @@ - "%1" ((USItype)(al)), \ - "g" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("sub.w %5,%1 -+ __asm__ ("sub.w %5,%1 \n\ - subx %3,%0" \ - : "=g" ((USItype)(sh)), \ - "=&g" ((USItype)(sl)) \ -@@ -288,7 +288,7 @@ - - #if defined (__hppa) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("add %4,%5,%1 -+ __asm__ ("add %4,%5,%1 \n\ - addc %2,%3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -297,7 +297,7 @@ - "%rM" ((USItype)(al)), \ - "rM" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("sub %4,%5,%1 -+ __asm__ ("sub %4,%5,%1 \n\ - subb %2,%3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -336,21 +336,21 @@ - do { \ - USItype __tmp; \ - __asm__ ( \ -- "ldi 1,%0 -- extru,= %1,15,16,%%r0 ; Bits 31..16 zero? -- extru,tr %1,15,16,%1 ; No. Shift down, skip add. -- ldo 16(%0),%0 ; Yes. Perform add. -- extru,= %1,23,8,%%r0 ; Bits 15..8 zero? -- extru,tr %1,23,8,%1 ; No. Shift down, skip add. -- ldo 8(%0),%0 ; Yes. Perform add. -- extru,= %1,27,4,%%r0 ; Bits 7..4 zero? -- extru,tr %1,27,4,%1 ; No. Shift down, skip add. -- ldo 4(%0),%0 ; Yes. Perform add. -- extru,= %1,29,2,%%r0 ; Bits 3..2 zero? -- extru,tr %1,29,2,%1 ; No. Shift down, skip add. -- ldo 2(%0),%0 ; Yes. Perform add. -- extru %1,30,1,%1 ; Extract bit 1. -- sub %0,%1,%0 ; Subtract it. -+ "ldi 1,%0\n\ -+ extru,= %1,15,16,%%r0 ; Bits 31..16 zero?\n\ -+ extru,tr %1,15,16,%1 ; No. Shift down, skip add.\n\ -+ ldo 16(%0),%0 ; Yes. Perform add.\n\ -+ extru,= %1,23,8,%%r0 ; Bits 15..8 zero?\n\ -+ extru,tr %1,23,8,%1 ; No. Shift down, skip add.\n\ -+ ldo 8(%0),%0 ; Yes. Perform add.\n\ -+ extru,= %1,27,4,%%r0 ; Bits 7..4 zero?\n\ -+ extru,tr %1,27,4,%1 ; No. Shift down, skip add.\n\ -+ ldo 4(%0),%0 ; Yes. Perform add.\n\ -+ extru,= %1,29,2,%%r0 ; Bits 3..2 zero?\n\ -+ extru,tr %1,29,2,%1 ; No. Shift down, skip add.\n\ -+ ldo 2(%0),%0 ; Yes. Perform add.\n\ -+ extru %1,30,1,%1 ; Extract bit 1.\n\ -+ sub %0,%1,%0 ; Subtract it.\n\ - " : "=r" (count), "=r" (__tmp) : "1" (x)); \ - } while (0) - #endif /* hppa */ -@@ -398,7 +398,7 @@ - - #if (defined (__i386__) || defined (__i486__)) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("addl %5,%1 -+ __asm__ ("addl %5,%1 \n\ - adcl %3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -407,7 +407,7 @@ - "%1" ((USItype)(al)), \ - "g" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("subl %5,%1 -+ __asm__ ("subl %5,%1 \n\ - sbbl %3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -520,7 +520,7 @@ - - #if (defined (__mc68000__) || defined (__mc68020__) || defined (__NeXT__) || defined(mc68020)) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("add%.l %5,%1 -+ __asm__ ("add%.l %5,%1 \n\ - addx%.l %3,%0" \ - : "=d" ((USItype)(sh)), \ - "=&d" ((USItype)(sl)) \ -@@ -529,7 +529,7 @@ - "%1" ((USItype)(al)), \ - "g" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("sub%.l %5,%1 -+ __asm__ ("sub%.l %5,%1 \n\ - subx%.l %3,%0" \ - : "=d" ((USItype)(sh)), \ - "=&d" ((USItype)(sl)) \ -@@ -568,27 +568,27 @@ - #else /* not mc68020 */ - #define umul_ppmm(xh, xl, a, b) \ - do { USItype __umul_tmp1, __umul_tmp2; \ -- __asm__ ("| Inlined umul_ppmm -- move%.l %5,%3 -- move%.l %2,%0 -- move%.w %3,%1 -- swap %3 -- swap %0 -- mulu %2,%1 -- mulu %3,%0 -- mulu %2,%3 -- swap %2 -- mulu %5,%2 -- add%.l %3,%2 -- jcc 1f -- add%.l %#0x10000,%0 --1: move%.l %2,%3 -- clr%.w %2 -- swap %2 -- swap %3 -- clr%.w %3 -- add%.l %3,%1 -- addx%.l %2,%0 -+ __asm__ ("| Inlined umul_ppmm\n\ -+ move%.l %5,%3\n\ -+ move%.l %2,%0\n\ -+ move%.w %3,%1\n\ -+ swap %3\n\ -+ swap %0\n\ -+ mulu %2,%1\n\ -+ mulu %3,%0\n\ -+ mulu %2,%3\n\ -+ swap %2\n\ -+ mulu %5,%2\n\ -+ add%.l %3,%2\n\ -+ jcc 1f\n\ -+ add%.l %#0x10000,%0\n\ -+1: move%.l %2,%3\n\ -+ clr%.w %2\n\ -+ swap %2\n\ -+ swap %3\n\ -+ clr%.w %3\n\ -+ add%.l %3,%1\n\ -+ addx%.l %2,%0\n\ - | End inlined umul_ppmm" \ - : "=&d" ((USItype)(xh)), "=&d" ((USItype)(xl)), \ - "=d" (__umul_tmp1), "=&d" (__umul_tmp2) \ -@@ -601,7 +601,7 @@ - - #if defined (__m88000__) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("addu.co %1,%r4,%r5 -+ __asm__ ("addu.co %1,%r4,%r5 \n\ - addu.ci %0,%r2,%r3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -610,7 +610,7 @@ - "%rJ" ((USItype)(al)), \ - "rJ" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("subu.co %1,%r4,%r5 -+ __asm__ ("subu.co %1,%r4,%r5 \n\ - subu.ci %0,%r2,%r3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -669,8 +669,8 @@ - "d" ((USItype)(v))) - #else - #define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("multu %2,%3 -- mflo %0 -+ __asm__ ("multu %2,%3 \n\ -+ mflo %0 \n\ - mfhi %1" \ - : "=d" ((USItype)(w0)), \ - "=d" ((USItype)(w1)) \ -@@ -691,8 +691,8 @@ - "d" ((UDItype)(v))) - #else - #define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("dmultu %2,%3 -- mflo %0 -+ __asm__ ("dmultu %2,%3 \n\ -+ mflo %0 \n\ - mfhi %1" \ - : "=d" ((UDItype)(w0)), \ - "=d" ((UDItype)(w1)) \ -@@ -861,7 +861,7 @@ - - #if defined (__pyr__) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("addw %5,%1 -+ __asm__ ("addw %5,%1 \n\ - addwc %3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -870,7 +870,7 @@ - "%1" ((USItype)(al)), \ - "g" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("subw %5,%1 -+ __asm__ ("subw %5,%1 \n\ - subwb %3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -883,7 +883,7 @@ - ({union {UDItype __ll; \ - struct {USItype __h, __l;} __i; \ - } __xx; \ -- __asm__ ("movw %1,%R0 -+ __asm__ ("movw %1,%R0 \n\ - uemul %2,%0" \ - : "=&r" (__xx.__ll) \ - : "g" ((USItype) (u)), \ -@@ -893,7 +893,7 @@ - - #if defined (__ibm032__) /* RT/ROMP */ && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("a %1,%5 -+ __asm__ ("a %1,%5 \n\ - ae %0,%3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -902,7 +902,7 @@ - "%1" ((USItype)(al)), \ - "r" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("s %1,%5 -+ __asm__ ("s %1,%5 \n\ - se %0,%3" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -914,25 +914,25 @@ - do { \ - USItype __m0 = (m0), __m1 = (m1); \ - __asm__ ( \ -- "s r2,r2 -- mts r10,%2 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- m r2,%3 -- cas %0,r2,r0 -+ "s r2,r2 \n\ -+ mts r10,%2 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ m r2,%3 \n\ -+ cas %0,r2,r0 \n\ - mfs r10,%1" \ - : "=r" ((USItype)(ph)), \ - "=r" ((USItype)(pl)) \ -@@ -963,8 +963,8 @@ - #if defined (__sh2__) && W_TYPE_SIZE == 32 - #define umul_ppmm(w1, w0, u, v) \ - __asm__ ( \ -- "dmulu.l %2,%3 -- sts macl,%1 -+ "dmulu.l %2,%3 \n\ -+ sts macl,%1 \n\ - sts mach,%0" \ - : "=r" ((USItype)(w1)), \ - "=r" ((USItype)(w0)) \ -@@ -976,7 +976,7 @@ - - #if defined (__sparc__) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("addcc %r4,%5,%1 -+ __asm__ ("addcc %r4,%5,%1 \n\ - addx %r2,%3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -986,7 +986,7 @@ - "rI" ((USItype)(bl)) \ - __CLOBBER_CC) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("subcc %r4,%5,%1 -+ __asm__ ("subcc %r4,%5,%1 \n\ - subx %r2,%3,%0" \ - : "=r" ((USItype)(sh)), \ - "=&r" ((USItype)(sl)) \ -@@ -1033,44 +1033,44 @@ - "r" ((USItype)(v))) - #define UMUL_TIME 5 - #define udiv_qrnnd(q, r, n1, n0, d) \ -- __asm__ ("! Inlined udiv_qrnnd -- wr %%g0,%2,%%y ! Not a delayed write for sparclite -- tst %%g0 -- divscc %3,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%%g1 -- divscc %%g1,%4,%0 -- rd %%y,%1 -- bl,a 1f -- add %1,%4,%1 -+ __asm__ ("! Inlined udiv_qrnnd \n\ -+ wr %%g0,%2,%%y ! Not a delayed write for sparclite \n\ -+ tst %%g0 \n\ -+ divscc %3,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%%g1 \n\ -+ divscc %%g1,%4,%0 \n\ -+ rd %%y,%1 \n\ -+ bl,a 1f \n\ -+ add %1,%4,%1 \n\ - 1: ! End of inline udiv_qrnnd" \ - : "=r" ((USItype)(q)), \ - "=r" ((USItype)(r)) \ -@@ -1091,45 +1091,45 @@ - /* Default to sparc v7 versions of umul_ppmm and udiv_qrnnd. */ - #ifndef umul_ppmm - #define umul_ppmm(w1, w0, u, v) \ -- __asm__ ("! Inlined umul_ppmm -- wr %%g0,%2,%%y ! SPARC has 0-3 delay insn after a wr -- sra %3,31,%%g2 ! Don't move this insn -- and %2,%%g2,%%g2 ! Don't move this insn -- andcc %%g0,0,%%g1 ! Don't move this insn -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,%3,%%g1 -- mulscc %%g1,0,%%g1 -- add %%g1,%%g2,%0 -+ __asm__ ("! Inlined umul_ppmm\n\ -+ wr %%g0,%2,%%y ! SPARC has 0-3 delay insn after a wr\n\ -+ sra %3,31,%%g2 ! Don't move this insn\n\ -+ and %2,%%g2,%%g2 ! Don't move this insn\n\ -+ andcc %%g0,0,%%g1 ! Don't move this insn\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,%3,%%g1\n\ -+ mulscc %%g1,0,%%g1\n\ -+ add %%g1,%%g2,%0\n\ - rd %%y,%1" \ - : "=r" ((USItype)(w1)), \ - "=r" ((USItype)(w0)) \ -@@ -1153,7 +1153,7 @@ - - #if defined (__vax__) && W_TYPE_SIZE == 32 - #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ -- __asm__ ("addl2 %5,%1 -+ __asm__ ("addl2 %5,%1 \n\ - adwc %3,%0" \ - : "=g" ((USItype)(sh)), \ - "=&g" ((USItype)(sl)) \ -@@ -1162,7 +1162,7 @@ - "%1" ((USItype)(al)), \ - "g" ((USItype)(bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ -- __asm__ ("subl2 %5,%1 -+ __asm__ ("subl2 %5,%1 \n\ - sbwc %3,%0" \ - : "=g" ((USItype)(sh)), \ - "=&g" ((USItype)(sl)) \ diff -Nur pspp.orig/files/patch-src::glob.c pspp/files/patch-src::glob.c --- pspp.orig/files/patch-src::glob.c Mon Dec 23 03:18:26 2002 +++ pspp/files/patch-src::glob.c Wed Dec 31 19:00:00 1969 @@ -1,10 +0,0 @@ ---- src/glob.c.orig Mon Dec 23 04:32:08 2002 -+++ src/glob.c Mon Dec 23 04:32:19 2002 -@@ -20,6 +20,7 @@ - #include - - #include -+#include - #include - - #if TIME_WITH_SYS_TIME diff -Nur pspp.orig/pkg-plist pspp/pkg-plist --- pspp.orig/pkg-plist Fri Jun 2 00:40:27 2000 +++ pspp/pkg-plist Wed Aug 31 14:48:35 2005 @@ -3,27 +3,10 @@ info/pspp.info info/pspp.info-1 info/pspp.info-2 -info/pspp.info-3 -info/pspp.info-4 -info/pspp.info-5 -info/pspp.info-6 -info/pspp.info-7 -info/pspp.info-8 @exec install-info %D/info/pspp.info %D/info/dir -share/doc/pspp/NEWS -share/doc/pspp/README -share/doc/pspp/TODO -@dirrm share/doc/pspp -@unexec if [ -f %D/etc/pspp/devices ] && cmp -s %D/etc/pspp/devices %D/etc/pspp/devices.default ; then rm -f %D/etc/pspp/devices; fi -etc/pspp/devices.default -@exec if [ ! -f %D/etc/pspp/devices ] ; then cp -p %D/%F %B/devices; fi -@unexec if [ -f %D/etc/pspp/html-prologue ] && cmp -s %D/etc/pspp/html-prologue %D/etc/pspp/html-prologue.default ; then rm -f %D/etc/pspp/html-prologue; fi -etc/pspp/html-prologue.default -@exec if [ ! -f %D/etc/pspp/html-prologue ] ; then cp -p %D/%F %B/html-prologue; fi -@unexec if [ -f %D/etc/pspp/papersize ] && cmp -s %D/etc/pspp/papersize %D/etc/pspp/papersize.default ; then rm -f %D/etc/pspp/papersize; fi -etc/pspp/papersize.default -@exec if [ ! -f %D/etc/pspp/papersize ] ; then cp -p %D/%F %B/papersize; fi -@unexec if [ -f %D/etc/pspp/ps-prologue ] && cmp -s %D/etc/pspp/ps-prologue %D/etc/pspp/ps-prologue.default ; then rm -f %D/etc/pspp/ps-prologue; fi -etc/pspp/ps-prologue.default -@exec if [ ! -f %D/etc/pspp/ps-prologue ] ; then cp -p %D/%F %B/ps-prologue; fi +share/locale/en_GB/LC_MESSAGES/pspp.mo +etc/pspp/devices +etc/pspp/html-prologue +etc/pspp/papersize +etc/pspp/ps-prologue @unexec rmdir %D/etc/pspp 2>/dev/null || true -- James P. Howard, II -- jh@jameshoward.us http://jameshoward.us/ -- 443-430-4050