3 files changed, 62 insertions, 85 deletions

diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 8b19fa09f8b6..dfee608c8415 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gputils
-PORTVERSION=	0.14.1
+PORTVERSION=	0.14.2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -15,7 +15,9 @@ COMMENT=	A set of utilities for Microchip PIC microcontrollers
 
 LICENSE=	GPLv2
 
+CONFLICTS=	gplink-[0-9]*
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 MANLANG=	"" fr
 MAN1=		gpasm.1 gpdasm.1 gplib.1 gplink.1 gpstrip.1 gputils.1 \
diff --git a/devel/gputils/distinfo b/devel/gputils/distinfo
index 757413eab346..0a3fe2d92d83 100644
--- a/devel/gputils/distinfo
+++ b/devel/gputils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gputils-0.14.1.tar.gz) = 8e2d195b4b84640c182a7ba1aaae958de151f46463d404b85324debbedc0af8e
-SIZE (gputils-0.14.1.tar.gz) = 3233430
+SHA256 (gputils-0.14.2.tar.gz) = d363861dafd44b5db3a7313b4149563fae9e99235f66744394589c3976a77406
+SIZE (gputils-0.14.2.tar.gz) = 3257391
diff --git a/devel/gputils/pkg-plist b/devel/gputils/pkg-plist
index 87f5074f7f6a..61d902d7d0b7 100644
--- a/devel/gputils/pkg-plist
+++ b/devel/gputils/pkg-plist
@@ -169,6 +169,8 @@ bin/gpvo
 %%DATADIR%%/header/p16f690.inc
 %%DATADIR%%/header/p16f716.inc
 %%DATADIR%%/header/p16f72.inc
+%%DATADIR%%/header/p16f720.inc
+%%DATADIR%%/header/p16f721.inc
 %%DATADIR%%/header/p16f722.inc
 %%DATADIR%%/header/p16f723.inc
 %%DATADIR%%/header/p16f724.inc
@@ -251,6 +253,8 @@ bin/gpvo
 %%DATADIR%%/header/p16lf1939.inc
 %%DATADIR%%/header/p16lf1946.inc
 %%DATADIR%%/header/p16lf1947.inc
+%%DATADIR%%/header/p16lf720.inc
+%%DATADIR%%/header/p16lf721.inc
 %%DATADIR%%/header/p16lf722.inc
 %%DATADIR%%/header/p16lf723.inc
 %%DATADIR%%/header/p16lf724.inc
@@ -497,53 +501,37 @@ bin/gpvo
 %%DATADIR%%/header/rf675f.inc
 %%DATADIR%%/header/rf675h.inc
 %%DATADIR%%/header/rf675k.inc
-%%DATADIR%%/lkr/10f200.lkr
-%%DATADIR%%/lkr/10f200i.lkr
-%%DATADIR%%/lkr/10f202.lkr
-%%DATADIR%%/lkr/10f202i.lkr
-%%DATADIR%%/lkr/10f204.lkr
-%%DATADIR%%/lkr/10f204i.lkr
-%%DATADIR%%/lkr/10f206.lkr
-%%DATADIR%%/lkr/10f206i.lkr
-%%DATADIR%%/lkr/10f220.lkr
-%%DATADIR%%/lkr/10f220i.lkr
-%%DATADIR%%/lkr/10f222.lkr
-%%DATADIR%%/lkr/10f222i.lkr
-%%DATADIR%%/lkr/12c508.lkr
-%%DATADIR%%/lkr/12c508a.lkr
-%%DATADIR%%/lkr/12c509.lkr
-%%DATADIR%%/lkr/12c509a.lkr
-%%DATADIR%%/lkr/12c671.lkr
-%%DATADIR%%/lkr/12c672.lkr
-%%DATADIR%%/lkr/12ce518.lkr
-%%DATADIR%%/lkr/12ce519.lkr
-%%DATADIR%%/lkr/12ce673.lkr
-%%DATADIR%%/lkr/12ce674.lkr
-%%DATADIR%%/lkr/12cr509a.lkr
+%%DATADIR%%/lkr/10f200_g.lkr
+%%DATADIR%%/lkr/10f202_g.lkr
+%%DATADIR%%/lkr/10f204_g.lkr
+%%DATADIR%%/lkr/10f206_g.lkr
+%%DATADIR%%/lkr/10f220_g.lkr
+%%DATADIR%%/lkr/10f222_g.lkr
+%%DATADIR%%/lkr/12c508_g.lkr
+%%DATADIR%%/lkr/12c508a_g.lkr
+%%DATADIR%%/lkr/12c509_g.lkr
+%%DATADIR%%/lkr/12c509a_g.lkr
+%%DATADIR%%/lkr/12c671_g.lkr
+%%DATADIR%%/lkr/12c672_g.lkr
+%%DATADIR%%/lkr/12ce518_g.lkr
+%%DATADIR%%/lkr/12ce519_g.lkr
+%%DATADIR%%/lkr/12ce673_g.lkr
+%%DATADIR%%/lkr/12ce674_g.lkr
+%%DATADIR%%/lkr/12cr509a_g.lkr
 %%DATADIR%%/lkr/12f1822_g.lkr
 %%DATADIR%%/lkr/12f1840_g.lkr
