diff --git a/devel/aunit/Makefile b/devel/aunit/Makefile
index da7b1536a5a2..87f655cad64c 100644
--- a/devel/aunit/Makefile
+++ b/devel/aunit/Makefile
@@ -1,50 +1,51 @@
 # New ports collection makefile for: aunit
 # Date created:		31 Dec 2006
 # Whom:			John Merryweather Cooper
 #
 #  $FreeBSD$
 #
 
 PORTNAME=	aunit
 PORTVERSION=	1.05
 CATEGORIES=	devel
 MASTER_SITES=	http://libre.adacore.com/
-EXTRACT_SUFX=	-src.tgz
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz
 
 MAINTAINER=	john_m_cooper@yahoo.com
 COMMENT=	AUnit is an adaption of the Java JUnit unit test framework
 
 BUILD_DEPENDS=	gnatmake:${PORTSDIR}/lang/gnat
 RUN_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
 
 USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 
 .include <bsd.port.pre.mk>
 
 # Check for GNAT sources.
-.if !exists(${DISTDIR}/${DISTFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=	${PRINTF}
-IGNORE=Because of licensing and registration restrictions, you must fetch\n \
-	the source distribution manually.  Please access\n \
-	http://libre.adacore.com/\ with a web browser, register\n \
-	(It's free!) and log in.  Download the source files:\n\n \
-	\t${DISTFILE}\n\n \
-	and place them in ${DISTDIR}\n
-	${ECHO_MSG} ${IGNORE}
+.if !exists(${DISTDIR}/${DISTFILES}) && !defined(PACKAGE_BUILDING)
+pre-everything::
+	@echo "Because of licensing and registration restrictions, you must"
+	@echo "fetch the source distribution manually.  Please access"
+	@echo "http://libre.adacore.com/ with a web browser, register"
+	@echo "(It's free!) and log in.  Download the source files:"
+	@echo
+	@echo "	${DISTFILES}"
+	@echo
+	@echo "and place them in ${DISTDIR}"
+	@exit 1
 .endif
 
-WRKSRC=		${WRKDIR}/aunit-${PORTVERSION}-src
-
 pre-build:
 	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
 
 # install-info is being called directly because aunit.info does not have an
 # entry field
 post-install:
 	@install-info --entry "AUnit" ${DOCSDIR}/aunit.info \
 		${DOCSDIR}/dir
 
 test:
 	@${CD} ${WRKSRC} && ${GMAKE} test
 
 .include <bsd.port.post.mk>
diff --git a/devel/florist-gpl/Makefile b/devel/florist-gpl/Makefile
index 78feb2f3a521..439d781dfeff 100644
--- a/devel/florist-gpl/Makefile
+++ b/devel/florist-gpl/Makefile
@@ -1,40 +1,41 @@
 # New ports collection makefile for: florist-gpl
 # Date created:		31 Dec 2006
 # Whom:			John Merryweather Cooper
 #
 # $FreeBSD$
 #
 
 PORTNAME=	florist-gpl
 PORTVERSION=	2006
 CATEGORIES=	devel
 MASTER_SITES=	http://libre.adacore.com/
-EXTRACT_SUFX=	-src.tgz
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz
 
 MAINTAINER=	john_m_cooper@yahoo.com
 COMMENT=	The POSIX Ada Binding
 
 BUILD_DEPENDS=	gnatmake:${PORTSDIR}/lang/gnat
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
+WRKSRC=		${WRKDIR}/florist-${PORTVERSION}-src
 
 .include <bsd.port.pre.mk>
 
 # Check for GNAT sources.
-.if !exists(${DISTDIR}/${DISTFILE}) && !defined(PACKAGE_BUILDING)
-ECHO_MSG=	${PRINTF}
-IGNORE=Because of licensing and registration restrictions, you must fetch\n \
-	the source distribution manually.  Please access\n \
-	http://libre.adacore.com/\ with a web browser, register\n \
-	(It's free!) and log in.  Download the source files:\n\n \
-	\t${DISTFILE}\n\n \
-	and place them in ${DISTDIR}\n
-	${ECHO_MSG} ${IGNORE}
+.if !exists(${DISTDIR}/${DISTFILES}) && !defined(PACKAGE_BUILDING)
+pre-everything::
+	@echo "Because of licensing and registration restrictions, you must"
+	@echo "fetch the source distribution manually.  Please access"
+	@echo "http://libre.adacore.com/ with a web browser, register"
+	@echo "(It's free!) and log in.  Download the source files:"
+	@echo
+	@echo "	${DISTFILES}
+	@echo
+	@echo "and place them in ${DISTDIR}"
+	@exit 1
 .endif
 
-WRKSRC=		${WRKDIR}/florist-${PORTVERSION}-src
-
 .include <bsd.port.post.mk>