From c87346f7869e38a123d0f4a625a4cab9b276505b Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Fri, 18 Jul 2014 16:31:49 +0000 Subject: [PATCH] Unbreak build by setting MAKE_JOBS_UNSAFE. While here, use OPTIONS helpers and @sample. --- www/middleman/Makefile | 20 ++++++-------------- www/middleman/pkg-plist | 4 ++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/www/middleman/Makefile b/www/middleman/Makefile index 2a190a59ca39..4da26d2b35d9 100644 --- a/www/middleman/Makefile +++ b/www/middleman/Makefile @@ -16,6 +16,10 @@ SYSLOG_DESC= Enable syslog support DEBUG_DESC= Enable debugging support MTIME_DESC= Enable mtime support +SYSLOG_CONFIGURE_ON= --enable-syslog +DEBUG_CONFIGURE_ON= --enable-debug +MTIME_CONFIGURE_ON= --enable-mtime + WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes USES= gmake @@ -23,19 +27,7 @@ USES= gmake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread -.include - -.if ${PORT_OPTIONS:MSYSLOG} -CONFIGURE_ARGS+= --enable-syslog -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif - -.if ${PORT_OPTIONS:MMTIME} -CONFIGURE_ARGS+= --enable-mtime -.endif +MAKE_JOBS_UNSAFE= yes MMAN_CACHE= /var/cache/mman PLIST_SUB+= MMAN_CACHE=${MMAN_CACHE} @@ -52,7 +44,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/mman.8 ${STAGEDIR}${MANPREFIX}/man/man8 ${INSTALL_PROGRAM} ${WRKSRC}/mman ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/config.xml \ - ${STAGEDIR}${PREFIX}/etc/mman.xml.dist + ${STAGEDIR}${PREFIX}/etc/mman.xml.sample ${INSTALL_DATA} ${WRKSRC}/scripts/mman.init \ ${STAGEDIR}${PREFIX}/etc/rc.d/mman.sh.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/www/middleman/pkg-plist b/www/middleman/pkg-plist index 2da8478f7bd7..2323272bec5f 100644 --- a/www/middleman/pkg-plist +++ b/www/middleman/pkg-plist @@ -1,6 +1,6 @@ bin/mman -etc/rc.d/mman.sh.sample -etc/mman.xml.dist +@sample etc/rc.d/mman.sh.sample +@sample etc/mman.xml.sample man/man8/mman.8.gz %%PORTDOCS%%%%DOCSDIR%%/README.html %%PORTDOCS%%%%DOCSDIR%%/filter.pl