4 files changed, 192 insertions, 63 deletions

diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 4695dde3b0bb..e0504370d1d6 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	gputils
 # Date created:				21 Jan 2002
-# Whom:					Samuel Tardieu <sam@inf.enst.fr>
+# Whom:					Samuel Tardieu <sam@rfc1149.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gputils
-PORTVERSION=	0.11.0
+PORTVERSION=	0.11.8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	sam@inf.enst.fr
+MAINTAINER=	sam@rfc1149.net
 COMMENT=	GPUTILS is a set of utilities for Microchip PIC microcontrollers
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=	gpasm.1 gpdasm.1 gplib.1 gplink.1 gputils.1 gpvc.1 gpvo.1
 
diff --git a/devel/gputils/distinfo b/devel/gputils/distinfo
index 2e24eb34d126..fa09e402b6b6 100644
--- a/devel/gputils/distinfo
+++ b/devel/gputils/distinfo
@@ -1 +1 @@
-MD5 (gputils-0.11.0.tar.gz) = b526dc7fec925b32b81d9f45fed2ae32
+MD5 (gputils-0.11.8.tar.gz) = 06b70d81d9fdf5ddcd96791acf93eac6
diff --git a/devel/gputils/pkg-descr b/devel/gputils/pkg-descr
index fe182874874e..8b4bd82f0476 100644
--- a/devel/gputils/pkg-descr
+++ b/devel/gputils/pkg-descr
@@ -6,4 +6,4 @@ This port was previously called GPASM.
 WWW: http://gputils.sourceforge.net/
 
  -- Samuel Tardieu
-    sam@inf.enst.fr
+    sam@rfc1149.net
diff --git a/devel/gputils/pkg-plist b/devel/gputils/pkg-plist
index f527b6e1f4dc..9b674d6e854f 100644
--- a/devel/gputils/pkg-plist
+++ b/devel/gputils/pkg-plist
@@ -1,19 +1,19 @@
-%%PORTDOCS%%share/doc/gputils/gputils.lyx
-%%PORTDOCS%%share/doc/gputils/gputils.pdf
-%%PORTDOCS%%share/doc/gputils/gputils.ps
+%%PORTDOCS%%%%DOCSDIR%%/gputils.lyx
+%%PORTDOCS%%%%DOCSDIR%%/gputils.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gputils.ps
 bin/gpasm
 bin/gplink
 bin/gpdasm
 bin/gplib
 bin/gpvc
 bin/gpvo
-share/gputils/header/ap7675.inc
 share/gputils/header/mcp250xx.inc
 share/gputils/header/memory.inc
-share/gputils/header/p12c508.inc
+share/gputils/header/migrate.inc
 share/gputils/header/p12c508a.inc
-share/gputils/header/p12c509.inc
+share/gputils/header/p12c508.inc
 share/gputils/header/p12c509a.inc
+share/gputils/header/p12c509.inc
 share/gputils/header/p12c671.inc
 share/gputils/header/p12c672.inc
 share/gputils/header/p12ce518.inc
@@ -25,60 +25,55 @@ share/gputils/header/p12f675.inc
 share/gputils/header/p14000.inc
 share/gputils/header/p16c432.inc
 share/gputils/header/p16c433.inc
-share/gputils/header/p16c461.inc
 share/gputils/header/p16c505.inc
 share/gputils/header/p16c554.inc
 share/gputils/header/p16c557.inc
 share/gputils/header/p16c558.inc
 share/gputils/header/p16c5x.inc
 share/gputils/header/p16c61.inc
-share/gputils/header/p16c62.inc
-share/gputils/header/p16c620.inc
 share/gputils/header/p16c620a.inc
-share/gputils/header/p16c621.inc
+share/gputils/header/p16c620.inc
 share/gputils/header/p16c621a.inc
-share/gputils/header/p16c622.inc
+share/gputils/header/p16c621.inc
 share/gputils/header/p16c622a.inc
+share/gputils/header/p16c622.inc
 share/gputils/header/p16c62a.inc
 share/gputils/header/p16c62b.inc
-share/gputils/header/p16c63.inc
+share/gputils/header/p16c62.inc
 share/gputils/header/p16c63a.inc
-share/gputils/header/p16c64.inc
-share/gputils/header/p16c641.inc
+share/gputils/header/p16c63.inc
 share/gputils/header/p16c642.inc
 share/gputils/header/p16c64a.inc
-share/gputils/header/p16c65.inc
+share/gputils/header/p16c64.inc
 share/gputils/header/p16c65a.inc
 share/gputils/header/p16c65b.inc
