OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   04-Apr-2006 10:04:30
  Branch: HEAD                             Handle: 2006040409042901

  Modified files:
    openpkg-src/transfig    transfig.patch transfig.spec

  Log:
    upgrade to Alpha version of xfig/transfig as it is a lot more modern
    (although itself already years old)

  Summary:
    Revision    Changes     Path
    1.3         +4  -49     openpkg-src/transfig/transfig.patch
    1.18        +13 -9      openpkg-src/transfig/transfig.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/transfig/transfig.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 transfig.patch
  --- openpkg-src/transfig/transfig.patch       18 Jun 2003 11:58:48 -0000      
1.2
  +++ openpkg-src/transfig/transfig.patch       4 Apr 2006 08:04:29 -0000       
1.3
  @@ -1,27 +1,7 @@
  ---- fig2dev/dev/genemf.h.orig        Thu Dec 19 07:42:05 2002
  -+++ fig2dev/dev/genemf.h     Tue Jan  7 20:16:08 2003
  -@@ -30,8 +30,10 @@
  - #ifndef __USE_MISC
  - /* Old compatibility names for C types.  */
  - typedef unsigned long int ulong;
  -+#ifndef __FreeBSD__
  - typedef unsigned short int ushort;
  - typedef unsigned int uint;
  -+#endif
  - #endif
  - 
  - 
  ---- fig2dev/fig2dev.h.dist   2003-06-18 13:38:13.000000000 +0200
  -+++ fig2dev/fig2dev.h        2003-06-18 13:38:58.000000000 +0200
  -@@ -22,7 +22,6 @@
  - #include <sys/file.h>
  - #include <signal.h>
  - #include <string.h>
  --#include <varargs.h>
  - #include <pwd.h>
  - #include <errno.h>
  - #include <time.h>
  -@@ -210,7 +210,7 @@
  +Index: fig2dev/fig2dev.h
  +--- fig2dev/fig2dev.h.orig   2003-07-15 18:21:12 +0200
  ++++ fig2dev/fig2dev.h        2006-04-04 09:07:23 +0200
  +@@ -213,7 +213,7 @@
    #endif /* MAXPATHLEN */
    #endif /* PATH_MAX */
    
  @@ -30,28 +10,3 @@
    extern int          sys_nerr, errno;
    #endif
    
  ---- fig2dev/dev/gensvg.c.dist        2003-06-18 13:53:55.000000000 +0200
  -+++ fig2dev/dev/gensvg.c     2003-06-18 13:54:49.000000000 +0200
  -@@ -692,16 +692,18 @@
  -     if (t->angle != 0) {
  -     fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
  -              (int) (t->base_x * mag), (int) (t->base_y * mag), degrees 
(t->angle));
  --    fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"  
font-family=\"%s\" 
  --             font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" 
text-anchor=\"%s\" >\n",
  -+    fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"  
font-family=\"%s\""
  -+                      " font-style=\"%s\" font-weight=\"%s\" 
font-size=\"%d\""
  -+                  " text-anchor=\"%s\" >\n",
  -              rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)],
  -              (t->font % 2 == 0 ? "normal" : "italic"),
  -              (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size * 
12 * mag)),
  -              anchor[t->type]);
  -     }
  -     else
  --    fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  
font-family=\"%s\" 
  --             font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" 
text-anchor=\"%s\" >\n",
  -+    fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  
font-family=\"%s\""
  -+                      " font-style=\"%s\" font-weight=\"%s\" 
font-size=\"%d\""
  -+                  " text-anchor=\"%s\" >\n",
  -              (int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal 
(t->color),
  -              family[(int) ceil ((t->font + 1) / 4)],
  -              (t->font % 2 == 0 ? "normal" : "italic"),
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/transfig/transfig.spec
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 transfig.spec
  --- openpkg-src/transfig/transfig.spec        1 Jan 2006 13:23:24 -0000       
1.17
  +++ openpkg-src/transfig/transfig.spec        4 Apr 2006 08:04:30 -0000       
1.18
  @@ -22,29 +22,33 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   package version
  +%define       V_major   3.2.5
  +%define       V_minor   7
  +
   #   package information
   Name:         transfig
   Summary:      Translate Fig Format Files
  -URL:          http://www.xfig.org/
  +URL:          http://xfig.org/
   Vendor:       Brian V. Smith et al.
   Packager:     OpenPKG
   Distribution: OpenPKG
   Class:        PLUS
   Group:        XWindow
   License:      MIT-style
  -Version:      3.2.4
  -Release:      20040920
  +Version:      %{V_major}a%{V_minor}
  +Release:      20060404
   
   #   list of sources
  -Source0:      http://www.xfig.org/xfigdist/transfig.%{version}.tar.gz
  +Source0:      
http://xfig.org/software/xfig/%{V_major}-alpha/transfig.%{V_major}_alpha%{V_minor}.tar.gz
   Patch0:       transfig.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, gcc, make
  -BuildPreReq:  zlib, jpeg, png, xpm
   PreReq:       OpenPKG, openpkg >= 20040130, X11
  +BuildPreReq:  zlib, jpeg, png, xpm
   PreReq:       zlib, jpeg, png, xpm
   AutoReq:      no
   AutoReqProv:  no
  @@ -55,13 +59,13 @@
   
   %track
       prog transfig = {
  -        version   = %{version}
  -        url       = http://www.xfig.org/xfigdist/
  -        regex     = transfig\.(__VER__)\.tar\.gz
  +        version   = %{V_major}_alpha%{V_minor}
  +        url       = http://www.xfig.org/art4.html
  +        regex     = transfig\.(__VER__[_-]alpha\d+)\.tar\.gz
       }
   
   %prep
  -    %setup -q -n transfig.%{version}
  +    %setup -q -n transfig.%{V_major}_alpha%{V_minor}
       %patch -p0
   
   %build
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to