summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cad/covered/Makefile25
-rw-r--r--cad/covered/PLIST209
-rw-r--r--cad/covered/distinfo13
-rw-r--r--cad/covered/patches/patch-src_lxt2__read.c15
-rw-r--r--cad/covered/patches/patch-src_lxt2__read.h17
5 files changed, 156 insertions, 123 deletions
diff --git a/cad/covered/Makefile b/cad/covered/Makefile
index e501661943f..cb0fce7eca4 100644
--- a/cad/covered/Makefile
+++ b/cad/covered/Makefile
@@ -1,37 +1,22 @@
-# $NetBSD: Makefile,v 1.24 2016/10/08 14:45:25 kamil Exp $
+# $NetBSD: Makefile,v 1.25 2016/10/08 21:18:30 kamil Exp $
#
-DISTNAME= covered-0.4.7
-PKGREVISION= 6
+DISTNAME= covered-0.7.10
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=covered/}
MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://covered.sourceforge.net/
COMMENT= Verilog code coverage analyzer (stable release version)
-
-DEPENDS+= verilog-[0-9]*:../../cad/verilog
+LICENSE= gnu-gpl-v2
GNU_CONFIGURE= YES
USE_TOOLS+= bison gmake lex
-REPLACE_INTERPRETER+= WISH
-REPLACE.WISH.old= .*wish
-REPLACE.WISH.new= ${PREFIX}/bin/wish
-REPLACE_FILES.WISH= scripts/main_view.tcl
-REPLACE_FILES.WISH+= scripts/menu_create.tcl
-REPLACE_FILES.WISH+= scripts/preferences.tcl
-REPLACE_FILES.WISH+= scripts/summary.tcl
-
-# we use this hack of setting a cache variable because
-# the configure script uses AC_PATH_PROG to try and find
-# the *Config.sh scripts but these are not installed with
-# the execute bit set.
-CONFIGURE_ENV+= r_cv_path_TCL_CONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
-CONFIGURE_ENV+= r_cv_path_TK_CONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
-
+# This is required for TCL/TK dependency
CPPFLAGS+= -DUSE_INTERP_RESULT
+.include "../../cad/verilog/buildlink3.mk"
.include "../../devel/gperf/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/tcl/buildlink3.mk"
diff --git a/cad/covered/PLIST b/cad/covered/PLIST
index 837e12d7b7e..f4816a6797a 100644
--- a/cad/covered/PLIST
+++ b/cad/covered/PLIST
@@ -1,87 +1,150 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:35:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/10/08 21:18:30 kamil Exp $
bin/covered
man/man1/covered.1
share/covered/.coveredrc
-share/covered/doc/gui/comb.html
-share/covered/doc/gui/cov_bar.html
-share/covered/doc/gui/cov_view.html
-share/covered/doc/gui/file_menu.html
-share/covered/doc/gui/help_menu.html
-share/covered/doc/gui/images/banner.gif
-share/covered/doc/gui/images/color.png
-share/covered/doc/gui/images/comb_complex.png
-share/covered/doc/gui/images/comb_event.png
-share/covered/doc/gui/images/comb_simple.png
-share/covered/doc/gui/images/comb_simple_and.png
-share/covered/doc/gui/images/comb_simple_or.png
-share/covered/doc/gui/images/comb_unary.png
-share/covered/doc/gui/images/dn_button.png
-share/covered/doc/gui/images/file_menu.png
-share/covered/doc/gui/images/help_menu.png
-share/covered/doc/gui/images/main_cov.png
-share/covered/doc/gui/images/main_info.png
-share/covered/doc/gui/images/main_lb.png
-share/covered/doc/gui/images/main_menu.png
-share/covered/doc/gui/images/main_summary.png
-share/covered/doc/gui/images/main_viewer.png
-share/covered/doc/gui/images/main_window.png
-share/covered/doc/gui/images/open_cdd.png
-share/covered/doc/gui/images/populated_lb.png
-share/covered/doc/gui/images/pref_window.png
-share/covered/doc/gui/images/report_menu.png
-share/covered/doc/gui/images/summary_window.png
-share/covered/doc/gui/images/toggle_full.png
-share/covered/doc/gui/images/up_button.png
-share/covered/doc/gui/images/view_menu.png
-share/covered/doc/gui/info_bar.html
-share/covered/doc/gui/intro.html
-share/covered/doc/gui/line.html
-share/covered/doc/gui/main.html
-share/covered/doc/gui/main_menu.html
-share/covered/doc/gui/mod_inst_lb.html
-share/covered/doc/gui/preferences.html
-share/covered/doc/gui/report_menu.html
-share/covered/doc/gui/summary.html
-share/covered/doc/gui/summary_bar.html
-share/covered/doc/gui/toggle.html
-share/covered/doc/gui/view_menu.html
-share/covered/doc/gui/welcome.html
-share/covered/doc/user/001.html
-share/covered/doc/user/002.html
-share/covered/doc/user/003.html
-share/covered/doc/user/004.html
-share/covered/doc/user/005.html
-share/covered/doc/user/006.html
-share/covered/doc/user/007.html
-share/covered/doc/user/008.html
-share/covered/doc/user/009.html
-share/covered/doc/user/010.html
-share/covered/doc/user/011.html
-share/covered/doc/user/012.html
-share/covered/doc/user/013.html
-share/covered/doc/user/014.html
-share/covered/doc/user/015.html
-share/covered/doc/user/016.html
-share/covered/doc/user/017.html
-share/covered/doc/user/018.html
-share/covered/doc/user/019.html
-share/covered/doc/user/020.html
-share/covered/doc/user/021.html
-share/covered/doc/user/022.html
-share/covered/doc/user/banner.gif
-share/covered/doc/user/example.rptI.html
-share/covered/doc/user/example.rptM.html
-share/covered/doc/user/example.v.html
-share/covered/doc/user/index.html
-share/covered/doc/user/styles.css
+share/covered/doc/html/chapter.attr.html
+share/covered/doc/html/chapter.boundaries.html
+share/covered/doc/html/chapter.debug.html
+share/covered/doc/html/chapter.epilogue.html
+share/covered/doc/html/chapter.exclude.html
+share/covered/doc/html/chapter.faq.html
+share/covered/doc/html/chapter.gui.assert.html
+share/covered/doc/html/chapter.gui.assert.source.html
+share/covered/doc/html/chapter.gui.exclude.html
+share/covered/doc/html/chapter.gui.fsm.html
+share/covered/doc/html/chapter.gui.genreport.html
+share/covered/doc/html/chapter.gui.intro.html
+share/covered/doc/html/chapter.gui.line.html
+share/covered/doc/html/chapter.gui.logic.html
+share/covered/doc/html/chapter.gui.main.html
+share/covered/doc/html/chapter.gui.memory.html
+share/covered/doc/html/chapter.gui.new.html
+share/covered/doc/html/chapter.gui.preferences.html
+share/covered/doc/html/chapter.gui.rank.html
+share/covered/doc/html/chapter.gui.toggle.html
+share/covered/doc/html/chapter.gui.wizard.html
+share/covered/doc/html/chapter.installation.html
+share/covered/doc/html/chapter.intro.html
+share/covered/doc/html/chapter.merge.html
+share/covered/doc/html/chapter.metrics.html
+share/covered/doc/html/chapter.race.html
+share/covered/doc/html/chapter.rank.html
+share/covered/doc/html/chapter.reading.html
+share/covered/doc/html/chapter.report.html
+share/covered/doc/html/chapter.score.html
+share/covered/doc/html/chapter.start.html
+share/covered/doc/html/chapter.using.html
+share/covered/doc/html/covered.css
+share/covered/doc/html/example.rptI.html
+share/covered/doc/html/example.rptM.html
+share/covered/doc/html/example.v.html
+share/covered/doc/html/img/app_menu.gif
+share/covered/doc/html/img/assert_excl.gif
+share/covered/doc/html/img/assert_src.gif
+share/covered/doc/html/img/assert_window.gif
+share/covered/doc/html/img/banner.jpg
+share/covered/doc/html/img/close_warn.gif
+share/covered/doc/html/img/col_show_hide.gif
+share/covered/doc/html/img/comb_complex.gif
+share/covered/doc/html/img/comb_event.gif
+share/covered/doc/html/img/comb_simple.gif
+share/covered/doc/html/img/comb_simple_and.gif
+share/covered/doc/html/img/comb_simple_or.gif
+share/covered/doc/html/img/comb_unary.gif
+share/covered/doc/html/img/dn_button.gif
+share/covered/doc/html/img/er_full.gif
+share/covered/doc/html/img/er_part.gif
+share/covered/doc/html/img/exit_warn.gif
+share/covered/doc/html/img/file_menu.gif
+share/covered/doc/html/img/file_viewer.gif
+share/covered/doc/html/img/fsm_example.png
+share/covered/doc/html/img/fsm_excl.gif
+share/covered/doc/html/img/fsm_window.gif
+share/covered/doc/html/img/gen_menu.gif
+share/covered/doc/html/img/help_menu.gif
+share/covered/doc/html/img/home.gif
+share/covered/doc/html/img/line_excl.gif
+share/covered/doc/html/img/line_incl.gif
+share/covered/doc/html/img/main_cov.gif
+share/covered/doc/html/img/main_info.gif
+share/covered/doc/html/img/main_lb.gif
+share/covered/doc/html/img/main_menu.gif
+share/covered/doc/html/img/main_viewer.gif
+share/covered/doc/html/img/main_window.gif
+share/covered/doc/html/img/memory_full.gif
+share/covered/doc/html/img/new_cdd_define.gif
+share/covered/doc/html/img/new_cdd_fsm.gif
+share/covered/doc/html/img/new_cdd_gen.gif
+share/covered/doc/html/img/new_cdd_insert_menu.gif
+share/covered/doc/html/img/new_cdd_lib_ext.gif
+share/covered/doc/html/img/new_cdd_mod_excl.gif
+share/covered/doc/html/img/new_cdd_mod_gen.gif
+share/covered/doc/html/img/new_cdd_name.gif
+share/covered/doc/html/img/new_cdd_options.gif
+share/covered/doc/html/img/new_cdd_options2.gif
+share/covered/doc/html/img/new_cdd_parm_oride.gif
+share/covered/doc/html/img/new_cdd_selection.gif
+share/covered/doc/html/img/new_cdd_type.gif
+share/covered/doc/html/img/next.gif
+share/covered/doc/html/img/note.gif
+share/covered/doc/html/img/populated_lb.gif
+share/covered/doc/html/img/pref_color.gif
+share/covered/doc/html/img/pref_exclude.gif
+share/covered/doc/html/img/pref_goals.gif
+share/covered/doc/html/img/pref_main.gif
+share/covered/doc/html/img/pref_merge.gif
+share/covered/doc/html/img/pref_syntax.gif
+share/covered/doc/html/img/prev.gif
+share/covered/doc/html/img/rank_files.gif
+share/covered/doc/html/img/rank_options.gif
+share/covered/doc/html/img/rank_output.gif
+share/covered/doc/html/img/rank_report.gif
+share/covered/doc/html/img/rank_selection.gif
+share/covered/doc/html/img/report_menu.gif
+share/covered/doc/html/img/rpt_gen_options.gif
+share/covered/doc/html/img/rpt_gen_selection.gif
+share/covered/doc/html/img/rpt_gen_view.gif
+share/covered/doc/html/img/toggle_full.gif
+share/covered/doc/html/img/up.gif
+share/covered/doc/html/img/up_button.gif
+share/covered/doc/html/img/vhier.png
+share/covered/doc/html/img/vhier2.png
+share/covered/doc/html/img/view_menu.gif
+share/covered/doc/html/img/wizard.gif
+share/covered/doc/html/index.html
+share/covered/doc/html/part.command.line.usage.html
+share/covered/doc/html/part.epilogue.html
+share/covered/doc/html/part.faq.html
+share/covered/doc/html/part.gui.html
+share/covered/doc/html/part.installation.html
+share/covered/doc/html/part.overview.html
+share/covered/scripts/assert.tcl
+share/covered/scripts/balloon.tcl
share/covered/scripts/banner.gif
share/covered/scripts/cdd_view.tcl
+share/covered/scripts/checked.gif
+share/covered/scripts/clear.gif
share/covered/scripts/comb.tcl
share/covered/scripts/cov_create.tcl
+share/covered/scripts/cov_icon.gif
+share/covered/scripts/exclude.tcl
+share/covered/scripts/find.gif
+share/covered/scripts/fsm.tcl
+share/covered/scripts/gen_new.tcl
+share/covered/scripts/gen_rank.tcl
+share/covered/scripts/gen_report.tcl
share/covered/scripts/help.tcl
+share/covered/scripts/left_arrow.gif
share/covered/scripts/main_view.tcl
+share/covered/scripts/memory.tcl
share/covered/scripts/menu_create.tcl
share/covered/scripts/preferences.tcl
share/covered/scripts/process_file.tcl
+share/covered/scripts/right_arrow.gif
share/covered/scripts/summary.tcl
share/covered/scripts/toggle.tcl
+share/covered/scripts/unchecked.gif
+share/covered/scripts/verilog.tcl
+share/covered/scripts/viewer.tcl
+share/covered/scripts/wizard.tcl
+@pkgdir libexec
diff --git a/cad/covered/distinfo b/cad/covered/distinfo
index 72aabd3fdfc..ae7ed3e0be5 100644
--- a/cad/covered/distinfo
+++ b/cad/covered/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 00:21:16 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/10/08 21:18:30 kamil Exp $
-SHA1 (covered-0.4.7.tar.gz) = 9dd9da4d739db15e5e2ea36f2767136a825a4728
-RMD160 (covered-0.4.7.tar.gz) = 63720610a24e6e71b9622586d561e3eb92a606f5
-SHA512 (covered-0.4.7.tar.gz) = 2fb44e9a7ef9e34a5180c767ea9fa86cf821f3df31351fa9086e5b2ce4ee690d55896082473655469c544ee8471e9012caf124fcb0450da767aa845cf4ef36dc
-Size (covered-0.4.7.tar.gz) = 1077912 bytes
-SHA1 (patch-src_lxt2__read.c) = 0c388647fd7fe2027b59cdd35761c91bbe490e64
-SHA1 (patch-src_lxt2__read.h) = 18be70aa6e0dfef5dcf72809e62260642ada7898
+SHA1 (covered-0.7.10.tar.gz) = 3f7f27ccb9d9263a27f5c8ae97e5569bf434c2f2
+RMD160 (covered-0.7.10.tar.gz) = 9e9146753aa542663fc43924d64601e8f16be316
+SHA512 (covered-0.7.10.tar.gz) = da1c844e2b138966ca572d0d06739c22a6a422f12ccff6b3201741019eb17d794cc8257b5fcf405f580614a0b22d370672d37c12f84ce556b49db1e8724e4b44
+Size (covered-0.7.10.tar.gz) = 3108263 bytes
+SHA1 (patch-src_lxt2__read.h) = 5540942aa8222db889ed1168244462e5b45cd977
diff --git a/cad/covered/patches/patch-src_lxt2__read.c b/cad/covered/patches/patch-src_lxt2__read.c
deleted file mode 100644
index f9902b95610..00000000000
--- a/cad/covered/patches/patch-src_lxt2__read.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_lxt2__read.c,v 1.1 2011/12/07 15:13:26 joerg Exp $
-
---- src/lxt2_read.c.orig 2011-12-07 14:54:06.000000000 +0000
-+++ src/lxt2_read.c
-@@ -62,8 +62,8 @@ _LXT2_RD_INLINE static unsigned int lxt2
- {
- unsigned short x = *((unsigned short *)((unsigned char *)mm+offset));
-
-- __asm("xchgb %b0,%h0" :
-- "=q" (x) :
-+ __asm("rorw $8, %w1" :
-+ "=r" (x) :
- "0" (x));
-
- return (unsigned int) x;
diff --git a/cad/covered/patches/patch-src_lxt2__read.h b/cad/covered/patches/patch-src_lxt2__read.h
index 738b9219d94..3008bba304e 100644
--- a/cad/covered/patches/patch-src_lxt2__read.h
+++ b/cad/covered/patches/patch-src_lxt2__read.h
@@ -1,20 +1,21 @@
-$NetBSD: patch-src_lxt2__read.h,v 1.1 2012/12/25 21:14:45 joerg Exp $
+$NetBSD: patch-src_lxt2__read.h,v 1.2 2016/10/08 21:18:30 kamil Exp $
---- src/lxt2_read.h.orig 2012-12-25 15:00:05.000000000 +0000
+Fix inline use.
+
+--- src/lxt2_read.h.orig 2008-06-27 14:02:03.000000000 +0000
+++ src/lxt2_read.h
@@ -247,12 +247,12 @@ unsigned process_mask_dirty : 1; /* only
struct lxt2_rd_trace * lxt2_rd_init(const char *name);
void lxt2_rd_close(struct lxt2_rd_trace *lt);
-_LXT2_RD_INLINE lxtint64_t lxt2_rd_set_max_block_mem_usage(struct lxt2_rd_trace *lt, lxtint64_t block_mem_max);
--_LXT2_RD_INLINE lxtint64_t lxt2_rd_get_block_mem_usage(struct lxt2_rd_trace *lt);
-+lxtint64_t lxt2_rd_set_max_block_mem_usage(struct lxt2_rd_trace *lt, lxtint64_t block_mem_max);
-+lxtint64_t lxt2_rd_get_block_mem_usage(struct lxt2_rd_trace *lt);
++lxtint64_t lxt2_rd_set_max_block_mem_usage(struct lxt2_rd_trace *lt, lxtint64_t block_mem_max);
+ _LXT2_RD_INLINE lxtint64_t lxt2_rd_get_block_mem_usage(struct lxt2_rd_trace *lt);
_LXT2_RD_INLINE unsigned int lxt2_rd_get_num_blocks(struct lxt2_rd_trace *lt);
unsigned int lxt2_rd_get_num_active_blocks(struct lxt2_rd_trace *lt);
-_LXT2_RD_INLINE lxtint32_t lxt2_rd_get_num_facs(struct lxt2_rd_trace *lt);
-+lxtint32_t lxt2_rd_get_num_facs(struct lxt2_rd_trace *lt);
++lxtint32_t lxt2_rd_get_num_facs(struct lxt2_rd_trace *lt);
char * lxt2_rd_get_facname(struct lxt2_rd_trace *lt, lxtint32_t facidx);
struct lxt2_rd_geometry * lxt2_rd_get_fac_geometry(struct lxt2_rd_trace *lt, lxtint32_t facidx);
_LXT2_RD_INLINE lxtint32_t lxt2_rd_get_fac_rows(struct lxt2_rd_trace *lt, lxtint32_t facidx);
@@ -23,7 +24,7 @@ $NetBSD: patch-src_lxt2__read.h,v 1.1 2012/12/25 21:14:45 joerg Exp $
_LXT2_RD_INLINE lxtint32_t lxt2_rd_get_fac_flags(struct lxt2_rd_trace *lt, lxtint32_t facidx);
_LXT2_RD_INLINE lxtint32_t lxt2_rd_get_fac_len(struct lxt2_rd_trace *lt, lxtint32_t facidx);
-_LXT2_RD_INLINE lxtint32_t lxt2_rd_get_alias_root(struct lxt2_rd_trace *lt, lxtint32_t facidx);
-+lxtint32_t lxt2_rd_get_alias_root(struct lxt2_rd_trace *lt, lxtint32_t facidx);
++lxtint32_t lxt2_rd_get_alias_root(struct lxt2_rd_trace *lt, lxtint32_t facidx);
_LXT2_RD_INLINE char lxt2_rd_get_timescale(struct lxt2_rd_trace *lt);
_LXT2_RD_INLINE lxtint64_t lxt2_rd_get_start_time(struct lxt2_rd_trace *lt);
@@ -32,7 +33,7 @@ $NetBSD: patch-src_lxt2__read.h,v 1.1 2012/12/25 21:14:45 joerg Exp $
_LXT2_RD_INLINE int lxt2_rd_set_fac_process_mask(struct lxt2_rd_trace *lt, lxtint32_t facidx);
_LXT2_RD_INLINE int lxt2_rd_clr_fac_process_mask(struct lxt2_rd_trace *lt, lxtint32_t facidx);
-_LXT2_RD_INLINE int lxt2_rd_set_fac_process_mask_all(struct lxt2_rd_trace *lt);
-+int lxt2_rd_set_fac_process_mask_all(struct lxt2_rd_trace *lt);
++int lxt2_rd_set_fac_process_mask_all(struct lxt2_rd_trace *lt);
_LXT2_RD_INLINE int lxt2_rd_clr_fac_process_mask_all(struct lxt2_rd_trace *lt);
/* null value_change_callback calls an empty dummy function */