-share/gputils/header/p16c66.inc
-share/gputils/header/p16c661.inc
+share/gputils/header/p16c65.inc
 share/gputils/header/p16c662.inc
+share/gputils/header/p16c66.inc
 share/gputils/header/p16c67.inc
-share/gputils/header/p16c70.inc
-share/gputils/header/p16c71.inc
 share/gputils/header/p16c710.inc
 share/gputils/header/p16c711.inc
 share/gputils/header/p16c712.inc
 share/gputils/header/p16c715.inc
 share/gputils/header/p16c716.inc
 share/gputils/header/p16c717.inc
-share/gputils/header/p16c71a.inc
-share/gputils/header/p16c72.inc
+share/gputils/header/p16c71.inc
 share/gputils/header/p16c72a.inc
-share/gputils/header/p16c73.inc
+share/gputils/header/p16c72.inc
 share/gputils/header/p16c73a.inc
 share/gputils/header/p16c73b.inc
-share/gputils/header/p16c74.inc
+share/gputils/header/p16c73.inc
 share/gputils/header/p16c745.inc
 share/gputils/header/p16c74a.inc
 share/gputils/header/p16c74b.inc
-share/gputils/header/p16c76.inc
+share/gputils/header/p16c74.inc
 share/gputils/header/p16c765.inc
-share/gputils/header/p16c77.inc
+share/gputils/header/p16c76.inc
 share/gputils/header/p16c770.inc
 share/gputils/header/p16c771.inc
 share/gputils/header/p16c773.inc
 share/gputils/header/p16c774.inc
+share/gputils/header/p16c77.inc
 share/gputils/header/p16c781.inc
 share/gputils/header/p16c782.inc
 share/gputils/header/p16c84.inc
@@ -96,45 +91,52 @@ share/gputils/header/p16cr65.inc
 share/gputils/header/p16cr72.inc
 share/gputils/header/p16cr83.inc
 share/gputils/header/p16cr84.inc
-share/gputils/header/p16f627.inc
+share/gputils/header/p16f5x.inc
 share/gputils/header/p16f627a.inc
-share/gputils/header/p16f628.inc
+share/gputils/header/p16f627.inc
 share/gputils/header/p16f628a.inc
+share/gputils/header/p16f628.inc
 share/gputils/header/p16f630.inc
+share/gputils/header/p16f648a.inc
 share/gputils/header/p16f676.inc
+share/gputils/header/p16f684.inc
+share/gputils/header/p16f688.inc
+share/gputils/header/p16f716.inc
 share/gputils/header/p16f72.inc
+share/gputils/header/p16f737.inc
 share/gputils/header/p16f73.inc
+share/gputils/header/p16f747.inc
 share/gputils/header/p16f74.inc
+share/gputils/header/p16f767.inc
 share/gputils/header/p16f76.inc
+share/gputils/header/p16f777.inc
 share/gputils/header/p16f77.inc
 share/gputils/header/p16f818.inc
 share/gputils/header/p16f819.inc
 share/gputils/header/p16f83.inc
-share/gputils/header/p16f84.inc
 share/gputils/header/p16f84a.inc
-share/gputils/header/p16f85.inc
-share/gputils/header/p16f86.inc
-share/gputils/header/p16f87.inc
+share/gputils/header/p16f84.inc
 share/gputils/header/p16f870.inc
 share/gputils/header/p16f871.inc
 share/gputils/header/p16f872.inc
-share/gputils/header/p16f873.inc
 share/gputils/header/p16f873a.inc
-share/gputils/header/p16f874.inc
+share/gputils/header/p16f873.inc
 share/gputils/header/p16f874a.inc
-share/gputils/header/p16f876.inc
+share/gputils/header/p16f874.inc
 share/gputils/header/p16f876a.inc
-share/gputils/header/p16f877.inc
+share/gputils/header/p16f876.inc
 share/gputils/header/p16f877a.inc
+share/gputils/header/p16f877.inc
+share/gputils/header/p16f87.inc
 share/gputils/header/p16f88.inc
 share/gputils/header/p16hv540.inc
-share/gputils/header/p17c42.inc
 share/gputils/header/p17c42a.inc
+share/gputils/header/p17c42.inc
 share/gputils/header/p17c43.inc
 share/gputils/header/p17c44.inc
 share/gputils/header/p17c752.inc
-share/gputils/header/p17c756.inc
 share/gputils/header/p17c756a.inc
+share/gputils/header/p17c756.inc
 share/gputils/header/p17c762.inc
 share/gputils/header/p17c766.inc
 share/gputils/header/p17cr42.inc
