View | Details | Raw Unified | Return to bug 191815 | Differences between
and this patch

Collapse All | Expand All

(-)devel/gpsim/Makefile (-24 / +43 lines)
Lines 2-46 Link Here
2
# $FreeBSD: head/devel/gpsim/Makefile 361721 2014-07-13 23:02:35Z bapt $
2
# $FreeBSD: head/devel/gpsim/Makefile 361721 2014-07-13 23:02:35Z bapt $
3
3
4
PORTNAME=	gpsim
4
PORTNAME=	gpsim
5
PORTVERSION=	0.22.0
5
PORTVERSION=	0.27.0
6
PORTREVISION=	8
7
CATEGORIES=	devel
6
CATEGORIES=	devel
8
MASTER_SITES=	SF
7
MASTER_SITES=	SF
9
8
10
MAINTAINER= ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
11
COMMENT=	Software simulator for Microchip PIC microcontrollers
10
COMMENT=	Software simulator for Microchip PIC microcontrollers
12
11
13
LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
12
LICENSE=	GPLv2 LGPL21
14
		libgtkextra-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtkextra2
13
LICENSE_COMB=	multi
14
15
BUILD_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
16
LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
15
RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
17
RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
16
18
17
USE_AUTOTOOLS=	libtool
19
USES=		libtool pathfix pkgconfig
20
USE_GNOME=	glib20
18
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
19
USES=		pkgconfig
22
INSTALL_TARGET=	install-strip
20
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
24
21
CPPFLAGS+=	-I${LOCALBASE}/include
25
CPPFLAGS+=	-I${LOCALBASE}/include
22
LDFLAGS+=	-L${LOCALBASE}/lib
26
LDFLAGS+=	-L${LOCALBASE}/lib
23
27
24
NO_STAGE=	yes
28
OPTIONS_DEFINE=		DOCS EXAMPLES GTK2
25
.include <bsd.port.pre.mk>
29
OPTIONS_DEFAULT=	GTK2
30
OPTIONS_SUB=		yes
31
32
GTK2_LIB_DEPENDS=	libgtkextra-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtkextra2
33
GTK2_USE=		gnome=gtk20
34
GTK2_CONFIGURE_ENABLE=	gui
35
36
.include <bsd.port.options.mk>
37
38
.if ${PORT_OPTIONS:MGTK2}
39
DESKTOP_ENTRIES="GPSim" "" "" "gpsim" "Development;GTK;" ""
40
.endif
26
41
27
post-patch:
42
post-patch:
28
	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
43
.for i in gpsim/Makefile.in modules/Makefile.in
29
		${WRKSRC}/src/os_dependent.cc
44
	@${REINPLACE_CMD} -e \
30
	@${REINPLACE_CMD} -e 's|glibconfig.h|glib.h|g' \
45
		's|-lstdc++||' ${WRKSRC}/${i}
31
		${WRKSRC}/src/bitlog.h
46
.endfor
32
47
33
post-install:
48
post-install:
34
.if !defined(NOPORTDOCS)
49
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
35
	${MKDIR} ${DOCSDIR}
50
.for i in AUTHORS ChangeLog PROCESSORS README* doc/gpsim.pdf
36
.for FILE in AUTHORS ChangeLog PROCESSORS README* doc/gpsim.pdf
51
	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
37
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
52
		${STAGEDIR}${DOCSDIR})
53
.endfor
54
.for i in led_test logic_test mod_test usart_gui usart_test
55
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/modules/${i}
56
	(cd ${WRKSRC}/examples/modules/${i} && ${INSTALL_DATA} *.asm *.stc \
57
		${STAGEDIR}${EXAMPLESDIR}/modules/${i})
58
.endfor
59
.for i in digital_stim p16f628_test stack_test
60
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/projects/${i}
61
	(cd ${WRKSRC}/examples/projects/${i} && ${INSTALL_DATA} *.asm *.stc \
62
		${STAGEDIR}${EXAMPLESDIR}/projects/${i})
38
.endfor
63
.endfor
39
.endif
40
41
	${MKDIR} ${EXAMPLESDIR}
42
	cd ${WRKSRC}/examples && \
43
		${FIND} * -type d -exec ${MKDIR} "${EXAMPLESDIR}/{}" \; && \
44
		${FIND} -E * -type f -iregex ".*\.(asm|stc|inc)" -exec ${INSTALL_DATA} "{}" "${EXAMPLESDIR}/{}" \;
