Re: [UPDATE] print/transfig to 3.2.7b

2019-11-12 Thread Rafael Sadowski 
On Mon Nov 11, 2019 at 08:27:37PM +0100, Frederic Cambus wrote:
> Hi ports@,
> 
> Here is a diff to update transfig to 3.2.7b.
> 
> This fixes CVE-2018-16140 and CVE-2019-14275.
> 
> Since version 3.2.7a, the X bitmaps files are not installed anymore.
> 
> From upstream CHANGES:
> 
> o Distribute the X bitmaps files within fig2dev, no need to install
>   these files. The files were needed for Tk and Perl/Tk output.
> 
> Tested with a graphics/xfig update (see following mail), and by successfully
> rebuilding graphics/enblend-enfuse which uses it as BUILD_DEPENDS.
> 
> Comments? OK?

With https OK rsadowski@

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/transfig/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile  12 Jul 2019 20:48:57 -  1.46
> +++ Makefile  11 Nov 2019 16:53:40 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= tools to convert Xfig's .fig files  #'
>  
> -VERSION= 3.2.6
> +VERSION= 3.2.7b
>  DISTNAME=fig2dev-${VERSION}
>  EXTRACT_SUFX =   .tar.xz
>  PKGNAME= transfig-${VERSION}
> @@ -24,8 +24,6 @@ MAKE_FLAGS= CC="${CC}"
>  CONFIGURE_STYLE=gnu
>  CONFIGURE_ARGS = --enable-transfig
>  CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
> -
> -MAKE_FLAGS = bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
>  
>  FLAVORS= a4
>  FLAVOR?=
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/transfig/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  24 Apr 2018 12:07:26 -  1.8
> +++ distinfo  11 Nov 2019 16:53:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (fig2dev-3.2.6.tar.xz) = ij0X7aQdZzOvRP2IwY6J4Ekrnvg/BcJg+A/XGXDqrsA=
> -SIZE (fig2dev-3.2.6.tar.xz) = 406288
> +SHA256 (fig2dev-3.2.7b.tar.xz) = R9wbRCChvFA7N3GZPhnNr3USDTi+ZUhwn32E97B9aLI=
> +SIZE (fig2dev-3.2.7b.tar.xz) = 512224
> Index: patches/patch-fig2dev_Makefile_in
> ===
> RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-fig2dev_Makefile_in
> --- patches/patch-fig2dev_Makefile_in 24 Apr 2018 12:07:26 -  1.1
> +++ patches/patch-fig2dev_Makefile_in 11 Nov 2019 16:53:40 -
> @@ -3,22 +3,12 @@ $OpenBSD: patch-fig2dev_Makefile_in,v 1.
>  Index: fig2dev/Makefile.in
>  --- fig2dev/Makefile.in.orig
>  +++ fig2dev/Makefile.in
> -@@ -118,8 +118,7 @@ PROGRAMS = $(bin_PROGRAMS)
> +@@ -125,7 +125,7 @@ PROGRAMS = $(bin_PROGRAMS)
>   am_fig2dev_OBJECTS = arrow.$(OBJEXT) bound.$(OBJEXT) colors.$(OBJEXT) \
>   creationdate.$(OBJEXT) fig2dev.$(OBJEXT) free.$(OBJEXT) \
> - iso2tex.$(OBJEXT) localmath.$(OBJEXT) psfonts.$(OBJEXT) \
> --read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT) \
> --getopt.$(OBJEXT)
> -+read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT)
> + iso2tex.$(OBJEXT) localmath.$(OBJEXT) read1_3.$(OBJEXT) \
> +-read.$(OBJEXT) trans_spline.$(OBJEXT) getopt.$(OBJEXT)
> ++read.$(OBJEXT) trans_spline.$(OBJEXT)
>   fig2dev_OBJECTS = $(am_fig2dev_OBJECTS)
>   LIBOBJDIR = ../fig2dev/lib/
> - fig2dev_DEPENDENCIES = $(LIBOBJS) dev/libdrivers.a
> -@@ -365,7 +364,7 @@ fig2dev_SOURCES = alloc.h arrow.c bound.h bound.c colo
> - iso2tex.c localmath.h localmath.c object.h psfonts.c read1_3.c read.h \
> - read.c trans_spline.h trans_spline.c pi.h getopt.c
> - 
> --fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a
> -+fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv
> - dist_bin_SCRIPTS = fig2ps2tex pic2tpic
> - all: all-recursive
> - 
> + am__dirstamp = $(am__leading_dot)dirstamp
> Index: patches/patch-fig2dev_fig2dev_c
> ===
> RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_fig2dev_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-fig2dev_fig2dev_c
> --- patches/patch-fig2dev_fig2dev_c   24 Apr 2018 12:07:26 -  1.1
> +++ patches/patch-fig2dev_fig2dev_c   11 Nov 2019 16:53:40 -
> @@ -3,21 +3,21 @@ $OpenBSD: patch-fig2dev_fig2dev_c,v 1.1 
>  Index: fig2dev/fig2dev.c
>  --- fig2dev/fig2dev.c.orig
>  +++ fig2dev/fig2dev.c
> -@@ -42,7 +42,7 @@
> - #include 
> - #endif
> +@@ -45,7 +45,7 @@
> + #include "read.h"
>   
> --extern int   fig_getopt(int nargc, char **nargv, char *ostr);
> + /* the three lines below could go into a getopt.h file */
> +-extern int   fig_getopt(int nargc, char **nargv, char *ostr); /* getopt.c */
>  +#include 
> - extern char *optarg;
> - extern int   optind;
> - static int   parse_gridspec(char *string, float *numer, float *denom,
> -@@ -208,7 +208,7 @@ get_args(int argc, char *argv[])
> + extern char *optarg;/* getopt.c */
> + extern int   optind;/* getopt.c */
> + 
> +@@ -219,7 +219,7 @@ get_args(int argc, char *argv[])
>   if (argc == 1)
> - fprintf(stder

[UPDATE] print/transfig to 3.2.7b

2019-11-11 Thread Frederic Cambus 
Hi ports@,

Here is a diff to update transfig to 3.2.7b.

This fixes CVE-2018-16140 and CVE-2019-14275.

Since version 3.2.7a, the X bitmaps files are not installed anymore.

>From upstream CHANGES:

o Distribute the X bitmaps files within fig2dev, no need to install
  these files. The files were needed for Tk and Perl/Tk output.

Tested with a graphics/xfig update (see following mail), and by successfully
rebuilding graphics/enblend-enfuse which uses it as BUILD_DEPENDS.

Comments? OK?

Index: Makefile
===
RCS file: /cvs/ports/print/transfig/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile12 Jul 2019 20:48:57 -  1.46
+++ Makefile11 Nov 2019 16:53:40 -
@@ -2,7 +2,7 @@
 
 COMMENT=   tools to convert Xfig's .fig files  #'
 
-VERSION=   3.2.6
+VERSION=   3.2.7b
 DISTNAME=  fig2dev-${VERSION}
 EXTRACT_SUFX = .tar.xz
 PKGNAME=   transfig-${VERSION}
@@ -24,8 +24,6 @@ MAKE_FLAGS=   CC="${CC}"
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS = --enable-transfig
 CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
-
-MAKE_FLAGS = bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
 
 FLAVORS=   a4
 FLAVOR?=
Index: distinfo
===
RCS file: /cvs/ports/print/transfig/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo24 Apr 2018 12:07:26 -  1.8
+++ distinfo11 Nov 2019 16:53:40 -
@@ -1,2 +1,2 @@
-SHA256 (fig2dev-3.2.6.tar.xz) = ij0X7aQdZzOvRP2IwY6J4Ekrnvg/BcJg+A/XGXDqrsA=
-SIZE (fig2dev-3.2.6.tar.xz) = 406288
+SHA256 (fig2dev-3.2.7b.tar.xz) = R9wbRCChvFA7N3GZPhnNr3USDTi+ZUhwn32E97B9aLI=
+SIZE (fig2dev-3.2.7b.tar.xz) = 512224
Index: patches/patch-fig2dev_Makefile_in
===
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fig2dev_Makefile_in
--- patches/patch-fig2dev_Makefile_in   24 Apr 2018 12:07:26 -  1.1
+++ patches/patch-fig2dev_Makefile_in   11 Nov 2019 16:53:40 -
@@ -3,22 +3,12 @@ $OpenBSD: patch-fig2dev_Makefile_in,v 1.
 Index: fig2dev/Makefile.in
 --- fig2dev/Makefile.in.orig
 +++ fig2dev/Makefile.in
-@@ -118,8 +118,7 @@ PROGRAMS = $(bin_PROGRAMS)
+@@ -125,7 +125,7 @@ PROGRAMS = $(bin_PROGRAMS)
  am_fig2dev_OBJECTS = arrow.$(OBJEXT) bound.$(OBJEXT) colors.$(OBJEXT) \
creationdate.$(OBJEXT) fig2dev.$(OBJEXT) free.$(OBJEXT) \
-   iso2tex.$(OBJEXT) localmath.$(OBJEXT) psfonts.$(OBJEXT) \
--  read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT) \
--  getopt.$(OBJEXT)
-+  read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT)
+   iso2tex.$(OBJEXT) localmath.$(OBJEXT) read1_3.$(OBJEXT) \
+-  read.$(OBJEXT) trans_spline.$(OBJEXT) getopt.$(OBJEXT)
++  read.$(OBJEXT) trans_spline.$(OBJEXT)
  fig2dev_OBJECTS = $(am_fig2dev_OBJECTS)
  LIBOBJDIR = ../fig2dev/lib/
