pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/ivtools ivtools: update to 2.0.4a1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fae9d4c14d6b
branches:  trunk
changeset: 447951:fae9d4c14d6b
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Mar 01 09:48:40 2021 +0000

description:
ivtools: update to 2.0.4a1

Changes: builds again;

August 22nd 2020 ivtools-2.0.3

* add Golang style "%v" format descriptor to comterp print func.

July 5th 2020 ivtools-2.0.2

* Change priority of "$$" (stream) operator to line up with other stream operators (i.e. ".." and "**").

June 30th 2020 ivtools-2.0.1

* Fix nested user defined funcs in comterp (the func() command).

* Change isalpha(), isdigit(), and isspace() funcs to return 0 or 1
  (instead of the bitmask which is returned for C).

* Add comterp_run utility script for hands-free launching of comterp scripts.
  Write scripts with this header:

   #! /usr/bin/env comterp_run

* Add csvfilt comterp script as an example of using comterp_run.
  After installing both try "csvfilt --help".

June 21st 2020 ivtools-2.0.0

Non-backward compatible changes from ivtools-1.2.11:

* Swap "$$" and "$" operators in comterp.  The "$$" operator is now stream() (which matches
  the other double-character stream operators - "..", "**", and ",,") and "$" is now list().

* Reverse the priority of ".." (iterate()) and "**" (repeat()), giving ".." precedence over "**".
  The reason is because ".." is more complex than "**", like multiplication is more complex than
  addition.

* Remove symmax() and symcnt() commands because they were redundant with symid() which accepts
  :max and :cnt keywords.

Other changes;

* remove patches directory, sourceforge102203.xml, aclocal.m4, README.cygwin, README.ivmkcm, and comtop.tgz

* migrated all CHANGES-* files to a CHANGES directory

diffstat:

 graphics/ivtools/Makefile                                   |   56 ++-
 graphics/ivtools/PLIST                                      |  151 ++-------
 graphics/ivtools/distinfo                                   |   56 +--
 graphics/ivtools/patches/patch-Makefile.am                  |   24 +
 graphics/ivtools/patches/patch-aa                           |   11 -
 graphics/ivtools/patches/patch-ab                           |   30 -
 graphics/ivtools/patches/patch-ac                           |   45 --
 graphics/ivtools/patches/patch-ad                           |   13 -
 graphics/ivtools/patches/patch-ae                           |   13 -
 graphics/ivtools/patches/patch-af                           |   22 -
 graphics/ivtools/patches/patch-ag                           |   13 -
 graphics/ivtools/patches/patch-ah                           |   22 -
 graphics/ivtools/patches/patch-ai                           |   13 -
 graphics/ivtools/patches/patch-aj                           |   40 --
 graphics/ivtools/patches/patch-ak                           |   13 -
 graphics/ivtools/patches/patch-al                           |   12 -
 graphics/ivtools/patches/patch-am                           |   12 -
 graphics/ivtools/patches/patch-an                           |   12 -
 graphics/ivtools/patches/patch-ao                           |   15 -
 graphics/ivtools/patches/patch-ap                           |   14 -
 graphics/ivtools/patches/patch-aq                           |   15 -
 graphics/ivtools/patches/patch-ar                           |   39 --
 graphics/ivtools/patches/patch-as                           |   12 -
 graphics/ivtools/patches/patch-at                           |   13 -
 graphics/ivtools/patches/patch-au                           |   15 -
 graphics/ivtools/patches/patch-av                           |   16 -
 graphics/ivtools/patches/patch-aw                           |   13 -
 graphics/ivtools/patches/patch-ax                           |   21 -
 graphics/ivtools/patches/patch-ay                           |   20 -
 graphics/ivtools/patches/patch-az                           |   21 -
 graphics/ivtools/patches/patch-ba                           |   21 -
 graphics/ivtools/patches/patch-bb                           |   23 -
 graphics/ivtools/patches/patch-bc                           |   12 -
 graphics/ivtools/patches/patch-bd                           |   42 --
 graphics/ivtools/patches/patch-be                           |  198 ------------
 graphics/ivtools/patches/patch-bf                           |   18 -
 graphics/ivtools/patches/patch-bg                           |   19 -
 graphics/ivtools/patches/patch-bh                           |   26 -
 graphics/ivtools/patches/patch-bi                           |   26 -
 graphics/ivtools/patches/patch-bj                           |   27 -
 graphics/ivtools/patches/patch-bk                           |   26 -
 graphics/ivtools/patches/patch-bl                           |   26 -
 graphics/ivtools/patches/patch-src_Attribute_attrvalue.h    |   18 -
 graphics/ivtools/patches/patch-src_ComTerp_iofunc.cc        |   21 +
 graphics/ivtools/patches/patch-src_ComUtil_comutil.arg      |   17 -
 graphics/ivtools/patches/patch-src_ComUtil_comutil.h        |   15 +
 graphics/ivtools/patches/patch-src_ComUtil_symbols.c        |   24 -
 graphics/ivtools/patches/patch-src_glyphs_strchooser_main.c |   15 -
 graphics/ivtools/patches/patch-src_tests_y2k_y2ktest.cc     |   13 -
 49 files changed, 134 insertions(+), 1225 deletions(-)

