From be062eeeb746485d47aaef7c427b6112bc41fa92 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 8 Sep 2022 11:17:09 +0000 Subject: [PATCH] update to xschem-3.1.0, from Hannu Vuolasaho (maintainer) --- cad/xschem/Makefile | 6 +- cad/xschem/distinfo | 4 +- cad/xschem/patches/patch-src_Makefile_in | 13 --- cad/xschem/pkg/PLIST | 111 ++++++++++++++++++++++- 4 files changed, 113 insertions(+), 21 deletions(-) delete mode 100644 cad/xschem/patches/patch-src_Makefile_in diff --git a/cad/xschem/Makefile b/cad/xschem/Makefile index d4a6381ae2c..cb9951ead3d 100644 --- a/cad/xschem/Makefile +++ b/cad/xschem/Makefile @@ -1,6 +1,6 @@ COMMENT = hierarchical schematic capture program -DISTNAME = xschem-3.0.0 +DISTNAME = xschem-3.1.0 CATEGORIES = cad @@ -11,8 +11,8 @@ MAINTAINER = Hannu Vuolasaho # GPLv2+ PERMIT_PACKAGE = Yes -WANTLIB = ${MODTK_WANTLIB} X11 X11-xcb Xpm Xrender -WANTLIB += c cairo m xcb xcb-render +WANTLIB = ${MODTK_WANTLIB} X11 Xpm +WANTLIB += c cairo m MASTER_SITES = http://repo.hu/projects/xschem/releases/ diff --git a/cad/xschem/distinfo b/cad/xschem/distinfo index cca37bdedc3..b6fd43f92cd 100644 --- a/cad/xschem/distinfo +++ b/cad/xschem/distinfo @@ -1,2 +1,2 @@ -SHA256 (xschem-3.0.0.tar.gz) = S3GrVf2NxrclPi+U2mPmeMa+CcnmpFNRSqiMOZWV4qM= -SIZE (xschem-3.0.0.tar.gz) = 10723489 +SHA256 (xschem-3.1.0.tar.gz) = UMwGnjJWGXzsurAESqv/mF7KDrkr5DG9PA1eQf6z9Qk= +SIZE (xschem-3.1.0.tar.gz) = 10694980 diff --git a/cad/xschem/patches/patch-src_Makefile_in b/cad/xschem/patches/patch-src_Makefile_in deleted file mode 100644 index 371a05c1f59..00000000000 --- a/cad/xschem/patches/patch-src_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ -rawtovcd shouldn't go to shared dir. Its place is in bin/ -Index: src/Makefile.in ---- src/Makefile.in.orig -+++ src/Makefile.in -@@ -13,7 +13,7 @@ put /local/install_shares { - keys.help xschem.help xschem.tcl break.awk convert_to_verilog2001.awk - flatten.awk flatten_tedax.awk flatten_savenodes.awk make_sym.awk make_sym_lcc.awk symgen.awk order_labels.awk - sort_labels.awk spice.awk tedax.awk verilog.awk vhdl.awk hspice_backannotate.tcl add_custom_menu.tcl -- change_index.tcl resources.tcl xschemrc ngspice_backannotate.tcl rawtovcd gschemtoxschem.awk -+ change_index.tcl resources.tcl xschemrc ngspice_backannotate.tcl gschemtoxschem.awk - } - - # generate a list of objects from the list of source files diff --git a/cad/xschem/pkg/PLIST b/cad/xschem/pkg/PLIST index 9ff4568e2ed..fda1b577431 100644 --- a/cad/xschem/pkg/PLIST +++ b/cad/xschem/pkg/PLIST @@ -15,12 +15,18 @@ share/doc/xschem/xschem_man/ share/doc/xschem/xschem_man/attribute_substitution.png share/doc/xschem/xschem_man/auto_wiring1.png share/doc/xschem/xschem_man/auto_wiring2.png +share/doc/xschem/xschem_man/backannotation1.png +share/doc/xschem/xschem_man/backannotation10.png share/doc/xschem/xschem_man/backannotation11.png share/doc/xschem/xschem_man/backannotation12.png share/doc/xschem/xschem_man/backannotation13.png share/doc/xschem/xschem_man/backannotation14.png share/doc/xschem/xschem_man/backannotation2.png share/doc/xschem/xschem_man/backannotation3.png +share/doc/xschem/xschem_man/backannotation4.png +share/doc/xschem/xschem_man/backannotation5.png +share/doc/xschem/xschem_man/backannotation6.png +share/doc/xschem/xschem_man/backannotation7.png share/doc/xschem/xschem_man/backannotation8.png share/doc/xschem/xschem_man/backannotation9.png share/doc/xschem/xschem_man/big_design.png @@ -79,6 +85,22 @@ share/doc/xschem/xschem_man/faq00.png share/doc/xschem/xschem_man/faq01.png share/doc/xschem/xschem_man/general_rules.png share/doc/xschem/xschem_man/global_property.png +share/doc/xschem/xschem_man/graphs.html +share/doc/xschem/xschem_man/graphs01.png +share/doc/xschem/xschem_man/graphs02.png +share/doc/xschem/xschem_man/graphs03.png +share/doc/xschem/xschem_man/graphs04.png +share/doc/xschem/xschem_man/graphs05.png +share/doc/xschem/xschem_man/graphs06.png +share/doc/xschem/xschem_man/graphs07.png +share/doc/xschem/xschem_man/graphs08.png +share/doc/xschem/xschem_man/graphs09.png +share/doc/xschem/xschem_man/graphs10.png +share/doc/xschem/xschem_man/graphs11.png +share/doc/xschem/xschem_man/graphs12.png +share/doc/xschem/xschem_man/graphs13.png +share/doc/xschem/xschem_man/graphs14.png +share/doc/xschem/xschem_man/graphs15.png share/doc/xschem/xschem_man/gschemtoxschem.png share/doc/xschem/xschem_man/install_xschem.html share/doc/xschem/xschem_man/load_schematic.png @@ -159,6 +181,10 @@ share/doc/xschem/xschem_man/tutorial_create_symbol_10.png share/doc/xschem/xschem_man/tutorial_create_symbol_11.png share/doc/xschem/xschem_man/tutorial_create_symbol_12.png share/doc/xschem/xschem_man/tutorial_create_symbol_13.png +share/doc/xschem/xschem_man/tutorial_gschemtoxschem.html +share/doc/xschem/xschem_man/tutorial_gschemtoxschem_01.png +share/doc/xschem/xschem_man/tutorial_gschemtoxschem_02.png +share/doc/xschem/xschem_man/tutorial_gschemtoxschem_03.png share/doc/xschem/xschem_man/tutorial_install_xschem.html share/doc/xschem/xschem_man/tutorial_install_xschem_00.png share/doc/xschem/xschem_man/tutorial_install_xschem_01.png @@ -207,7 +233,9 @@ share/doc/xschem/xschem_man/tutorial_xschem_slides08.html share/doc/xschem/xschem_man/tutorial_xschem_slides08.png share/doc/xschem/xschem_man/tutorial_xschem_slides081.html share/doc/xschem/xschem_man/tutorial_xschem_slides0812.html -share/doc/xschem/xschem_man/tutorial_xschem_slides082.html +share/doc/xschem/xschem_man/tutorial_xschem_slides083.html +share/doc/xschem/xschem_man/tutorial_xschem_slides084.html +share/doc/xschem/xschem_man/tutorial_xschem_slides085.html share/doc/xschem/xschem_man/tutorial_xschem_slides09.html share/doc/xschem/xschem_man/tutorial_xschem_slides09.png share/doc/xschem/xschem_man/tutorial_xschem_slides10.html @@ -220,6 +248,11 @@ share/doc/xschem/xschem_man/tutorial_xschem_slides15.png share/doc/xschem/xschem_man/tutorial_xschem_slides16.png share/doc/xschem/xschem_man/tutorial_xschem_slides17.png share/doc/xschem/xschem_man/tutorial_xschem_slides18.png +share/doc/xschem/xschem_man/tutorial_xschem_slides19.png +share/doc/xschem/xschem_man/tutorial_xschem_slides20.png +share/doc/xschem/xschem_man/tutorial_xschem_slides21.png +share/doc/xschem/xschem_man/tutorial_xschem_slides22.png +share/doc/xschem/xschem_man/tutorial_xschem_slides23.png share/doc/xschem/xschem_man/underconstr.png share/doc/xschem/xschem_man/what_is_xschem.html share/doc/xschem/xschem_man/xschem_all_selected.png @@ -275,6 +308,8 @@ share/examples/xschem/examples/and.sym share/examples/xschem/examples/ao21.sym share/examples/xschem/examples/buf.sym share/examples/xschem/examples/bus_keeper.sch +share/examples/xschem/examples/classD_amp.sch +share/examples/xschem/examples/classD_amp.sym share/examples/xschem/examples/cmos_example.sch share/examples/xschem/examples/cmos_example.sym share/examples/xschem/examples/cmos_inv.sch @@ -283,6 +318,8 @@ share/examples/xschem/examples/diode_1.sch share/examples/xschem/examples/diode_1.sym share/examples/xschem/examples/dlatch.sch share/examples/xschem/examples/dlatch.sym +share/examples/xschem/examples/doublepin.sch +share/examples/xschem/examples/doublepin.sym share/examples/xschem/examples/flop.sch share/examples/xschem/examples/flop.sym share/examples/xschem/examples/greycnt.sch @@ -298,6 +335,8 @@ share/examples/xschem/examples/loading.sch share/examples/xschem/examples/loading.sym share/examples/xschem/examples/mos_power_ampli.sch share/examples/xschem/examples/mos_power_ampli.sym +share/examples/xschem/examples/mos_power_ampli_extracted.sch +share/examples/xschem/examples/mos_power_ampli_extracted.sym share/examples/xschem/examples/nand.sym share/examples/xschem/examples/nand2.sch share/examples/xschem/examples/nand2.sym @@ -314,6 +353,7 @@ share/examples/xschem/examples/plot_manipulation.sym share/examples/xschem/examples/poweramp.sch share/examples/xschem/examples/poweramp.sym share/examples/xschem/examples/poweramp_xyce.sch +share/examples/xschem/examples/poweramp_xyce.sym share/examples/xschem/examples/pump.sch share/examples/xschem/examples/pump.sym share/examples/xschem/examples/rcline.sch @@ -331,8 +371,16 @@ share/examples/xschem/examples/tesla.sch share/examples/xschem/examples/tesla.sym share/examples/xschem/examples/test.sch share/examples/xschem/examples/test2.sch +share/examples/xschem/examples/test_ac.sch +share/examples/xschem/examples/test_ac.sym +share/examples/xschem/examples/test_ac_xyce.sch +share/examples/xschem/examples/test_ac_xyce.sym share/examples/xschem/examples/test_backannotated_subckt.sch share/examples/xschem/examples/test_backannotated_subckt.sym +share/examples/xschem/examples/test_doublepin.sch +share/examples/xschem/examples/test_doublepin.sym +share/examples/xschem/examples/test_extracted_netlist.sch +share/examples/xschem/examples/test_extracted_netlist.sym share/examples/xschem/examples/test_lm324.sch share/examples/xschem/examples/test_lm324.sym share/examples/xschem/examples/test_ne555.sch @@ -415,27 +463,72 @@ share/examples/xschem/logic/ram_tb.sch share/examples/xschem/logic/stimuli.test_ngspice share/examples/xschem/logic/sync_reg.sch share/examples/xschem/logic/sync_reg.sym +share/examples/xschem/logic/test_mos_verilog.sch +share/examples/xschem/logic/test_mos_verilog.sym share/examples/xschem/logic/test_ngspice.sch share/examples/xschem/logic/test_ngspice.sym share/examples/xschem/logic/testbench.sch share/examples/xschem/logic/testbench.sym share/examples/xschem/ngspice/ +share/examples/xschem/ngspice/adc.sch +share/examples/xschem/ngspice/adc.sym share/examples/xschem/ngspice/amp_xschem.sch +share/examples/xschem/ngspice/and3_ngspice.sch +share/examples/xschem/ngspice/and3_ngspice.sym +share/examples/xschem/ngspice/and_ngspice.sch +share/examples/xschem/ngspice/and_ngspice.sym share/examples/xschem/ngspice/autozero_comp.sch share/examples/xschem/ngspice/autozero_comp_xyce.sch share/examples/xschem/ngspice/buck.sch +share/examples/xschem/ngspice/buf_ngspice.sch +share/examples/xschem/ngspice/buf_ngspice.sym share/examples/xschem/ngspice/colpitts_xschem.sch +share/examples/xschem/ngspice/comp_65nm.sch +share/examples/xschem/ngspice/comp_65nm.sym +share/examples/xschem/ngspice/comp_ngspice.sch +share/examples/xschem/ngspice/comp_ngspice.sym +share/examples/xschem/ngspice/counter_6bit_ngspice.sch +share/examples/xschem/ngspice/counter_6bit_ngspice.sym +share/examples/xschem/ngspice/delta_sigma.sch +share/examples/xschem/ngspice/delta_sigma.sym +share/examples/xschem/ngspice/diode_ngspice.sch +share/examples/xschem/ngspice/diode_ngspice.sym +share/examples/xschem/ngspice/flip_flop_ngspice.sch +share/examples/xschem/ngspice/flip_flop_ngspice.sym +share/examples/xschem/ngspice/full_adder_ngspice.sch +share/examples/xschem/ngspice/full_adder_ngspice.sym +share/examples/xschem/ngspice/half_adder_ngspice.sch +share/examples/xschem/ngspice/half_adder_ngspice.sym share/examples/xschem/ngspice/hpf_xschem.sch share/examples/xschem/ngspice/inv-2.sym +share/examples/xschem/ngspice/inv_ngspice.sch +share/examples/xschem/ngspice/inv_ngspice.sym +share/examples/xschem/ngspice/keeper_ngspice.sch +share/examples/xschem/ngspice/keeper_ngspice.sym share/examples/xschem/ngspice/led_driver.sch share/examples/xschem/ngspice/lm741.sym +share/examples/xschem/ngspice/nand_ngspice.sch +share/examples/xschem/ngspice/nand_ngspice.sym share/examples/xschem/ngspice/nmos4-v.sym +share/examples/xschem/ngspice/nor_ngspice.sch +share/examples/xschem/ngspice/nor_ngspice.sym +share/examples/xschem/ngspice/opamp_65nm.sch +share/examples/xschem/ngspice/opamp_65nm.sym +share/examples/xschem/ngspice/or_ngspice.sch +share/examples/xschem/ngspice/or_ngspice.sym share/examples/xschem/ngspice/passgate.sym share/examples/xschem/ngspice/pmos4-v.sym +share/examples/xschem/ngspice/pv_ngspice.sch +share/examples/xschem/ngspice/pv_ngspice.sym share/examples/xschem/ngspice/solar_panel.sch +share/examples/xschem/ngspice/solar_panel.sym share/examples/xschem/ngspice/solar_panel_xyce.sch share/examples/xschem/ngspice/stimuli.autozero_comp share/examples/xschem/ngspice/stimuli.autozero_comp_xyce +share/examples/xschem/ngspice/xnor_ngspice.sch +share/examples/xschem/ngspice/xnor_ngspice.sym +share/examples/xschem/ngspice/xor_ngspice.sch +share/examples/xschem/ngspice/xor_ngspice.sym share/examples/xschem/pcb/ share/examples/xschem/pcb/0_pcb_top.sch share/examples/xschem/pcb/74ls00-2.sym @@ -507,6 +600,7 @@ share/examples/xschem/rom8k/rom3_array_ref.sym share/examples/xschem/rom8k/rom3_rowdec.sch share/examples/xschem/rom8k/rom3_rowdec.sym share/examples/xschem/rom8k/rom8k.sch +share/examples/xschem/rom8k/rom8k.sym share/examples/xschem/rom8k/stimuli.rom8k share/examples/xschem/rulz-r8c33/ share/examples/xschem/rulz-r8c33/ft232rl.sym @@ -543,6 +637,7 @@ share/examples/xschem/xschem_simulator/and2_1.sym share/examples/xschem/xschem_simulator/and3_1.sym share/examples/xschem/xschem_simulator/and4_1.sym share/examples/xschem/xschem_simulator/dev-1.sym +share/examples/xschem/xschem_simulator/dev-2.sym share/examples/xschem/xschem_simulator/dfrbp_1.sym share/examples/xschem/xschem_simulator/dfrtp_1.sym share/examples/xschem/xschem_simulator/diode_3.sym @@ -557,20 +652,23 @@ share/examples/xschem/xschem_simulator/invert-1.sym share/examples/xschem/xschem_simulator/logic_test.sch share/examples/xschem/xschem_simulator/logic_test.sym share/examples/xschem/xschem_simulator/mux2_1.sym -share/examples/xschem/xschem_simulator/n.sym share/examples/xschem/xschem_simulator/nand2_1.sym share/examples/xschem/xschem_simulator/nand3_1.sym share/examples/xschem/xschem_simulator/nand4_1.sym share/examples/xschem/xschem_simulator/nor4_1.sym +share/examples/xschem/xschem_simulator/ntrans.sym share/examples/xschem/xschem_simulator/o21ai_1.sym share/examples/xschem/xschem_simulator/or4_1.sym -share/examples/xschem/xschem_simulator/p.sym +share/examples/xschem/xschem_simulator/ptrans.sym share/examples/xschem/xschem_simulator/segment.sym share/examples/xschem/xschem_simulator/simulate_ff.sch share/examples/xschem/xschem_simulator/simulate_ff.sym share/examples/xschem/xschem_simulator/switch-1.sym share/examples/xschem/xschem_simulator/switch_level_sim.sch +share/examples/xschem/xschem_simulator/xnor2_1.sym share/examples/xschem/xschem_simulator/xor2_1.sym +share/examples/xschem/xschem_simulator/xor3_1.sym +share/examples/xschem/xschem_simulator/xor4_1.sym share/xschem/ share/xschem/add_custom_menu.tcl share/xschem/break.awk @@ -608,9 +706,11 @@ share/xschem/utile/preprocess.awk share/xschem/utile/stimuli.awk share/xschem/utile/template.stimuli share/xschem/utile/utile +share/xschem/utile/utile.bat share/xschem/utile/utile.tcl share/xschem/utile/utile.txt share/xschem/utile/utile3 +share/xschem/utile/utile3.bat share/xschem/verilog.awk share/xschem/vhdl.awk share/xschem/xschem.help @@ -637,6 +737,7 @@ share/xschem/xschem_library/devices/conn_10x2.sym share/xschem/xschem_library/devices/conn_14x1.sym share/xschem/xschem_library/devices/conn_3x1.sym share/xschem/xschem_library/devices/conn_4x1.sym +share/xschem/xschem_library/devices/conn_6x1.sym share/xschem/xschem_library/devices/conn_8x1.sym share/xschem/xschem_library/devices/connect.sym share/xschem/xschem_library/devices/connector.sym @@ -645,6 +746,7 @@ share/xschem/xschem_library/devices/crystal.sym share/xschem/xschem_library/devices/dac_bridge.sym share/xschem/xschem_library/devices/delay.sym share/xschem/xschem_library/devices/delay_line.sym +share/xschem/xschem_library/devices/device_param_probe.sym share/xschem/xschem_library/devices/diode.sym share/xschem/xschem_library/devices/flash_cell.sym share/xschem/xschem_library/devices/generic_pin.sym @@ -676,6 +778,7 @@ share/xschem/xschem_library/devices/nmos-sub.sym share/xschem/xschem_library/devices/nmos.sym share/xschem/xschem_library/devices/nmos3.sym share/xschem/xschem_library/devices/nmos4.sym +share/xschem/xschem_library/devices/nmos4_depl.sym share/xschem/xschem_library/devices/noconn.sym share/xschem/xschem_library/devices/npn.sym share/xschem/xschem_library/devices/opin.sym @@ -693,8 +796,10 @@ share/xschem/xschem_library/devices/pmosnat.sym share/xschem/xschem_library/devices/pnp.sym share/xschem/xschem_library/devices/port_attributes.sym share/xschem/xschem_library/devices/res.sym +share/xschem/xschem_library/devices/res3.sym share/xschem/xschem_library/devices/res_ac.sym share/xschem/xschem_library/devices/rgb_led.sym +share/xschem/xschem_library/devices/rnmos4.sym share/xschem/xschem_library/devices/spice_probe.sym share/xschem/xschem_library/devices/spice_probe_vdiff.sym share/xschem/xschem_library/devices/sqwsource.sym