Date: Sun, 9 Oct 2016 09:01:52 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423580 - head/graphics/gdchart Message-ID: <201610090901.u9991q07037323@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610090901.u9991q07037323>