From owner-svn-ports-all@freebsd.org  Wed Apr 12 12:40:34 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07FEBD3A82D;
 Wed, 12 Apr 2017 12:40:34 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CC4D2C7C;
 Wed, 12 Apr 2017 12:40:33 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3CCeWxK027681;
 Wed, 12 Apr 2017 12:40:32 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3CCeWSn027680;
 Wed, 12 Apr 2017 12:40:32 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201704121240.v3CCeWSn027680@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 12 Apr 2017 12:40:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r438353 - head/sysutils/dvdisaster
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Apr 2017 12:40:34 -0000

Author: amdmi3
Date: Wed Apr 12 12:40:32 2017
New Revision: 438353
URL: https://svnweb.freebsd.org/changeset/ports/438353

Log:
  - Remove obsolete OSVERSION condition
  - Switch to options helpers

Modified:
  head/sysutils/dvdisaster/Makefile

Modified: head/sysutils/dvdisaster/Makefile
==============================================================================
--- head/sysutils/dvdisaster/Makefile	Wed Apr 12 12:39:56 2017	(r438352)
+++ head/sysutils/dvdisaster/Makefile	Wed Apr 12 12:40:32 2017	(r438353)
@@ -65,18 +65,17 @@ post-patch:
 	${REINPLACE_CMD} -e 's|THESE_ARE_THE_DEVEL_SOURCES;|GNUmakefile;|; \
 		/install -d $$(BUILDROOT)$$(DOCSUBDIR)/,+18 d' \
 			${WRKSRC}/GNUmakefile.template
-.elif ${OSVERSION} > 1000000 && ${ARCH} == i386
+.elif ${ARCH} == i386
 	${REINPLACE_CMD} -e 's|THESE_ARE_THE_DEVEL_SOURCES;|GNUmakefile;|; \
 		/install -m 644 README.MODIFYING/{N;p;s/.*/	install -m 644 TODO $$(BUILDROOT)$$(DOCSUBDIR)/;}; \
 		/install -m 644 TODO $$(BUILDROOT)$$(DOCSUBDIR)/,+13 d' \
 			${WRKSRC}/GNUmakefile.template
 .endif
 
-.if ! ${PORT_OPTIONS:MNLS}
+post-patch-NLS-off:
 	${REINPLACE_CMD} -e 's|DOC_LOCALES = cs de en ru|DOC_LOCALES = en|; \
 		s|install -m 644 CREDITS\*|install -m 644 CREDITS\.en|' \
 			${WRKSRC}/GNUmakefile.template
-.endif
 
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC} && \