6 files changed, 256 insertions, 12 deletions

diff --git a/devel/gpasm/Makefile b/devel/gpasm/Makefile
index b414f54afd32..5a179eeef757 100644
--- a/devel/gpasm/Makefile
+++ b/devel/gpasm/Makefile
@@ -6,14 +6,18 @@
 #
 
 PORTNAME=	gpasm
-PORTVERSION=	0.8.10
+PORTVERSION=	0.9.5
 CATEGORIES=	devel
-MASTER_SITES=	http://gpasm.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sam@inf.enst.fr
 
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	DATADIR=${PREFIX}/share/gpasm
+CONFIGURE_ENV=	CC="cc -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lgnugetopt"
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/gpasm/distinfo b/devel/gpasm/distinfo
index 6a3ecc3d254a..612c4533d8f4 100644
--- a/devel/gpasm/distinfo
+++ b/devel/gpasm/distinfo
@@ -1 +1 @@
-MD5 (gpasm-0.8.10.tar.gz) = 740efd9cbedc0bf28a61d1c887a77146
+MD5 (gpasm-0.9.5.tar.gz) = 89f6482c77df197c6d18a9f5092e2cb2
diff --git a/devel/gpasm/pkg-plist b/devel/gpasm/pkg-plist
index 22044cecea00..17b71bd9671a 100644
--- a/devel/gpasm/pkg-plist
+++ b/devel/gpasm/pkg-plist
@@ -1,5 +1,123 @@
 bin/gpasm
-share/gpasm/special.inc
+bin/gpdasm
+bin/gpvc
+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
-@dirrm share/gpasm
 @dirrm share/doc/gpasm
+@dirrm share/gpasm/header
+@dirrm share/gpasm
diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index b414f54afd32..5a179eeef757 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -6,14 +6,18 @@
 #
 
 PORTNAME=	gpasm
-PORTVERSION=	0.8.10
+PORTVERSION=	0.9.5
 CATEGORIES=	devel
-MASTER_SITES=	http://gpasm.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sam@inf.enst.fr
 
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	DATADIR=${PREFIX}/share/gpasm
+CONFIGURE_ENV=	CC="cc -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lgnugetopt"
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/devel/gputils/distinfo b/devel/gputils/distinfo
index 6a3ecc3d254a..612c4533d8f4 100644
--- a/devel/gputils/distinfo
+++ b/devel/gputils/distinfo
@@ -1 +1 @@
-MD5 (gpasm-0.8.10.tar.gz) = 740efd9cbedc0bf28a61d1c887a77146
+MD5 (gpasm-0.9.5.tar.gz) = 89f6482c77df197c6d18a9f5092e2cb2
diff --git a/devel/gputils/pkg-plist b/devel/gputils/pkg-plist
index 22044cecea00..17b71bd9671a 100644
--- a/devel/gputils/pkg-plist
+++ b/devel/gputils/pkg-plist
@@ -1,5 +1,123 @@
 bin/gpasm
-share/gpasm/special.inc
+bin/gpdasm
+bin/gpvc
+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
-@dirrm share/gpasm
 @dirrm share/doc/gpasm
+@dirrm share/gpasm/header
+@dirrm share/gpasm