5 files changed, 169 insertions, 139 deletions

diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 8b7fcb5b6de5..dff92cf06d22 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	gpasm
-# Date created:				4 Aug 2000
+# New ports collection makefile for:	gputils
+# Date created:				21 Jan 2002
 # Whom:					Samuel Tardieu <sam@inf.enst.fr>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gpasm
-PORTVERSION=	0.9.7
+PORTNAME=	gputils
+PORTVERSION=	0.10.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,15 +14,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sam@inf.enst.fr
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CC="cc -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
 
-.if !defined(NOPORTDOCS)
+MAN1=	gpasm.1 gpdasm.1 gputils.1 gpvc.1
+
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/gpasm
-	${INSTALL_DATA} ${WRKSRC}/doc/gpasm.ps ${PREFIX}/share/doc/gpasm
-	${INSTALL_DATA} ${WRKSRC}/doc/gpasm.pdf ${PREFIX}/share/doc/gpasm
-	${INSTALL_DATA} ${WRKSRC}/doc/gpasm.lyx ${PREFIX}/share/doc/gpasm
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for ext in ps pdf lyx
+	@${INSTALL_DATA} ${WRKSRC}/doc/gputils.${ext} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/gputils/distinfo b/devel/gputils/distinfo
index c25f03000925..0d8982f26bd5 100644
--- a/devel/gputils/distinfo
+++ b/devel/gputils/distinfo
@@ -1 +1 @@
-MD5 (gpasm-0.9.7.tar.gz) = 7ee911ca1ae1e47f33c2d6e269d31ab0
+MD5 (gputils-0.10.3.tar.gz) = 5a3e98f78e148c40af8cbc3f134b7523
diff --git a/devel/gputils/pkg-comment b/devel/gputils/pkg-comment
index 5f1835b24912..e3f04b5fe504 100644
--- a/devel/gputils/pkg-comment
+++ b/devel/gputils/pkg-comment
@@ -1 +1 @@
-GPASM is the GNU Pic 12c508 and 16c84 microcontrollers family
+GPUTILS is a set of utilities for Microchip PIC microcontrollers
diff --git a/devel/gputils/pkg-descr b/devel/gputils/pkg-descr
index 0ccff12760a2..fe182874874e 100644
--- a/devel/gputils/pkg-descr
+++ b/devel/gputils/pkg-descr
@@ -1,7 +1,9 @@
-GPASM is the GNU Pic assembler, and can compile assembly files for 12c508
-and 16c84 microcontrollers family.
+GPUTILS contains a set of utilities (assembler, disassembler, ...) for
+Microchip's PIC microcontroller families.
 
-WWW: http://gpasm.sourceforge.net/
+This port was previously called GPASM.
+
+WWW: http://gputils.sourceforge.net/
 
  -- Samuel Tardieu
     sam@inf.enst.fr
diff --git a/devel/gputils/pkg-plist b/devel/gputils/pkg-plist
index 499665ac476a..10e63685013f 100644
--- a/devel/gputils/pkg-plist
+++ b/devel/gputils/pkg-plist
@@ -1,126 +1,154 @@
 bin/gpasm
 bin/gpdasm
 bin/gpvc
