pkg/26323: update of x11/XaoS to 3.1

To: gnats-bugs%gnats.netbsd.org@localhost
Subject: pkg/26323: update of x11/XaoS to 3.1
From: Rhialto <rhialto%azenomei.knuffel.net@localhost>
Date: Wed, 14 Jul 2004 17:15:08 +0200 (CEST)
>Number:         26323
>Category:       pkg
>Synopsis:       update of x11/XaoS to 3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 14 15:16:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rhialto
>Release:        NetBSD 1.6.2 / 2.0 beta
>Organization:
>Environment:
        
        
System: NetBSD azenomei.falu.nl 1.6.2 NetBSD 1.6.2 (AZENOMEI) #1: Tue Jun 1 
18:15:41 CEST 2004 
root%azenomei.falu.nl@localhost:/usr/src/sys/arch/alpha/compile/AZENOMEI alpha
Architecture: alpha
Machine: alpha
>Description:
        update of pkg to current released version
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile    2004/03/24 11:56:00     1.8
+++ Makefile    2004/07/14 15:11:28
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.8 2004/03/24 11:56:00 wiz Exp $
 #
 
-DISTNAME=              XaoS-3.0
+DISTNAME=              XaoS-3.1
 PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=xaos/}
@@ -10,11 +10,16 @@
 HOMEPAGE=              http://xaos.theory.org/
 COMMENT=               Zoomable fractal rendering doodad
 
+PKG_INSTALLATION_TYPES=      overwrite pkgviews
 USE_BUILDLINK3=                YES
+USE_GNU_TOOLS=         make
 USE_X11=               YES
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --with-curses-driver=no
+# DGA fails to link somehow, XXX should be fixed
+CONFIGURE_ARGS+=       --with-dga-driver=no    
 INFO_FILES=            xaos.info
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    2004/03/24 11:56:00     1.3
+++ distinfo    2004/07/14 15:11:28
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/03/24 11:56:00 wiz Exp $
+$NetBSD$
 
-SHA1 (XaoS-3.0.tar.gz) = 1537e5ec5a60dd018bc3bf8ee6cc8f81943b539b
-Size (XaoS-3.0.tar.gz) = 491049 bytes
-SHA1 (patch-aa) = 6e176f87e319f05f46c234df303a1cdf818921bd
-SHA1 (patch-ab) = cc6e2b1b70637a40200f1500b6ab70bc9f1c9384
+SHA1 (XaoS-3.1.tar.gz) = c9956dbea463040efc46c67f32b3d0e6b3bc4bfe
+Size (XaoS-3.1.tar.gz) = 1182143 bytes
+SHA1 (patch-aa) = 8aca5c9924d0527fe425f7628c350b98f4c8905f
+SHA1 (patch-ab) = dfee2d1904618c44d3c3f47a2ad590e1e1603cef
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patch-aa    2002/03/25 16:19:31     1.1
+++ patch-aa    2004/07/14 15:11:28
@@ -2,12 +2,12 @@
 
 Rip out the 16 bit i387 specific code.
 
---- src/engine/fractal.c-orig  Wed Mar  4 16:49:12 1998
-+++ src/engine/fractal.c       Sun Mar 10 16:29:06 2002
-@@ -48,13 +48,6 @@
+--- src/engine/fractal.c.orig  2003-02-03 17:16:37.000000000 +0100
++++ src/engine/fractal.c       2004-07-14 16:12:49.000000000 +0200
+@@ -49,13 +49,6 @@
  #include <complex.h>
  #include <plane.h>
- #include <timers.h>
+ #include "../include/timers.h"
 -#ifdef __GNUC__
 -#ifdef __i386__
 -#ifndef PC_64
@@ -18,27 +18,31 @@
  #ifdef __alpha__
  #ifdef __linux__
  #include <asm/fpu.h>
