diff -ruN gwave.orig/Makefile gwave/Makefile --- gwave.orig/Makefile Fri Jun 23 21:39:16 2006 +++ gwave/Makefile Fri Jun 23 21:35:09 2006 @@ -6,8 +6,7 @@ # PORTNAME= gwave -PORTVERSION= 20030804 -PORTREVISION= 3 +PORTVERSION= 20051222 CATEGORIES= cad MASTER_SITES= http://www.cs.unc.edu/~tell/dist/ \ http://geda.seul.org/dist/ @@ -15,21 +14,65 @@ MAINTAINER= dmlb@dmlb.org COMMENT= Waveform viewer for analogue electronic simulation tools -RUN_DEPENDS= graph:${PORTSDIR}/graphics/plotutils +#RUN_DEPENDS= graph:${PORTSDIR}/graphics/plotutils LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile \ guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk -USE_AUTOTOOLS= autoconf:253 USE_GNOME= gtk12 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -MAN1= sp2sp.1 +GNU_CONFIGURE= yes +USE_GMAKE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I/usr/X11R6/include" \ + LIBS="-L${LOCALBASE}/lib -I/usr/X11R6/lib" + +OPTIONS= PLOTUTILS "Use GNU plotutils for plotting" off \ + GNUPLOT "Use gnuplot for plotting" on \ + DOCS "Install documentation" on \ + EXAMPLES "Install example spice files" off + +DOCFILES= Guile.notes \ + gwave-concepts.txt \ + gwave-hooks.txt \ + gwave-procedures.txt \ + gwave-variables.txt \ + hspice-output.txt \ + hspice.txt \ + spice3.txt .include -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile on FreeBSD ${OSVERSION}" +.if defined(WITH_PLOTUTILS) +RUN_DEPENDS+= graph:${PORTSDIR}/graphics/plotutils +.endif + +.if defined(WITH_GNUPLOT) +RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot +.endif + +.if defined(WITH_DOCS) +PLIST_SUB+= DOCS="" +.else +PLIST_SUB+= DOCS="@comment " +.endif + +.if defined(WITH_EXAMPLES) +PLIST_SUB+= EXAMPLES="" +.else +PLIST_SUB+= EXAMPLES="@comment " +.endif + +post-install: +.if defined(WITH_DOCS) + @${MKDIR} ${DOCSDIR} +.for FILE in ${DOCFILES} + @${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR} +.endfor .endif + +.if defined(WITH_EXAMPLES) + @${MKDIR} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} +.endif + +MAN1= sp2sp.1 .include diff -ruN gwave.orig/distinfo gwave/distinfo --- gwave.orig/distinfo Fri Jun 23 21:39:16 2006 +++ gwave/distinfo Fri Jun 23 20:52:47 2006 @@ -1,3 +1,3 @@ -MD5 (gwave-20030804.tar.gz) = 4b8ae59dd4bd80520e64df43bc13f7ce -SHA256 (gwave-20030804.tar.gz) = 4c1f162b01d2745607e68238d6ea75108225526cbe1fa4b65d025e6f306ed97b -SIZE (gwave-20030804.tar.gz) = 437860 +MD5 (gwave-20051222.tar.gz) = 5defce2525247300dcd432ad12bbf173 +SHA256 (gwave-20051222.tar.gz) = 32c9d78f702f0620101a208efc3704c10c9c23be38868463a2db96a49c9344e3 +SIZE (gwave-20051222.tar.gz) = 479477 diff -ruN gwave.orig/files/patch-wavefile.c gwave/files/patch-wavefile.c --- gwave.orig/files/patch-wavefile.c Fri Jun 23 21:39:16 2006 +++ gwave/files/patch-wavefile.c Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- spicefile/wavefile.c~ Sun Jun 16 12:16:05 2002 -+++ spicefile/wavefile.c Sun Jun 16 12:01:26 2002 -@@ -32,6 +32,7 @@ - - - #ifdef HAVE_POSIX_REGEXP -+#include - #include - #define REGEXP_T regex_t - #define regexp_test(c,s) (regexec((c), (s), 0, NULL, 0) == 0) diff -ruN gwave.orig/pkg-plist gwave/pkg-plist --- gwave.orig/pkg-plist Fri Jun 23 21:39:16 2006 +++ gwave/pkg-plist Fri Jun 23 21:37:11 2006 @@ -1,22 +1,67 @@ -bin/sp2sp bin/gwave bin/gwave-exec bin/gwaverepl +bin/sp2sp +bin/sweepsplit share/guile/app/gwave/system.gwaverc share/guile/app/gwave/cmds.scm share/guile/app/gwave/dynlink.scm +share/guile/app/gwave/export-gnugraph.scm +share/guile/app/gwave/export-gnuplot.scm +share/guile/app/gwave/export.scm +share/guile/app/gwave/extra-menus.scm share/guile/app/gwave/globals.scm +share/guile/app/gwave/gtk-helpers.scm +share/guile/app/gwave/gwave-config.scm +share/guile/app/gwave/gwave-startup.scm share/guile/app/gwave/minimal.scm share/guile/app/gwave/std-args.scm share/guile/app/gwave/std-menus.scm share/guile/app/gwave/std-toolbar.scm -share/guile/app/gwave/extra-menus.scm -share/guile/app/gwave/visiblewave-ops.scm -share/guile/app/gwave/gwave-startup.scm -share/guile/app/gwave/export-gnugraph.scm -share/guile/app/gwave/export-gnuplot.scm -share/guile/app/gwave/export.scm -share/guile/app/gwave/gtk-helpers.scm share/guile/app/gwave/utils.scm +share/guile/app/gwave/visiblewave-ops.scm +%%DOCS%%share/doc/gwave/Guile.notes +%%DOCS%%share/doc/gwave/gwave-concepts.txt +%%DOCS%%share/doc/gwave/gwave-hooks.txt +%%DOCS%%share/doc/gwave/gwave-procedures.txt +%%DOCS%%share/doc/gwave/gwave-variables.txt +%%DOCS%%share/doc/gwave/hspice-output.txt +%%DOCS%%share/doc/gwave/hspice.txt +%%DOCS%%share/doc/gwave/spice3.txt +%%EXAMPLES%%share/examples/gwave/Readme +%%EXAMPLES%%share/examples/gwave/aoi.W +%%EXAMPLES%%share/examples/gwave/aoi.W.gw +%%EXAMPLES%%share/examples/gwave/aoi.W.tr0 +%%EXAMPLES%%share/examples/gwave/aoi.W.tr0.gw +%%EXAMPLES%%share/examples/gwave/aoi.W1 +%%EXAMPLES%%share/examples/gwave/diffpair.braw +%%EXAMPLES%%share/examples/gwave/diffpair.sp +%%EXAMPLES%%share/examples/gwave/gw +%%EXAMPLES%%share/examples/gwave/gwave.gw +%%EXAMPLES%%share/examples/gwave/gwplot.dat +%%EXAMPLES%%share/examples/gwave/gwplot.dat.0 +%%EXAMPLES%%share/examples/gwave/gwplot.dat.1 +%%EXAMPLES%%share/examples/gwave/gwplot.dat.gnuplot +%%EXAMPLES%%share/examples/gwave/lpf.ac0 +%%EXAMPLES%%share/examples/gwave/lpf.sp +%%EXAMPLES%%share/examples/gwave/nand.N.tr0 +%%EXAMPLES%%share/examples/gwave/nfet.N.sw0 +%%EXAMPLES%%share/examples/gwave/nfet.N.sw0.binary +%%EXAMPLES%%share/examples/gwave/nisrc.N.sw0 +%%EXAMPLES%%share/examples/gwave/pd1.N.tr0 +%%EXAMPLES%%share/examples/gwave/pd2.N +%%EXAMPLES%%share/examples/gwave/pd2.N.gw +%%EXAMPLES%%share/examples/gwave/pd2long.N +%%EXAMPLES%%share/examples/gwave/quickAC.ac0 +%%EXAMPLES%%share/examples/gwave/quickINV.tr0 +%%EXAMPLES%%share/examples/gwave/quickTRAN.tr0 +%%EXAMPLES%%share/examples/gwave/rcsq.raw +%%EXAMPLES%%share/examples/gwave/rcsq.sp +%%EXAMPLES%%share/examples/gwave/test1.tr0.binary +%%EXAMPLES%%share/examples/gwave/tlong.tr0.9601 +%%EXAMPLES%%share/examples/gwave/tpwl.acs +%%EXAMPLES%%share/examples/gwave/tscript @dirrm share/guile/app/gwave +@dirrm share/examples/gwave +@dirrm share/doc/gwave @dirrmtry share/guile/app