@@ -148,28 +150,56 @@ share/gputils/header/p18c658.inc
 share/gputils/header/p18c801.inc
 share/gputils/header/p18c858.inc
 share/gputils/header/p18cxxx.inc
-share/gputils/header/p18f020.inc
 share/gputils/header/p18f1220.inc
 share/gputils/header/p18f1320.inc
 share/gputils/header/p18f2220.inc
 share/gputils/header/p18f2320.inc
+share/gputils/header/p18f2331.inc
 share/gputils/header/p18f242.inc
+share/gputils/header/p18f2431.inc
+share/gputils/header/p18f2439.inc
 share/gputils/header/p18f248.inc
+share/gputils/header/p18f2515.inc
+share/gputils/header/p18f2525.inc
 share/gputils/header/p18f252.inc
+share/gputils/header/p18f2539.inc
 share/gputils/header/p18f258.inc
+share/gputils/header/p18f2610.inc
+share/gputils/header/p18f2620.inc
 share/gputils/header/p18f4220.inc
 share/gputils/header/p18f4320.inc
+share/gputils/header/p18f4331.inc
 share/gputils/header/p18f442.inc
+share/gputils/header/p18f4431.inc
+share/gputils/header/p18f4439.inc
 share/gputils/header/p18f448.inc
+share/gputils/header/p18f4515.inc
+share/gputils/header/p18f4525.inc
 share/gputils/header/p18f452.inc
+share/gputils/header/p18f4539.inc
 share/gputils/header/p18f458.inc
+share/gputils/header/p18f4610.inc
+share/gputils/header/p18f4620.inc
+share/gputils/header/p18f6520.inc
+share/gputils/header/p18f6525.inc
+share/gputils/header/p18f6585.inc
 share/gputils/header/p18f6620.inc
+share/gputils/header/p18f6621.inc
+share/gputils/header/p18f6680.inc
 share/gputils/header/p18f6720.inc
+share/gputils/header/p18f8520.inc
+share/gputils/header/p18f8525.inc
+share/gputils/header/p18f8585.inc
 share/gputils/header/p18f8620.inc
+share/gputils/header/p18f8621.inc
+share/gputils/header/p18f8680.inc
 share/gputils/header/p18f8720.inc
-share/gputils/header/p18macro.inc
+share/gputils/header/ps500.inc
 share/gputils/header/rf509af.inc
 share/gputils/header/rf509ag.inc
+share/gputils/header/rf675f.inc
+share/gputils/header/rf675h.inc
+share/gputils/header/rf675k.inc
 share/gputils/lkr/12c508a.lkr
 share/gputils/lkr/12c508.lkr
 share/gputils/lkr/12c509a.lkr
@@ -181,6 +211,11 @@ share/gputils/lkr/12ce519.lkr
 share/gputils/lkr/12ce673.lkr
 share/gputils/lkr/12ce674.lkr
 share/gputils/lkr/12cr509a.lkr
+share/gputils/lkr/12f629i.lkr
+share/gputils/lkr/12f629.lkr
+share/gputils/lkr/12f635.lkr
+share/gputils/lkr/12f675i.lkr
+share/gputils/lkr/12f675.lkr
 share/gputils/lkr/14000.lkr
 share/gputils/lkr/16c432.lkr
 share/gputils/lkr/16c433.lkr
@@ -191,6 +226,7 @@ share/gputils/lkr/16c54b.lkr
 share/gputils/lkr/16c54c.lkr
 share/gputils/lkr/16c54.lkr
 share/gputils/lkr/16c554.lkr
+share/gputils/lkr/16c557.lkr
 share/gputils/lkr/16c558.lkr
 share/gputils/lkr/16c55a.lkr
 share/gputils/lkr/16c55.lkr
@@ -272,39 +308,71 @@ share/gputils/lkr/16cr65.lkr
 share/gputils/lkr/16cr72.lkr
 share/gputils/lkr/16cr83.lkr
 share/gputils/lkr/16cr84.lkr
+share/gputils/lkr/16f54.lkr
+share/gputils/lkr/16f57.lkr
+share/gputils/lkr/16f627ai.lkr
+share/gputils/lkr/16f627a.lkr
 share/gputils/lkr/16f627.lkr
-share/gputils/lkr/16f628.lkr
+share/gputils/lkr/16f628ai.lkr
 share/gputils/lkr/16f628a.lkr
+share/gputils/lkr/16f628.lkr
+share/gputils/lkr/16f630i.lkr
 share/gputils/lkr/16f630.lkr