-@@ -333,11 +326,6 @@
+@@ -382,15 +375,6 @@
  {
    fractal_context *new_ctxt;
  
+-#ifndef __BEOS__
 -#ifdef __GNUC__
 -#ifdef __i386__
+-#ifndef NOASSEMBLY
 -  _control87 (PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC);
 -#endif
 -#endif
+-#endif
+-#endif
  #ifdef __alpha__
  #ifdef __linux__
-   extern void ieee_set_fp_control(unsigned long);
---- src/engine/Makefile.in-orig        Wed Mar  4 16:49:12 1998
-+++ src/engine/Makefile.in     Sun Mar 10 16:27:30 2002
-@@ -22,8 +22,7 @@
-        stereogram.c \
+   extern void ieee_set_fp_control (unsigned long);
+--- src/engine/Makefile.in.orig        2002-08-08 15:46:46.000000000 +0200
++++ src/engine/Makefile.in     2004-07-14 16:13:55.000000000 +0200
+@@ -24,8 +24,7 @@
+        3d.c \
         subwindow.c \
         plane.c \
 -       julia.c \
 -       i386.c
 +       julia.c
  
- OBJS = $(SRCS:.c=.o)
  
+ OBJS = $(SRCS:.c=.o)
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XaoS/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- patch-ab    2004/03/24 11:56:00     1.3
+++ patch-ab    2004/07/14 15:11:28
@@ -1,12 +1,20 @@
 $NetBSD: patch-ab,v 1.3 2004/03/24 11:56:00 wiz Exp $
 
---- Makefile.in.orig   Wed Mar  4 22:49:12 1998
-+++ Makefile.in
-@@ -41,7 +41,6 @@ install: 
-       @INSTALL@ -m 444 catalogs/* $(datadir)/XaoS/catalogs
-       @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt 
doc/ANNOUNCE doc/PROBLEMS doc/tutorial.txt $(datadir)/XaoS/doc
-       @INSTALL@ -m 444 doc/xaos.6 $(mandir)/man6
+--- Makefile.in.orig   2003-02-10 23:42:27.000000000 +0100
++++ Makefile.in        2004-07-14 17:06:05.000000000 +0200
+@@ -35,6 +35,7 @@
+       @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc
+       @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
+       @INSTALL@ -d $(DESTDIR)$(bindir)
++      @INSTALL@ -d $(DESTDIR)$(infodir)
+       @INSTALL@ -d $(DESTDIR)$(mandir)/man6
+       @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
+       @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
+@@ -43,7 +44,6 @@
+       @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
+       @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt 
doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc
+       @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
 -      @STICKY@
-       @INSTALL@ -m 444 doc/xaos.info $(infodir)
+       @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)
        #install-info doc/xaos.info 
- 
+       if [ "@USE_NLS@" = "yes" ]; then $(MAKE) -C src/i18n/ install; fi


For clarity here are the complete new patch files:

$NetBSD: patch-aa,v 1.1 2002/03/25 16:19:31 atatat Exp $

Rip out the 16 bit i387 specific code.

--- src/engine/fractal.c.orig   2003-02-03 17:16:37.000000000 +0100
+++ src/engine/fractal.c        2004-07-14 16:12:49.000000000 +0200
@@ -49,13 +49,6 @@
 #include <complex.h>
 #include <plane.h>
 #include "../include/timers.h"
-#ifdef __GNUC__
-#ifdef __i386__
-#ifndef PC_64
-#include <i386/ctrl87.h>
-#endif
-#endif
-#endif
 #ifdef __alpha__
 #ifdef __linux__
 #include <asm/fpu.h>
@@ -382,15 +375,6 @@
 {
   fractal_context *new_ctxt;
 
-#ifndef __BEOS__
-#ifdef __GNUC__
-#ifdef __i386__
-#ifndef NOASSEMBLY
-  _control87 (PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC);
-#endif
-#endif
-#endif
-#endif
 #ifdef __alpha__
 #ifdef __linux__
   extern void ieee_set_fp_control (unsigned long);
--- src/engine/Makefile.in.orig 2002-08-08 15:46:46.000000000 +0200
+++ src/engine/Makefile.in      2004-07-14 16:13:55.000000000 +0200
@@ -24,8 +24,7 @@
        3d.c \
        subwindow.c \
        plane.c \
-       julia.c \
-       i386.c
+       julia.c
 
 
 OBJS = $(SRCS:.c=.o)



$NetBSD: patch-ab,v 1.3 2004/03/24 11:56:00 wiz Exp $

--- Makefile.in.orig    2003-02-10 23:42:27.000000000 +0100
+++ Makefile.in 2004-07-14 17:06:05.000000000 +0200
@@ -35,6 +35,7 @@
        @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc
        @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
        @INSTALL@ -d $(DESTDIR)$(bindir)
+       @INSTALL@ -d $(DESTDIR)$(infodir)
        @INSTALL@ -d $(DESTDIR)$(mandir)/man6
        @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
        @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
@@ -43,7 +44,6 @@
        @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
        @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt 
doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc
        @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
-       @STICKY@
        @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)
        #install-info doc/xaos.info 
        if [ "@USE_NLS@" = "yes" ]; then $(MAKE) -C src/i18n/ install; fi

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert
\X/ rhialto/at/xs4all.nl        -- Cetero censeo "authored" delendum esse.
>Release-Note:
>Audit-Trail:
>Unformatted:
Prev by Date: pkg/26284: ftplibpp-1.0.1 package created
Next by Date: pkg/26326: databases/rrdtool is OUTDATED
Previous by Thread: pkg/26284: ftplibpp-1.0.1 package created
Next by Thread: pkg/26326: databases/rrdtool is OUTDATED
Indexes:
Home | Main Index | Thread Index | Old Index