Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Nov 2012 16:13:14 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306811 - head/deskutils/nagaina
Message-ID:  <201211011613.qA1GDEog028013@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Thu Nov  1 16:13:13 2012
New Revision: 306811
URL: http://svn.freebsd.org/changeset/ports/306811

Log:
  - Add LICENSE
  - Mark MAKE_JOBS_SAFE
  - Respect CXX/CXXFLAGS
  
  While here:
  - Fix COMMENT
  - Add missing deps
  - Fix application name in desktop entry
  
  PR:		ports/172222
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Feature safe:	yes

Modified:
  head/deskutils/nagaina/Makefile

Modified: head/deskutils/nagaina/Makefile
==============================================================================
--- head/deskutils/nagaina/Makefile	Thu Nov  1 15:35:56 2012	(r306810)
+++ head/deskutils/nagaina/Makefile	Thu Nov  1 16:13:13 2012	(r306811)
@@ -1,43 +1,61 @@
-# New ports collection makefile for:	nagaina
-# Date created:		21 August 2007
-# Whom:			Yinghong Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong Liu <relaxbsd@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	nagaina
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+DISTVERSIONSUFFIX=	-sources
+PORTREVISION=	4
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-sources
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A notes-taking application based QT4
+COMMENT=	Notes-taking application based on Qt4
+
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		pcre:${PORTSDIR}/devel/pcre \
+		png15:${PORTSDIR}/graphics/png \
+		freetype:${PORTSDIR}/print/freetype2 \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		xcb:${PORTSDIR}/x11/libxcb
+
+OPTIONS_DEFINE=	DOCS
 
-USE_QT4=	gui xml qmake_build moc_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USE_GETTEXT=	yes
+USE_ICONV=	yes
+USE_GNOME=	glib20
+USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
+USE_XORG=	ice sm x11 xau xdmcp xext xrender
+MAKE_JOBS_SAFE=	yes
+
+PORTDOCS=	CHANGELOG TODO
 PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
-PORTDOCS=	CHANGELOG COMPILE LICENSE TODO
 
-DESKTOP_ENTRIES=	"${PORTNAME}" \
+DESKTOP_ENTRIES=	"Nagaina" \
 			"${COMMENT}" \
 			"${PORTNAME}" \
 			"${PORTNAME}" \
 			"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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211011613.qA1GDEog028013>