Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 May 2013 19:39:20 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r318258 - head/news/noffle
Message-ID:  <201305151939.r4FJdKDH072437@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Wed May 15 19:39:20 2013
New Revision: 318258
URL: http://svnweb.freebsd.org/changeset/ports/318258

Log:
  - Fix undetermined strings [1]
  - Trim Makefile header
  - Use OptionsNG for DOCS option
  
  PR:		ports/177660 [1]
  Submitted by:	John Marino <draco@marino.st> [1]
  Approved by:	culot (mentor)

Modified:
  head/news/noffle/Makefile

Modified: head/news/noffle/Makefile
==============================================================================
--- head/news/noffle/Makefile	Wed May 15 19:33:14 2013	(r318257)
+++ head/news/noffle/Makefile	Wed May 15 19:39:20 2013	(r318258)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	noffle
-# Date created:				28.06.2003
-# Whom:					Kirill Ponomarew <ponomarew@oberon.net>
-#
+# Created by: Kirill Ponomarew <ponomarew@oberon.net>
 # $FreeBSD$
-#
 
 PORTNAME=	noffle
 PORTVERSION=	1.1.5
@@ -37,6 +33,8 @@ post-patch:
 		${WRKSRC}/docs/${PORTNAME}.1 \
 		${WRKSRC}/docs/${PORTNAME}.conf.5
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
 		${PREFIX}/bin
@@ -46,12 +44,12 @@ do-install:
 		${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/noffle.conf.example \
 		${PREFIX}/etc/noffle.conf.sample
-	@${ECHO} "
+	@${ECHO}
 	@${ECHO} "------------------------------------------------------------"
 	@${ECHO} "Sample of configuration file placed at"
 	@${ECHO} "${PREFIX}/etc/noffle.conf.sample"
-	@${ECHO} "------------------------------------------------------------
-	@${ECHO} "
+	@${ECHO} "------------------------------------------------------------"
+	@${ECHO}
 	@${MKDIR} ${SPOOL_DIR}
 	@${MKDIR} ${SPOOL_DIR}/data
 	@${MKDIR} ${SPOOL_DIR}/lock
@@ -59,8 +57,7 @@ do-install:
 	@${MKDIR} ${SPOOL_DIR}/overview
 	@${MKDIR} ${SPOOL_DIR}/requested
 	@${CHOWN} -R news:news ${SPOOL_DIR}
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif



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