diff --git a/MOVED b/MOVED
index 4f74b28a0021..b3cbf8f8eac4 100644
--- a/MOVED
+++ b/MOVED
@@ -11610,7 +11610,6 @@ www/moodle31|www/moodle35|2019-03-04|Has expired: Upstream no longer maintained
 www/moodle34|www/moodle35|2019-03-04|Has expired: Upstream no longer maintained
 net/wireshark-qt5|net/wireshark|2019-03-05|Only GUI for wireshark is Qt5
 devel/elixir-lager_logger||2019-03-06|Has expired: Broken for more than 6 months
-devel/gpsim||2019-03-06|Has expired: Broken for more than 6 months
 devel/hgview||2019-03-06|Has expired: Broken for more than 6 months
 games/mudmagic||2019-03-06|Has expired: Broken for more than 6 months
 math/mumps-mpich||2019-03-06|Has expired: Broken for more than 6 months
diff --git a/misc/Makefile b/misc/Makefile
index 937ec30998a1..f92a955e94a5 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -165,6 +165,7 @@
     SUBDIR += gone
     SUBDIR += gonvert
     SUBDIR += gplink
+    SUBDIR += gpsim
     SUBDIR += granulate
     SUBDIR += grc
     SUBDIR += gwhich
diff --git a/misc/gpsim/Makefile b/misc/gpsim/Makefile
new file mode 100644
index 000000000000..a247ca1bdfe7
--- /dev/null
+++ b/misc/gpsim/Makefile
@@ -0,0 +1,63 @@
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
+# $FreeBSD$
+
+PORTNAME=	gpsim
+DISTVERSION=	0.31.0
+CATEGORIES=	misc
+MASTER_SITES=	SF
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Software simulator for Microchip PIC microcontrollers
+
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+
+BUILD_DEPENDS=	gpasm:devel/gputils
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libpopt.so:devel/popt
+RUN_DEPENDS=	gpasm:devel/gputils
+
+USES=		compiler:c++11-lang gmake gnome libtool localbase:ldflags pathfix pkgconfig readline
+USE_CXXSTD=	gnu++98
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 pango
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USE_CXXSTD=	c++11
+USE_LDCONFIG=	yes
+
+CONFLICTS_BUILD=	ga
+
+DESKTOP_ENTRIES=	"GPSim" "" "" "gpsim" "Development;GTK;" ""
+
+OPTIONS_DEFINE=		DOCS EXAMPLES
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+post-patch:
+.for i in gpsim/Makefile.in modules/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-lstdc++||' ${WRKSRC}/${i}
+.endfor
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS ChangeLog PROCESSORS README* doc/gpsim.pdf
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
+.endfor
+
+post-install-EXAMPLES-on:
+.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
+
+.include <bsd.port.mk>
diff --git a/misc/gpsim/distinfo b/misc/gpsim/distinfo
new file mode 100644
index 000000000000..db0eede38865
--- /dev/null
+++ b/misc/gpsim/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1571981677
+SHA256 (gpsim-0.31.0.tar.gz) = 110ee6be3a5d02b32803a91e480cbfc9d423ef72e0830703fc0bc97b9569923f
+SIZE (gpsim-0.31.0.tar.gz) = 3454179
diff --git a/misc/gpsim/files/patch-src_modules.cc b/misc/gpsim/files/patch-src_modules.cc
new file mode 100644
index 000000000000..e4b080af4465
--- /dev/null
+++ b/misc/gpsim/files/patch-src_modules.cc
@@ -0,0 +1,11 @@
+--- src/modules.cc.orig	2019-10-25 05:47:58 UTC
++++ src/modules.cc
+@@ -47,7 +47,7 @@ License along with this library; if not, see
+ #undef interface
+ #endif
+ 
+-#include "error.h"
++//#include "error.h"
+ #include "gpsim_interface.h"
+ #include "stimuli.h"
+ #include "symbol.h"
diff --git a/misc/gpsim/pkg-descr b/misc/gpsim/pkg-descr
new file mode 100644
index 000000000000..d6f354b3c0be
--- /dev/null
+++ b/misc/gpsim/pkg-descr
@@ -0,0 +1,4 @@
+gpsim is a full-featured software simulator for Microchip PIC
+microcontrollers distributed under the GNU General Public License.
+
+WWW: http://gpsim.sourceforge.net/
diff --git a/misc/gpsim/pkg-plist b/misc/gpsim/pkg-plist
new file mode 100644
index 000000000000..8520ad2699ea
--- /dev/null
+++ b/misc/gpsim/pkg-plist
@@ -0,0 +1,128 @@
+bin/gpsim
+include/eXdbm/eXdbm.h
+include/eXdbm/eXdbmErrors.h
+include/eXdbm/eXdbmTypes.h
+include/gpsim/12bit-instructions.h
+include/gpsim/12bit-processors.h
+include/gpsim/14bit-instructions.h
+include/gpsim/14bit-processors.h
+include/gpsim/14bit-registers.h
+include/gpsim/14bit-tmrs.h
+include/gpsim/16bit-instructions.h
+include/gpsim/16bit-processors.h
+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/clc.h
+include/gpsim/clock_phase.h
+include/gpsim/cmd_gpsim.h
+include/gpsim/cmd_manager.h
+include/gpsim/cod.h
+include/gpsim/comparator.h
+include/gpsim/ctmu.h
+include/gpsim/cwg.h
+include/gpsim/dsm_module.h
+include/gpsim/eeprom.h
+include/gpsim/errors.h
+include/gpsim/exports.h
+include/gpsim/expr.h
+include/gpsim/fopen-path.h
+include/gpsim/gpsim_classes.h
+include/gpsim/gpsim_def.h
+include/gpsim/gpsim_interface.h
+include/gpsim/gpsim_object.h
+include/gpsim/gpsim_time.h
+include/gpsim/hexutils.h
+include/gpsim/i2c-ee.h
+include/gpsim/icd.h
+include/gpsim/intcon.h
+include/gpsim/interface.h
+include/gpsim/ioports.h
+include/gpsim/lcd_module.h
+include/gpsim/lxt_write.h
+include/gpsim/modules.h
+include/gpsim/nco.h
+include/gpsim/op_amp.h
+include/gpsim/operator.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/p16f91x.h
+include/gpsim/p16x5x.h
+include/gpsim/p16x6x.h
+include/gpsim/p16x7x.h
+include/gpsim/p16x8x.h
+include/gpsim/p17c75x.h
+include/gpsim/p18fk.h
+include/gpsim/p18x.h
+include/gpsim/p1xf1xxx.h
+include/gpsim/packages.h
+include/gpsim/pic-instructions.h
+include/gpsim/pic-ioports.h
+include/gpsim/pic-packages.h
+include/gpsim/pic-processor.h
+include/gpsim/pic-registers.h
+include/gpsim/pie.h
+include/gpsim/pir.h
+include/gpsim/pm_rd.h
+include/gpsim/pps.h
+include/gpsim/processor.h
+include/gpsim/program_files.h
+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/spp.h
+include/gpsim/ssp.h
+include/gpsim/stimuli.h
+include/gpsim/symbol.h
+include/gpsim/tmr0.h
+include/gpsim/trace.h
+include/gpsim/trace_orb.h
+include/gpsim/trigger.h
+include/gpsim/ttoken.h
+include/gpsim/uart.h
+include/gpsim/ui.h
+include/gpsim/value.h
+include/gpsim/xref.h
+include/gpsim/zcd.h
+lib/libgpsim.a
+lib/libgpsim.so
+lib/libgpsim.so.0
+lib/libgpsim.so.0.0.0
+lib/libgpsim_dspic.a
+lib/libgpsim_dspic.so
+lib/libgpsim_dspic.so.0
+lib/libgpsim_dspic.so.0.0.0
+lib/libgpsim_eXdbm.a
+lib/libgpsim_eXdbm.so
+lib/libgpsim_eXdbm.so.0
+lib/libgpsim_eXdbm.so.0.0.0
+lib/libgpsim_extras.a
+lib/libgpsim_extras.so
+lib/libgpsim_extras.so.0
+lib/libgpsim_extras.so.0.0.0
+lib/libgpsim_modules.a
+lib/libgpsim_modules.so
+lib/libgpsim_modules.so.0
+lib/libgpsim_modules.so.0.0.0
+lib/libgpsimcli.a
+lib/libgpsimcli.so
+lib/libgpsimcli.so.0
+lib/libgpsimcli.so.0.0.0
+lib/libgpsimgui.a
+lib/libgpsimgui.so
+lib/libgpsimgui.so.0
+lib/libgpsimgui.so.0.0.0