Import of pkgsrc-2013Q2

graphics/Ngraph/patches/patch-aa

@@ -0,0 +1,74 @@
+$NetBSD: patch-aa,v 1.7 2010/02/01 02:37:56 joerg Exp $
+--- Makefile.orig	Sat Aug  7 19:57:39 2004
++++ Makefile	Tue Aug 31 20:40:29 2004
+@@ -1,26 +1,42 @@
+ #
+ MAINVERSION = '"6.03"'
+ GUIVERSION = '".30"'
+-LIBDIR = '"/usr/local/lib/Ngraph"'
+-INSTALLDIR = /usr/local/lib/Ngraph
+-BINDIR = /usr/local/bin
++LIBDIR = '"${PREFIX}/libexec/Ngraph"'
++INSTALLDIR =${DESTDIR}${PREFIX}/libexec/Ngraph
++BINDIR = ${DESTDIR}${PREFIX}/bin
+ #
+ #
+ ###############################################################################
+ #
+-# Linux + Open Motif 2.1 [dynamic link]
+-#
++# NetBSD + lesstif/openmotif [dynamic link]
+ CC = gcc
+-CCOPTION = -O2 -m486
+-MAKE = make
++CCOPTION = ${CFLAGS}
++MAKE = gmake
+ AR = ar
+ RANLIB = ranlib
+ STRIP = strip
+-DEFS = -DJAPANESE
+-PLATFORM  = '"for X11 [Linux(glibc2) + Open Motif]"'
+-X11INCLUDE = -I/usr/X11R6/include
+-STATICLINK =
+-X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM
++DEFS = ${MOTIF_DEFS}
++PLATFORM  = '"for X11 [NetBSD + OpenMotif/LessTif]"'
++X11INCLUDE = -I${X11BASE}/include -I../combo
++STATICLINK = ./combo/ComboBox.o
++X11LIB = ${LDFLAGS} ${MOTIFLIB} -lm -lXext -lXt -lXp -lX11 -lICE -lSM
++#
++#
++###############################################################################
++#
++# Linux + Open Motif 2.1 [dynamic link]
++#
++#CC = gcc
++#CCOPTION = -O2 -m486
++#MAKE = make
++#AR = ar
++#RANLIB = ranlib
++#STRIP = strip
++#DEFS = -DJAPANESE
++#PLATFORM  = '"for X11 [Linux(glibc2) + Open Motif]"'
++#X11INCLUDE = -I/usr/X11R6/include
++#STATICLINK =
++#X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM
+ #
+ #
+ ###############################################################################
+@@ -170,6 +186,7 @@
+ OBJECT = x11/main.o x11/x11.a src/kern.a
+ 
+ all:
++	(cd combo; $(CC) $(CCOPTION) $(X11INCLUDE) -c ComboBox.c)
+ 	(cd src; $(MAKE) kern.a)
+ 	(cd x11; $(MAKE) main.o)
+ 	(cd x11; $(MAKE) x11.a)
+@@ -216,6 +233,7 @@
+ 	- (cd x11; $(MAKE) clean)
+ 	- (cd x11drive; $(MAKE) clean)
+ 	- (cd x11addin; $(MAKE) clean)
++	- (cd combo; rm ComboBox.o)
+ 
+ cleanbackup:
+ 	rm *~ src/*~ x11/*~ x11drive/*~

graphics/Ngraph/patches/patch-ab

@@ -0,0 +1,148 @@
+$NetBSD: patch-ab,v 1.3 2004/12/02 14:08:16 wiz Exp $
+
+--- x11drive/gra2wmf.c.orig	2004-08-07 21:57:39.000000000 +0200
++++ x11drive/gra2wmf.c
+@@ -334,7 +334,7 @@ errexit:
+   return FALSE;
+ }
+ 
+-int round(double x)
++int ngraph_round(double x)
+ {
+   int ix;
+   double dx;
+@@ -831,8 +831,8 @@ void lineto(HDC DC,int x,int y)
+     len2=len=sqrt(dx*dx+dy*dy);
+     while (len2>((dashlist)[dashi]-dashlen)) {
+       dd=(len-len2+(dashlist)[dashi]-dashlen)/len;
+-      gx=gx1+round(dx*dd);
+-      gy=gy1+round(dy*dd);
++      gx=gx1+ngraph_round(dx*dd);
++      gy=gy1+ngraph_round(dy*dd);
+       if (dotf) LineTo(DC,gx,gy);
+       else MoveTo(DC,gx,gy);
+       dotf=dotf ? FALSE : TRUE;
+@@ -853,22 +853,22 @@ void lineto(HDC DC,int x,int y)
+ 
+ int dot2pixel(int r)
+ {
+-  return round(r*pixel_dot);
++  return ngraph_round(r*pixel_dot);
+ }
+ 
+ int dot2pixelx(int x)
+ {
+-  return round(x*pixel_dot+offsetx-scrollx);
++  return ngraph_round(x*pixel_dot+offsetx-scrollx);
+ }
+ 
+ int dot2pixely(int y)
+ {
+-  return round(y*pixel_dot+offsety-scrolly);
++  return ngraph_round(y*pixel_dot+offsety-scrolly);
+ }
+ 
+ int pixel2dot(int r)
+ {
+-  return round(r/pixel_dot);
++  return ngraph_round(r/pixel_dot);
+ }
+ 
+ void draw(char code,int *cpar,char *cstr)
+@@ -1018,10 +1018,10 @@ void draw(char code,int *cpar,char *cstr
+                dot2pixely(cpar[2]-cpar[4]),
+                dot2pixelx(cpar[1]+cpar[3]),
+                dot2pixely(cpar[2]+cpar[4]),
+-               dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta1)))-1,
+-               dot2pixely(cpar[2]-round(cpar[4]*sin(Theta1)))-1,
+-               dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta2)))-1,
+-               dot2pixely(cpar[2]-round(cpar[4]*sin(Theta2)))-1);
++               dot2pixelx(cpar[1]+ngraph_round(cpar[3]*cos(Theta1)))-1,
++               dot2pixely(cpar[2]-ngraph_round(cpar[4]*sin(Theta1)))-1,
++               dot2pixelx(cpar[1]+ngraph_round(cpar[3]*cos(Theta2)))-1,
++               dot2pixely(cpar[2]-ngraph_round(cpar[4]*sin(Theta2)))-1);
+       } else {
+         TmpPen=OrgPen;
+         SelectObject(DC,TmpPen);
+@@ -1033,19 +1033,19 @@ void draw(char code,int *cpar,char *cstr
+                  dot2pixely(cpar[2]-cpar[4]),
+                  dot2pixelx(cpar[1]+cpar[3]),
+                  dot2pixely(cpar[2]+cpar[4]),
+-                 dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta1)))-1,
+-                 dot2pixely(cpar[2]-round(cpar[4]*sin(Theta1)))-1,
+-                 dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta2)))-1,
+-                 dot2pixely(cpar[2]-round(cpar[4]*sin(Theta2)))-1);
++                 dot2pixelx(cpar[1]+ngraph_round(cpar[3]*cos(Theta1)))-1,
++                 dot2pixely(cpar[2]-ngraph_round(cpar[4]*sin(Theta1)))-1,
++                 dot2pixelx(cpar[1]+ngraph_round(cpar[3]*cos(Theta2)))-1,
++                 dot2pixely(cpar[2]-ngraph_round(cpar[4]*sin(Theta2)))-1);
+         } else {
+           Chord(DC,dot2pixelx(cpar[1]-cpar[3]),
+                    dot2pixely(cpar[2]-cpar[4]),
+                    dot2pixelx(cpar[1]+cpar[3]),
+                    dot2pixely(cpar[2]+cpar[4]),
+-                   dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta1)))-1,
+-                   dot2pixely(cpar[2]-round(cpar[4]*sin(Theta1)))-1,
+-                   dot2pixelx(cpar[1]+round(cpar[3]*cos(Theta2)))-1,
+-                   dot2pixely(cpar[2]-round(cpar[4]*sin(Theta2)))-1);
++                   dot2pixelx(cpar[1]+ngraph_round(cpar[3]*cos(Theta1)))-1,
++                   dot2pixely(cpar[2]-ngraph_round(cpar[4]*sin(Theta1)))-1,
++                   dot2pixelx(cpar[1]+ngraph_round(cpar[3]*cos(Theta2)))-1,
++                   dot2pixely(cpar[2]-ngraph_round(cpar[4]*sin(Theta2)))-1);
+         }
+         SelectObject(DC,ThePen);
+       }
+@@ -1129,9 +1129,9 @@ void draw(char code,int *cpar,char *cstr
+       loadfontf=FALSE;
+       break;
+     }
+-    IDFont.lfHeight=-round(pixel_dot*fontsize);
++    IDFont.lfHeight=-ngraph_round(pixel_dot*fontsize);
+     IDFont.lfWidth=0;
+-    IDFont.lfEscapement=IDFont.lfOrientation=round(fontdir*10);
++    IDFont.lfEscapement=IDFont.lfOrientation=ngraph_round(fontdir*10);
+     IDFont.lfUnderline=0;
+     IDFont.lfStrikeOut=0;
+     IDFont.lfPitchAndFamily=0;
+@@ -1199,8 +1199,8 @@ void draw(char code,int *cpar,char *cstr
+     if (s==NULL) break;
+     x0=cpx;
+     y0=cpy;
+-    TextOut(DC,dot2pixelx(round(x0)),
+-               dot2pixely(round(y0)),s,strlen(s));
++    TextOut(DC,dot2pixelx(ngraph_round(x0)),
++               dot2pixely(ngraph_round(y0)),s,strlen(s));
+     fontwidth=0;
+     for (i=0;i<strlen(s);i++) {
+       fontwidth+=charwidth((unsigned char)s[i],fontalias,fontsize/25.4*72);
+@@ -1209,15 +1209,15 @@ void draw(char code,int *cpar,char *cstr
+     free(s);
+     x0+=fontwidth*fontcos;
+     y0-=fontwidth*fontsin;
+-    cpx=round(x0);
+-    cpy=round(y0);
++    cpx=ngraph_round(x0);
++    cpy=ngraph_round(y0);
+     break;
+   case 'K':
+     if (!loadfontf) break;
+     x0=cpx;
+     y0=cpy;
+-    TextOut(DC,dot2pixelx(round(x0)),
+-               dot2pixely(round(y0)),cstr,strlen(cstr));
++    TextOut(DC,dot2pixelx(ngraph_round(x0)),
++               dot2pixely(ngraph_round(y0)),cstr,strlen(cstr));
+     fontwidth=0;
+     for (i=0;i<strlen(s);i+=2) {
+       fontwidth+=charwidth((((unsigned char)cstr[i+1])<<8)+(unsigned char)cstr[i],
+@@ -1226,8 +1226,8 @@ void draw(char code,int *cpar,char *cstr
+     }
+     x0+=fontwidth*fontcos;
+     y0-=fontwidth*fontsin;
+-    cpx=round(x0);
+-    cpy=round(y0);
++    cpx=ngraph_round(x0);
++    cpy=ngraph_round(y0);
+     break;
+   default: break;
+   }