Attachment 144586 Details for Bug 191815 – devel_gpsim.diff

[patch] devel_gpsim.diff

devel_gpsim.diff (text/plain), 12.51 KB, created by tkato432 on 2014-07-11 18:42:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-07-11 18:42:37 UTC

Size: 12.51 KB

patch

obsolete

>diff -urN /usr/ports/devel/gpsim/Makefile devel/gpsim/Makefile
>--- /usr/ports/devel/gpsim/Makefile	2014-07-04 21:32:16.000000000 +0900
>+++ devel/gpsim/Makefile	2014-07-12 00:00:00.000000000 +0900
>@@ -2,45 +2,64 @@
> # $FreeBSD: head/devel/gpsim/Makefile 360604 2014-07-04 12:06:07Z bapt $
> 
> PORTNAME=	gpsim
>-PORTVERSION=	0.22.0
>-PORTREVISION=	8
>+PORTVERSION=	0.27.0
> CATEGORIES=	devel
> MASTER_SITES=	SF
> 
>-MAINTAINER= ports@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Software simulator for Microchip PIC microcontrollers
> 
>-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
>-		gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2
>+LICENSE=	GPLv2 LGPL21
>+LICENSE_COMB=	multi
>+
>+BUILD_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
>+LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
> RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
> 
>-USE_AUTOTOOLS=	libtool
>+USES=		libtool pathfix pkgconfig
>+USE_GNOME=	glib20
> GNU_CONFIGURE=	yes
>-USES=		pkgconfig
>+INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>+
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-NO_STAGE=	yes
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE=		DOCS EXAMPLES GTK2
>+OPTIONS_DEFAULT=	GTK2
>+OPTIONS_SUB=		yes
>+
>+GTK2_LIB_DEPENDS=	libgtkextra-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtkextra2
>+GTK2_USE=		gnome=gtk20
>+GTK2_CONFIGURE_ENABLE=	gui
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MGTK2}
>+DESKTOP_ENTRIES="GPSim" "" "" "gpsim" "Development;GTK;" ""
>+.endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
>-		${WRKSRC}/src/os_dependent.cc
>-	@${REINPLACE_CMD} -e 's|glibconfig.h|glib.h|g' \
>-		${WRKSRC}/src/bitlog.h
>+.for i in gpsim/Makefile.in modules/Makefile.in
>+	@${REINPLACE_CMD} -e \
>+		's|-lstdc++||' ${WRKSRC}/${i}
>+.endfor
> 
> post-install:
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-.for FILE in AUTHORS ChangeLog PROCESSORS README* doc/gpsim.pdf
>-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+.for i in AUTHORS ChangeLog PROCESSORS README* doc/gpsim.pdf
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
>+		${STAGEDIR}${DOCSDIR})
>+.endfor
>+.for i in led_test logic_test mod_test usart_gui usart_test
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/modules/${i}
>+	(cd ${WRKSRC}/examples/modules/${i} && ${INSTALL_DATA} *.asm *.stc \
>+		${STAGEDIR}${EXAMPLESDIR}/modules/${i})
>+.endfor
>+.for i in digital_stim p16f628_test stack_test
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/projects/${i}
>+	(cd ${WRKSRC}/examples/projects/${i} && ${INSTALL_DATA} *.asm *.stc \
>+		${STAGEDIR}${EXAMPLESDIR}/projects/${i})
> .endfor
>-.endif
>-
>-	${MKDIR} ${EXAMPLESDIR}
>-	cd ${WRKSRC}/examples && \
>-		${FIND} * -type d -exec ${MKDIR} "${EXAMPLESDIR}/{}" \; && \
>-		${FIND} -E * -type f -iregex ".*\.(asm|stc|inc)" -exec ${INSTALL_DATA} "{}" "${EXAMPLESDIR}/{}" \;
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/devel/gpsim/distinfo devel/gpsim/distinfo
>--- /usr/ports/devel/gpsim/distinfo	2014-06-21 17:51:26.000000000 +0900
>+++ devel/gpsim/distinfo	2014-07-12 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (gpsim-0.22.0.tar.gz) = 08fdc92b88dee4cd9d63e5abe56dc73940b0efec427997eee005f8fe75d54fc7
>-SIZE (gpsim-0.22.0.tar.gz) = 1528125
>+SHA256 (gpsim-0.27.0.tar.gz) = 204ed2a8aaf1b3021617544330997f4a508b811afce71fb9628b94406d5e59a2
>+SIZE (gpsim-0.27.0.tar.gz) = 2465642
>diff -urN /usr/ports/devel/gpsim/files/patch-modules__stimuli.cc devel/gpsim/files/patch-modules__stimuli.cc
>--- /usr/ports/devel/gpsim/files/patch-modules__stimuli.cc	1970-01-01 09:00:00.000000000 +0900
>+++ devel/gpsim/files/patch-modules__stimuli.cc	2014-07-12 00:00:00.000000000 +0900
>@@ -0,0 +1,33 @@
>+--- 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<ValueStimulusData>::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 -urN /usr/ports/devel/gpsim/files/patch-modules__switch.cc devel/gpsim/files/patch-modules__switch.cc
>--- /usr/ports/devel/gpsim/files/patch-modules__switch.cc	1970-01-01 09:00:00.000000000 +0900
>+++ devel/gpsim/files/patch-modules__switch.cc	2014-07-12 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- 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 -urN /usr/ports/devel/gpsim/pkg-descr devel/gpsim/pkg-descr
>--- /usr/ports/devel/gpsim/pkg-descr	2014-06-21 17:51:26.000000000 +0900
>+++ devel/gpsim/pkg-descr	2014-07-12 00:00:00.000000000 +0900
>@@ -1,24 +1,4 @@
>-gpsim is a full-featured software simulator for Microchip PIC microcontrollers
>-distributed under the GNU General Public License.
>+gpsim is a full-featured software simulator for Microchip PIC
>+microcontrollers distributed under the GNU General Public License.
> 
>-gpsim has been designed to be as accurate as possible. Accuracy includes the
>-entire PIC - from the core to the I/O pins and including ALL of the internal
>-peripherals. Thus it's possible to create stimuli and tie them to the I/O pins
>-and test the PIC the same PIC the same way you would in the real world.
>-
>-gpsim has been designed to be as fast as possible. Real time simulation speeds
>-of 20Mhz pics are possible. A 'goto $' program runs at the same speed as a
>-25Mhz pic when simulated on my 400Mhz PII Linux Box. Of course, as you add
>-stimuli and begin interacting with peripherals, the performance drops. But
>-it's still fast!
>-
>-gpsim has been designed to be as useful as possible (at least that's the
>-intent - honest). The standard simulation paradigm including breakpoints,
>-single stepping, disassembling, memory inspect & change, and so on has been
>-implemented. In addition, gpsim supports many debugging features that are only
>-available with in-circuit emulators. For example, a continuous trace buffer
>-tracks every action of the simulator (whether you want it or not). Also, it's
>-possible to set read and write break points on values (e.g. break if a
>-specific value is read from or written to a register).
>-
>-WWW: http://www.dattalo.com/gnupic/gpsim.html
>+WWW: http://gpsim.sourceforge.net/
>diff -urN /usr/ports/devel/gpsim/pkg-plist devel/gpsim/pkg-plist
>--- /usr/ports/devel/gpsim/pkg-plist	2014-06-21 17:51:26.000000000 +0900
>+++ devel/gpsim/pkg-plist	2014-07-12 00:00:00.000000000 +0900
>@@ -13,12 +13,14 @@
> include/gpsim/16bit-registers.h
> include/gpsim/16bit-tmrs.h
> include/gpsim/ValueCollections.h
>+include/gpsim/a2d_v2.h
> include/gpsim/a2dconverter.h
> include/gpsim/attributes.h
> include/gpsim/bit.h
> include/gpsim/bitlog.h
> include/gpsim/breakpoints.h
> include/gpsim/bytelog.h
>+include/gpsim/clock_phase.h
> include/gpsim/cmd_gpsim.h
> include/gpsim/cmd_manager.h
> include/gpsim/cod.h
>@@ -42,9 +44,12 @@
> 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
> include/gpsim/p16f87x.h
>+include/gpsim/p16f88x.h
> include/gpsim/p16f8x.h
> include/gpsim/p16x5x.h
> include/gpsim/p16x6x.h
>@@ -67,13 +72,12 @@
> include/gpsim/protocol.h
> include/gpsim/psp.h
> include/gpsim/pthread-wrap.h
>+include/gpsim/rcon.h
> include/gpsim/registers.h
> include/gpsim/sim_context.h
> include/gpsim/ssp.h
> include/gpsim/stimuli.h
>-include/gpsim/stimulus_orb.h
> include/gpsim/symbol.h
>-include/gpsim/symbol_orb.h
> include/gpsim/tmr0.h
> include/gpsim/trace.h
> include/gpsim/trace_orb.h
>@@ -84,29 +88,45 @@
> include/gpsim/value.h
> include/gpsim/xref.h
> lib/libgpsim.a
>-lib/libgpsim.la
> lib/libgpsim.so
> lib/libgpsim.so.0
>+lib/libgpsim.so.0.0.0
>+lib/libgpsim_ds1307.a
>+lib/libgpsim_ds1307.so
>+lib/libgpsim_ds1307.so.0
>+lib/libgpsim_ds1307.so.0.0.0
>+lib/libgpsim_ds1820.a
>+lib/libgpsim_ds1820.so
>+lib/libgpsim_ds1820.so.0
>+lib/libgpsim_ds1820.so.0.0.0
> lib/libgpsim_dspic.a
>-lib/libgpsim_dspic.la
> lib/libgpsim_dspic.so
> lib/libgpsim_dspic.so.0
>+lib/libgpsim_dspic.so.0.0.0
> lib/libgpsim_eXdbm.a
>-lib/libgpsim_eXdbm.la
> lib/libgpsim_eXdbm.so
> lib/libgpsim_eXdbm.so.0
>+lib/libgpsim_eXdbm.so.0.0.0
>+lib/libgpsim_graphicLCD.a
>+lib/libgpsim_graphicLCD.so
>+lib/libgpsim_graphicLCD.so.0
>+lib/libgpsim_graphicLCD.so.0.0.0
>+lib/libgpsim_lcd.a
>+lib/libgpsim_lcd.so
>+lib/libgpsim_lcd.so.0
>+lib/libgpsim_lcd.so.0.0.0
> lib/libgpsim_modules.a
>-lib/libgpsim_modules.la
> lib/libgpsim_modules.so
> lib/libgpsim_modules.so.0
>+lib/libgpsim_modules.so.0.0.0
> lib/libgpsimcli.a
>-lib/libgpsimcli.la
> lib/libgpsimcli.so
> lib/libgpsimcli.so.0
>+lib/libgpsimcli.so.0.0.0
> lib/libgpsimgui.a
>-lib/libgpsimgui.la
> lib/libgpsimgui.so
> lib/libgpsimgui.so.0
>+lib/libgpsimgui.so.0.0.0
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/PROCESSORS
>@@ -114,33 +134,33 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.EXAMPLES
> %%PORTDOCS%%%%DOCSDIR%%/README.MODULES
> %%PORTDOCS%%%%DOCSDIR%%/gpsim.pdf
>-%%EXAMPLESDIR%%/modules/led_test/led_mod.asm
>-%%EXAMPLESDIR%%/modules/led_test/led_mod.stc
>-%%EXAMPLESDIR%%/modules/logic_test/logic_mod.asm
>-%%EXAMPLESDIR%%/modules/logic_test/logic_mod.stc
>-%%EXAMPLESDIR%%/modules/mod_test/mod_test.asm
>-%%EXAMPLESDIR%%/modules/mod_test/mod_test.stc
>-%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.asm
>-%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.stc
>-%%EXAMPLESDIR%%/modules/usart_test/usart_test.asm
>-%%EXAMPLESDIR%%/modules/usart_test/usart_test.stc
>-%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.asm
>-%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.stc
>-%%EXAMPLESDIR%%/projects/p16f628_test/f628.asm
>-%%EXAMPLESDIR%%/projects/p16f628_test/f628.stc
>-%%EXAMPLESDIR%%/projects/stack_test/stack_test.asm
>-%%EXAMPLESDIR%%/projects/stack_test/stack_test.stc
>-@dirrm include/eXdbm
>-@dirrm include/gpsim
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/led_test/led_mod.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/led_test/led_mod.stc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/logic_test/logic_mod.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/logic_test/logic_mod.stc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/mod_test/mod_test.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/mod_test/mod_test.stc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.stc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_test/usart_test.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_test/usart_test.stc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.stc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/p16f628_test/f628.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/p16f628_test/f628.stc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/stack_test/stack_test.asm
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/stack_test/stack_test.stc
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects/stack_test
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects/p16f628_test
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects/digital_stim
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/usart_test
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/usart_gui
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/mod_test
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/logic_test
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/led_test
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm %%EXAMPLESDIR%%/modules/led_test
>-@dirrm %%EXAMPLESDIR%%/modules/logic_test
>-@dirrm %%EXAMPLESDIR%%/modules/mod_test
>-@dirrm %%EXAMPLESDIR%%/modules/usart_gui
>-@dirrm %%EXAMPLESDIR%%/modules/usart_test
>-@dirrm %%EXAMPLESDIR%%/modules
>-@dirrm %%EXAMPLESDIR%%/projects/stack_test
>-@dirrm %%EXAMPLESDIR%%/projects/p16f628_test
>-@dirrm %%EXAMPLESDIR%%/projects/digital_stim
>-@dirrm %%EXAMPLESDIR%%/projects
>-@dirrm %%EXAMPLESDIR%%
>+@dirrm include/gpsim
>+@dirrm include/eXdbm

Actions: View | Diff

Attachments on bug 191815: 144586 | 144659