- Update to 0.22.0

- Remove 4.x support
- Remove obsolete patch files
- Use USE_LDCONFIG

Submitted by:	danfe

5 files changed, 35 insertions, 120 deletions

diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 16524e4057a3..d029422865cc 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpsim
-PORTVERSION=	0.21.11
-PORTREVISION=	1
+PORTVERSION=	0.22.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,16 +22,12 @@ USE_AUTOTOOLS=	libtool:15
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GCC=	3.4+
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES=	${FILESDIR}/4patch-*
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/devel/gpsim/distinfo b/devel/gpsim/distinfo
index 76cffafdee11..d96feccc3c2e 100644
--- a/devel/gpsim/distinfo
+++ b/devel/gpsim/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpsim-0.21.11.tar.gz) = 2acd268dc2dd69d1ad687253bde8dd21
-SHA256 (gpsim-0.21.11.tar.gz) = 65d1a6a867cf0ee9a030e89b928d633ce7019b275b2683d6126fe8597e87fe84
-SIZE (gpsim-0.21.11.tar.gz) = 1218332
+MD5 (gpsim-0.22.0.tar.gz) = f05a4e58d24b5a5c6b57c8d0e3810f75
+SHA256 (gpsim-0.22.0.tar.gz) = 08fdc92b88dee4cd9d63e5abe56dc73940b0efec427997eee005f8fe75d54fc7
+SIZE (gpsim-0.22.0.tar.gz) = 1528125
diff --git a/devel/gpsim/files/4patch-cli_input.cc b/devel/gpsim/files/4patch-cli_input.cc
deleted file mode 100644
index 856e5c367214..000000000000
--- a/devel/gpsim/files/4patch-cli_input.cc
+++ /dev/null
@@ -1,32 +0,0 @@
---- cli/input.cc.orig	Wed Aug 31 05:57:33 2005
-+++ cli/input.cc	Sun Mar 19 20:35:44 2006
-@@ -49,7 +49,6 @@
- // temp fix to over come 23jan05 changes to configure script that prevent
- // readline from being found on older systems.
- #define HAVE_READLINE
--#define HAVE_NSCLEAN_READLINE
- 
- #endif
- 
-@@ -899,7 +898,7 @@
-   win32_fd_to_raw(fileno(stdin));
- #endif
- 
--  rl_getc_function = gpsim_rl_getc;
-+  rl_getc_function = (Function *) gpsim_rl_getc;
-   channel = g_io_channel_unix_new (fileno(stdin));
- 
- #ifdef _WIN32
-@@ -915,10 +914,10 @@
- #else
-  g_io_add_watch (channel, G_IO_IN, keypressed, NULL);
- #endif
--  rl_callback_handler_install (prompt, have_line);
-+  rl_callback_handler_install ((char *) prompt, (VFunction *) have_line);
- 
-   /* Tell the completer that we want a crack first. */
--  rl_attempted_completion_function = gpsim_completion;
-+  rl_attempted_completion_function = (CPPFunction *) gpsim_completion;
- 
- #endif //HAVE_READLINE
- }
diff --git a/devel/gpsim/files/patch-src_os__dependent.cc b/devel/gpsim/files/patch-src_os__dependent.cc
deleted file mode 100644
index 30547a4fd047..000000000000
--- a/devel/gpsim/files/patch-src_os__dependent.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/os_dependent.cc.orig	Thu Aug 25 23:57:41 2005
-+++ src/os_dependent.cc	Sun Mar 19 20:45:54 2006
-@@ -349,7 +349,7 @@
- 
- char * get_error_message() {
- #ifndef _WIN32
--  return dlerror();
-+  return (char *) dlerror();
- #else
-   return g_win32_error_message(GetLastError());
- #endif
diff --git a/devel/gpsim/pkg-plist b/devel/gpsim/pkg-plist
index 2bcd3374b699..0e2aedd048b1 100644
--- a/devel/gpsim/pkg-plist
+++ b/devel/gpsim/pkg-plist
@@ -12,6 +12,8 @@ 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/a2dconverter.h
 include/gpsim/attributes.h
 include/gpsim/bit.h
 include/gpsim/bitlog.h
@@ -20,6 +22,7 @@ include/gpsim/bytelog.h
 include/gpsim/cmd_gpsim.h
 include/gpsim/cmd_manager.h
 include/gpsim/cod.h
+include/gpsim/comparator.h
 include/gpsim/eeprom.h
 include/gpsim/errors.h
 include/gpsim/exports.h
@@ -30,6 +33,7 @@ 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
@@ -41,6 +45,7 @@ include/gpsim/operator.h
 include/gpsim/p12x.h
 include/gpsim/p16f62x.h
 include/gpsim/p16f87x.h
+include/gpsim/p16f8x.h
 include/gpsim/p16x5x.h
 include/gpsim/p16x6x.h
 include/gpsim/p16x7x.h
@@ -49,15 +54,18 @@ include/gpsim/p17c75x.h
 include/gpsim/p18x.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/picdis.h
 include/gpsim/pie.h
 include/gpsim/pir.h
+include/gpsim/pm_rd.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/registers.h
 include/gpsim/sim_context.h
@@ -72,12 +80,17 @@ 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
 lib/libgpsim.a
 lib/libgpsim.la
 lib/libgpsim.so
 lib/libgpsim.so.0
+lib/libgpsim_dspic.a
+lib/libgpsim_dspic.la
+lib/libgpsim_dspic.so
+lib/libgpsim_dspic.so.0
 lib/libgpsim_eXdbm.a
 lib/libgpsim_eXdbm.la
 lib/libgpsim_eXdbm.so
@@ -101,80 +114,30 @@ lib/libgpsimgui.so.0
 %%PORTDOCS%%%%DOCSDIR%%/README.EXAMPLES
 %%PORTDOCS%%%%DOCSDIR%%/README.MODULES
 %%PORTDOCS%%%%DOCSDIR%%/gpsim.pdf
-%%EXAMPLESDIR%%/12bit/p12c508_test.stc
-%%EXAMPLESDIR%%/12bit/p12c509_test.asm
-%%EXAMPLESDIR%%/12bit/pcl_test_12bit.asm
-%%EXAMPLESDIR%%/12bit/p12c508_test.asm
-%%EXAMPLESDIR%%/12bit/p12_it.asm
-%%EXAMPLESDIR%%/12bit/gpio_stim.stc
-%%EXAMPLESDIR%%/12bit/p12x.inc
-%%EXAMPLESDIR%%/14bit/vertical_adder.asm
-%%EXAMPLESDIR%%/14bit/p16f877_test2.stc
-%%EXAMPLESDIR%%/14bit/p16c64_pwm.asm
-%%EXAMPLESDIR%%/14bit/portc_stim.stc
-%%EXAMPLESDIR%%/14bit/p16c64_test.stc
-%%EXAMPLESDIR%%/14bit/async_stim.stc
-%%EXAMPLESDIR%%/14bit/eetest.asm
-%%EXAMPLESDIR%%/14bit/sync_stim.stc
-%%EXAMPLESDIR%%/14bit/usart_14.asm
-%%EXAMPLESDIR%%/14bit/p16c74_pwm.stc
-%%EXAMPLESDIR%%/14bit/ap.stc
-%%EXAMPLESDIR%%/14bit/iopin_stim.stc
-%%EXAMPLESDIR%%/14bit/t.stc
-%%EXAMPLESDIR%%/14bit/p16c65_pwm.stc
-%%EXAMPLESDIR%%/14bit/wdt_test.asm
-%%EXAMPLESDIR%%/14bit/loop_test.asm
-%%EXAMPLESDIR%%/14bit/iopin_stim.asm
-%%EXAMPLESDIR%%/14bit/p16c64_ccp.asm
-%%EXAMPLESDIR%%/14bit/module_test.stc
-%%EXAMPLESDIR%%/14bit/p16c64_pwm.stc
-%%EXAMPLESDIR%%/14bit/usart.stc
-%%EXAMPLESDIR%%/14bit/p16c64_tmr1.asm
-%%EXAMPLESDIR%%/14bit/async_stim2.stc
-%%EXAMPLESDIR%%/14bit/p16f877_test2.asm
-%%EXAMPLESDIR%%/14bit/pcl_test.asm
-%%EXAMPLESDIR%%/14bit/stim_test.asm
-%%EXAMPLESDIR%%/14bit/p16c64_ccp.stc
-%%EXAMPLESDIR%%/14bit/dtmf.stc
-%%EXAMPLESDIR%%/14bit/it.asm
-%%EXAMPLESDIR%%/14bit/twist.asm
-%%EXAMPLESDIR%%/14bit/p16c74_test.stc
-%%EXAMPLESDIR%%/14bit/async_pulse.stc
-%%EXAMPLESDIR%%/14bit/sine.asm
-%%EXAMPLESDIR%%/14bit/p16f877_test.asm
-%%EXAMPLESDIR%%/14bit/p16c71_test.asm
-%%EXAMPLESDIR%%/14bit/p16c74_test.asm
-%%EXAMPLESDIR%%/14bit/analog_stim2.stc
-%%EXAMPLESDIR%%/14bit/pulse_measure.asm
-%%EXAMPLESDIR%%/14bit/p16c65_pwm.asm
-%%EXAMPLESDIR%%/14bit/mod_test.asm
-%%EXAMPLESDIR%%/14bit/bcd.asm
-%%EXAMPLESDIR%%/14bit/ioport_stim.stc
-%%EXAMPLESDIR%%/14bit/time_test.stc
-%%EXAMPLESDIR%%/14bit/p16c64_test.asm
-%%EXAMPLESDIR%%/14bit/analog_stim.stc
-%%EXAMPLESDIR%%/16bit/p18.asm
-%%EXAMPLESDIR%%/16bit/indtest18.asm
-%%EXAMPLESDIR%%/16bit/it18.asm
-%%EXAMPLESDIR%%/16bit/mul.asm
-%%EXAMPLESDIR%%/16bit/bt18.asm
-%%EXAMPLESDIR%%/16bit/calltest18.asm
-%%EXAMPLESDIR%%/16bit/p18c242_test.asm
-%%EXAMPLESDIR%%/modules/mod_test/mod_test.stc
+%%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
-%%EXAMPLESDIR%%/projects/p16f628_test/f628.stc
-%%EXAMPLESDIR%%/projects/p16f628_test/f628.asm
-%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.stc
-%%EXAMPLESDIR%%/projects/digital_stim/digital_stim.asm
 @dirrm include/eXdbm
 @dirrm include/gpsim
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%/12bit
-@dirrm %%EXAMPLESDIR%%/14bit
-@dirrm %%EXAMPLESDIR%%/16bit
+@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