ports/172222: deskutils/nagaina: Support CXX/CXXFLAGS properly

[KATO Tsuguru]

>Number:         172222
>Category:       ports
>Synopsis:       deskutils/nagaina: Support CXX/CXXFLAGS properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 01 18:10:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Support CXX/CXXFLAGS properly

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/deskutils/nagaina/Makefile deskutils/nagaina/Makefile
--- /usr/ports/deskutils/nagaina/Makefile	2012-06-06 15:43:26.000000000 +0900
+++ deskutils/nagaina/Makefile	2012-10-02 00:22:20.000000000 +0900
@@ -1,25 +1,27 @@
-# New ports collection makefile for:	nagaina
-# Date created:		21 August 2007
-# Whom:			Yinghong Liu <relaxbsd at gmail.com>
-#
+# Created by: Yinghong Liu <relaxbsd at gmail.com>
 # $FreeBSD: ports/deskutils/nagaina/Makefile,v 1.9 2012/06/06 06:43:26 miwi Exp $
-#
 
 PORTNAME=	nagaina
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-sources
+MASTER_SITES=	GOOGLE_CODE
+DISTVERSIONSUFFIX=	-sources
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A notes-taking application based QT4
 
-USE_QT4=	gui xml qmake_build moc_build rcc_build uic_build
+LICENSE=	GPLv2
+
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USE_QT4=	gui xml moc_build qmake_build rcc_build uic_build
+MAKE_JOBS_SAFE=	yes
+
+PORTDOCS=	CHANGELOG TODO
 PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
-PORTDOCS=	CHANGELOG COMPILE LICENSE TODO
 
 DESKTOP_ENTRIES=	"${PORTNAME}" \
 			"${COMMENT}" \
@@ -28,16 +30,20 @@
 			"Qt;KDE;Office;Utility;" \
 			"false"
 
-pre-build:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE}
+.include <bsd.port.options.mk>
+
+do-configure:
+	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
 
 post-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${PREFIX}/share/pixmaps
-.if !defined(NOPORTDOCS)
+	(cd ${WRKSRC}/bin \
+		&& ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
+	(cd ${WRKSRC}/images \
+		&& ${INSTALL_DATA} ${PORTNAME}.png ${PREFIX}/share/pixmaps)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${DOCSDIR})
 .endfor
 .endif
 
>Release-Note:
>Audit-Trail:
>Unformatted: