From owner-svn-ports-head@freebsd.org  Tue Jan 12 01:56:06 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5ED07A6D63C;
 Tue, 12 Jan 2016 01:56:06 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2F7CB1C5C;
 Tue, 12 Jan 2016 01:56:06 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0C1u5pf083638;
 Tue, 12 Jan 2016 01:56:05 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0C1u5Ux083637;
 Tue, 12 Jan 2016 01:56:05 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601120156.u0C1u5Ux083637@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 12 Jan 2016 01:56:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405820 - head/audio/gnuitar
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2016 01:56:06 -0000

Author: amdmi3
Date: Tue Jan 12 01:56:04 2016
New Revision: 405820
URL: https://svnweb.freebsd.org/changeset/ports/405820

Log:
  - Fix COMMENT
  - Display message in pre-everything instead of pre-fetch
  - Switch to options helpers

Modified:
  head/audio/gnuitar/Makefile

Modified: head/audio/gnuitar/Makefile
==============================================================================
--- head/audio/gnuitar/Makefile	Tue Jan 12 01:48:45 2016	(r405819)
+++ head/audio/gnuitar/Makefile	Tue Jan 12 01:56:04 2016	(r405820)
@@ -8,7 +8,7 @@ CATEGORIES=	audio multimedia
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The real-time guitar processor
+COMMENT=	Real-time guitar processor
 
 USE_GNOME=	gtk20
 USES=		tar:bzip2 gmake pkgconfig
@@ -21,11 +21,6 @@ TXT_DOCS=	AUTHORS COPYING FAQ INSTALL NE
 HTML_DOCS=	faq.html index.html install.html readme.html
 PORTDOCS=	${TXT_DOCS} ${HTML_DOCS}
 
-OPTIONS_DEFINE=	SUID DOCS
-OPTIONS_DEFAULT=	SUID
-SUID_DESC=	Use suid to allow highest priority (priv. dropped)
-OPTIONS_SUB=	yes
-
 DESKTOP_ENTRIES="GNUitar" \
 		"Apply guitar effects in real-time" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
@@ -33,12 +28,19 @@ DESKTOP_ENTRIES="GNUitar" \
 		"" \
 		true
 
-pre-fetch:
-	@${CAT} pkg-message
+OPTIONS_DEFINE=	SUID DOCS
+OPTIONS_DEFAULT=	SUID
+SUID_DESC=	Use suid to allow highest priority (priv. dropped)
+OPTIONS_SUB=	yes
+
+pre-everything::
+	@${CAT} ${PKGMESSAGE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gnuitar ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/gnuitar.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${TXT_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${HTML_DOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}