From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 16 20:05:12 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 85D3B106564A;
	Mon, 16 Jul 2012 20:05:12 +0000 (UTC)
	(envelope-from garga@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 70EA78FC0C;
	Mon, 16 Jul 2012 20:05:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GK5C4i077705;
	Mon, 16 Jul 2012 20:05:12 GMT (envelope-from garga@svn.freebsd.org)
Received: (from garga@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GK5Cbs077703;
	Mon, 16 Jul 2012 20:05:12 GMT (envelope-from garga@svn.freebsd.org)
Message-Id: <201207162005.q6GK5Cbs077703@svn.freebsd.org>
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 16 Jul 2012 20:05:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r300979 - head/mail/queue-fix
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2012 20:05:12 -0000

Author: garga
Date: Mon Jul 16 20:05:11 2012
New Revision: 300979
URL: http://svn.freebsd.org/changeset/ports/300979

Log:
  - Move to OPTIONSng
  - Handle DOCS using PORTDOCS and cleanup PLIST_*

Modified:
  head/mail/queue-fix/Makefile

Modified: head/mail/queue-fix/Makefile
==============================================================================
--- head/mail/queue-fix/Makefile	Mon Jul 16 20:04:35 2012	(r300978)
+++ head/mail/queue-fix/Makefile	Mon Jul 16 20:05:11 2012	(r300979)
@@ -21,28 +21,26 @@ MAKE_JOBS_SAFE=	yes
 
 PREFIX?=	${QMAIL_PREFIX}
 
-OPTIONS=	BIG_TODO "Use big_todo patch" off
+OPTIONS_DEFINE=	BIG_TODO
+
+BIG_TODO_DESC=	Use big_todo patch
 
 CONFIGURE_SCRIPT=
 ALL_TARGET=
 
-PLIST_SUB=	DOCDIR=${DOCDIR}
 PLIST_FILES=	bin/queue-fix
 
-.if !defined(NOPORTDOCS)
-PLIST_FILES+=	%%DOCDIR%%/README
-PLIST_DIRS+=	%%DOCDIR%%
-.endif
+PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
 
 .if (${PREFIX} == ${LOCALBASE})
-DOCDIR=	share/doc/qmail/queue-fix
+DOCSDIR=	${PREFIX}/share/doc/qmail/queue-fix
 .else
-DOCDIR=	doc/queue-fix
+DOCSDIR=	${PREFIX}/doc/queue-fix
 .endif
 
-.if defined(WITH_BIG_TODO)
+.if ${PORT_OPTIONS:MBIG_TODO}
 PATCH_SITES+=		http://www.qmail.org/
 PATCHFILES+=		queue-fix-todo.patch
 PATCH_DIST_STRIP+=	-p1
@@ -51,9 +49,9 @@ PATCH_DIST_STRIP+=	-p1
 do-install:
 	@${MKDIR} ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/queue-fix ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>