- fig2dev_DEPENDENCIES = $(LIBOBJS) dev/libdrivers.a
-@@ -365,7 +364,7 @@ fig2dev_SOURCES = alloc.h arrow.c bound.h bound.c colo
- iso2tex.c localmath.h localmath.c object.h psfonts.c read1_3.c read.h \
- read.c trans_spline.h trans_spline.c pi.h getopt.c
- 
--fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a
-+fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv
- dist_bin_SCRIPTS = fig2ps2tex pic2tpic
- all: all-recursive
- 
+ am__dirstamp = $(am__leading_dot)dirstamp
Index: patches/patch-fig2dev_fig2dev_c
===
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_fig2dev_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fig2dev_fig2dev_c
--- patches/patch-fig2dev_fig2dev_c 24 Apr 2018 12:07:26 -  1.1
+++ patches/patch-fig2dev_fig2dev_c 11 Nov 2019 16:53:40 -
@@ -3,21 +3,21 @@ $OpenBSD: patch-fig2dev_fig2dev_c,v 1.1 
 Index: fig2dev/fig2dev.c
 --- fig2dev/fig2dev.c.orig
 +++ fig2dev/fig2dev.c
-@@ -42,7 +42,7 @@
- #include 
- #endif
+@@ -45,7 +45,7 @@
+ #include "read.h"
  
