From owner-svn-ports-all@FreeBSD.ORG  Fri Jun 14 13:51:05 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1D820D64;
 Fri, 14 Jun 2013 13:51:05 +0000 (UTC)
 (envelope-from bsam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EA0CE1068;
 Fri, 14 Jun 2013 13:51:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EDp4Dv036618;
 Fri, 14 Jun 2013 13:51:04 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EDp4Nb036617;
 Fri, 14 Jun 2013 13:51:04 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201306141351.r5EDp4Nb036617@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Fri, 14 Jun 2013 13:51:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320918 - head/russian/mueller-dic
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jun 2013 13:51:05 -0000

Author: bsam
Date: Fri Jun 14 13:51:04 2013
New Revision: 320918
URL: http://svnweb.freebsd.org/changeset/ports/320918

Log:
  . NOPORTDOCS -> PORT_OPTIONS:MDOCS;
  . simplify install (use 1 line instead of 6);
  . trim Makefile headers;
  . add tab space to WRKSRC.

Modified:
  head/russian/mueller-dic/Makefile

Modified: head/russian/mueller-dic/Makefile
==============================================================================
--- head/russian/mueller-dic/Makefile	Fri Jun 14 13:48:02 2013	(r320917)
+++ head/russian/mueller-dic/Makefile	Fri Jun 14 13:51:04 2013	(r320918)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mueller-dic
-# Date created:		14 Jan 2004
-# Whom:			Igor Pokrovsky <tiamat@comset.net>
-#
+# Created by: Igor Pokrovsky <tiamat@comset.net>
 # $FreeBSD$
-#
 
 PORTNAME=	mueller-dic
 PORTVERSION=	1.2
@@ -21,10 +17,12 @@ USE_GMAKE=	yes
 USES=		iconv
 SUB_FILES=	mueller
 
-WRKSRC=	${WRKDIR}/mf
+WRKSRC=		${WRKDIR}/mf
 WRKSRC_DIC=	${WRKDIR}/usr/local/share/dict
 WRKSRC_DOC=	${WRKDIR}/usr/local/share/mova
 
+OPTIONS_DEFINE=	DOCS
+
 post-build:
 # convert dictionary to other charsets
 	${MV} ${WRKSRC_DIC}/Mueller7accentGPL.koi ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R
@@ -37,20 +35,17 @@ post-build:
 	${WRKSRC}/mf -d ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.CP1251 -hash
 	${WRKSRC}/mf -d ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.UTF-8 -hash
 
+.include <bsd.port.options.mk>
+
 do-install:
 	# install program with different name (it conflicts with teTeX)
 	${INSTALL_PROGRAM} ${WRKSRC}/mf ${PREFIX}/bin/muellerfind
 	${INSTALL_SCRIPT} ${WRKDIR}/mueller ${PREFIX}/bin/
 
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R.h ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.CP1251 ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.CP1251.h ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.UTF-8 ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.UTF-8.h ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.* ${DATADIR}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC_DOC}/Mueller7.txt ${DOCSDIR}/Mueller7.txt
 .endif