- Support CC properly

- Add LICENSE
- Stage support
- Bump PORTREVISION

PR:		187767
Submitted by:	ports fury

2 files changed, 32 insertions, 20 deletions

diff --git a/mail/qconfirm/Makefile b/mail/qconfirm/Makefile
index e13aed65490a..4d17377f64e7 100644
--- a/mail/qconfirm/Makefile
+++ b/mail/qconfirm/Makefile
@@ -3,39 +3,41 @@
 
 PORTNAME=	qconfirm
 PORTVERSION=	0.14.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://smarden.org/qconfirm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Filter spam by requesting confirmation from sender
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/package/COPYING
+
 WRKSRC=		${WRKDIR}/mail/${DISTNAME}
+
 ALL_TARGET=	default
 
-MAN1=		qconfirm.1 qconfirm-accept.1 qconfirm-check.1 \
-		qconfirm-check-mid.1 qconfirm-conf.1 \
-		qconfirm-cdb-check.1 qconfirm-cdb-update.1 \
-		qconfirm-control.1 qconfirm-inject.1 \
-		qconfirm-notice.1 qconfirm-return.1
-DOCS=		package/CHANGES package/COPYING package/README doc/*.html
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-configure:
 	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
+	${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/src/conf-ld
 
 do-build:
-	cd ${WRKSRC} && package/compile
-	@${ECHO_MSG} "Type 'make test' to run self-tests"
-
-test:
-	cd ${WRKSRC} && package/check
+	(cd ${WRKSRC} && package/compile)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	(cd ${WRKSRC}/command && ${INSTALL_PROGRAM} * \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/man && ${INSTALL_MAN} *.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html \
+		${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/package && ${INSTALL_DATA} CHANGES README \
+		${STAGEDIR}${DOCSDIR})
+
+test: build
+	(cd ${WRKSRC} && package/check)
 
 .include <bsd.port.mk>
diff --git a/mail/qconfirm/pkg-plist b/mail/qconfirm/pkg-plist
index 6f94b4a461a8..f0b10673a5dc 100644
--- a/mail/qconfirm/pkg-plist
+++ b/mail/qconfirm/pkg-plist
@@ -9,8 +9,18 @@ bin/qconfirm-control
 bin/qconfirm-inject
 bin/qconfirm-notice
 bin/qconfirm-return
+man/man1/qconfirm.1.gz
+man/man1/qconfirm-accept.1.gz
+man/man1/qconfirm-cdb-check.1.gz
+man/man1/qconfirm-cdb-update.1.gz
+man/man1/qconfirm-check.1.gz
+man/man1/qconfirm-check-mid.1.gz
+man/man1/qconfirm-conf.1.gz
+man/man1/qconfirm-control.1.gz
+man/man1/qconfirm-inject.1.gz
+man/man1/qconfirm-notice.1.gz
+man/man1/qconfirm-return.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/benefits.html
 %%PORTDOCS%%%%DOCSDIR%%/bounces.html
@@ -24,8 +34,8 @@ bin/qconfirm-return
 %%PORTDOCS%%%%DOCSDIR%%/qconfirm-accept.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qconfirm-cdb-check.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qconfirm-cdb-update.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qconfirm-check.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qconfirm-check-mid.1.html
+%%PORTDOCS%%%%DOCSDIR%%/qconfirm-check.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qconfirm-conf.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qconfirm-control.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qconfirm-inject.1.html