-%%DATADIR%%/lkr/12f508.lkr
-%%DATADIR%%/lkr/12f508i.lkr
-%%DATADIR%%/lkr/12f509.lkr
-%%DATADIR%%/lkr/12f509i.lkr
-%%DATADIR%%/lkr/12f510.lkr
-%%DATADIR%%/lkr/12f510i.lkr
-%%DATADIR%%/lkr/12f519.lkr
-%%DATADIR%%/lkr/12f609.lkr
-%%DATADIR%%/lkr/12f609i.lkr
-%%DATADIR%%/lkr/12f615.lkr
-%%DATADIR%%/lkr/12f615i.lkr
-%%DATADIR%%/lkr/12f629.lkr
-%%DATADIR%%/lkr/12f629i.lkr
-%%DATADIR%%/lkr/12f635.lkr
-%%DATADIR%%/lkr/12f635i.lkr
-%%DATADIR%%/lkr/12f675.lkr
-%%DATADIR%%/lkr/12f675i.lkr
+%%DATADIR%%/lkr/12f508_g.lkr
+%%DATADIR%%/lkr/12f509_g.lkr
+%%DATADIR%%/lkr/12f510_g.lkr
+%%DATADIR%%/lkr/12f519_g.lkr
+%%DATADIR%%/lkr/12f609_g.lkr
+%%DATADIR%%/lkr/12f615_g.lkr
+%%DATADIR%%/lkr/12f629_g.lkr
+%%DATADIR%%/lkr/12f635_g.lkr
+%%DATADIR%%/lkr/12f675_g.lkr
 %%DATADIR%%/lkr/12f683_g.lkr
-%%DATADIR%%/lkr/12hv609.lkr
-%%DATADIR%%/lkr/12hv609i.lkr
-%%DATADIR%%/lkr/12hv615.lkr
-%%DATADIR%%/lkr/12hv615i.lkr
+%%DATADIR%%/lkr/12hv609_g.lkr
+%%DATADIR%%/lkr/12hv615_g.lkr
 %%DATADIR%%/lkr/12lf1822_g.lkr
 %%DATADIR%%/lkr/12lf1840_g.lkr
 %%DATADIR%%/lkr/14000.lkr
@@ -564,8 +552,8 @@ bin/gpvo
 %%DATADIR%%/lkr/16c56a.lkr
 %%DATADIR%%/lkr/16c57.lkr
 %%DATADIR%%/lkr/16c57c.lkr
-%%DATADIR%%/lkr/16c58a.lkr
-%%DATADIR%%/lkr/16c58b.lkr
+%%DATADIR%%/lkr/16c58a_g.lkr
+%%DATADIR%%/lkr/16c58b_g.lkr
 %%DATADIR%%/lkr/16c61.lkr
 %%DATADIR%%/lkr/16c62.lkr
 %%DATADIR%%/lkr/16c620.lkr
@@ -628,8 +616,8 @@ bin/gpvo
 %%DATADIR%%/lkr/16cr57a.lkr
 %%DATADIR%%/lkr/16cr57b.lkr
 %%DATADIR%%/lkr/16cr57c.lkr
-%%DATADIR%%/lkr/16cr58a.lkr
-%%DATADIR%%/lkr/16cr58b.lkr
+%%DATADIR%%/lkr/16cr58a_g.lkr
+%%DATADIR%%/lkr/16cr58b_g.lkr
 %%DATADIR%%/lkr/16cr62.lkr
 %%DATADIR%%/lkr/16cr620a.lkr
 %%DATADIR%%/lkr/16cr63.lkr
@@ -691,31 +679,27 @@ bin/gpvo
 %%DATADIR%%/lkr/16f630i.lkr
 %%DATADIR%%/lkr/16f631.lkr
 %%DATADIR%%/lkr/16f631i.lkr
-%%DATADIR%%/lkr/16f636.lkr
-%%DATADIR%%/lkr/16f636i.lkr
-%%DATADIR%%/lkr/16f639.lkr
-%%DATADIR%%/lkr/16f639i.lkr
+%%DATADIR%%/lkr/16f636_g.lkr
+%%DATADIR%%/lkr/16f639_g.lkr
 %%DATADIR%%/lkr/16f648a.lkr
 %%DATADIR%%/lkr/16f648ai.lkr
 %%DATADIR%%/lkr/16f676.lkr
 %%DATADIR%%/lkr/16f676i.lkr
-%%DATADIR%%/lkr/16f677.lkr
-%%DATADIR%%/lkr/16f677i.lkr
-%%DATADIR%%/lkr/16f684.lkr
-%%DATADIR%%/lkr/16f684i.lkr
+%%DATADIR%%/lkr/16f677_g.lkr
+%%DATADIR%%/lkr/16f684_g.lkr
 %%DATADIR%%/lkr/16f685.lkr
 %%DATADIR%%/lkr/16f685i.lkr