45
64
46
.include <bsd.port.post.mk>
65
.include <bsd.port.mk>
(-)devel/gpsim/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gpsim-0.22.0.tar.gz) = 08fdc92b88dee4cd9d63e5abe56dc73940b0efec427997eee005f8fe75d54fc7
1
SHA256 (gpsim-0.27.0.tar.gz) = 204ed2a8aaf1b3021617544330997f4a508b811afce71fb9628b94406d5e59a2
2
SIZE (gpsim-0.22.0.tar.gz) = 1528125
2
SIZE (gpsim-0.27.0.tar.gz) = 2465642
(-)devel/gpsim/files/patch-modules__stimuli.cc (+33 lines)
Line 0 Link Here
1
--- modules/stimuli.cc.orig
2
+++ modules/stimuli.cc
3
@@ -216,7 +216,7 @@
4
   //----------------------------------------------------------------------
5
   //----------------------------------------------------------------------
6
 
7
-  PulseGen::PulseGen(const char *_name=0)
8
+  PulseGen::PulseGen(const char *_name)
9
     : StimulusBase(_name, "\
10
 Pulse Generator\n\
11
  Attributes:\n\
12
@@ -402,13 +402,20 @@
13
     setBreak(m_start_cycle + (*si).time, si);
14
 
15
   }
16
+
17
+  static bool compare_data_point(const ValueStimulusData &data_point1,
18
+                                 const ValueStimulusData &data_point2)
19
+  {
20
+    return (data_point1.time < data_point2.time);
21
+  }
22
+
23
   void PulseGen::put_data(ValueStimulusData &data_point)