-bin/gpvo
-share/gpasm/header/memory.inc
-share/gpasm/header/p12c508.inc
-share/gpasm/header/p12c508a.inc
-share/gpasm/header/p12c509.inc
-share/gpasm/header/p12c509a.inc
-share/gpasm/header/p12c671.inc
-share/gpasm/header/p12c672.inc
-share/gpasm/header/p12ce518.inc
-share/gpasm/header/p12ce519.inc
-share/gpasm/header/p12ce673.inc
-share/gpasm/header/p12ce674.inc
-share/gpasm/header/p14000.inc
-share/gpasm/header/p16c432.inc
-share/gpasm/header/p16c433.inc
-share/gpasm/header/p16c461.inc
-share/gpasm/header/p16c505.inc
-share/gpasm/header/p16c554.inc
-share/gpasm/header/p16c558.inc
-share/gpasm/header/p16c5x.inc
-share/gpasm/header/p16c61.inc
-share/gpasm/header/p16c62.inc
-share/gpasm/header/p16c620.inc
-share/gpasm/header/p16c620a.inc
-share/gpasm/header/p16c621.inc
-share/gpasm/header/p16c621a.inc
-share/gpasm/header/p16c622.inc
-share/gpasm/header/p16c622a.inc
-share/gpasm/header/p16c62a.inc
-share/gpasm/header/p16c62b.inc
-share/gpasm/header/p16c63.inc
-share/gpasm/header/p16c63a.inc
-share/gpasm/header/p16c64.inc
-share/gpasm/header/p16c641.inc
-share/gpasm/header/p16c642.inc
-share/gpasm/header/p16c64a.inc
-share/gpasm/header/p16c65.inc
-share/gpasm/header/p16c65a.inc
-share/gpasm/header/p16c65b.inc
-share/gpasm/header/p16c66.inc
-share/gpasm/header/p16c661.inc
-share/gpasm/header/p16c662.inc
-share/gpasm/header/p16c67.inc
-share/gpasm/header/p16c70.inc
-share/gpasm/header/p16c71.inc
-share/gpasm/header/p16c710.inc
-share/gpasm/header/p16c711.inc
-share/gpasm/header/p16c712.inc
-share/gpasm/header/p16c715.inc
-share/gpasm/header/p16c716.inc
-share/gpasm/header/p16c717.inc
-share/gpasm/header/p16c71a.inc
-share/gpasm/header/p16c72.inc
-share/gpasm/header/p16c72a.inc
-share/gpasm/header/p16c73.inc
-share/gpasm/header/p16c73a.inc
-share/gpasm/header/p16c73b.inc
-share/gpasm/header/p16c74.inc
-share/gpasm/header/p16c745.inc
-share/gpasm/header/p16c74a.inc
-share/gpasm/header/p16c74b.inc
-share/gpasm/header/p16c76.inc
-share/gpasm/header/p16c765.inc
-share/gpasm/header/p16c77.inc
-share/gpasm/header/p16c770.inc
-share/gpasm/header/p16c771.inc
-share/gpasm/header/p16c773.inc
-share/gpasm/header/p16c774.inc
-share/gpasm/header/p16c84.inc
-share/gpasm/header/p16c923.inc
-share/gpasm/header/p16c924.inc
-share/gpasm/header/p16c925.inc
-share/gpasm/header/p16c926.inc
-share/gpasm/header/p16ce623.inc
-share/gpasm/header/p16ce624.inc
-share/gpasm/header/p16ce625.inc
-share/gpasm/header/p16cr62.inc
-share/gpasm/header/p16cr63.inc
-share/gpasm/header/p16cr64.inc
-share/gpasm/header/p16cr65.inc
-share/gpasm/header/p16cr72.inc
-share/gpasm/header/p16cr83.inc
-share/gpasm/header/p16cr84.inc
-share/gpasm/header/p16f627.inc
-share/gpasm/header/p16f628.inc
-share/gpasm/header/p16f73.inc
-share/gpasm/header/p16f74.inc
-share/gpasm/header/p16f76.inc
-share/gpasm/header/p16f77.inc
-share/gpasm/header/p16f83.inc
-share/gpasm/header/p16f84.inc
-share/gpasm/header/p16f84a.inc
-share/gpasm/header/p16f870.inc
-share/gpasm/header/p16f871.inc
-share/gpasm/header/p16f872.inc
-share/gpasm/header/p16f873.inc
-share/gpasm/header/p16f874.inc
-share/gpasm/header/p16f876.inc
-share/gpasm/header/p16f877.inc
-share/gpasm/header/p16hv540.inc
-share/gpasm/header/p17c42.inc
-share/gpasm/header/p17c42a.inc
-share/gpasm/header/p17c43.inc
-share/gpasm/header/p17c44.inc
-share/gpasm/header/p17c752.inc
-share/gpasm/header/p17c756.inc
-share/gpasm/header/p17c756a.inc
-share/gpasm/header/p17c762.inc
-share/gpasm/header/p17c766.inc
-share/gpasm/header/p17cr42.inc
-share/gpasm/header/p17cr43.inc
-share/gpasm/header/p18c242.inc
-share/gpasm/header/p18c252.inc
-share/gpasm/header/p18c442.inc
-share/gpasm/header/p18c452.inc
-share/gpasm/header/p18c658.inc
-share/gpasm/header/p18c858.inc
-share/doc/gpasm/gpasm.ps
-share/doc/gpasm/gpasm.pdf
-share/doc/gpasm/gpasm.lyx
-@dirrm share/doc/gpasm
-@dirrm share/gpasm/header
-@dirrm share/gpasm
+%%PORTDOCS%%share/doc/gputils/gputils.lyx
+%%PORTDOCS%%share/doc/gputils/gputils.pdf
+%%PORTDOCS%%share/doc/gputils/gputils.ps
+share/gputils/header/ap7675.inc
+share/gputils/header/mcp250xx.inc
+share/gputils/header/memory.inc
+share/gputils/header/p12c508.inc
+share/gputils/header/p12c508a.inc
+share/gputils/header/p12c509.inc
+share/gputils/header/p12c509a.inc
+share/gputils/header/p12c671.inc
+share/gputils/header/p12c672.inc
+share/gputils/header/p12ce518.inc
+share/gputils/header/p12ce519.inc
+share/gputils/header/p12ce673.inc
+share/gputils/header/p12ce674.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/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/p16c621a.inc
+share/gputils/header/p16c622.inc
+share/gputils/header/p16c622a.inc
+share/gputils/header/p16c62a.inc
+share/gputils/header/p16c62b.inc
+share/gputils/header/p16c63.inc
+share/gputils/header/p16c63a.inc
+share/gputils/header/p16c64.inc
+share/gputils/header/p16c641.inc
+share/gputils/header/p16c642.inc
+share/gputils/header/p16c64a.inc
+share/gputils/header/p16c65.inc
+share/gputils/header/p16c65a.inc
+share/gputils/header/p16c65b.inc
+share/gputils/header/p16c66.inc
+share/gputils/header/p16c661.inc
+share/gputils/header/p16c662.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/p16c72a.inc
+share/gputils/header/p16c73.inc
+share/gputils/header/p16c73a.inc
+share/gputils/header/p16c73b.inc
+share/gputils/header/p16c74.inc
+share/gputils/header/p16c745.inc
+share/gputils/header/p16c74a.inc
+share/gputils/header/p16c74b.inc
+share/gputils/header/p16c76.inc
+share/gputils/header/p16c765.inc
+share/gputils/header/p16c77.inc
+share/gputils/header/p16c770.inc
+share/gputils/header/p16c771.inc
+share/gputils/header/p16c773.inc
+share/gputils/header/p16c774.inc
+share/gputils/header/p16c781.inc
+share/gputils/header/p16c782.inc
+share/gputils/header/p16c84.inc
+share/gputils/header/p16c923.inc
+share/gputils/header/p16c924.inc
+share/gputils/header/p16c925.inc
+share/gputils/header/p16c926.inc
+share/gputils/header/p16ce623.inc
+share/gputils/header/p16ce624.inc
+share/gputils/header/p16ce625.inc
+share/gputils/header/p16cr62.inc
+share/gputils/header/p16cr63.inc
+share/gputils/header/p16cr64.inc
+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/p16f628.inc
+share/gputils/header/p16f73.inc
+share/gputils/header/p16f74.inc
+share/gputils/header/p16f76.inc
+share/gputils/header/p16f77.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/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/p16f874a.inc
+share/gputils/header/p16f876.inc
+share/gputils/header/p16f876a.inc
+share/gputils/header/p16f877.inc
+share/gputils/header/p16f877a.inc
+share/gputils/header/p16hv540.inc
+share/gputils/header/p17c42.inc
+share/gputils/header/p17c42a.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/p17c762.inc
+share/gputils/header/p17c766.inc
+share/gputils/header/p17cr42.inc
+share/gputils/header/p17cr43.inc
+share/gputils/header/p18c242.inc
+share/gputils/header/p18c252.inc
+share/gputils/header/p18c442.inc
+share/gputils/header/p18c452.inc
+share/gputils/header/p18c601.inc
+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/p18f242.inc
+share/gputils/header/p18f248.inc
+share/gputils/header/p18f252.inc
+share/gputils/header/p18f258.inc
+share/gputils/header/p18f442.inc
+share/gputils/header/p18f448.inc
+share/gputils/header/p18f452.inc
+share/gputils/header/p18f458.inc
+share/gputils/header/p18f6620.inc
+share/gputils/header/p18f6720.inc
+share/gputils/header/p18f8620.inc
+share/gputils/header/p18f8720.inc
+share/gputils/header/p18macro.inc
+share/gputils/header/rf509af.inc
+share/gputils/header/rf509ag.inc
+@dirrm share/gputils/header
+@dirrm share/gputils
+%%PORTDOCS%%@dirrm share/doc/gputils