+share/gputils/lkr/16f636.lkr
+share/gputils/lkr/16f648ai.lkr
+share/gputils/lkr/16f648a.lkr
+share/gputils/lkr/16f676i.lkr
 share/gputils/lkr/16f676.lkr
+share/gputils/lkr/16f684.lkr
+share/gputils/lkr/16f688i.lkr
+share/gputils/lkr/16f688.lkr
+share/gputils/lkr/16f716.lkr
 share/gputils/lkr/16f72.lkr
+share/gputils/lkr/16f737i.lkr
+share/gputils/lkr/16f737.lkr
 share/gputils/lkr/16f73.lkr
+share/gputils/lkr/16f747i.lkr
+share/gputils/lkr/16f747.lkr
 share/gputils/lkr/16f74.lkr
+share/gputils/lkr/16f767i.lkr
+share/gputils/lkr/16f767.lkr
 share/gputils/lkr/16f76.lkr
+share/gputils/lkr/16f777i.lkr
+share/gputils/lkr/16f777.lkr
 share/gputils/lkr/16f77.lkr
+share/gputils/lkr/16f818i.lkr
+share/gputils/lkr/16f818.lkr
+share/gputils/lkr/16f819i.lkr
+share/gputils/lkr/16f819.lkr
 share/gputils/lkr/16f83.lkr
 share/gputils/lkr/16f84a.lkr
 share/gputils/lkr/16f84.lkr
-share/gputils/lkr/16f85.lkr
-share/gputils/lkr/16f86.lkr
 share/gputils/lkr/16f870i.lkr
 share/gputils/lkr/16f870.lkr
 share/gputils/lkr/16f871i.lkr
 share/gputils/lkr/16f871.lkr
 share/gputils/lkr/16f872i.lkr
 share/gputils/lkr/16f872.lkr
-share/gputils/lkr/16f873i.lkr
+share/gputils/lkr/16f873ai.lkr
 share/gputils/lkr/16f873a.lkr
+share/gputils/lkr/16f873i.lkr
 share/gputils/lkr/16f873.lkr
+share/gputils/lkr/16f874ai.lkr
 share/gputils/lkr/16f874a.lkr
 share/gputils/lkr/16f874i.lkr
 share/gputils/lkr/16f874.lkr
+share/gputils/lkr/16f876ai.lkr
 share/gputils/lkr/16f876a.lkr
 share/gputils/lkr/16f876i.lkr
 share/gputils/lkr/16f876.lkr
+share/gputils/lkr/16f877ai.lkr
 share/gputils/lkr/16f877a.lkr
 share/gputils/lkr/16f877i.lkr
 share/gputils/lkr/16f877.lkr
+share/gputils/lkr/16f87i.lkr
+share/gputils/lkr/16f87.lkr
+share/gputils/lkr/16f88i.lkr
+share/gputils/lkr/16f88.lkr
 share/gputils/lkr/16hv540.lkr
 share/gputils/lkr/17c42a.lkr
 share/gputils/lkr/17c42.lkr
@@ -327,44 +395,104 @@ share/gputils/lkr/18c658.lkr
 share/gputils/lkr/18c801i.lkr
 share/gputils/lkr/18c801.lkr
 share/gputils/lkr/18c858.lkr
-share/gputils/lkr/18f010.lkr
-share/gputils/lkr/18f020.lkr
+share/gputils/lkr/18f1220i.lkr
 share/gputils/lkr/18f1220.lkr
+share/gputils/lkr/18f1320i.lkr
 share/gputils/lkr/18f1320.lkr
+share/gputils/lkr/18f2220i.lkr
 share/gputils/lkr/18f2220.lkr
+share/gputils/lkr/18f2320i.lkr
 share/gputils/lkr/18f2320.lkr
+share/gputils/lkr/18f2331i.lkr
+share/gputils/lkr/18f2331.lkr
 share/gputils/lkr/18f242i.lkr
 share/gputils/lkr/18f242.lkr
-share/gputils/lkr/18f248.lkr
+share/gputils/lkr/18f2431i.lkr
+share/gputils/lkr/18f2431.lkr
+share/gputils/lkr/18f2439i.lkr
+share/gputils/lkr/18f2439.lkr
 share/gputils/lkr/18f248i.lkr
-share/gputils/lkr/18f252.lkr
+share/gputils/lkr/18f248.lkr
+share/gputils/lkr/18f2515.lkr
+share/gputils/lkr/18f2525.lkr
 share/gputils/lkr/18f252i.lkr