diffs (truncated from 1662 to 300 lines):

diff -r fc177e657b14 -r fae9d4c14d6b graphics/ivtools/Makefile
--- a/graphics/ivtools/Makefile Mon Mar 01 09:25:32 2021 +0000
+++ b/graphics/ivtools/Makefile Mon Mar 01 09:48:40 2021 +0000
@@ -1,38 +1,48 @@
-# $NetBSD: Makefile,v 1.33 2017/08/16 20:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2021/03/01 09:48:40 nia Exp $
 
-DISTNAME=      ivtools-1.2.8
-PKGREVISION=   4
+DISTNAME=      ivtools-2.0.4a1
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ivtools/}
-EXTRACT_SUFX=  .tgz
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=vectaport/}
+GITHUB_PROJECT=        ivtools
+GITHUB_TAG=    ${DISTNAME}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://www.ivtools.org/ivtools/
+HOMEPAGE=      http://ivtools.sourceforge.net/ivtools/index.html
 COMMENT=       Drawing editors for PostScript, TeX, and web graphics
+LICENSE=       modified-bsd # close enough
 
 CONFLICTS+=    dclock-[0-9]*
 
-DEPENDS+=      pstoedit>=3.0:../../graphics/pstoedit
-
-USE_LANGUAGES= c c++
-USE_TOOLS+=    imake bash:run wget:run tar
+DEPENDS+=      ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
 
-REPLACE_BASH+= src/scripts/ivgetjpg.bash src/scripts/ivtiftopnm.bash
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+USE_LANGUAGES= c c++
+USE_TOOLS+=    autoconf automake autoreconf
+USE_TOOLS+=    gmake bash:run
+USE_LIBTOOL=   yes
+GNU_CONFIGURE= yes
 
-WRKSRC=                ${WRKDIR}/ivtools-1.2
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS=        --with-tiff=${BUILDLINK_PREFIX.tiff}
+REPLACE_BASH+= src/scripts/comterp_run.bash
+REPLACE_BASH+= src/scripts/ivgetjpg.bash
+REPLACE_BASH+= src/scripts/ivtiftopnm.bash
 
-post-patch:
-       ${RM} -f ${WRKSRC}/src/include/ivstd/strstream.h
-       ${TOUCH} ${WRKSRC}/config/dragonfly-gcc.mk
+REPLACE_INTERPRETER+=  comterp
+REPLACE.comterp.old=   /usr/bin/env comterp_run
+REPLACE.comterp.new=   ${PREFIX}/bin/comterp_run
+REPLACE_FILES.comterp= src/scripts/csvfilt
 
-pre-install:
-       ${RM} -f ${WRKSRC}/config/local.def.orig
-       ${RM} -f ${WRKSRC}/config/params.def.orig
-       ${RM} -f ${WRKSRC}/config/rules.def.orig
-       ${RM} -f ${WRKSRC}/config/site.def.*.orig
-       ${RM} -f ${WRKSRC}/config/arch.def.orig
+SUBST_CLASSES+=                gsf
+SUBST_STAGE.gsf=       pre-configure
+SUBST_MESSAGE.gsf=     Correcting the path to Ghostscript fonts.
+SUBST_FILES.gsf+=      configure.ac
+SUBST_SED.gsf+=                -e "s,/usr/share/ghostscript/fonts,${PREFIX}/share/ghostscript/fonts,g"
+
+CONFIGURE_ARGS=                --with-tiff=${BUILDLINK_PREFIX.tiff}
+CONFIGURE_ARGS+=       --without-ace
+CONFIGURE_ARGS+=       --without-clippoly
+
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fi
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff -r fc177e657b14 -r fae9d4c14d6b graphics/ivtools/PLIST
--- a/graphics/ivtools/PLIST    Mon Mar 01 09:25:32 2021 +0000
+++ b/graphics/ivtools/PLIST    Mon Mar 01 09:48:40 2021 +0000
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2014/12/25 05:10:38 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2021/03/01 09:48:40 nia Exp $
 bin/comdraw
 bin/comterp
+bin/comterp_run
 bin/comtest
+bin/csvfilt
 bin/dclock
 bin/drawserv
 bin/drawtool
@@ -12,13 +14,11 @@
 bin/iclass
 bin/idemo
 bin/idraw
-bin/ivgetjpg
-bin/ivmkmf
 bin/ivtext
