Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Jul 2014 16:31:49 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362217 - head/www/middleman
Message-ID:  <201407181631.s6IGVnLG058668@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Fri Jul 18 16:31:49 2014
New Revision: 362217
URL: http://svnweb.freebsd.org/changeset/ports/362217
QAT: https://qat.redports.org/buildarchive/r362217/

Log:
  Unbreak build by setting MAKE_JOBS_UNSAFE. While here, use OPTIONS
  helpers and @sample.

Modified:
  head/www/middleman/Makefile
  head/www/middleman/pkg-plist

Modified: head/www/middleman/Makefile
==============================================================================
--- head/www/middleman/Makefile	Fri Jul 18 16:17:33 2014	(r362216)
+++ head/www/middleman/Makefile	Fri Jul 18 16:31:49 2014	(r362217)
@@ -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 <bsd.port.options.mk>
-
-.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}

Modified: head/www/middleman/pkg-plist
==============================================================================
--- head/www/middleman/pkg-plist	Fri Jul 18 16:17:33 2014	(r362216)
+++ head/www/middleman/pkg-plist	Fri Jul 18 16:31:49 2014	(r362217)
@@ -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



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