-share/gputils/lkr/18f258.lkr
+share/gputils/lkr/18f252.lkr
+share/gputils/lkr/18f2539i.lkr
+share/gputils/lkr/18f2539.lkr
 share/gputils/lkr/18f258i.lkr
+share/gputils/lkr/18f258.lkr
+share/gputils/lkr/18f2610.lkr
+share/gputils/lkr/18f2620_e.lkr
+share/gputils/lkr/18f2620i_e.lkr
+share/gputils/lkr/18f2620i.lkr
+share/gputils/lkr/18f2620.lkr
+share/gputils/lkr/18f4220i.lkr
 share/gputils/lkr/18f4220.lkr
+share/gputils/lkr/18f4320i.lkr
 share/gputils/lkr/18f4320.lkr
-share/gputils/lkr/18f442.lkr
+share/gputils/lkr/18f4331i.lkr
+share/gputils/lkr/18f4331.lkr
 share/gputils/lkr/18f442i.lkr
-share/gputils/lkr/18f448.lkr
+share/gputils/lkr/18f442.lkr
+share/gputils/lkr/18f4431i.lkr
+share/gputils/lkr/18f4431.lkr
+share/gputils/lkr/18f4439i.lkr
+share/gputils/lkr/18f4439.lkr
 share/gputils/lkr/18f448i.lkr
-share/gputils/lkr/18f452.lkr
+share/gputils/lkr/18f448.lkr
+share/gputils/lkr/18f4515.lkr
+share/gputils/lkr/18f4525.lkr
 share/gputils/lkr/18f452i.lkr
-share/gputils/lkr/18f458.lkr
+share/gputils/lkr/18f452.lkr
+share/gputils/lkr/18f4539.lkr
+share/gputils/lkr/18f4539i.lkr
 share/gputils/lkr/18f458i.lkr
-share/gputils/lkr/18f6620.lkr
+share/gputils/lkr/18f458.lkr
+share/gputils/lkr/18f4610.lkr
+share/gputils/lkr/18f4620_e.lkr
+share/gputils/lkr/18f4620i_e.lkr
+share/gputils/lkr/18f4620i.lkr
+share/gputils/lkr/18f4620.lkr
+share/gputils/lkr/18f6520i.lkr
+share/gputils/lkr/18f6520.lkr
+share/gputils/lkr/18f6525i.lkr
+share/gputils/lkr/18f6525.lkr
+share/gputils/lkr/18f6585i.lkr
+share/gputils/lkr/18f6585.lkr
 share/gputils/lkr/18f6620i.lkr
-share/gputils/lkr/18f6720.lkr
+share/gputils/lkr/18f6620.lkr
+share/gputils/lkr/18f6621i.lkr
+share/gputils/lkr/18f6621.lkr
+share/gputils/lkr/18f6680i.lkr
+share/gputils/lkr/18f6680.lkr
 share/gputils/lkr/18f6720i.lkr
-share/gputils/lkr/18f8620.lkr
+share/gputils/lkr/18f6720.lkr
+share/gputils/lkr/18f8520i.lkr
+share/gputils/lkr/18f8520.lkr
+share/gputils/lkr/18f8525i.lkr
+share/gputils/lkr/18f8525.lkr
+share/gputils/lkr/18f8585i.lkr
+share/gputils/lkr/18f8585.lkr
 share/gputils/lkr/18f8620i.lkr
-share/gputils/lkr/18f8720.lkr
+share/gputils/lkr/18f8620.lkr
+share/gputils/lkr/18f8621i.lkr
+share/gputils/lkr/18f8621.lkr
+share/gputils/lkr/18f8680i.lkr
+share/gputils/lkr/18f8680.lkr
 share/gputils/lkr/18f8720i.lkr
-share/gputils/lkr/ap7675.lkr
+share/gputils/lkr/18f8720.lkr
 share/gputils/lkr/hcs1365.lkr
 share/gputils/lkr/hcs1370.lkr
+share/gputils/lkr/ps500.lkr
 share/gputils/lkr/rf509af.lkr
 share/gputils/lkr/rf509ag.lkr
-@dirrm share/doc/gputils
+share/gputils/lkr/rf675fi.lkr
+share/gputils/lkr/rf675f.lkr
+share/gputils/lkr/rf675hi.lkr
+share/gputils/lkr/rf675h.lkr
+share/gputils/lkr/rf675ki.lkr
+share/gputils/lkr/rf675k.lkr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/gputils/header
 @dirrm share/gputils/lkr
 @dirrm share/gputils