-bin/ivtiftopnm
-bin/ivtmpnam
 bin/pnmtopgm
 bin/stdcmapppm
+include/AceDispatch/ace_dispatcher.h
+include/AceDispatch/ace_iohandler.h
 include/AttrGlyph/attredit.h
 include/Attribute/_comterp.h
 include/Attribute/_comutil.h
@@ -58,6 +58,7 @@
 include/ComTerp/listfunc.h
 include/ComTerp/mathfunc.h
 include/ComTerp/numfunc.h
+include/ComTerp/parsefunc.h
 include/ComTerp/parser.h
 include/ComTerp/postfunc.h
 include/ComTerp/randfunc.h
@@ -65,6 +66,7 @@
 include/ComTerp/statfunc.h
 include/ComTerp/strmfunc.h
 include/ComTerp/symbolfunc.h
+include/ComTerp/timefunc.h
 include/ComTerp/typefunc.h
 include/ComTerp/xformfunc.h
 include/ComUnidraw/comeditor.h
@@ -150,6 +152,7 @@
 include/GraphUnidraw/graphdata.h
 include/GraphUnidraw/graphdialog.h
 include/GraphUnidraw/grapheditor.h
+include/GraphUnidraw/graphexport.h
 include/GraphUnidraw/graphimport.h
 include/GraphUnidraw/graphkit.h
 include/GraphUnidraw/graphtools.h
@@ -205,7 +208,6 @@
 include/IV-2_6/_enter.h
 include/IV-2_6/_leave.h
 include/IV-2_6/_names.h
-include/IV-3_1/InterViews
 include/IV-X11/Xdefs.h
 include/IV-X11/Xext.h
 include/IV-X11/Xlib.h
@@ -274,6 +276,7 @@
 include/IVGlyph/textform.h
 include/IVGlyph/textview.h
 include/IVGlyph/textwindow.h
+include/IVGlyph/timeglyph.h
 include/IVGlyph/toolbutton.h
 include/IVGlyph/valuator.h
 include/InterViews/_defines.h
@@ -444,7 +447,6 @@
 include/Time/Date.h
 include/Time/Time_.h
 include/Time/obstime.h
-include/Time/timeglyph.h
 include/TopoFace/fgeomobjs.h
 include/TopoFace/topoedge.h
 include/TopoFace/topoedgelist.h
@@ -463,7 +465,6 @@
 include/UniIdraw/ided.h
 include/UniIdraw/idkybd.h
 include/UniIdraw/idvars.h
-include/UniIdraw/idversion.h
 include/Unidraw/Commands/align.h
 include/Unidraw/Commands/brushcmd.h
 include/Unidraw/Commands/catcmds.h
@@ -567,7 +568,9 @@
 include/Unidraw/unidraw.h
 include/Unidraw/upage.h
 include/Unidraw/viewer.h
+include/ivstd/fstream
 include/ivstd/fstream.h
+include/ivstd/ignores.h
 include/ivstd/iosfwd
 include/ivstd/iostream.h
 include/ivstd/leakchecker.h
@@ -580,115 +583,24 @@
 include/ivstd/stdlib.h
 include/ivstd/stream.h
 include/ivstd/string.h
