5 files changed, 31 insertions, 20 deletions

diff --git a/sysutils/afbinit/Makefile b/sysutils/afbinit/Makefile
index ae26ae704dcb..2f41e79db963 100644
--- a/sysutils/afbinit/Makefile
+++ b/sysutils/afbinit/Makefile
@@ -7,15 +7,19 @@
 
 PORTNAME=		afbinit
 PORTVERSION=		1.0
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		sysutils graphics
-MASTER_SITES=		${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/contrib/a/afbinit
-DISTNAME=		${PORTNAME}_${PORTVERSION}.orig
+MASTER_SITES=		${MASTER_SITE_DEBIAN:S/$/:afbinit,patch/} \
+			http://dlc.sun.com/%SUBDIR%/:microcode
+MASTER_SITE_SUBDIR=	pool/contrib/a/afbinit/:afbinit,patch \
+			osol/sparc-gfx/downloads/:microcode
+DISTFILES=		${PORTNAME}_${PORTVERSION}.orig.tar.gz:afbinit \
+			afb-ucode.tar.bz2:microcode
+DIST_SUBDIR=		${PORTNAME}
 
 PATCH_SITES=		${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=		${PORTNAME}_${PORTVERSION}-4.diff.gz
+PATCHFILES=		${PORTNAME}_${PORTVERSION}-4.diff.gz:patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		marius@FreeBSD.org
@@ -23,7 +27,7 @@ COMMENT=		Sun AFB aka Sun Elite 3D microcode firmware loader
 
 ONLY_FOR_ARCHS=		sparc64
 USE_RC_SUBR=		afbinit.sh
-WRKSRC=			${WRKDIR}/${DISTNAME:S/_/-/}
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
 MAN8=			afbinit.8
@@ -45,6 +49,11 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/afbinit ${PREFIX}/sbin
 	@${INSTALL_MAN} ${WRKSRC}/debian/afbinit.8 ${PREFIX}/man/man8
 	@${INSTALL} -d ${DATADIR}
+	@${INSTALL_DATA} ${WRKDIR}/afb-ucode/afb.ucode ${DATADIR}
+.if !defined(NOPORTDOCS)
+	@${INSTALL} -d ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKDIR}/afb-ucode/README ${DOCSDIR}
+.endif
 
 post-install:
 	@${CAT} ${WRKDIR}/pkg-message
diff --git a/sysutils/afbinit/distinfo b/sysutils/afbinit/distinfo
index 7395701b7fdf..daa9bfc228e0 100644
--- a/sysutils/afbinit/distinfo
+++ b/sysutils/afbinit/distinfo
@@ -1,6 +1,9 @@
-MD5 (afbinit_1.0.orig.tar.gz) = c126b3ebb72e5028fd5d35fb6128316f
-SHA256 (afbinit_1.0.orig.tar.gz) = cc0e316ed911955042186f5e1ccc43f9413fa369e4ddb8de8aaad293ad56a206
-SIZE (afbinit_1.0.orig.tar.gz) = 2979
-MD5 (afbinit_1.0-4.diff.gz) = 894ee8cf4afa258aa879be7ebe90edf9
-SHA256 (afbinit_1.0-4.diff.gz) = ca6a321f6e85dd63ac0b12c88468e8104f22014f0533ff416a9215d8f200c971
-SIZE (afbinit_1.0-4.diff.gz) = 3815
+MD5 (afbinit/afbinit_1.0.orig.tar.gz) = c126b3ebb72e5028fd5d35fb6128316f
+SHA256 (afbinit/afbinit_1.0.orig.tar.gz) = cc0e316ed911955042186f5e1ccc43f9413fa369e4ddb8de8aaad293ad56a206
+SIZE (afbinit/afbinit_1.0.orig.tar.gz) = 2979
+MD5 (afbinit/afb-ucode.tar.bz2) = 55ceee0162a42313d87950f902aaf0ee
+SHA256 (afbinit/afb-ucode.tar.bz2) = 6ef1da6c6ff7a6ba07d7cf8c5b3677e353d59b8baea40af05ae0ee56d2befc84
+SIZE (afbinit/afb-ucode.tar.bz2) = 36421
+MD5 (afbinit/afbinit_1.0-4.diff.gz) = 894ee8cf4afa258aa879be7ebe90edf9
+SHA256 (afbinit/afbinit_1.0-4.diff.gz) = ca6a321f6e85dd63ac0b12c88468e8104f22014f0533ff416a9215d8f200c971
+SIZE (afbinit/afbinit_1.0-4.diff.gz) = 3815
diff --git a/sysutils/afbinit/pkg-descr b/sysutils/afbinit/pkg-descr
index 008f5dd92d1e..40cdaad25cc1 100644
--- a/sysutils/afbinit/pkg-descr
+++ b/sysutils/afbinit/pkg-descr
@@ -1,6 +1,5 @@
 This port provides a program that loads the microcode firmware onto Sun
 Microsystems AFB Graphics Accelerators aka Sun Microsystems Elite 3D
-found in many UltraSPARC systems. The microcode is necessary if you want
-to run XFree86 with acceleration on these cards.
-The microcode in itself has to be obtained from an existing SunOS/Solaris
-installation.
+found in many UltraSPARC systems.  The microcode is necessary if you want
+to run X.Org with acceleration on these cards and is also included in this
+port.
diff --git a/sysutils/afbinit/pkg-message b/sysutils/afbinit/pkg-message
index 9f7244956f72..e9aa02e76061 100644
--- a/sysutils/afbinit/pkg-message
+++ b/sysutils/afbinit/pkg-message
@@ -1,7 +1,5 @@
 ===========================================================================
 
-In order to use afbinit(8) you have to manually copy /usr/lib/afb.ucode
-from a SunOS/Solaris installation over to %%DATADIR%%.
 In order to automatically load the microcode during boot add the following
 line to to /etc/rc.conf or /etc/rc.conf.local:
 
diff --git a/sysutils/afbinit/pkg-plist b/sysutils/afbinit/pkg-plist
index c222e0822625..92a877c84993 100644
--- a/sysutils/afbinit/pkg-plist
+++ b/sysutils/afbinit/pkg-plist
@@ -1,3 +1,5 @@
 sbin/afbinit
-@exec install -d %D/%%DATADIR%%
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || echo "If permanently deleting this package, %D/%%DATADIR%% and its contents must be removed manually."
+%%DATADIR%%/afb.ucode
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%