diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile index 47351d9a9ca2..9367383330b8 100644 --- a/devel/gpsim/Makefile +++ b/devel/gpsim/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= gpsim -PORTVERSION= 0.27.0 +PORTVERSION= 0.28.1 CATEGORIES= devel -MASTER_SITES= SF +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.0 MAINTAINER= ports@FreeBSD.org COMMENT= Software simulator for Microchip PIC microcontrollers @@ -16,7 +16,7 @@ BUILD_DEPENDS= gpasm:${PORTSDIR}/devel/gputils LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils -USES= libtool pathfix pkgconfig +USES= gmake libtool pathfix pkgconfig readline USE_GNOME= glib20 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/devel/gpsim/distinfo b/devel/gpsim/distinfo index 6c83d445617b..209d98b4e46d 100644 --- a/devel/gpsim/distinfo +++ b/devel/gpsim/distinfo @@ -1,2 +1,2 @@ -SHA256 (gpsim-0.27.0.tar.gz) = 204ed2a8aaf1b3021617544330997f4a508b811afce71fb9628b94406d5e59a2 -SIZE (gpsim-0.27.0.tar.gz) = 2465642 +SHA256 (gpsim-0.28.1.tar.gz) = d8d41fb530630e6df31db89a0ca630038395aed4d07c48859655468ed25658ed +SIZE (gpsim-0.28.1.tar.gz) = 3206451 diff --git a/devel/gpsim/files/patch-modules__stimuli.cc b/devel/gpsim/files/patch-modules__stimuli.cc deleted file mode 100644 index 7e2fdd54b5a9..000000000000 --- a/devel/gpsim/files/patch-modules__stimuli.cc +++ /dev/null @@ -1,33 +0,0 @@ ---- modules/stimuli.cc.orig -+++ modules/stimuli.cc -@@ -216,7 +216,7 @@ - //---------------------------------------------------------------------- - //---------------------------------------------------------------------- - -- PulseGen::PulseGen(const char *_name=0) -+ PulseGen::PulseGen(const char *_name) - : StimulusBase(_name, "\ - Pulse Generator\n\ - Attributes:\n\ -@@ -402,13 +402,20 @@ - setBreak(m_start_cycle + (*si).time, si); - - } -+ -+ static bool compare_data_point(const ValueStimulusData &data_point1, -+ const ValueStimulusData &data_point2) -+ { -+ return (data_point1.time < data_point2.time); -+ } -+ - void PulseGen::put_data(ValueStimulusData &data_point) - { - list::iterator si; - si = find(samples.begin(), samples.end(), data_point); - if (si == samples.end()) { - samples.push_back(data_point); -- samples.sort(); -+ samples.sort(compare_data_point); - } else { - delete (*si).v; - (*si).v = data_point.v; diff --git a/devel/gpsim/files/patch-modules__switch.cc b/devel/gpsim/files/patch-modules__switch.cc deleted file mode 100644 index ea720c76e191..000000000000 --- a/devel/gpsim/files/patch-modules__switch.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/switch.cc.orig -+++ modules/switch.cc -@@ -582,7 +582,7 @@ - - //======================================================================== - -- Switch::Switch(const char *_new_name=0) -+ Switch::Switch(const char *_new_name) - : SwitchBase(_new_name, "\ - Two port switch\n\ - Attributes:\n\ diff --git a/devel/gpsim/pkg-plist b/devel/gpsim/pkg-plist index 70a2b799c1d9..4b23ecb964c8 100644 --- a/devel/gpsim/pkg-plist +++ b/devel/gpsim/pkg-plist @@ -44,7 +44,6 @@ include/gpsim/ioports.h include/gpsim/lxt_write.h include/gpsim/modules.h include/gpsim/operator.h -include/gpsim/p12f182x.h include/gpsim/p12f6xx.h include/gpsim/p12x.h include/gpsim/p16f62x.h @@ -57,6 +56,7 @@ include/gpsim/p16x7x.h include/gpsim/p16x8x.h include/gpsim/p17c75x.h include/gpsim/p18x.h +include/gpsim/p1xf1xxx.h include/gpsim/packages.h include/gpsim/pic-instructions.h include/gpsim/pic-ioports.h @@ -75,6 +75,7 @@ include/gpsim/pthread-wrap.h include/gpsim/rcon.h include/gpsim/registers.h include/gpsim/sim_context.h +include/gpsim/spp.h include/gpsim/ssp.h include/gpsim/stimuli.h include/gpsim/symbol.h @@ -91,6 +92,10 @@ lib/libgpsim.a lib/libgpsim.so lib/libgpsim.so.0 lib/libgpsim.so.0.0.0 +lib/libgpsim_dht11.a +lib/libgpsim_dht11.so +lib/libgpsim_dht11.so.0 +lib/libgpsim_dht11.so.0.0.0 lib/libgpsim_ds1307.a lib/libgpsim_ds1307.so lib/libgpsim_ds1307.so.0