--extern int fig_getopt(int nargc, char **nargv, char *ostr);
+ /* the three lines below could go into a getopt.h file */
+-extern int fig_getopt(int nargc, char **nargv, char *ostr); /* getopt.c */
 +#include 
- extern char   *optarg;
- extern int optind;
- static int parse_gridspec(char *string, float *numer, float *denom,
-@@ -208,7 +208,7 @@ get_args(int argc, char *argv[])
+ extern char   *optarg;/* getopt.c */
+ extern int optind;/* getopt.c */
+ 
+@@ -219,7 +219,7 @@ get_args(int argc, char *argv[])
if (argc == 1)
-   fprintf(stderr,Usage,prog,prog);
+   fprintf(stderr, Usage, prog, prog);
/* sum of all arguments */
 -  while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
 +  while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {
  
  /* global (all drivers) option h

Re: update print/transfig

2018-04-28 Thread Marc Espie 
On Sat, Apr 28, 2018 at 05:07:27PM +0200, Antoine Jacoutot wrote:
> On Sat, Apr 28, 2018 at 04:20:15PM +0200, Solene Rapenne wrote:
> > Following diff updates print/transfig, so the port get synced with the
> > newer version of xfig
> 
> Looks fine portwise.
> OK aja
> 

For the record, unfortunately, there's a bug in there... either that or
our texlive's   tikz is too old.

In any case, I've got some rather simple .pics that don't convert correctly
where they converted correctly before.

It seems the preamble code got broken.

Minimal example that worked perfectly fine with fig2dev 3.2.6:

fig2dev -L tikz fig1.fig fig1.tikz
pdflatex t
(./fig1.tikz
! No room for a new \dimen .
\ch@ck ...\else \errmessage {No room for a new #3}
  \fi 
l.9 ...alloc@1\dimen\dimendef\insc@unt}\temp\XFigu
  \catcode`\@12\fi}
? x


work-around is to use -W, which means it's the dimension-setting code that
changed in incompatible ways.

It does NOT happen for every picture, no idea why this one is special :(

(I'll have a closer look later, but it's not okay to update as-is)
#FIG 3.2  Produced by xfig version 3.2.6
Landscape
Center
Inches
Letter
100.00
Single
-2
1200 2
2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
 600 900 2700 900 2700 5400 600 5400 600 900
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 600 2400 2700 2400
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 600 3000 2700 3000
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 600 3600 2700 3600
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
0 0 2.00 210.00 255.00
 3300 2400 3300 4200
4 0 0 50 -1 0 12 0. 4 150 540 900 1500 Buffer\001
4 0 0 50 -1 0 12 0. 0 195 1215 900 2700 Frame pointer\001
4 0 0 50 -1 0 12 0. 0 150 1305 900 3300 Return address\001


t.tex
Description: t.tex
\ifx\XFigwidth\undefined\dimen1=0pt\else\dimen1\XFigwidth\fi
\divide\dimen1 by 2829
\ifx\XFigheight\undefined\dimen3=0pt\else\dimen3\XFigheight\fi
\divide\dimen3 by 4524
\ifdim\dimen1=0pt\ifdim\dimen3=0pt\dimen1=3946sp\dimen3\dimen1
  \else\dimen1\dimen3\fi\else\ifdim\dimen3=0pt\dimen3\dimen1\fi\fi
\tikzpicture[x=+\dimen1, y=+\dimen3]
{\ifx\XFigu\undefined\catcode`\@11
\def\temp{\alloc@1\dimen\dimendef\insc@unt}\temp\XFigu\catcode`\@12\fi}
\XFigu3946sp
% Uncomment to scale line thicknesses with the same
% factor as width of the drawing.
%\pgfextractx\XFigu{\pgfqpointxy{1}{1}}
\ifdim\XFigu<0pt\XFigu-\XFigu\fi
\pgfdeclarearrow{
  name = xfiga0,
  parameters = {
\the\pgfarrowlinewidth \the\pgfarrowlength \the\pgfarrowwidth},
  defaults = {
  line width=+7.5\XFigu, length=+120\XFigu, width=+60\XFigu},
  setup code = {
% miter protrusion = thk * sqrt(wd^2 + (tipmv*len)^2) / (2 * wd)
\dimen7 2.15\pgfarrowlength\pgfmathveclen{\the\dimen7}{\the\pgfarrowwidth}
\dimen7 2\pgfarrowwidth\pgfmathdivide{\pgfmathresult}{\the\dimen7}
\dimen7 \pgfmathresult\pgfarrowlinewidth
\pgfarrowssettipend{+\dimen7}
\pgfarrowssetbackend{+-\pgfarrowlength}
\dimen9 -0.5\pgfarrowlinewidth
\pgfarrowssetvisualbackend{+\dimen9}
\pgfarrowssetlineend{+-0.5\pgfarrowlinewidth}
\pgfarrowshullpoint{+\dimen7}{+0pt}
\pgfarrowsupperhullpoint{+-\pgfarrowlength}{+0.5\pgfarrowwidth}
\pgfarrowssavethe\pgfarrowlinewidth
\pgfarrowssavethe\pgfarrowlength
\pgfarrowssavethe\pgfarrowwidth
  },
  drawing code = {\pgfsetdash{}{+0pt}

\ifdim\pgfarrowlinewidth=\pgflinewidth\else\pgfsetlinewidth{+\pgfarrowlinewidth}\fi
\pgfpathmoveto{\pgfqpoint{-\pgfarrowlength}{0.5\pgfarrowwidth}}
\pgfpathlineto{\pgfqpoint{0pt}{0pt}}
\pgfpathlineto{\pgfqpoint{-\pgfarrowlength}{-0.5\pgfarrowwidth}}
\pgfusepathqstroke
  }
}
\clip(588,-5412) rectangle (3417,-888);
\tikzset{inner sep=+0pt, outer sep=+0pt}
\pgftext[base,left,at=\pgfqpointxy{900}{-3300}] {\fontsize{12}{14.4}\normalfont 
Return address}
\pgfsetlinewidth{+7.5\XFigu}
\draw (600,-2400)--(2700,-2400);
\draw (600,-3000)--(2700,-3000);
\draw (600,-3600)--(2700,-3600);
\pgfsetarrows{[line width=15\XFigu, width=210\XFigu, length=255\XFigu]}
\pgfsetarrowsend{xfiga0}
\draw (3300,-2400)--(3300,-4200);
\pgftext[base,left,at=\pgfqpointxy{900}{-1500}] 
{\fontsize{12}{14.4}\usefont{T1}{ptm}{m}{n}Buffer}
\pgftext[base,left,at=\pgfqpointxy{900}{-2700}] {\fontsize{12}{14.4}\normalfont 
Frame pointer}
\draw (600,-900) rectangle (2700,-5400);
\endtikzpicture%

Re: update print/transfig

2018-04-28 Thread Antoine Jacoutot 
On Sat, Apr 28, 2018 at 04:20:15PM +0200, Solene Rapenne wrote:
> Following diff updates print/transfig, so the port get synced with the
> newer version of xfig

Looks fine portwise.
OK aja


> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/transfig/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- Makefile  24 Apr 2018 12:07:26 -  1.45
> +++ Makefile  28 Apr 2018 14:18:37 -
> @@ -2,7 +2,7 @@
> 
>  COMMENT= tools to convert Xfig's .fig files  #'
> 
> -VERSION= 3.2.6
> +VERSION= 3.2.7
>  DISTNAME=fig2dev-${VERSION}
>  EXTRACT_SUFX =   .tar.xz
>  PKGNAME= transfig-${VERSION}
> @@ -25,7 +25,7 @@ CONFIGURE_STYLE=gnu
>  CONFIGURE_ARGS = --enable-transfig
>  CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
> 
> -MAKE_FLAGS = bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
> +MAKE_FLAGS+= bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
> 
>  FLAVORS= a4
>  FLAVOR?=
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/transfig/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  24 Apr 2018 12:07:26 -  1.8
> +++ distinfo  28 Apr 2018 14:18:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (fig2dev-3.2.6.tar.xz) = ij0X7aQdZzOvRP2IwY6J4Ekrnvg/BcJg+A/XGXDqrsA=
> -SIZE (fig2dev-3.2.6.tar.xz) = 406288
> +SHA256 (fig2dev-3.2.7.tar.xz) = 3kWBl1L2V6t+v/5KAvyZA40SSo82vjBVCyHvT6A6o6U=
> +SIZE (fig2dev-3.2.7.tar.xz) = 508336
> cvs server: Diffing patches
> Index: patches/patch-fig2dev_Makefile_in
> ===
> RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-fig2dev_Makefile_in
> --- patches/patch-fig2dev_Makefile_in 24 Apr 2018 12:07:26 -  1.1
> +++ patches/patch-fig2dev_Makefile_in 28 Apr 2018 14:18:37 -
> @@ -3,22 +3,21 @@ $OpenBSD: patch-fig2dev_Makefile_in,v 1.
>  Index: fig2dev/Makefile.in
>  --- fig2dev/Makefile.in.orig
>  +++ fig2dev/Makefile.in
> -@@ -118,8 +118,7 @@ PROGRAMS = $(bin_PROGRAMS)
> +@@ -128,7 +128,7 @@ PROGRAMS = $(bin_PROGRAMS)
>   am_fig2dev_OBJECTS = arrow.$(OBJEXT) bound.$(OBJEXT) colors.$(OBJEXT) \
>   creationdate.$(OBJEXT) fig2dev.$(OBJEXT) free.$(OBJEXT) \
> - iso2tex.$(OBJEXT) localmath.$(OBJEXT) psfonts.$(OBJEXT) \
> --read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT) \
> --getopt.$(OBJEXT)
> -+read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT)
> + iso2tex.$(OBJEXT) localmath.$(OBJEXT) read1_3.$(OBJEXT) \
> +-read.$(OBJEXT) trans_spline.$(OBJEXT) getopt.$(OBJEXT)
> ++read.$(OBJEXT) trans_spline.$(OBJEXT)
>   fig2dev_OBJECTS = $(am_fig2dev_OBJECTS)
>   LIBOBJDIR = ../fig2dev/lib/
> - fig2dev_DEPENDENCIES = $(LIBOBJS) dev/libdrivers.a
> -@@ -365,7 +364,7 @@ fig2dev_SOURCES = alloc.h arrow.c bound.h bound.c colo
> - iso2tex.c localmath.h localmath.c object.h psfonts.c read1_3.c read.h \
> - read.c trans_spline.h trans_spline.c pi.h getopt.c
> + am__DEPENDENCIES_1 =
> +@@ -390,7 +390,7 @@ fig2dev_SOURCES = alloc.h arrow.c bool.h bound.h bound
> + iso2tex.c localmath.h localmath.c object.h read1_3.c read.h read.c \
> + trans_spline.h trans_spline.c pi.h getopt.c
> 
> --fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a
> -+fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv
> +-fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a $(am__append_3)
> ++fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv $(am__append_3)
>   dist_bin_SCRIPTS = fig2ps2tex pic2tpic
>   all: all-recursive
> 
> Index: patches/patch-fig2dev_fig2dev_c
> ===
> RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_fig2dev_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-fig2dev_fig2dev_c
> --- patches/patch-fig2dev_fig2dev_c   24 Apr 2018 12:07:26 -  1.1
> +++ patches/patch-fig2dev_fig2dev_c   28 Apr 2018 14:18:37 -
> @@ -3,21 +3,12 @@ $OpenBSD: patch-fig2dev_fig2dev_c,v 1.1
>  Index: fig2dev/fig2dev.c
>  --- fig2dev/fig2dev.c.orig
>  +++ fig2dev/fig2dev.c
> -@@ -42,7 +42,7 @@
> - #include 
> - #endif
> -
> --extern int   fig_getopt(int nargc, char **nargv, char *ostr);
> -+#include 
> - extern char *optarg;
> - extern int   optind;
> - static int   parse_gridspec(char *string, float *numer, float *denom,
> -@@ -208,7 +208,7 @@ get_args(int argc, char *argv[])
> +@@ -221,7 +221,7 @@ get_args(int argc, char *argv[])
>   if (argc == 1)
> - fprintf(stderr,Usage,prog,prog);
> + fprintf(stderr, Usage, prog, prog);
>   /* sum of all arguments */
>  -while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
>  +while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {
> 
> /* global (all drivers) option handling */
> -   switch (c) {
> + switch (c) {
> 

-- 
Antoine

update print/transfig

2018-04-28 Thread Solene Rapenne 
Following diff updates print/transfig, so the port get synced with the
newer version of xfig


Index: Makefile
===
RCS file: /cvs/ports/print/transfig/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile24 Apr 2018 12:07:26 -  1.45
+++ Makefile28 Apr 2018 14:18:37 -
@@ -2,7 +2,7 @@

 COMMENT=   tools to convert Xfig's .fig files  #'

-VERSION=   3.2.6
+VERSION=   3.2.7
 DISTNAME=  fig2dev-${VERSION}
 EXTRACT_SUFX = .tar.xz
 PKGNAME=   transfig-${VERSION}
@@ -25,7 +25,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS = --enable-transfig
 CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include

-MAKE_FLAGS = bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
+MAKE_FLAGS+= bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps

 FLAVORS=   a4
 FLAVOR?=
Index: distinfo
===
RCS file: /cvs/ports/print/transfig/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo24 Apr 2018 12:07:26 -  1.8
+++ distinfo28 Apr 2018 14:18:37 -
@@ -1,2 +1,2 @@
-SHA256 (fig2dev-3.2.6.tar.xz) = ij0X7aQdZzOvRP2IwY6J4Ekrnvg/BcJg+A/XGXDqrsA=
-SIZE (fig2dev-3.2.6.tar.xz) = 406288
+SHA256 (fig2dev-3.2.7.tar.xz) = 3kWBl1L2V6t+v/5KAvyZA40SSo82vjBVCyHvT6A6o6U=
+SIZE (fig2dev-3.2.7.tar.xz) = 508336
cvs server: Diffing patches
Index: patches/patch-fig2dev_Makefile_in
===
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fig2dev_Makefile_in
--- patches/patch-fig2dev_Makefile_in   24 Apr 2018 12:07:26 -  1.1
+++ patches/patch-fig2dev_Makefile_in   28 Apr 2018 14:18:37 -
@@ -3,22 +3,21 @@ $OpenBSD: patch-fig2dev_Makefile_in,v 1.
 Index: fig2dev/Makefile.in
 --- fig2dev/Makefile.in.orig
 +++ fig2dev/Makefile.in
-@@ -118,8 +118,7 @@ PROGRAMS = $(bin_PROGRAMS)
+@@ -128,7 +128,7 @@ PROGRAMS = $(bin_PROGRAMS)
  am_fig2dev_OBJECTS = arrow.$(OBJEXT) bound.$(OBJEXT) colors.$(OBJEXT) \
creationdate.$(OBJEXT) fig2dev.$(OBJEXT) free.$(OBJEXT) \
-   iso2tex.$(OBJEXT) localmath.$(OBJEXT) psfonts.$(OBJEXT) \
--  read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT) \
--  getopt.$(OBJEXT)
-+  read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT)
+   iso2tex.$(OBJEXT) localmath.$(OBJEXT) read1_3.$(OBJEXT) \
+-  read.$(OBJEXT) trans_spline.$(OBJEXT) getopt.$(OBJEXT)
++  read.$(OBJEXT) trans_spline.$(OBJEXT)
  fig2dev_OBJECTS = $(am_fig2dev_OBJECTS)
  LIBOBJDIR = ../fig2dev/lib/
- fig2dev_DEPENDENCIES = $(LIBOBJS) dev/libdrivers.a
-@@ -365,7 +364,7 @@ fig2dev_SOURCES = alloc.h arrow.c bound.h bound.c colo
- iso2tex.c localmath.h localmath.c object.h psfonts.c read1_3.c read.h \
- read.c trans_spline.h trans_spline.c pi.h getopt.c
+ am__DEPENDENCIES_1 =
+@@ -390,7 +390,7 @@ fig2dev_SOURCES = alloc.h arrow.c bool.h bound.h bound
+ iso2tex.c localmath.h localmath.c object.h read1_3.c read.h read.c \
+ trans_spline.h trans_spline.c pi.h getopt.c

--fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a
-+fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv
+-fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a $(am__append_3)
++fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv $(am__append_3)
  dist_bin_SCRIPTS = fig2ps2tex pic2tpic
  all: all-recursive

Index: patches/patch-fig2dev_fig2dev_c
===
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_fig2dev_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fig2dev_fig2dev_c
--- patches/patch-fig2dev_fig2dev_c 24 Apr 2018 12:07:26 -  1.1
+++ patches/patch-fig2dev_fig2dev_c 28 Apr 2018 14:18:37 -
@@ -3,21 +3,12 @@ $OpenBSD: patch-fig2dev_fig2dev_c,v 1.1
 Index: fig2dev/fig2dev.c
 --- fig2dev/fig2dev.c.orig
 +++ fig2dev/fig2dev.c
-@@ -42,7 +42,7 @@
- #include 
- #endif
-
--extern int fig_getopt(int nargc, char **nargv, char *ostr);
-+#include 
- extern char   *optarg;
- extern int optind;
- static int parse_gridspec(char *string, float *numer, float *denom,
-@@ -208,7 +208,7 @@ get_args(int argc, char *argv[])
+@@ -221,7 +221,7 @@ get_args(int argc, char *argv[])
if (argc == 1)
-   fprintf(stderr,Usage,prog,prog);
+   fprintf(stderr, Usage, prog, prog);
/* sum of all arguments */
 -  while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
 +  while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {

  /* global (all drivers) option handling */
- switch (c) {
+   switch (c) {

UPDATE: print/transfig -> 3.2.5

2008-08-20 Thread Stuart Henderson 
matching transfig for the xfig update. I'm not sure why the newlines
were added to the fprintf() in the gensvg.c patch, anyone remember?
those lines have changed format quite a bit upstream now, so I haven't
carried that across.

works for oga@ on amd64, anyone else like to try it?

Index: Makefile
===
RCS file: /cvs/ports/print/transfig/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile15 Sep 2007 22:50:19 -  1.29
+++ Makefile20 Aug 2008 12:23:53 -
@@ -2,15 +2,13 @@
 
 COMMENT=   tools to convert Xfig's .fig files
 
-VERSION=   3.2.4
+VERSION=   3.2.5
 DISTNAME=  transfig.${VERSION}
-PKGNAME=   transfig-${VERSION}p0
+PKGNAME=   transfig-${VERSION}
 CATEGORIES=print
-MASTER_SITES=  ftp://www-epb.lbl.gov/xfig/ \
-   ftp://www-epb.lbl.gov/xfig/previous_versions/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mcj/}
 
-LIB_DEPENDS=   jpeg.>=62::graphics/jpeg \
-   png.>=2::graphics/png
+LIB_DEPENDS=   png.>=2::graphics/png
 RUN_DEPENDS=   :ghostscript-*:print/ghostscript/gnu \
:netpbm->=9.19:graphics/netpbm
 
@@ -18,6 +16,8 @@ PERMIT_PACKAGE_CDROM= Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
+
+PATCHORIG= .pat.orig
 
 CONFIGURE_STYLE=imake
 USE_X11=   Yes
Index: distinfo
===
RCS file: /cvs/ports/print/transfig/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo5 Apr 2007 16:20:19 -   1.4
+++ distinfo20 Aug 2008 12:23:53 -
@@ -1,5 +1,5 @@
-MD5 (transfig.3.2.4.tar.gz) = dC3g96PK500ke70McN2d1w==
-RMD160 (transfig.3.2.4.tar.gz) = exI489NsbcMAM9ykM0jjx9MRZhA=
-SHA1 (transfig.3.2.4.tar.gz) = 7f7Bhl2/6eegaui+AW8aSJs9MH0=
-SHA256 (transfig.3.2.4.tar.gz) = pLWTI9l4Zt57cmdcEdwzuVu0eaacrn2D+YupcqHVSRA=
-SIZE (transfig.3.2.4.tar.gz) = 326284
+MD5 (transfig.3.2.5.tar.gz) = Oyz/3SVSmuWHfjBfKarm0Q==
+RMD160 (transfig.3.2.5.tar.gz) = Q1YVve1mIiUSfqVk/HRunLAFjxg=
+SHA1 (transfig.3.2.5.tar.gz) = JlfBBNAJnctFZah2KpVDMQ5V52c=
+SHA256 (transfig.3.2.5.tar.gz) = 6lpXJMj6HctSUxxNROyKWYMLLcLaEeVh4VJA6N0W0EM=
+SIZE (transfig.3.2.5.tar.gz) = 394296
Index: patches/patch-fig2dev_Imakefile
===
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Imakefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-fig2dev_Imakefile
--- patches/patch-fig2dev_Imakefile 4 Apr 2003 14:28:36 -   1.5
+++ patches/patch-fig2dev_Imakefile 20 Aug 2008 12:23:53 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-fig2dev_Imakefile,v 1.5 2003/04/04 14:28:36 naddy Exp $
 fig2dev/Imakefile.orig Thu Dec 19 18:33:44 2002
-+++ fig2dev/Imakefile  Thu Apr  3 01:33:40 2003
-@@ -20,13 +20,13 @@ XCOMM **
+--- fig2dev/Imakefile.orig Thu Oct 27 17:56:02 2005
 fig2dev/Imakefile  Wed Aug 20 13:20:52 2008
+@@ -34,7 +34,7 @@ XCOMM **
  XCOMM You should point XFIGLIBDIR to the same directory you did when you 
compiled
  XCOMM and installed xfig.
  
@@ -9,15 +9,8 @@ $OpenBSD: patch-fig2dev_Imakefile,v 1.5 
 +XFIGLIBDIR =  $(LIBDIR)/xfig
  
  XCOMM **
- XCOMM If your system has the strerror() function (doesn't have sys_errlist) 
then
- XCOMM comment out NEED_STRERROR with an XCOMM comment.
- 
--NEED_STRERROR = -DNEED_STRERROR
-+XCOMM NEED_STRERROR = -DNEED_STRERROR
- 
- XCOMM The following probably only applies to Windows 9x/NT:
- XCOMM If your system can open files in text and binary modes and has the
-@@ -39,7 +39,7 @@ XCOMM Uncomment the following line if yo
+ XCOMM If your system doesn't have the strerror() function (has sys_errlist) 
then
+@@ -53,7 +53,7 @@ XCOMM Uncomment the following line if your compiler su
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -26,23 +19,20 @@ $OpenBSD: patch-fig2dev_Imakefile,v 1.5 
  
  XCOMM 
  XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -60,8 +60,8 @@ XCOMM Redefine the following if your PNG
- XCOMM are in different places
+@@ -74,9 +74,9 @@ XCOMM Redefine the following if your PNG library, zlib
+ XCOMM file are in different places
  
  #ifdef USEPNG
 -PNGLIBDIR = $(USRLIBDIR)
--PNGINC = -I/usr/include/X11
 +PNGLIBDIR = ${LOCALBASE}/lib
+ ZLIBDIR = $(USRLIBDIR)
+-PNGINC = -I/usr/include/X11
 +PNGINC = -I${LOCALBASE}/include/libpng
  #endif
  
  XCOMM 
-@@ -73,11 +73,11 @@ XCOMM Change XPMLIBDIR if necessary to p
- XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
- XCOMM
- 
--XCOMM #define USEXPM
-+#define USEXPM
+@@ -91,8 +91,8 @@ XCOMM
+ #define USEXPM
  
  #ifdef USEXPM
 -XPMLIBDIR = $(USRLIBDIR)
@@ -52,16 +42,16 @@ $OpenBSD: patch-fig2dev_Imakefile,v 1.5 
  #endif
  
  XCOMM 
-@@ -126,7 +126,7 @@ XCOMM Comment