24
   {
25
     list<ValueStimulusData>::iterator si;
26
     si = find(samples.begin(), samples.end(), data_point);
27
     if (si == samples.end()) {
28
       samples.push_back(data_point);
29
-      samples.sort();
30
+      samples.sort(compare_data_point);
31
     } else {
32
       delete (*si).v;
33
       (*si).v = data_point.v;
(-)devel/gpsim/files/patch-modules__switch.cc (+11 lines)
Line 0 Link Here
1
--- modules/switch.cc.orig
2
+++ modules/switch.cc
3
@@ -582,7 +582,7 @@
4
 
5
   //========================================================================
6
 
7
-  Switch::Switch(const char *_new_name=0)
8
+  Switch::Switch(const char *_new_name)
9
     : SwitchBase(_new_name, "\
10
 Two port switch\n\
11
  Attributes:\n\
(-)devel/gpsim/pkg-descr (-23 / +3 lines)
Lines 1-24 Link Here
1
gpsim is a full-featured software simulator for Microchip PIC microcontrollers
1
gpsim is a full-featured software simulator for Microchip PIC
2
distributed under the GNU General Public License.
2
microcontrollers distributed under the GNU General Public License.
3
3
4
gpsim has been designed to be as accurate as possible. Accuracy includes the
4
WWW: http://gpsim.sourceforge.net/
5
entire PIC - from the core to the I/O pins and including ALL of the internal
6
peripherals. Thus it's possible to create stimuli and tie them to the I/O pins
7
and test the PIC the same PIC the same way you would in the real world.
8
9
gpsim has been designed to be as fast as possible. Real time simulation speeds
10
of 20Mhz pics are possible. A 'goto $' program runs at the same speed as a
11
25Mhz pic when simulated on my 400Mhz PII Linux Box. Of course, as you add
12
stimuli and begin interacting with peripherals, the performance drops. But
13
it's still fast!
14
15
gpsim has been designed to be as useful as possible (at least that's the
16
intent - honest). The standard simulation paradigm including breakpoints,
17
single stepping, disassembling, memory inspect & change, and so on has been
18
implemented. In addition, gpsim supports many debugging features that are only
19
available with in-circuit emulators. For example, a continuous trace buffer
20
tracks every action of the simulator (whether you want it or not). Also, it's
21
possible to set read and write break points on values (e.g. break if a
22
specific value is read from or written to a register).
23
24
WWW: http://www.dattalo.com/gnupic/gpsim.html
(-)devel/gpsim/pkg-plist (-37 / +57 lines)
Lines 13-24 Link Here
13
include/gpsim/16bit-registers.h
13
include/gpsim/16bit-registers.h
14
include/gpsim/16bit-tmrs.h
14
include/gpsim/16bit-tmrs.h
15
include/gpsim/ValueCollections.h
15
include/gpsim/ValueCollections.h
16
include/gpsim/a2d_v2.h
16
include/gpsim/a2dconverter.h
17
include/gpsim/a2dconverter.h
17
include/gpsim/attributes.h
18
include/gpsim/attributes.h
18
include/gpsim/bit.h
19
include/gpsim/bit.h
19
include/gpsim/bitlog.h
20
include/gpsim/bitlog.h
20
include/gpsim/breakpoints.h
21
include/gpsim/breakpoints.h
21
include/gpsim/bytelog.h
22
include/gpsim/bytelog.h
23
include/gpsim/clock_phase.h
22
include/gpsim/cmd_gpsim.h
24
include/gpsim/cmd_gpsim.h
23
include/gpsim/cmd_manager.h
25
include/gpsim/cmd_manager.h
24
include/gpsim/cod.h
26
include/gpsim/cod.h
Lines 42-50 Link Here
42
include/gpsim/lxt_write.h
44
include/gpsim/lxt_write.h
43
include/gpsim/modules.h
45
include/gpsim/modules.h
44
include/gpsim/operator.h
46
include/gpsim/operator.h
47
include/gpsim/p12f182x.h
48
include/gpsim/p12f6xx.h
45
include/gpsim/p12x.h
49
include/gpsim/p12x.h
46
include/gpsim/p16f62x.h
50
include/gpsim/p16f62x.h
47
include/gpsim/p16f87x.h
51
include/gpsim/p16f87x.h
52
include/gpsim/p16f88x.h
48
include/gpsim/p16f8x.h
53
include/gpsim/p16f8x.h
49
include/gpsim/p16x5x.h
54
include/gpsim/p16x5x.h
50
include/gpsim/p16x6x.h
55
include/gpsim/p16x6x.h
Lines 67-79 Link Here
67
include/gpsim/protocol.h
72
include/gpsim/protocol.h
68
include/gpsim/psp.h
73
include/gpsim/psp.h
69
include/gpsim/pthread-wrap.h
74
include/gpsim/pthread-wrap.h
75
include/gpsim/rcon.h
70
include/gpsim/registers.h
76
include/gpsim/registers.h
71
include/gpsim/sim_context.h
77
include/gpsim/sim_context.h
72
include/gpsim/ssp.h
78
include/gpsim/ssp.h
73
include/gpsim/stimuli.h
79
include/gpsim/stimuli.h
74
include/gpsim/stimulus_orb.h
75
include/gpsim/symbol.h
80
include/gpsim/symbol.h
76
include/gpsim/symbol_orb.h
77
include/gpsim/tmr0.h
81
include/gpsim/tmr0.h
78
include/gpsim/trace.h
82
include/gpsim/trace.h
79
include/gpsim/trace_orb.h
83
include/gpsim/trace_orb.h
Lines 84-112 Link Here
84
include/gpsim/value.h
88
include/gpsim/value.h
85
include/gpsim/xref.h
89
include/gpsim/xref.h
86
lib/libgpsim.a
90
lib/libgpsim.a
87
lib/libgpsim.la
88
lib/libgpsim.so
91
lib/libgpsim.so
89
lib/libgpsim.so.0
92
lib/libgpsim.so.0
93
lib/libgpsim.so.0.0.0
94
lib/libgpsim_ds1307.a
95
lib/libgpsim_ds1307.so
96
lib/libgpsim_ds1307.so.0
97
lib/libgpsim_ds1307.so.0.0.0
98
lib/libgpsim_ds1820.a
99
lib/libgpsim_ds1820.so
100
lib/libgpsim_ds1820.so.0
101
lib/libgpsim_ds1820.so.0.0.0
90
lib/libgpsim_dspic.a
102
lib/libgpsim_dspic.a
91
lib/libgpsim_dspic.la
92
lib/libgpsim_dspic.so
103
lib/libgpsim_dspic.so
93
lib/libgpsim_dspic.so.0
104
lib/libgpsim_dspic.so.0
105
lib/libgpsim_dspic.so.0.0.0
94
lib/libgpsim_eXdbm.a
106
lib/libgpsim_eXdbm.a
95
lib/libgpsim_eXdbm.la
96
lib/libgpsim_eXdbm.so
107
lib/libgpsim_eXdbm.so
97
lib/libgpsim_eXdbm.so.0
108
lib/libgpsim_eXdbm.so.0
109
lib/libgpsim_eXdbm.so.0.0.0
110
lib/libgpsim_graphicLCD.a
111
lib/libgpsim_graphicLCD.so
112
lib/libgpsim_graphicLCD.so.0
113
lib/libgpsim_graphicLCD.so.0.0.0
114
lib/libgpsim_lcd.a
115
lib/libgpsim_lcd.so
116
lib/libgpsim_lcd.so.0
117
lib/libgpsim_lcd.so.0.0.0
98
lib/libgpsim_modules.a
118
lib/libgpsim_modules.a
99
lib/libgpsim_modules.la
100
lib/libgpsim_modules.so
119
lib/libgpsim_modules.so
101
lib/libgpsim_modules.so.0
120
lib/libgpsim_modules.so.0
121
lib/libgpsim_modules.so.0.0.0
102
lib/libgpsimcli.a
122
lib/libgpsimcli.a
103
lib/libgpsimcli.la
104
lib/libgpsimcli.so
123
lib/libgpsimcli.so
105
lib/libgpsimcli.so.0
124
lib/libgpsimcli.so.0
125
lib/libgpsimcli.so.0.0.0
106
lib/libgpsimgui.a
126
lib/libgpsimgui.a
107
lib/libgpsimgui.la
108
lib/libgpsimgui.so
127
lib/libgpsimgui.so
109
lib/libgpsimgui.so.0
128
lib/libgpsimgui.so.0
129
lib/libgpsimgui.so.0.0.0
110
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
130
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
111
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
131
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
112
%%PORTDOCS%%%%DOCSDIR%%/PROCESSORS
132
%%PORTDOCS%%%%DOCSDIR%%/PROCESSORS
Lines 114-146 Link Here
114
%%PORTDOCS%%%%DOCSDIR%%/README.EXAMPLES
134
%%PORTDOCS%%%%DOCSDIR%%/README.EXAMPLES
115
%%PORTDOCS%%%%DOCSDIR%%/README.MODULES
135
%%PORTDOCS%%%%DOCSDIR%%/README.MODULES
116
%%PORTDOCS%%%%DOCSDIR%%/gpsim.pdf
136
%%PORTDOCS%%%%DOCSDIR%%/gpsim.pdf
117
%%EXAMPLESDIR%%/modules/led_test/led_mod.asm
137
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/led_test/led_mod.asm
118
%%EXAMPLESDIR%%/modules/led_test/led_mod.stc
138
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/led_test/led_mod.stc
119
%%EXAMPLESDIR%%/modules/logic_test/logic_mod.asm
139
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/logic_test/logic_mod.asm
120
%%EXAMPLESDIR%%/modules/logic_test/logic_mod.stc
140
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/logic_test/logic_mod.stc
121
%%EXAMPLESDIR%%/modules/mod_test/mod_test.asm
141
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/mod_test/mod_test.asm
122
%%EXAMPLESDIR%%/modules/mod_test/mod_test.stc
142
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/mod_test/mod_test.stc
123
%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.asm
143
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.asm
124
%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.stc
144
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_gui/usart_gui.stc
125
%%EXAMPLESDIR%%/modules/usart_test/usart_test.asm
145
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_test/usart_test.asm
126
%%EXAMPLESDIR%%/modules/usart_test/usart_test.stc
146
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modules/usart_test/usart_test.stc
127
%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.asm
147
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.asm
128
%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.stc
148
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.stc
129
%%EXAMPLESDIR%%/projects/p16f628_test/f628.asm
149
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/p16f628_test/f628.asm
130
%%EXAMPLESDIR%%/projects/p16f628_test/f628.stc
150
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/p16f628_test/f628.stc
131
%%EXAMPLESDIR%%/projects/stack_test/stack_test.asm
151
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/stack_test/stack_test.asm
132
%%EXAMPLESDIR%%/projects/stack_test/stack_test.stc
152
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/projects/stack_test/stack_test.stc
133
@dirrm include/eXdbm
153
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects/stack_test
134
@dirrm include/gpsim
154
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects/p16f628_test
155
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects/digital_stim
156
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/projects
157
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/usart_test
158
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/usart_gui
159
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/mod_test
160
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/logic_test
161
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules/led_test
162
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/modules
163
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
135
%%PORTDOCS%%@dirrm %%DOCSDIR%%
164
%%PORTDOCS%%@dirrm %%DOCSDIR%%
136
@dirrm %%EXAMPLESDIR%%/modules/led_test
165
@dirrm include/gpsim
137
@dirrm %%EXAMPLESDIR%%/modules/logic_test
166
@dirrm include/eXdbm
138
@dirrm %%EXAMPLESDIR%%/modules/mod_test
139
@dirrm %%EXAMPLESDIR%%/modules/usart_gui
140
@dirrm %%EXAMPLESDIR%%/modules/usart_test
141
@dirrm %%EXAMPLESDIR%%/modules
142
@dirrm %%EXAMPLESDIR%%/projects/stack_test
143
@dirrm %%EXAMPLESDIR%%/projects/p16f628_test
144
@dirrm %%EXAMPLESDIR%%/projects/digital_stim
145
@dirrm %%EXAMPLESDIR%%/projects
146
@dirrm %%EXAMPLESDIR%%

Return to bug 191815