From owner-svn-ports-all@freebsd.org  Sun Oct  9 09:01:53 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 C5A5DC0617D;
 Sun,  9 Oct 2016 09:01:53 +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 7ED51F32;
 Sun,  9 Oct 2016 09:01:53 +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 u9991qSZ037325;
 Sun, 9 Oct 2016 09:01:52 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9991q07037323;
 Sun, 9 Oct 2016 09:01:52 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201610090901.u9991q07037323@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: Sun, 9 Oct 2016 09:01:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r423580 - head/graphics/gdchart
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Oct 2016 09:01:53 -0000

Author: amdmi3
Date: Sun Oct  9 09:01:52 2016
New Revision: 423580
URL: https://svnweb.freebsd.org/changeset/ports/423580

Log:
  - Switch to options helpers

Modified:
  head/graphics/gdchart/Makefile
  head/graphics/gdchart/pkg-plist

Modified: head/graphics/gdchart/Makefile
==============================================================================
--- head/graphics/gdchart/Makefile	Sun Oct  9 09:00:35 2016	(r423579)
+++ head/graphics/gdchart/Makefile	Sun Oct  9 09:01:52 2016	(r423580)
@@ -20,9 +20,8 @@ MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ARGS=	PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}"
 USE_LDCONFIG=	yes
 
-EXAMPLES=	ft_samp.c gdc_pie_samp.c gdc_samp1.c gdc_samp2.c
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
+PORTDOCS=	README.txt
+PORTEXAMPLES=	ft_samp.c gdc_pie_samp.c gdc_samp1.c gdc_samp2.c
 
 .if defined(NO_PROFILE)
 PLIST_SUB+=	PROFILE="@comment "
@@ -30,25 +29,29 @@ PLIST_SUB+=	PROFILE="@comment "
 PLIST_SUB+=	PROFILE=""
 .endif
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' \
 		-e 's/^#ifdef HAVE_LIBFREETYPE/#ifndef NO_LIBFREETYPE/' \
 			${WRKSRC}/*.[ch]
 # ft_samp.c and gdc_samp?.c miss #include "gdcpie.h"
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e 's/^#include "gdc\.h"/#include "gdcpie.h"/' \
 			${WRKSRC}/ft_samp.c \
 			${WRKSRC}/gdc_samp?.c
 # gdc_pie_samp.c misses #include "gdchart.h"
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e 's/^#include "gdc\.h"/#include "gdchart.h"/' \
 			${WRKSRC}/gdc_pie_samp.c
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/gdchart/pkg-plist
==============================================================================
--- head/graphics/gdchart/pkg-plist	Sun Oct  9 09:00:35 2016	(r423579)
+++ head/graphics/gdchart/pkg-plist	Sun Oct  9 09:01:52 2016	(r423580)
@@ -5,8 +5,3 @@ lib/libgdc.a
 lib/libgdc.so
 lib/libgdc.so.1
 %%PROFILE%%lib/libgdc_p.a
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ft_samp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gdc_samp1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gdc_samp2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gdc_pie_samp.c