Date: Mon, 28 Jul 2014 21:54:34 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363261 - in head: german/dict/files graphics/aalib/files graphics/autotrace graphics/autotrace/files graphics/dc20pack graphics/dc20pack/files graphics/dia/files graphics/g2/files grap... Message-ID: <201407282154.s6SLsYSI027655@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 21:54:33 2014 New Revision: 363261 URL: http://svnweb.freebsd.org/changeset/ports/363261 QAT: https://qat.redports.org/buildarchive/r363261/ Log: Rename german/ and graphics/ patch-xy patches to reflect the files they modify. Added: head/german/dict/files/patch-Makefile - copied unchanged from r363257, head/german/dict/files/patch-aa head/graphics/aalib/files/patch-src_aafire.c - copied unchanged from r363257, head/graphics/aalib/files/patch-ag head/graphics/aalib/files/patch-src_aaprintf.c - copied unchanged from r363257, head/graphics/aalib/files/patch-ai head/graphics/aalib/files/patch-src_aarender.c - copied unchanged from r363257, head/graphics/aalib/files/patch-ah head/graphics/autotrace/files/patch-output-swf.c - copied unchanged from r363257, head/graphics/autotrace/files/patch-ab head/graphics/dc20pack/files/patch-Makefile - copied unchanged from r363257, head/graphics/dc20pack/files/patch-ab head/graphics/dc20pack/files/patch-dc20_hif.c - copied unchanged from r363257, head/graphics/dc20pack/files/patch-aa head/graphics/dia/files/patch-app_main.c - copied unchanged from r363257, head/graphics/dia/files/patch-ae head/graphics/dia/files/patch-configure - copied unchanged from r363257, head/graphics/dia/files/patch-ad head/graphics/g2/files/patch-Makefile.in - copied unchanged from r363257, head/graphics/g2/files/patch-aa head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in - copied unchanged from r363257, head/graphics/gdk-pixbuf/files/patch-ac head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S - copied unchanged from r363257, head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S head/graphics/gkrellkam2/files/patch-gkrellkam2.c - copied unchanged from r363257, head/graphics/gkrellkam2/files/patch-ba head/graphics/gplot/files/patch-Makefile - copied unchanged from r363257, head/graphics/gplot/files/patch-aa head/graphics/gplot/files/patch-utils.c - copied unchanged from r363257, head/graphics/gplot/files/patch-ab head/graphics/gracula/files/patch-Makefile - copied unchanged from r363257, head/graphics/gracula/files/patch-aa head/graphics/gtkgraph/files/patch-config.h.in - copied unchanged from r363257, head/graphics/gtkgraph/files/patch-aa head/graphics/jbigkit/files/patch-Makefile - copied unchanged from r363257, head/graphics/jbigkit/files/patch-aa head/graphics/jbigkit/files/patch-libjbig_Makefile - copied unchanged from r363257, head/graphics/jbigkit/files/patch-ab head/graphics/jbigkit/files/patch-pbmtools_Makefile - copied unchanged from r363257, head/graphics/jbigkit/files/patch-ac head/graphics/jgraph/files/patch-ex2.jgr - copied unchanged from r363257, head/graphics/jgraph/files/patch-ae head/graphics/jgraph/files/patch-jgraph.1 - copied unchanged from r363257, head/graphics/jgraph/files/patch-ad head/graphics/jgraph/files/patch-jgraph.c - copied unchanged from r363257, head/graphics/jgraph/files/patch-ac head/graphics/jgraph/files/patch-makefile - copied unchanged from r363257, head/graphics/jgraph/files/patch-aa head/graphics/jgraph/files/patch-token.c - copied unchanged from r363257, head/graphics/jgraph/files/patch-ab head/graphics/jslice/files/patch-Makefile.new - copied unchanged from r363257, head/graphics/jslice/files/patch-aa head/graphics/lfview/files/patch-Imakefile - copied unchanged from r363257, head/graphics/lfview/files/patch-ab head/graphics/lfview/files/patch-config.tmpl - copied unchanged from r363257, head/graphics/lfview/files/patch-aa head/graphics/lfview/files/patch-plugins_Imakefile - copied unchanged from r363257, head/graphics/lfview/files/patch-ac head/graphics/liblug/files/patch-Makefile.linux - copied unchanged from r363257, head/graphics/liblug/files/patch-aa head/graphics/liblug/files/patch-convert_rla.c - copied unchanged from r363257, head/graphics/liblug/files/patch-ab head/graphics/libmorph/files/patch-Makefile.in - copied unchanged from r363257, head/graphics/libmorph/files/patch-aa head/graphics/p5-PGPLOT/files/patch-PGPLOT.xs - copied unchanged from r363257, head/graphics/p5-PGPLOT/files/patch-aa head/graphics/pgplot/files/patch-pgdispd_proccom.c - copied unchanged from r363257, head/graphics/pgplot/files/patch-ab head/graphics/picturebook/files/patch-Makefile - copied unchanged from r363257, head/graphics/picturebook/files/patch-aa head/graphics/picturebook/files/patch-capture.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-ab head/graphics/picturebook/files/patch-capture.h - copied unchanged from r363257, head/graphics/picturebook/files/patch-ac head/graphics/picturebook/files/patch-command.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-ah head/graphics/picturebook/files/patch-mchip.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-ai head/graphics/picturebook/files/patch-pci.h - copied unchanged from r363257, head/graphics/picturebook/files/patch-ad head/graphics/picturebook/files/patch-pci_freebsd.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-ae head/graphics/picturebook/files/patch-ptable.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-af head/graphics/picturebook/files/patch-setbrightness.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-ba head/graphics/picturebook/files/patch-sonypi.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-ag head/graphics/picturebook/files/patch-vaiobat.c - copied unchanged from r363257, head/graphics/picturebook/files/patch-bb head/graphics/pixmap/files/patch-Imakefile - copied unchanged from r363257, head/graphics/pixmap/files/patch-ac head/graphics/pixmap/files/patch-Pixmap.h - copied unchanged from r363257, head/graphics/pixmap/files/patch-aa head/graphics/pixmap/files/patch-SelFile_SelFile.c - copied unchanged from r363257, head/graphics/pixmap/files/patch-ab head/graphics/png/files/patch-scripts_libpng-config-body.in - copied unchanged from r363257, head/graphics/png/files/patch-ac head/graphics/png2html/files/patch-Makefile - copied unchanged from r363257, head/graphics/png2html/files/patch-aa head/graphics/pvmpov/files/patch-FreeBSD-strings - copied unchanged from r363257, head/graphics/pvmpov/files/patch-aa head/graphics/pvmpov/files/patch-povray31-source-pvm-Makefile.aimk - copied unchanged from r363257, head/graphics/pvmpov/files/patch-ab head/graphics/rayshade/files/patch-Configure - copied unchanged from r363257, head/graphics/rayshade/files/patch-aa head/graphics/rayshade/files/patch-libray_Makefile - copied unchanged from r363257, head/graphics/rayshade/files/patch-ad head/graphics/rayshade/files/patch-raypaint_Makefile.SH - copied unchanged from r363257, head/graphics/rayshade/files/patch-ac head/graphics/sane-epkowa/files/patch-backend_cfg-obj.c - copied unchanged from r363257, head/graphics/sane-epkowa/files/patch-03 head/graphics/sane-epkowa/files/patch-frontend__pisa_main.cc - copied unchanged from r363257, head/graphics/sane-epkowa/files/patch-02 head/graphics/sane-epkowa/files/patch-headerfix - copied unchanged from r363257, head/graphics/sane-epkowa/files/patch-01 head/graphics/stamp/files/patch-lib_rcfile.c - copied unchanged from r363257, head/graphics/stamp/files/patch-ab head/graphics/svgalib/files/patch-Makefile - copied unchanged from r363257, head/graphics/svgalib/files/patch-ae head/graphics/svgalib/files/patch-Makefile.cfg - copied unchanged from r363257, head/graphics/svgalib/files/patch-aa head/graphics/svgalib/files/patch-demos-Makefile - copied unchanged from r363257, head/graphics/svgalib/files/patch-ar head/graphics/svgalib/files/patch-demos-accel.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-as head/graphics/svgalib/files/patch-demos-forktest.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-at head/graphics/svgalib/files/patch-demos-linearfork.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-au head/graphics/svgalib/files/patch-gl-Makefile - copied unchanged from r363257, head/graphics/svgalib/files/patch-aq head/graphics/svgalib/files/patch-gl-cctext.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-ay head/graphics/svgalib/files/patch-gl-inlstring.h - copied unchanged from r363257, head/graphics/svgalib/files/patch-ac head/graphics/svgalib/files/patch-include-linux-kd.h - copied unchanged from r363257, head/graphics/svgalib/files/patch-aw head/graphics/svgalib/files/patch-include-linux-keyboard.h - copied unchanged from r363257, head/graphics/svgalib/files/patch-av head/graphics/svgalib/files/patch-src-Makefile - copied unchanged from r363257, head/graphics/svgalib/files/patch-ab head/graphics/svgalib/files/patch-src-ark.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-ao head/graphics/svgalib/files/patch-src-config-libvga.config - copied unchanged from r363257, head/graphics/svgalib/files/patch-az head/graphics/svgalib/files/patch-src-joystick-joydev.h_1 - copied unchanged from r363257, head/graphics/svgalib/files/patch-ag head/graphics/svgalib/files/patch-src-joystick-joydev.h_2 - copied unchanged from r363257, head/graphics/svgalib/files/patch-af head/graphics/svgalib/files/patch-src-keyboard-keyboard.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-ah head/graphics/svgalib/files/patch-src-keyboard-vgakeyboard.h - copied unchanged from r363257, head/graphics/svgalib/files/patch-ax head/graphics/svgalib/files/patch-src-libvga.h - copied unchanged from r363257, head/graphics/svgalib/files/patch-ai head/graphics/svgalib/files/patch-src-mach32.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-aj head/graphics/svgalib/files/patch-src-mouse-ms.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-ak head/graphics/svgalib/files/patch-src-nv3.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-al head/graphics/svgalib/files/patch-src-vga.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-am head/graphics/svgalib/files/patch-src-vgamisc.c - copied unchanged from r363257, head/graphics/svgalib/files/patch-an head/graphics/svgalib/files/patch-utils-Makefile - copied unchanged from r363257, head/graphics/svgalib/files/patch-ap head/graphics/svgalib/files/patch-utils-gtf-scitech.h - copied unchanged from r363257, head/graphics/svgalib/files/patch-ad head/graphics/tifmerge/files/patch-tifmerge.c - copied unchanged from r363257, head/graphics/tifmerge/files/patch-aa head/graphics/vcg/files/patch-Makefile - copied, changed from r363257, head/graphics/vcg/files/patch-ap head/graphics/vcg/files/patch-demo_Makefile - copied unchanged from r363257, head/graphics/vcg/files/patch-aa head/graphics/vcg/files/patch-doc_Makefile - copied unchanged from r363257, head/graphics/vcg/files/patch-ab head/graphics/vcg/files/patch-preconf_X11_Imakefile - copied, changed from r363257, head/graphics/vcg/files/patch-ap head/graphics/vcg/files/patch-src_Makefile - copied unchanged from r363257, head/graphics/vcg/files/patch-ae head/graphics/vcg/files/patch-src_X11dev.c - copied unchanged from r363257, head/graphics/vcg/files/patch-ag head/graphics/vcg/files/patch-src_X11devcl.c - copied unchanged from r363257, head/graphics/vcg/files/patch-ah head/graphics/vcg/files/patch-src_X11devfe.c - copied unchanged from r363257, head/graphics/vcg/files/patch-ai head/graphics/vcg/files/patch-src_X11devfs.c - copied unchanged from r363257, head/graphics/vcg/files/patch-aj head/graphics/vcg/files/patch-src_X11devla.c - copied unchanged from r363257, head/graphics/vcg/files/patch-ak head/graphics/vcg/files/patch-src_X11devpb.c - copied unchanged from r363257, head/graphics/vcg/files/patch-al head/graphics/vcg/files/patch-src_X11devst.c - copied unchanged from r363257, head/graphics/vcg/files/patch-am head/graphics/vcg/files/patch-src_X11devti.c - copied unchanged from r363257, head/graphics/vcg/files/patch-an head/graphics/vcg/files/patch-src_X11devvw.c - copied unchanged from r363257, head/graphics/vcg/files/patch-ao head/graphics/vcg/files/patch-src_main.c - copied unchanged from r363257, head/graphics/vcg/files/patch-af head/graphics/vcg/files/patch-src_preconf_lex.yy.c - copied unchanged from r363257, head/graphics/vcg/files/patch-ad head/graphics/vcg/files/patch-src_preconf_y.tab.c - copied unchanged from r363257, head/graphics/vcg/files/patch-ac head/graphics/whirlgif/files/patch-Makefile - copied unchanged from r363257, head/graphics/whirlgif/files/patch-aa head/graphics/xdgagrab/files/patch-Makefile - copied unchanged from r363257, head/graphics/xdgagrab/files/patch-aa head/graphics/xfpovray/files/patch-flx_Imakefile - copied unchanged from r363257, head/graphics/xfpovray/files/patch-ad head/graphics/xfpovray/files/patch-src_Imakefile - copied unchanged from r363257, head/graphics/xfpovray/files/patch-ac head/graphics/xfpovray/files/patch-src_show_image.c - copied unchanged from r363257, head/graphics/xfpovray/files/patch-ae head/graphics/xfpovray/files/patch-src_xfpovray.h - copied unchanged from r363257, head/graphics/xfpovray/files/patch-ab head/graphics/xfpovray/files/patch-src_xfprovray.c - copied unchanged from r363257, head/graphics/xfpovray/files/patch-af head/graphics/xfpovray/files/patch-xfpovraf.cf - copied unchanged from r363257, head/graphics/xfpovray/files/patch-aa head/graphics/xpx/files/patch-Imakefile - copied unchanged from r363257, head/graphics/xpx/files/patch-aa head/graphics/xzgv/files/patch-Makefile - copied unchanged from r363257, head/graphics/xzgv/files/patch-aa head/graphics/xzgv/files/patch-doc_Makefile - copied unchanged from r363257, head/graphics/xzgv/files/patch-ab Deleted: head/german/dict/files/patch-aa head/graphics/aalib/files/patch-ag head/graphics/aalib/files/patch-ah head/graphics/aalib/files/patch-ai head/graphics/autotrace/files/patch-ab head/graphics/dc20pack/files/patch-aa head/graphics/dc20pack/files/patch-ab head/graphics/dia/files/patch-ad head/graphics/dia/files/patch-ae head/graphics/g2/files/patch-aa head/graphics/gdk-pixbuf/files/patch-ac head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S head/graphics/gkrellkam2/files/patch-ba head/graphics/gplot/files/patch-aa head/graphics/gplot/files/patch-ab head/graphics/gracula/files/patch-aa head/graphics/gtkgraph/files/patch-aa head/graphics/jbigkit/files/patch-aa head/graphics/jbigkit/files/patch-ab head/graphics/jbigkit/files/patch-ac head/graphics/jgraph/files/patch-aa head/graphics/jgraph/files/patch-ab head/graphics/jgraph/files/patch-ac head/graphics/jgraph/files/patch-ad head/graphics/jgraph/files/patch-ae head/graphics/jslice/files/patch-aa head/graphics/lfview/files/patch-aa head/graphics/lfview/files/patch-ab head/graphics/lfview/files/patch-ac head/graphics/liblug/files/patch-aa head/graphics/liblug/files/patch-ab head/graphics/libmorph/files/patch-aa head/graphics/p5-PGPLOT/files/patch-aa head/graphics/pgplot/files/patch-ab head/graphics/picturebook/files/patch-aa head/graphics/picturebook/files/patch-ab head/graphics/picturebook/files/patch-ac head/graphics/picturebook/files/patch-ad head/graphics/picturebook/files/patch-ae head/graphics/picturebook/files/patch-af head/graphics/picturebook/files/patch-ag head/graphics/picturebook/files/patch-ah head/graphics/picturebook/files/patch-ai head/graphics/picturebook/files/patch-ba head/graphics/picturebook/files/patch-bb head/graphics/pixmap/files/patch-aa head/graphics/pixmap/files/patch-ab head/graphics/pixmap/files/patch-ac head/graphics/png/files/patch-ac head/graphics/png2html/files/patch-aa head/graphics/pvmpov/files/patch-aa head/graphics/pvmpov/files/patch-ab head/graphics/rayshade/files/patch-aa head/graphics/rayshade/files/patch-ac head/graphics/rayshade/files/patch-ad head/graphics/sane-epkowa/files/patch-01 head/graphics/sane-epkowa/files/patch-02 head/graphics/sane-epkowa/files/patch-03 head/graphics/stamp/files/patch-ab head/graphics/svgalib/files/patch-aa head/graphics/svgalib/files/patch-ab head/graphics/svgalib/files/patch-ac head/graphics/svgalib/files/patch-ad head/graphics/svgalib/files/patch-ae head/graphics/svgalib/files/patch-af head/graphics/svgalib/files/patch-ag head/graphics/svgalib/files/patch-ah head/graphics/svgalib/files/patch-ai head/graphics/svgalib/files/patch-aj head/graphics/svgalib/files/patch-ak head/graphics/svgalib/files/patch-al head/graphics/svgalib/files/patch-am head/graphics/svgalib/files/patch-an head/graphics/svgalib/files/patch-ao head/graphics/svgalib/files/patch-ap head/graphics/svgalib/files/patch-aq head/graphics/svgalib/files/patch-ar head/graphics/svgalib/files/patch-as head/graphics/svgalib/files/patch-at head/graphics/svgalib/files/patch-au head/graphics/svgalib/files/patch-av head/graphics/svgalib/files/patch-aw head/graphics/svgalib/files/patch-ax head/graphics/svgalib/files/patch-ay head/graphics/svgalib/files/patch-az head/graphics/tifmerge/files/patch-aa head/graphics/vcg/files/patch-aa head/graphics/vcg/files/patch-ab head/graphics/vcg/files/patch-ac head/graphics/vcg/files/patch-ad head/graphics/vcg/files/patch-ae head/graphics/vcg/files/patch-af head/graphics/vcg/files/patch-ag head/graphics/vcg/files/patch-ah head/graphics/vcg/files/patch-ai head/graphics/vcg/files/patch-aj head/graphics/vcg/files/patch-ak head/graphics/vcg/files/patch-al head/graphics/vcg/files/patch-am head/graphics/vcg/files/patch-an head/graphics/vcg/files/patch-ao head/graphics/vcg/files/patch-ap head/graphics/whirlgif/files/patch-aa head/graphics/xdgagrab/files/patch-aa head/graphics/xfpovray/files/patch-aa head/graphics/xfpovray/files/patch-ab head/graphics/xfpovray/files/patch-ac head/graphics/xfpovray/files/patch-ad head/graphics/xfpovray/files/patch-ae head/graphics/xfpovray/files/patch-af head/graphics/xpx/files/patch-aa head/graphics/xzgv/files/patch-aa head/graphics/xzgv/files/patch-ab Modified: head/graphics/autotrace/Makefile head/graphics/dc20pack/Makefile head/graphics/lfview/Makefile head/graphics/picturebook/Makefile head/graphics/pvmpov/Makefile head/graphics/vcg/Makefile head/graphics/xfpovray/Makefile Copied: head/german/dict/files/patch-Makefile (from r363257, head/german/dict/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/german/dict/files/patch-Makefile Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/german/dict/files/patch-aa) @@ -0,0 +1,11 @@ +--- Makefile.old Sat Mar 9 12:20:02 2002 ++++ Makefile Sat Mar 9 12:19:37 2002 +@@ -9,7 +9,7 @@ + + beforeinstall: + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ +- ${.CURDIR}/dict.sh ${DESTDIR}${BINDIR}/dict ++ ${.CURDIR}/dict.sh ${DESTDIR}${BINDIR}/de-dict + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${.CURDIR}/${dict} ${DESTDIR}${PREFIX}/share + Copied: head/graphics/aalib/files/patch-src_aafire.c (from r363257, head/graphics/aalib/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aalib/files/patch-src_aafire.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/aalib/files/patch-ag) @@ -0,0 +1,37 @@ +--- src/aafire.c.orig Fri Apr 27 00:30:03 2001 ++++ src/aafire.c Sat Mar 2 22:51:46 2002 +@@ -48,6 +48,7 @@ + initialize (void) + { + int i; ++ srandomdev(); + context = aa_autoinit (&aa_defparams); + if (context == NULL) + { +@@ -114,20 +115,20 @@ + height++; + loop--; + if (loop < 0) +- loop = rand () % 3, sloop++;; ++ loop = random () % 3, sloop++;; + i1 = 1; + i2 = 4 * XSIZ + 1; + for (p = (char *) bitmap + XSIZ * (YSIZ + 0); + p < ((unsigned char *) bitmap + XSIZ * (YSIZ + 1)); + p++, i1 += 4, i2 -= 4) + { +- last1 = rand () % min (i1, min (i2, height)); +- i = rand () % 6; ++ last1 = random () % min (i1, min (i2, height)); ++ i = random () % 6; + for (; p < (unsigned char *) bitmap + XSIZ * (YSIZ + 1) && i != 0; + p++, i--, i1 += 4, i2 -= 4) +- *p = last1, last1 += rand () % 6 - 2, *(p + XSIZ) = last1, last1 += +- rand () % 6 - 2; +- *(p + 2 * XSIZ) = last1, last1 += rand () % 6 - 2; ++ *p = last1, last1 += random () % 6 - 2, *(p + XSIZ) = last1, last1 += ++ random () % 6 - 2; ++ *(p + 2 * XSIZ) = last1, last1 += random () % 6 - 2; + } + i = 0; + firemain (); Copied: head/graphics/aalib/files/patch-src_aaprintf.c (from r363257, head/graphics/aalib/files/patch-ai) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aalib/files/patch-src_aaprintf.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/aalib/files/patch-ai) @@ -0,0 +1,11 @@ +--- src/aaprintf.c.orig Thu Apr 26 23:37:31 2001 ++++ src/aaprintf.c Sat Mar 2 22:54:56 2002 +@@ -7,7 +7,7 @@ + char buf[1025]; + int i; + va_start(args,fmt); +- i=vsprintf(buf,fmt,args); ++ i=vsnprintf(buf,sizeof(buf),fmt,args); + va_end(args); + aa_puts(c,x,y,attr,buf); + return i; Copied: head/graphics/aalib/files/patch-src_aarender.c (from r363257, head/graphics/aalib/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/aalib/files/patch-src_aarender.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/aalib/files/patch-ah) @@ -0,0 +1,28 @@ +--- src/aarender.c.orig Thu Apr 26 23:37:31 2001 ++++ src/aarender.c Sat Mar 2 23:02:04 2002 +@@ -27,11 +27,11 @@ + return (p); + } + #define MYLONG_MAX 0xffffffffU /*this is enought for me. */ +-#define myrand() (state = ((state * 1103515245) + 12345) & MYLONG_MAX) ++#define myrand() (random() & MYLONG_MAX) + + void aa_renderpalette(aa_context * c, __AA_CONST aa_palette palette, __AA_CONST aa_renderparams * p, int x1, int y1, int x2, int y2) + { +- static int state; ++ static int rand_init = 0; + int x, y; + int val; + int wi = c->imgwidth; +@@ -47,6 +47,11 @@ + int randomval = p->randomval; + int dither = p->dither; + aa_palette table; ++ ++ if (!rand_init) { ++ srandomdev(); ++ rand_init = 1; ++ } + if (x2 < 0 || y2 < 0 || x1 > aa_scrwidth(c) || y1 > aa_scrheight(c)) + return; + if (x2 >= aa_scrwidth(c)) Modified: head/graphics/autotrace/Makefile ============================================================================== --- head/graphics/autotrace/Makefile Mon Jul 28 21:40:54 2014 (r363260) +++ head/graphics/autotrace/Makefile Mon Jul 28 21:54:33 2014 (r363261) @@ -23,30 +23,19 @@ LDFLAGS+= $$(libpng-config --L_opts) ${P INSTALL_TARGET= install-strip OPTIONS_DEFINE= IMAGEMAGICK MING PSTOEDIT -OPTIONS_DEFAULT= IMAGEMAGICK PSTOEDIT +OPTIONS_DEFAULT=IMAGEMAGICK PSTOEDIT MING_DESC= Enable swf interface PSTOEDIT_DESC= Convert postscript to other formats -.include <bsd.port.options.mk> +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick +IMAGEMAGICK_CONFIGURE_OFF= --without-magick -.if ${PORT_OPTIONS:MIMAGEMAGICK} -LIB_DEPENDS+= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick -.else -CONFIGURE_ARGS+= --without-magick -.endif - -.if ${PORT_OPTIONS:MMING} -LIB_DEPENDS+= libming.so:${PORTSDIR}/graphics/ming -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming -.else -CONFIGURE_ENV+= ac_cv_header_ming_h=no -.endif - -.if ${PORT_OPTIONS:MPSTOEDIT} -LIB_DEPENDS+= libpstoedit.so:${PORTSDIR}/graphics/pstoedit -.else -CONFIGURE_ARGS+= --without-pstoedit -.endif +MING_LIB_DEPENDS= libming.so:${PORTSDIR}/graphics/ming +MING_CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/ming +MING_CONFIGURE_OFF= ac_cv_header_ming_h=no + +PSTOEDIT_LIB_DEPENDS= libpstoedit.so:${PORTSDIR}/graphics/pstoedit +PSTOEDIT_CONFIGURE_OFF= --without-pstoedit post-patch: @${REINPLACE_CMD} -e \ Copied: head/graphics/autotrace/files/patch-output-swf.c (from r363257, head/graphics/autotrace/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/autotrace/files/patch-output-swf.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/autotrace/files/patch-ab) @@ -0,0 +1,11 @@ +--- output-swf.c.orig Sun Dec 23 22:10:59 2001 ++++ output-swf.c Thu Dec 27 14:45:31 2001 +@@ -2,7 +2,7 @@ + + #include "spline.h" + #include "output-swf.h" +-#include <ming.h> ++#include <ming/libming.h> + + #define FPS 24.0 + #define IMGID 1 Modified: head/graphics/dc20pack/Makefile ============================================================================== --- head/graphics/dc20pack/Makefile Mon Jul 28 21:40:54 2014 (r363260) +++ head/graphics/dc20pack/Makefile Mon Jul 28 21:54:33 2014 (r363261) @@ -6,12 +6,12 @@ PORTVERSION= 1.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/capture -EXTRACT_SUFX= .tgz MAINTAINER= maurice@castro.aus.net COMMENT= Digital camera control and download tool for Kodak DC20/25 camera WRKSRC= ${WRKDIR} +USES= tar:tgz post-extract: for file in `${FIND} ${WRKSRC} -type f`; do \ Copied: head/graphics/dc20pack/files/patch-Makefile (from r363257, head/graphics/dc20pack/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dc20pack/files/patch-Makefile Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/dc20pack/files/patch-ab) @@ -0,0 +1,15 @@ +--- Makefile.orig Wed Sep 8 18:38:19 1999 ++++ Makefile Wed Sep 8 18:38:34 1999 +@@ -1,10 +1,10 @@ + all: dc20term dc2totga + + dc20term: dc20_ui.o dc20_hif.o +- gcc -o $@ dc20_ui.o dc20_hif.o ++ ${CC} ${CFLAGS} -o $@ dc20_ui.o dc20_hif.o + + dc2totga: dc2totga.c +- gcc -O3 -o dc2totga dc2totga.c -lm ++ ${CC} ${CFLAGS} -o dc2totga dc2totga.c -lm + + clean: + rm -f dc20_ui.o dc20_hif.o dc2totga.o dc20term dc2totga Copied: head/graphics/dc20pack/files/patch-dc20_hif.c (from r363257, head/graphics/dc20pack/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dc20pack/files/patch-dc20_hif.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/dc20pack/files/patch-aa) @@ -0,0 +1,44 @@ +*** dc20_hif.c.orig Sun Aug 1 13:55:41 1999 +--- dc20_hif.c Sun Aug 1 13:57:21 1999 +*************** +*** 15,21 **** + unsigned char sts_res= 0, sts_bat= 0; + unsigned char sts_pic_cnt= 0, sts_pic_rem= 0; + unsigned char dc_type= 0x25; +! unsigned char com_dev[128]= "/dev/ttyS0"; + + + /* LOCAL VARIABLES ****************************************/ +--- 15,21 ---- + unsigned char sts_res= 0, sts_bat= 0; + unsigned char sts_pic_cnt= 0, sts_pic_rem= 0; + unsigned char dc_type= 0x25; +! unsigned char com_dev[128]= "/dev/cuaa0"; + + + /* LOCAL VARIABLES ****************************************/ +*************** +*** 146,156 **** + { + switch (com_nr) + { +! case 1: strcpy(com_dev, "/dev/ttyS0") ; break; +! case 2: strcpy(com_dev, "/dev/ttyS1") ; break; +! case 3: strcpy(com_dev, "/dev/ttyS2") ; break; +! case 4: strcpy(com_dev, "/dev/ttyS3") ; break; +! default: strcpy(com_dev, "/dev/ttyS0") ; break; + } + + if ((com_hdl = open(com_dev, O_RDWR)) == -1) +--- 146,156 ---- + { + switch (com_nr) + { +! case 1: strcpy(com_dev, "/dev/cuaa0") ; break; +! case 2: strcpy(com_dev, "/dev/cuaa1") ; break; +! case 3: strcpy(com_dev, "/dev/cuaa2") ; break; +! case 4: strcpy(com_dev, "/dev/cuaa3") ; break; +! default: strcpy(com_dev, "/dev/cuaa0") ; break; + } + + if ((com_hdl = open(com_dev, O_RDWR)) == -1) Copied: head/graphics/dia/files/patch-app_main.c (from r363257, head/graphics/dia/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dia/files/patch-app_main.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/dia/files/patch-ae) @@ -0,0 +1,12 @@ +--- app/main.c.orig Sun Mar 25 19:05:16 2001 ++++ app/main.c Thu May 17 14:09:02 2001 +@@ -19,2 +19,4 @@ + ++#include <ieeefp.h> ++ + #include "geometry.h" +@@ -35,2 +37,4 @@ + { ++ fpsetmask(0); ++ + app_init(argc, argv); Copied: head/graphics/dia/files/patch-configure (from r363257, head/graphics/dia/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dia/files/patch-configure Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/dia/files/patch-ad) @@ -0,0 +1,29 @@ +--- configure.orig 2009-07-11 00:18:11.000000000 +1000 ++++ configure 2009-07-11 00:18:11.000000000 +1000 +@@ -26619,7 +26619,7 @@ $as_echo_n "checking local Python config + + fi + +- ++ PYTHON_EXEC_PREFIX=${LOCALBASE} + + PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"` + +@@ -26681,12 +26681,12 @@ except ImportError: + except: + sys.exit(0) + sys.exit(0)" +-if $PYTHON -c "$prog" 1>&5 2>&5 +- then ++#if $PYTHON -c "$prog" 1>&5 2>&5 ++# then + eval "py_cv_mod_$py_mod_var=yes" +- else +- eval "py_cv_mod_$py_mod_var=no" +- fi ++# else ++# eval "py_cv_mod_$py_mod_var=no" ++# fi + + fi + Copied: head/graphics/g2/files/patch-Makefile.in (from r363257, head/graphics/g2/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/g2/files/patch-Makefile.in Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/g2/files/patch-aa) @@ -0,0 +1,20 @@ +--- Makefile.in.orig Wed Apr 7 17:41:01 1999 ++++ Makefile.in Wed Apr 7 17:42:04 1999 +@@ -25,7 +25,7 @@ + FIND = @FIND@ + MAKEDEPEND = @MAKEDEPEND@ + AR = ar +-ARFLAGS = -rs ++ARFLAGS = -r + + BASE_DIR = ./src + BASE_SRC = $(BASE_DIR)/g2_device.c $(BASE_DIR)/g2_ui_control.c \ +@@ -70,7 +70,7 @@ + + libg2.a: $(OBJ) + $(AR) $(ARFLAGS) libg2.a $(OBJ) +- ln -s libg2.a libg2.0.40.a ++ ln -fs libg2.a libg2.0.40.a + + libg2.so: $(OBJ) + $(CC) -shared -o libg2.so $(OBJ) -lc -lm Copied: head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in (from r363257, head/graphics/gdk-pixbuf/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_Makefile.in Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/gdk-pixbuf/files/patch-ac) @@ -0,0 +1,11 @@ +--- gdk-pixbuf/Makefile.in.orig Sat Oct 5 01:29:29 2002 ++++ gdk-pixbuf/Makefile.in Sat Oct 5 01:32:30 2002 +@@ -400,7 +400,7 @@ + libpixbufloader_bmp_la_OBJECTS = io-bmp.lo + libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la + libpixbufloader_xbm_la_OBJECTS = io-xbm.lo +-noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \ ++noinst_PROGRAMS = # test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \ + testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \ + testpixbuf-scale$(EXEEXT) + PROGRAMS = $(noinst_PROGRAMS) Copied: head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S (from r363257, head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf_pixops_have_mmx.S Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S) @@ -0,0 +1,11 @@ +--- gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:34:50 1.1 ++++ gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:35:21 +@@ -19,6 +19,8 @@ + popfl + pushfl + popl %eax ++ pushl %ebx ++ popfl + + cmpl %eax, %ebx + Copied: head/graphics/gkrellkam2/files/patch-gkrellkam2.c (from r363257, head/graphics/gkrellkam2/files/patch-ba) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gkrellkam2/files/patch-gkrellkam2.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/gkrellkam2/files/patch-ba) @@ -0,0 +1,134 @@ +--- gkrellkam2.c.orig Sun Nov 24 04:26:59 2002 ++++ gkrellkam2.c Sun Nov 24 04:30:50 2002 +@@ -139,8 +139,7 @@ + "_full_ filename in the \"Image Source\" box. To watch a webcam\n", + "or other online picture, or use an online list, just put its\n", + "address (beginning with http:// or ftp://) in the \"Image Source\n", +-"box. Lists should end in \"-list\" or \".list\". You'll need GNU\n", +-"wget installed to be able to get files from the internet.\n", ++"box. Lists should end in \"-list\" or \".list\".\n", + "Special case: when this field begins with \"-x\" followed by a\n", + "space and some more text, the remaining text is assumed to be a\n", + "script or other system commmand, and the whole path does not\n", +@@ -178,7 +177,6 @@ + "" + }; + +-#define wget_opts "--cache=off" + #define BUFLEN 256 + #define MIN_NUMPANELS 0 + #define MAX_NUMPANELS 5 +@@ -690,11 +688,11 @@ + /* + start_img_dl () + +- Open a pipe and spawn wget. ++ Open a pipe and spawn fetch. + */ + static void start_img_dl (KKamPanel *p) + { +- gchar *wget_str; ++ gchar *fetch_str; + char tmpfile[] = TEMPTEMPLATE "XXXXXX"; + int tmpfd; + +@@ -710,16 +708,16 @@ + } + close (tmpfd); + +- wget_str = g_strdup_printf ("wget -q %s -O %s \"%s\"", +- wget_opts, tmpfile, ++ fetch_str = g_strdup_printf ("fetch -p -q -o %s \"%s\"", ++ tmpfile, + panel_cursource (p)->img_name); + +- p->cmd_pipe = popen (wget_str, "r"); +- g_free (wget_str); ++ p->cmd_pipe = popen (fetch_str, "r"); ++ g_free (fetch_str); + if (p->cmd_pipe == NULL) + { + unlink (tmpfile); +- report_error (p, _("Couldn't start wget: %s"), strerror (errno)); ++ report_error (p, _("Couldn't start fetch: %s"), strerror (errno)); + return; + } + +@@ -819,7 +817,7 @@ + p->cmd_pipe = NULL; + + /* pclose will return a -1 on a wait4 error. If that happens, +- we have no way to know whether wget succeeded. Just try */ ++ we have no way to know whether fetch succeeded. Just try */ + if (ks->type == SOURCE_URL && code <= 0) + { + ks->next_dl = time (NULL) + ks->tlife; +@@ -827,7 +825,7 @@ + return 1; + } + +- report_error (p, _("Error: wget gave bad code or script died. code %d"), ++ report_error (p, _("Error: fetch gave bad code or script died. code %d"), + code); + return -1; + } +@@ -848,10 +846,10 @@ + } + else + { +- /* if we get here with wget, then wget said something. This is generally ++ /* if we get here with fetch, then fetch said something. This is generally + not good, since we passed -q. We'll have to wait for it to die */ + +- report_error (p, _("wget said: \"%s\""), buf); ++ report_error (p, _("fetch said: \"%s\""), buf); + return -1; + } + } +@@ -949,14 +947,14 @@ + code = 256; + + /* pclose will return a -1 on a wait4 error. If that happens, +- we have no way to know whether wget succeeded. Just try */ ++ we have no way to know whether fetch succeeded. Just try */ + if (code <= 0) + { + kkam_read_list (p, p->listurl_file, 0); + update_image (p); + } + else +- report_error (p, _("Error: wget listurl download died. code %d"), code); ++ report_error (p, _("Error: fetch listurl download died. code %d"), code); + + unlink (p->listurl_file); + g_free (p->listurl_file); +@@ -1607,7 +1605,7 @@ + + static void kkam_read_listurl (KKamPanel *p, char *source) + { +- gchar *wget_str; ++ gchar *fetch_str; + char tmpfile[] = TEMPTEMPLATE "-urllistXXXXXX"; + int tmpfd; + +@@ -1623,15 +1621,15 @@ + } + close (tmpfd); + +- wget_str = g_strdup_printf ("wget -q %s -O %s \"%s\"", +- wget_opts, tmpfile, source); ++ fetch_str = g_strdup_printf ("fetch -p -q -o %s \"%s\"", ++ tmpfile, source); + +- p->listurl_pipe = popen (wget_str, "r"); +- g_free (wget_str); ++ p->listurl_pipe = popen (fetch_str, "r"); ++ g_free (fetch_str); + if (p->listurl_pipe == NULL) + { + unlink (tmpfile); +- report_error (p, _("Couldn't start wget for list download: %s"), ++ report_error (p, _("Couldn't start fetch for list download: %s"), + strerror (errno)); + return; + } Copied: head/graphics/gplot/files/patch-Makefile (from r363257, head/graphics/gplot/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gplot/files/patch-Makefile Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/gplot/files/patch-aa) @@ -0,0 +1,302 @@ +--- Makefile.orig Tue Oct 27 07:07:42 1992 ++++ Makefile Sun Oct 19 02:41:01 2003 +@@ -55,9 +55,9 @@ + # lvr.o lvr_io.o sony laser video disk recorder controller + # dq.o diaquest controller + +-DRV_FLAGS = -Dincps -Dinctek -Dinccgmc -Dinccgmb ++DRV_FLAGS = -Dincps -Dinctek -Dinccgmc -Dinccgmb + +-CTR_FLAGS = -O -Dinctty ++CTR_FLAGS = $(CFLAGS) -Dinctty + CTR_OBJ = tty.o + + XWS_OBJ = xws_cla.o xws_color.o xws_delim.o xws_marker.o xws_polygon.o \ +@@ -87,8 +87,8 @@ + + # To build this software on a Sun workstation, uncomment the next lines. + #AR = ar ru +-#F_LINK = f77 +-#RANLIB = ranlib ++F_LINK = f77 ++RANLIB = ranlib + # To include the Sunview driver and gplottool interface, uncomment SVLIBS. + # To include the Sun CGI B&W driver, uncomment SLIBS. + # NOTE: Uncomment only one of the following two lines. +@@ -141,7 +141,7 @@ + #CFLAGS = -g + # To build Gplot on the IRIS, uncomment the next line. + #CFLAGS = -cckr +-CFLAGS = ++#CFLAGS = + + # ****************************************************************** + # +@@ -162,32 +162,32 @@ + utils.o carray.o io.o $(FONTS) devices.o emul.o + + gplot: $(GPT_OBJ) $(CTR_OBJ) $(DRV_OBJ) $(MACHINE_OBJ) +- cc -o $@ $(GPT_OBJ) $(CTR_OBJ) $(DRV_OBJ) $(MACHINE_OBJ) $(LIBS) ++ $(CC) -o $@ $(GPT_OBJ) $(CTR_OBJ) $(DRV_OBJ) $(MACHINE_OBJ) $(LIBS) + + gtex: $(GTEX_OBJ) ps.o tek.o qms.o cgmb.o cgmc.o tty.o +- cc -o $@ $(GTEX_OBJ) ps.o tek.o qms.o cgmb.o cgmc.o tty.o -lm ++ $(CC) -o $@ $(GTEX_OBJ) ps.o tek.o qms.o cgmb.o cgmc.o tty.o -lm + + gplottool: gplot_suntool.o wint.o ccgm.o cgm.o utils.o io.o carray.o \ + hload.o emul.o sv.o +- cc -o $@ gplot_suntool.o wint.o cgm.o utils.o io.o carray.o ccgm.o \ ++ $(CC) -o $@ gplot_suntool.o wint.o cgm.o utils.o io.o carray.o ccgm.o \ + hload.o emul.o sv.o $(LIBS) + + # To use the xws driver for gplotdw, include $(XWS_OBJ) instead of xl.o + gplotdw: gplotdw.o wint.o cgm.o utils.o io.o carray.o ccgm.o emul.o \ + hload.o xl.o +- cc -o $@ gplotdw.o wint.o cgm.o utils.o io.o carray.o ccgm.o emul.o \ ++ $(CC) -o $@ gplotdw.o wint.o cgm.o utils.o io.o carray.o ccgm.o emul.o \ + hload.o xl.o $(LIBS) + + # To use the xws driver for gplotaw, include $(XWS_OBJ) instead of xl.o + gplotaw: gplotaw.o wint.o cgm.o ccgm.o utils.o io.o carray.o \ + hload.o emul.o xl.o $(MACHINE_OBJ) +- cc -o $@ gplotaw.o wint.o cgm.o ccgm.o utils.o io.o carray.o \ ++ $(CC) -o $@ gplotaw.o wint.o cgm.o ccgm.o utils.o io.o carray.o \ + hload.o emul.o xl.o $(MACHINE_OBJ) $(LIBS) + + # To use the xws driver for gplotm, include $(XWS_OBJ) instead of xl.o + gplotm: gplotm.o wint.o cgm.o utils.o io.o carray.o ccgm.o emul.o \ + hload.o xl.o $(MACHINE_OBJ) +- cc -o $@ gplotm.o wint.o cgm.o utils.o io.o carray.o ccgm.o emul.o \ ++ $(CC) -o $@ gplotm.o wint.o cgm.o utils.o io.o carray.o ccgm.o emul.o \ + hload.o xl.o $(MACHINE_OBJ) $(LIBS) + + drawcgm: $(DCGM_PATH)drawcgm.a +@@ -230,77 +230,77 @@ + + # controlling GPLOT program + gplot.o: gplot.c defs.h +- cc -c $(CFLAGS) gplot.c ++ $(CC) -c $(CFLAGS) gplot.c + + # controlling GPLOT program for the SUNview driver + gplot_suntool.o: gplot_suntool.c defs.h +- cc -c $(CFLAGS) gplot_suntool.c ++ $(CC) -c $(CFLAGS) gplot_suntool.c + + # controlling GPLOTAW program for Athena Widgets + gplotaw.o: gplotaw.c + # To make gplotaw (xl) compile on the Cray, uncomment the next line +-# cc -c -DR3_INTRINSICS gplotaw.c ++# $(CC) -c -DR3_INTRINSICS gplotaw.c + # To make gplotaw (xws) compile on the Cray, uncomment the next line +-# cc -c -DR3_INTRINSICS -Dincxws gplotaw.c ++# $(CC) -c -DR3_INTRINSICS -Dincxws gplotaw.c + # To use the xws driver for gplotaw, uncomment the next line +-# cc -c $(CFLAGS) -Dincxws gplotaw.c ++# $(CC) -c $(CFLAGS) -Dincxws gplotaw.c + + # controlling GPLOTDW program for Decwindows + gplotdw.o: gplotdw.c defs.h + # To use the xws driver for gplotdw, uncomment the next line +-# cc -c $(CFLAGS) -Dincxws gplotdw.c ++# $(CC) -c $(CFLAGS) -Dincxws gplotdw.c + + # controlling GPLOTM program for Motif + gplotm.o: gplotm.c defs.h + # To use the xws driver for gplotm, uncomment the next line +-# cc -c $(CFLAGS) -Dincxws gplotm.c ++# $(CC) -c $(CFLAGS) -Dincxws gplotm.c + + # window interface module + wint.o: wint.c defs.h +- cc -c $(CFLAGS) wint.c ++ $(CC) -c $(CFLAGS) wint.c + + # controlling GTEX program + gtex.o: gtex.c defs.h +- cc -c $(CFLAGS) -Dincps -Dincqms gtex.c ++ $(CC) -c $(CFLAGS) -Dincps -Dincqms gtex.c + + # all of the cgm specific stuff + cgm.o: cgm.c defs.h +- cc -c $(CFLAGS) cgm.c ++ $(CC) -c $(CFLAGS) cgm.c + + # all of the clear text cgm specific stuff + ccgm.o: ccgm.c defs.h ccdefs.h +- cc -c $(CFLAGS) ccgm.c ++ $(CC) -c $(CFLAGS) ccgm.c + + # utility functions + utils.o: utils.c defs.h +- cc -c $(CFLAGS) -Dinchershey utils.c ++ $(CC) -c $(CFLAGS) -Dinchershey utils.c + # if we wanted PK fonts also, it would be +-# cc -c $(CFLAGS) -Dinchershey -Dincpkras utils.c ++# $(CC) -c $(CFLAGS) -Dinchershey -Dincpkras utils.c + + # I/O routines + io.o: io.c defs.h +- cc -c $(CFLAGS) $(CTR_FLAGS) io.c ++ $(CC) -c $(CFLAGS) $(CTR_FLAGS) io.c + # To get a gplot usage log file on Unix, uncomment the next line +-# cc -c $(CTR_FLAGS) -DUSAGE_NAME=\"gplot_usage.log\" io.c ++# $(CC) -c $(CTR_FLAGS) -DUSAGE_NAME=\"gplot_usage.log\" io.c + + # devices interface + devices.o: devices.c defs.h +- cc -c $(CFLAGS) $(CTR_FLAGS) $(DRV_FLAGS) devices.c ++ $(CC) -c $(CFLAGS) $(CTR_FLAGS) $(DRV_FLAGS) devices.c + + # Cell Array libraries + carray.o: carray.c defs.h +- cc -c $(CFLAGS) carray.c ++ $(CC) -c $(CFLAGS) carray.c + + drvcla.o: drvcla.c defs.h +- cc -c $(CFLAGS) drvcla.c ++ $(CC) -c $(CFLAGS) drvcla.c + + # Emulation package + emul.o: emul.c defs.h +- cc -c $(CFLAGS) emul.c ++ $(CC) -c $(CFLAGS) emul.c + + # Hershey font support + hload.o: hload.c hload.h defs.h +- cc -c $(CFLAGS) hload.c ++ $(CC) -c $(CFLAGS) hload.c + + # decoding for the PK format files + # if fonts are available we must say here where they are +@@ -309,100 +309,100 @@ + # (1000 implies 10 point fonts at 300 pt/in), e.g., + # /usr/staff/andrews/pk/1000/cmr10.pk + pkras.o: pkras.c defs.h +- cc -c -DUNIXFONTS=\"/usr/staff/andrews/pk\" pkras.c ++ $(CC) $(CFLAGS) -c -DUNIXFONTS=\"/usr/local/share/texmf/fonts/pk\" pkras.c + + #TTY controller + tty.o: tty.c defs.h +- cc -c $(CFLAGS) tty.c ++ $(CC) -c $(CFLAGS) tty.c + + # LVR controller + lvr.o: lvr.c lvr_defines.h defs.h +- cc -c $(CFLAGS) lvr.c ++ $(CC) -c $(CFLAGS) lvr.c + # to change audit file name, lvr port +-# cc -c -DAUDIT_FILE="lvr.dat" -DDEFAULT_PORT="ttyd2" lvr.c ++# $(CC) -c -DAUDIT_FILE="lvr.dat" -DDEFAULT_PORT="ttyd2" lvr.c + + dq.o: dq.c defs.h +- cc -c $(CFLAGS) dq.c ++ $(CC) -c $(CFLAGS) dq.c + + lvr_io.o: lvr_io.c lvr_defines.h +- cc -c $(CFLAGS) lvr_io.c ++ $(CC) -c $(CFLAGS) lvr_io.c + # to turn on debug I/O printout +-# cc -c -DDEBUG_IO lvr_io.c ++# $(CC) -c -DDEBUG_IO lvr_io.c + + # Postscript device + ps.o: ps.c defs.h +- cc -c $(CFLAGS) ps.c ++ $(CC) -c $(CFLAGS) ps.c + + # Tektronix devices + tek.o: tek.c defs.h +- cc -c $(CFLAGS) tek.c ++ $(CC) -c $(CFLAGS) tek.c + + # Clear text CGM driver + cgmc.o: cgmc.c defs.h +- cc -c $(CFLAGS) cgmc.c ++ $(CC) -c $(CFLAGS) cgmc.c + + # Binary CGM driver + cgmb.o: cgmb.c defs.h +- cc -c $(CFLAGS) cgmb.c ++ $(CC) -c $(CFLAGS) cgmb.c + + # Sun CGI driver + sundriv.o: sundriv.c defs.h +- cc -c $(CFLAGS) sundriv.c ++ $(CC) -c $(CFLAGS) sundriv.c + + # Silicon Graphics GI driver + igl.o: igl.c defs.h +- cc -c $(CFLAGS) igl.c ++ $(CC) -c $(CFLAGS) igl.c + + # the sunview driver + sv.o: sv.c defs.h +- cc -c $(CFLAGS) sv.c ++ $(CC) -c $(CFLAGS) sv.c + + # the Xlib driver + xl.o: xl.c defs.h +- cc -c $(CFLAGS) xl.c ++ $(CC) -c $(CFLAGS) xl.c + + + #-------------- X Window System driver (xws) -------------------------- + + xws_setup.o: /usr/include/stdio.h \ + /usr/include/strings.h \ +- /usr/include/X11/Intrinsic.h \ +- /usr/include/X11/StringDefs.h \ +- /usr/include/X11/Xutil.h \ +- /usr/include/X11/cursorfont.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/StringDefs.h \ ++ $(LOCALBASE)/include/X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/cursorfont.h \ + defs.h xws_defs.h + + xws_delim.o: /usr/include/stdio.h \ + /usr/include/strings.h \ +- /usr/include/X11/Intrinsic.h \ +- /usr/include/X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Xutil.h \ + defs.h xws_defs.h + + xws_color.o: /usr/include/stdio.h \ + /usr/include/math.h \ +- /usr/include/X11/Intrinsic.h \ +- /usr/include/X11/Xutil.h \ +- /usr/include/X11/Xatom.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include//X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/Xatom.h \ + defs.h xws_defs.h xws_color.h + +-xws_polyline.o:/usr/include/X11/Intrinsic.h \ ++xws_polyline.o:$(LOCALBASE)/include/X11/Intrinsic.h \ + defs.h xws_defs.h + + xws_polygon.o: /usr/include/stdio.h \ +- /usr/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ + defs.h xws_defs.h xws_fill.h + +-xws_marker.o: /usr/include/X11/Intrinsic.h \ ++xws_marker.o: $(LOCALBASE)/include/X11/Intrinsic.h \ + defs.h xws_defs.h + + xws_text.o: /usr/include/strings.h \ +- /usr/include/X11/Intrinsic.h \ +- /usr/include/X11/Xatom.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Xatom.h \ + defs.h xws_defs.h + + xws_cla.o: /usr/include/stdio.h \ + /usr/include/math.h \ +- /usr/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ + defs.h xws_defs.h xws_color.h + #----------------------------------------------------------------------------- + # DrawCGM and CGMGen, and test routines Copied: head/graphics/gplot/files/patch-utils.c (from r363257, head/graphics/gplot/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gplot/files/patch-utils.c Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/gplot/files/patch-ab) @@ -0,0 +1,22 @@ +--- utils.c.orig Wed Oct 30 00:48:16 1991 ++++ utils.c Sat Jun 16 02:10:19 2007 +@@ -4,6 +4,7 @@ + #include <stdio.h> + #include <math.h> + #include <ctype.h> ++#include <string.h> + #include "defs.h" + /* some include files vary in location */ + #ifdef VAXC +@@ -300,9 +301,8 @@ + struct info_struct *out_info; + struct one_opt *opt; /* put command line options here */ + #define may_override(name) if (opt[(int) name].set) switch (opt[(int) name].tag) { \ +- case integer: out_info->name = opt[(int) name].val.i; break; \ +- case real: out_info->name = opt[(int) name].val.r; break; \ +- case lst: case str: strcpy(out_info->name, opt[(int) name].val.str); break;} ++ case integer: out_info->name = opt[(int) name].val.i; break; \ ++ case real: out_info->name = opt[(int) name].val.r; break; } + { + /* and now overide the device if the command line wants us to */ + may_override(pxl_in); Copied: head/graphics/gracula/files/patch-Makefile (from r363257, head/graphics/gracula/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gracula/files/patch-Makefile Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/gracula/files/patch-aa) @@ -0,0 +1,11 @@ +--- Makefile.orig Fri Jun 18 20:11:39 1999 ++++ Makefile Mon Apr 30 03:17:17 2001 +@@ -13,8 +13,6 @@ + ## Use maximum optimization. On busy web sites we want gracula to work as + ## fast as possible. However, these options may not work with a compiler + ## other than gcc. If that is the case, comment them out. +-CFLAGS+= -O3 -fexpensive-optimizations -frerun-cse-after-loop \ +- -fomit-frame-pointer + ## Comment out the next line if you only want 32-bit counters, + ## or if you get linking errors (since it, too, may only work with gcc): + CFLAGS+= -DGCLUSELONGLONG Copied: head/graphics/gtkgraph/files/patch-config.h.in (from r363257, head/graphics/gtkgraph/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gtkgraph/files/patch-config.h.in Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/gtkgraph/files/patch-aa) @@ -0,0 +1,18 @@ +--- config.h.in.orig Tue Jul 27 15:09:36 1999 ++++ config.h.in Fri Nov 12 11:13:03 1999 +@@ -6,15 +6,6 @@ + /* Default value for alignment of strings in .mo file. */ + #define DEFAULT_ALIGNMENT 1 + +-#ifndef __P +-# if __STDC__ +-# define __P(args) args +-# else +-# define __P(args) () +-# endif +-#endif +- +- + /* Define if using alloca.c. */ + #undef C_ALLOCA + Copied: head/graphics/jbigkit/files/patch-Makefile (from r363257, head/graphics/jbigkit/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jbigkit/files/patch-Makefile Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/jbigkit/files/patch-aa) @@ -0,0 +1,31 @@ +--- ./Makefile.orig 2014-03-27 18:47:15.000000000 +0000 ++++ ./Makefile 2014-06-21 22:53:57.000000000 +0000 +@@ -1,24 +1,22 @@ + # Unix makefile for JBIG-KIT + + # Select an ANSI/ISO C compiler here, GNU gcc is recommended +-CC = gcc ++#CC = gcc + + # Options for the compiler: A high optimization level is suggested +-CFLAGS = -O2 -W -Wno-unused-result ++CFLAGS += -W # -Wno-unused-result -- older compilers don't have this + # CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG + +-export CC CFLAGS +- + VERSION=2.1 + + all: lib pbm + @echo "Enter 'make test' in order to start some automatic tests." + + lib: +- cd libjbig && $(MAKE) -e ++ cd libjbig && $(MAKE) + + pbm: lib +- cd pbmtools && $(MAKE) -e ++ cd pbmtools && $(MAKE) + + test: lib pbm + cd libjbig && $(MAKE) test Copied: head/graphics/jbigkit/files/patch-libjbig_Makefile (from r363257, head/graphics/jbigkit/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jbigkit/files/patch-libjbig_Makefile Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/jbigkit/files/patch-ab) @@ -0,0 +1,38 @@ +--- libjbig/Makefile 2014-03-27 14:47:15.000000000 -0400 ++++ libjbig/Makefile 2014-04-08 08:43:57.000000000 -0400 +@@ -2,10 +2,14 @@ + + # Select an ANSI/ISO C compiler here, GNU gcc is recommended +-CC = gcc ++#CC = gcc + + # Options for the compiler: A high optimization level is suggested +-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage ++CFLAGS += -W -Wall -ansi -pedantic # --coverage + +-all: libjbig.a libjbig85.a tstcodec tstcodec85 ++all: libjbig.a libjbig85.a tstcodec tstcodec85 libjbig.so.2 libjbig85.so.1 ++ ++.SUFFIXES: .c .So ++.c.So: ++ $(CC) -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET} + + tstcodec: tstcodec.o jbig.o jbig_ar.o +@@ -20,4 +24,8 @@ + -ranlib libjbig.a + ++libjbig.so.2: jbig.So jbig_ar.So ++ rm -f ${.TARGET} ++ $(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC} ++ + libjbig85.a: jbig85.o jbig_ar.o + rm -f libjbig85.a +@@ -25,4 +33,8 @@ + -ranlib libjbig85.a + ++libjbig85.so.1: jbig85.So jbig_ar.So ++ rm -f ${.TARGET} ++ $(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC} ++ + jbig.o: jbig.c jbig.h jbig_ar.h + jbig85.o: jbig85.c jbig85.h jbig_ar.h Copied: head/graphics/jbigkit/files/patch-pbmtools_Makefile (from r363257, head/graphics/jbigkit/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jbigkit/files/patch-pbmtools_Makefile Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/jbigkit/files/patch-ac) @@ -0,0 +1,32 @@ +--- pbmtools/Makefile 2014-03-27 14:47:15.000000000 -0400 ++++ pbmtools/Makefile 2014-04-08 09:18:42.000000000 -0400 +@@ -2,14 +2,14 @@ + + # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended +-CC = gcc ++#CC = gcc + + # Options for the compiler +-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage +-CPPFLAGS = -I../libjbig ++CFLAGS += -W -Wall -ansi -pedantic # --coverage -Wno-unused-result ++CFLAGS += -I../libjbig + + .SUFFIXES: .1 .5 .txt $(SUFFIXES) + .PHONY: txt test test82 test85 clean + +-all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt ++all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 + + txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt +@@ -144,6 +144,8 @@ + cmp test-$(IMG).pbm test-$(IMG).pbm85 + +-test-%.pbm: ../examples/%.jbg +- ./jbgtopbm $< $@ ++.for i in 1 2 3 ++test-ccitt$i.pbm: ../examples/ccitt$i.jbg ++ ./jbgtopbm ${.ALLSRC} ${.TARGET} ++.endfor + + test-t82.pbm: Copied: head/graphics/jgraph/files/patch-ex2.jgr (from r363257, head/graphics/jgraph/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jgraph/files/patch-ex2.jgr Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/jgraph/files/patch-ae) @@ -0,0 +1,20 @@ +--- ex2.jgr.orig Fri Mar 19 16:27:08 1999 ++++ ex2.jgr Thu Aug 5 15:34:14 1999 +@@ -25,7 +25,7 @@ + newcurve + marktype none linetype solid + label : N log N / 35000 +- pts shell : nawk \ ++ pts shell : awk \ + ' $5 != 0 { \ + print $5, $5 * log($5) / 35000}' \ + data.txt +@@ -52,7 +52,7 @@ + newcurve\ + marktype none linetype solid\ + label : N log N / 35000\ +- pts shell : nawk \\ ++ pts shell : awk \\ + ' $5 != 0 { \\ + print $5, $5 * log($5) / 35000}' \\ + data.txt\ Copied: head/graphics/jgraph/files/patch-jgraph.1 (from r363257, head/graphics/jgraph/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jgraph/files/patch-jgraph.1 Mon Jul 28 21:54:33 2014 (r363261, copy of r363257, head/graphics/jgraph/files/patch-ad) @@ -0,0 +1,961 @@ +--- jgraph.1.orig Fri Mar 19 16:27:09 1999 ++++ jgraph.1 Wed Aug 4 16:42:13 1999 +@@ -307,7 +307,7 @@ + command lets you explicitly enter one which will go directly into the + jgraph output. Its units are the + final postscript units. It's probably best to use the +-\fB\-p\FR ++\fB\-p\fR + option + to see what the bounding box is that jgraph produces, and then + alter that accordingly with +@@ -333,10 +333,10 @@ + These two commands allow the user to include strings or + files (the token specifies the filename) which will be copied directly + into jgraph's output. +-The \fIpreamble\fB is included at the beginning of the output ++The \fIpreamble\fR is included at the beginning of the output + (after some initial postscript to set things up for jgraph), +-and the \fIepilogue\fB is included at the end. A good use for +-the \fIpreamble\fB is to set up a postscript dictionary if you're ++and the \fIepilogue\fR is included at the end. A good use for ++the \fIpreamble\fR is to set up a postscript dictionary if you're + using postscript marks. + .PD + .RE +@@ -364,13 +364,13 @@ + \fB\|{\fIinteger\fB\|}. \fR + If the curve doesn't exist, then this command creates it and starts *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407282154.s6SLsYSI027655>