From owner-svn-ports-all@FreeBSD.ORG  Sat Sep  8 13:09:11 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7C809106564A;
	Sat,  8 Sep 2012 13:09:11 +0000 (UTC)
	(envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 66BA38FC0A;
	Sat,  8 Sep 2012 13:09:11 +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 q88D9BC3089707;
	Sat, 8 Sep 2012 13:09:11 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q88D9BUQ089705;
	Sat, 8 Sep 2012 13:09:11 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201209081309.q88D9BUQ089705@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Sat, 8 Sep 2012 13:09:11 +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: r303900 - head/graphics/recoverjpeg
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sat, 08 Sep 2012 13:09:11 -0000

Author: ehaupt
Date: Sat Sep  8 13:09:10 2012
New Revision: 303900
URL: http://svn.freebsd.org/changeset/ports/303900

Log:
  - Use OPTIONSng
  - Remove deprecated header information

Modified:
  head/graphics/recoverjpeg/Makefile

Modified: head/graphics/recoverjpeg/Makefile
==============================================================================
--- head/graphics/recoverjpeg/Makefile	Sat Sep  8 12:42:02 2012	(r303899)
+++ head/graphics/recoverjpeg/Makefile	Sat Sep  8 13:09:10 2012	(r303900)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	recoverjpeg
-# Date created:				25 Sep 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	recoverjpeg
 PORTVERSION=	2.1.1
@@ -20,15 +15,16 @@ GNU_CONFIGURE=	yes
 MANCOMPRESSED=	no
 MAKE_JOBS_SAFE=	yes
 
-# recoverjpeg scripts require many dependencies
-OPTIONS=	SCRIPTS	"Install sort-pictures script" off
-
 PLIST_FILES=	bin/recoverjpeg
 MAN1=		recoverjpeg.1
 
-.include <bsd.port.pre.mk>
+# recoverjpeg scripts require many dependencies
+OPTIONS_DEFINE=	SSCRIPTS
+SSCRIPTS_DESC=	Install sort-pictures script
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SCRIPTS)
+.if  ${PORT_OPTIONS:MSSCRIPTS}
 RUN_DEPENDS=	exif:${PORTSDIR}/graphics/exif \
 		identify:${PORTSDIR}/graphics/ImageMagick
 PLIST_FILES+=	bin/sort-pictures
@@ -37,7 +33,7 @@ MAN1+=		sort-pictures.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(WITHOUT_SCRIPTS)
+.if ${PORT_OPTIONS:MSSCRIPTS}
 .for f in sort-pictures
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
@@ -46,4 +42,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/${f} ${MANPREFIX}/man/man1
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>