-%%DATADIR%%/lkr/16f687.lkr
-%%DATADIR%%/lkr/16f687i.lkr
+%%DATADIR%%/lkr/16f687_g.lkr
 %%DATADIR%%/lkr/16f688.lkr
 %%DATADIR%%/lkr/16f688i.lkr
 %%DATADIR%%/lkr/16f689.lkr
 %%DATADIR%%/lkr/16f689i.lkr
 %%DATADIR%%/lkr/16f690.lkr
 %%DATADIR%%/lkr/16f690i.lkr
-%%DATADIR%%/lkr/16f716.lkr
-%%DATADIR%%/lkr/16f716i.lkr
+%%DATADIR%%/lkr/16f716_g.lkr
 %%DATADIR%%/lkr/16f72.lkr
+%%DATADIR%%/lkr/16f720_g.lkr
+%%DATADIR%%/lkr/16f721_g.lkr
 %%DATADIR%%/lkr/16f722.lkr
 %%DATADIR%%/lkr/16f722i.lkr
 %%DATADIR%%/lkr/16f723.lkr
@@ -727,23 +711,16 @@ bin/gpvo
 %%DATADIR%%/lkr/16f727.lkr
 %%DATADIR%%/lkr/16f727i.lkr
 %%DATADIR%%/lkr/16f73.lkr
-%%DATADIR%%/lkr/16f737.lkr
-%%DATADIR%%/lkr/16f737i.lkr
+%%DATADIR%%/lkr/16f737_g.lkr
 %%DATADIR%%/lkr/16f74.lkr
-%%DATADIR%%/lkr/16f747.lkr
-%%DATADIR%%/lkr/16f747i.lkr
+%%DATADIR%%/lkr/16f747_g.lkr
 %%DATADIR%%/lkr/16f76.lkr
-%%DATADIR%%/lkr/16f767.lkr
-%%DATADIR%%/lkr/16f767i.lkr
+%%DATADIR%%/lkr/16f767_g.lkr
 %%DATADIR%%/lkr/16f77.lkr
-%%DATADIR%%/lkr/16f777.lkr
-%%DATADIR%%/lkr/16f777i.lkr
-%%DATADIR%%/lkr/16f785.lkr
-%%DATADIR%%/lkr/16f785i.lkr
-%%DATADIR%%/lkr/16f818.lkr
-%%DATADIR%%/lkr/16f818i.lkr
-%%DATADIR%%/lkr/16f819.lkr
-%%DATADIR%%/lkr/16f819i.lkr
+%%DATADIR%%/lkr/16f777_g.lkr
+%%DATADIR%%/lkr/16f785_g.lkr
+%%DATADIR%%/lkr/16f818_g.lkr
+%%DATADIR%%/lkr/16f819_g.lkr
 %%DATADIR%%/lkr/16f83.lkr
 %%DATADIR%%/lkr/16f84.lkr
 %%DATADIR%%/lkr/16f84a.lkr
@@ -787,19 +764,15 @@ bin/gpvo
 %%DATADIR%%/lkr/16f913i.lkr
 %%DATADIR%%/lkr/16f914.lkr
 %%DATADIR%%/lkr/16f914i.lkr
-%%DATADIR%%/lkr/16f916.lkr
-%%DATADIR%%/lkr/16f916i.lkr
-%%DATADIR%%/lkr/16f917.lkr
-%%DATADIR%%/lkr/16f917i.lkr
-%%DATADIR%%/lkr/16f946.lkr
-%%DATADIR%%/lkr/16f946i.lkr
+%%DATADIR%%/lkr/16f916_g.lkr
+%%DATADIR%%/lkr/16f917_g.lkr
+%%DATADIR%%/lkr/16f946_g.lkr
 %%DATADIR%%/lkr/16hv540.lkr
 %%DATADIR%%/lkr/16hv610.lkr
 %%DATADIR%%/lkr/16hv610i.lkr
 %%DATADIR%%/lkr/16hv616.lkr
 %%DATADIR%%/lkr/16hv616i.lkr
-%%DATADIR%%/lkr/16hv785.lkr
-%%DATADIR%%/lkr/16hv785i.lkr
+%%DATADIR%%/lkr/16hv785_g.lkr
 %%DATADIR%%/lkr/16lf1455_g.lkr
 %%DATADIR%%/lkr/16lf1458_g.lkr
 %%DATADIR%%/lkr/16lf1459_g.lkr
@@ -836,6 +809,8 @@ bin/gpvo
 %%DATADIR%%/lkr/16lf1939_g.lkr
 %%DATADIR%%/lkr/16lf1946_g.lkr
 %%DATADIR%%/lkr/16lf1947_g.lkr
+%%DATADIR%%/lkr/16lf720_g.lkr
+%%DATADIR%%/lkr/16lf721_g.lkr
 %%DATADIR%%/lkr/16lf722.lkr
 %%DATADIR%%/lkr/16lf722i.lkr
 %%DATADIR%%/lkr/16lf723.lkr