-include/ivstd/version.h
-lib/ivtools/Idemo
-lib/ivtools/InterViews
-lib/ivtools/comterp.err
-lib/ivtools/config/InterViews/iv-DGUX.cf
-lib/ivtools/config/InterViews/iv-Mips.cf
-lib/ivtools/config/InterViews/iv-aix.cf
-lib/ivtools/config/InterViews/iv-alpha.cf
-lib/ivtools/config/InterViews/iv-apollo.cf
-lib/ivtools/config/InterViews/iv-att.cf
-lib/ivtools/config/InterViews/iv-bsd.cf
-lib/ivtools/config/InterViews/iv-convex.cf
-lib/ivtools/config/InterViews/iv-cray.cf
-lib/ivtools/config/InterViews/iv-cygwin.cf
-lib/ivtools/config/InterViews/iv-darwin.cf
-lib/ivtools/config/InterViews/iv-freebsd.cf
-lib/ivtools/config/InterViews/iv-generic.cf
-lib/ivtools/config/InterViews/iv-hp.cf
-lib/ivtools/config/InterViews/iv-ibm.cf
-lib/ivtools/config/InterViews/iv-linux.cf
-lib/ivtools/config/InterViews/iv-luna.cf
-lib/ivtools/config/InterViews/iv-m4330.cf
-lib/ivtools/config/InterViews/iv-macII.cf
-lib/ivtools/config/InterViews/iv-moto.cf
-lib/ivtools/config/InterViews/iv-netbsd.cf
-lib/ivtools/config/InterViews/iv-pegasus.cf
-lib/ivtools/config/InterViews/iv-sgi.cf
-lib/ivtools/config/InterViews/iv-sony.cf
-lib/ivtools/config/InterViews/iv-stellar.cf
-lib/ivtools/config/InterViews/iv-stratus.cf
-lib/ivtools/config/InterViews/iv-sun.cf
-lib/ivtools/config/InterViews/iv-ultrix.cf
-lib/ivtools/config/InterViews/iv-x386.cf
-lib/ivtools/config/InterViews/xparams.cf
-lib/ivtools/config/alpha3.0-gcc.mk
-lib/ivtools/config/alpha3.2-gcc.mk
-lib/ivtools/config/alpha4-gcc.mk
-lib/ivtools/config/arch.def
-lib/ivtools/config/config-${LOWER_OPSYS}-gcc.defs
-lib/ivtools/config/config.defs.in
-lib/ivtools/config/config.mk
-lib/ivtools/config/config.null.mk
-lib/ivtools/config/darwin-gcc.mk
-lib/ivtools/config/default-gcc.mk
-lib/ivtools/config/dragonfly-gcc.mk
-lib/ivtools/config/freebsd-gcc.mk
-lib/ivtools/config/freebsd2.1-gcc.mk
-lib/ivtools/config/gcc.def
-lib/ivtools/config/hpux-gcc.mk
-lib/ivtools/config/hpux10.20-gcc.mk
-lib/ivtools/config/irix5-gcc.mk
-lib/ivtools/config/irix6-gcc.mk
-lib/ivtools/config/linux-gcc.mk
-lib/ivtools/config/local.def
-lib/ivtools/config/m88k-sysv3-gcc.mk
-lib/ivtools/config/m88k-sysv4-gcc.mk
-lib/ivtools/config/makevars.def
-lib/ivtools/config/netbsd-gcc.mk
-lib/ivtools/config/params.def
-lib/ivtools/config/rules.def
-lib/ivtools/config/sco3.2.4-gcc.mk
-lib/ivtools/config/site.def.ALPHA
-lib/ivtools/config/site.def.CYGWIN
-lib/ivtools/config/site.def.DARWIN
-lib/ivtools/config/site.def.FREEBSD
-lib/ivtools/config/site.def.HP800
-lib/ivtools/config/site.def.LINUX
-lib/ivtools/config/site.def.NETBSD
-lib/ivtools/config/site.def.SGI
-lib/ivtools/config/site.def.SUN4
-lib/ivtools/config/solaris-gcc.mk
-lib/ivtools/config/sunos4-gcc.mk
-lib/ivtools/config/template
-lib/libAttrGlyph.so
-lib/libAttrGlyph.so.${PKGVERSION}
-lib/libAttribute.so
-lib/libAttribute.so.${PKGVERSION}
-lib/libComGlyph.so
-lib/libComGlyph.so.${PKGVERSION}
-lib/libComTerp.so
-lib/libComTerp.so.${PKGVERSION}
-lib/libComUnidraw.so
-lib/libComUnidraw.so.${PKGVERSION}
-lib/libComUtil.so
-lib/libComUtil.so.${PKGVERSION}
-lib/libDrawServ.so
-lib/libDrawServ.so.${PKGVERSION}
-lib/libFrameUnidraw.so
-lib/libFrameUnidraw.so.${PKGVERSION}
-lib/libGraphUnidraw.so
-lib/libGraphUnidraw.so.${PKGVERSION}
-lib/libIV-common.so
-lib/libIV-common.so.${PKGVERSION}
-lib/libIV.so
-lib/libIV.so.${PKGVERSION}
-lib/libIVGlyph.so
-lib/libIVGlyph.so.${PKGVERSION}
-lib/libOverlayUnidraw.so
-lib/libOverlayUnidraw.so.${PKGVERSION}
-lib/libTime.so
-lib/libTime.so.${PKGVERSION}
-lib/libTopoFace.so
-lib/libTopoFace.so.${PKGVERSION}
-lib/libUniIdraw.so
-lib/libUniIdraw.so.${PKGVERSION}
-lib/libUnidraw-common.so
-lib/libUnidraw-common.so.${PKGVERSION}
-lib/libUnidraw.so
-lib/libUnidraw.so.${PKGVERSION}
+lib/libAttrGlyph.la
+lib/libAttribute.la
+lib/libComGlyph.la
+lib/libComTerp.la
+lib/libComUnidraw.la
+lib/libComUtil.la
+lib/libDrawServ.la
+lib/libFrameUnidraw.la
+lib/libGraphUnidraw.la
+lib/libIV-common.la
+lib/libIV.la
+lib/libIVGlyph.la
+lib/libOverlayUnidraw.la
+lib/libTime.la
+lib/libTopoFace.la
+lib/libUniIdraw.la



Home | Main Index | Thread Index | Old Index