- Update to version 1.03 and thus undeprecate

- Install complete set of files
- Merge `post-install' (for docs) with `do-install'
- Utilize DATADIR and DOCSDIR macros in pkg-plist
- Reformat Makefile header
- Kill attribution in pkg-descr

4 files changed, 52 insertions, 19 deletions

diff --git a/devel/aunit/Makefile b/devel/aunit/Makefile
index 07ee1fa0a895..ab91490db7f0 100644
--- a/devel/aunit/Makefile
+++ b/devel/aunit/Makefile
@@ -1,32 +1,37 @@
-# New ports collection makefile for:   aunit
-# Date created:        20 Jan 2002
-# Whom:                Aidan Skinner <aidan@velvet.net>
+# New ports collection makefile for:	AUnit
+# Date created:				20 Jan 2002
+# Whom:					Aidan Skinner <aidan@velvet.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aunit
-PORTVERSION=	1.01
+PORTVERSION=	1.03
 CATEGORIES=	devel
-MASTER_SITES=	http://libre.act-europe.fr/aunit/
+MASTER_SITES=	https://libre2.adacore.com/aunit/
+DISTNAME=	${PORTNAME}-${PORTVERSION}p-src
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A unit testing framework for the Ada '95 programming language
 
-DEPRECATED=	no longer available from mastersite; current version is 1.03
-EXPIRATION_DATE=	2006-11-04
-
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/AUnit
+
+pre-install:
+	@${FIND} ${WRKSRC} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf
 
 do-install:
 	@${MKDIR} ${PREFIX}/include/aunit
 	${INSTALL_DATA} ${WRKSRC}/aunit/framework/* ${PREFIX}/include/aunit
 	${INSTALL_DATA} ${WRKSRC}/aunit/text_reporter/* ${PREFIX}/include/aunit
-
+	@${MKDIR} ${DATADIR}/template ${DATADIR}/test
+	${INSTALL_DATA} ${WRKSRC}/template/* ${DATADIR}/template
+	${INSTALL_DATA} ${WRKSRC}/test/* ${DATADIR}/test
+	${INSTALL_DATA} ${WRKSRC}/*.gpr ${DATADIR}
 .if !defined(NOPORTDOCS)
-post-install:
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/AUnit.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/AUnit.html ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/aunit/distinfo b/devel/aunit/distinfo
index cb386553eff9..caad4b98df13 100644
--- a/devel/aunit/distinfo
+++ b/devel/aunit/distinfo
@@ -1,3 +1,3 @@
-MD5 (aunit-1.01.tar.gz) = 2ee22dd2862eae1c23205df33f4ee4ff
-SHA256 (aunit-1.01.tar.gz) = bbe2d97ee3a2d8f6fc2b918677123e5f4c892d7c44b9b00ffd73729514e37370
-SIZE (aunit-1.01.tar.gz) = 27221
+MD5 (aunit-1.03p-src.tgz) = 24e6e78f199b732aa6a21293968e32cc
+SHA256 (aunit-1.03p-src.tgz) = cdc6b076253d9cb9fab5227c789ac178bf12bcdecbc85ef36d4b9f51fb30d365
+SIZE (aunit-1.03p-src.tgz) = 29737
diff --git a/devel/aunit/pkg-descr b/devel/aunit/pkg-descr
index 0830a96cc2be..daa278f2d89a 100644
--- a/devel/aunit/pkg-descr
+++ b/devel/aunit/pkg-descr
@@ -8,6 +8,3 @@ tests to provide flexibility in determining what tests to run for a
 given purpose.
 
 WWW: http://libre.act-europe.fr/aunit/
-
-- Aidan 
-aidan@velvet.net
diff --git a/devel/aunit/pkg-plist b/devel/aunit/pkg-plist
index 4af0ff0b95f6..36090ad20a3b 100644
--- a/devel/aunit/pkg-plist
+++ b/devel/aunit/pkg-plist
@@ -19,5 +19,36 @@ include/aunit/aunit-test_suites.ads
 include/aunit/aunit-tests.ads
 include/aunit/aunit.ads
 @dirrm include/aunit
-%%PORTDOCS%%share/doc/aunit/AUnit.html
-%%PORTDOCS%%@dirrm share/doc/aunit
+%%DATADIR%%/template/sample_suite.adb
+%%DATADIR%%/template/sample.adp
+%%DATADIR%%/template/sample.gpr
+%%DATADIR%%/template/pr_xxxx_xxx.adb
+%%DATADIR%%/template/pr_xxxx_xxx.ads
+%%DATADIR%%/template/harness.adb
+@dirrm %%DATADIR%%/template
+%%DATADIR%%/test/default.adp
+%%DATADIR%%/test/empty_test_case.adb
+%%DATADIR%%/test/empty_test_case.ads
+%%DATADIR%%/test/one_test_case-inherited_test_case.adb
+%%DATADIR%%/test/one_test_case-inherited_test_case.ads
+%%DATADIR%%/test/simple_test_case.adb
+%%DATADIR%%/test/simple_test_case.ads
+%%DATADIR%%/test/harness.adb
+%%DATADIR%%/test/test_lists.adb
+%%DATADIR%%/test/test_lists.ads
+%%DATADIR%%/test/timed_harness.adb
+%%DATADIR%%/test/test_test_suite.adb
+%%DATADIR%%/test/test_test_suite.ads
+%%DATADIR%%/test/aunit_suite.adb
+%%DATADIR%%/test/test_test_case_registration.adb
+%%DATADIR%%/test/test_test_case_registration.ads
+%%DATADIR%%/test/test_test_case.adb
+%%DATADIR%%/test/test_test_case.ads
+%%DATADIR%%/test/one_test_case.adb
+%%DATADIR%%/test/one_test_case.ads
+@dirrm %%DATADIR%%/test
+%%DATADIR%%/aunit.gpr
+%%DATADIR%%/aunit_tests.gpr
+%%PORTDOCS%%%%DOCSDIR%%/AUnit.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%